Skip to content

Comments

chore: cherry pick fixes from main#487

Merged
15 commits merged intorelease-1.3from
unknown repository
Dec 10, 2024
Merged

chore: cherry pick fixes from main#487
15 commits merged intorelease-1.3from
unknown repository

Conversation

@ghost
Copy link

@ghost ghost commented Dec 9, 2024 •
edited by ghost
Loading

This PR cherry picks from main to release-1.3. This is for v1.3.0-rc.2 release.

This PR targets on branch release-1.3.

AdamKorcz and others added 2 commits December 9, 2024 10:34
@AdamKorcz
test: add fuzz test (#459)
b95c1d5 
Adds a fuzz test from cncf-fuzzing:
https://github.com/cncf/cncf-fuzzing/blob/main/projects/notary/fuzz_pkix_test.go

Signed-off-by: Adam Korczynski <adam@adalogics.com>
Signed-off-by: Patrick Zheng <patrickzheng@microsoft.com>
@dependabot
build(deps): bump github.com/veraison/go-cose from 1.1.0 to 1.3.0 (#467)
29912ac 
Signed-off-by: Patrick Zheng <patrickzheng@microsoft.com>
@codecov
Copy link

codecov bot commented Dec 9, 2024 •
edited
Loading

Codecov Report

Attention: Patch coverage is 97.72727% with 1 line in your changes missing coverage. Please review.

Project coverage is 80.60%. Comparing base (fb1f0c8) to head (dd73327).

Files with missing lines Patch % Lines
notation.go 50.00% 1 Missing ⚠️
Additional details and impacted files 
@@               Coverage Diff               @@
##           release-1.3     #487      +/-   ##
===============================================
- Coverage        81.71%   80.60%   -1.12%     
===============================================
  Files               33       33              
  Lines             2374     3062     +688     
===============================================
+ Hits              1940     2468     +528     
- Misses             302      463     +161     
+ Partials           132      131       -1

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

JeyJeyGao
JeyJeyGao previously approved these changes Dec 9, 2024
View reviewed changes
Copy link
Contributor

@JeyJeyGao JeyJeyGao left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Compared commit history and diff against main branch.

@ghost ghost changed the title bump: cherry pick from main chore: cherry pick from main Dec 9, 2024
@shizhMSFT shizhMSFT changed the title chore: cherry pick from main chore: cherry pick fixes from main Dec 9, 2024
shizhMSFT
shizhMSFT reviewed Dec 9, 2024
View reviewed changes
Copy link
Contributor

@shizhMSFT shizhMSFT left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The commit e723406 is required to be backported.

JeyJeyGao and others added 13 commits December 9, 2024 14:16
@JeyJeyGao
fix: OS error when setting CRL cache leads to denial of signature ver…
3c33022 
…ification

Signed-off-by: Junjie Gao <junjiegao@microsoft.com>
Signed-off-by: Patrick Zheng <patrickzheng@microsoft.com>
fix: added tsa trust store root cert validation (#471)
d66c7ab 
This PR adds tsa trust store root cert validation while getting
certificates from trust store. This is to fail fast if cert in TSA trust
store is not a root CA certificate.

Resolves #470

---------

Signed-off-by: Patrick Zheng <patrickzheng@microsoft.com>
chore: add crl cache debug logs (#473)
0b9f71f 
Signed-off-by: Patrick Zheng <patrickzheng@microsoft.com>
@dependabot
build(deps): bump golang.org/x/crypto from 0.27.0 to 0.28.0 (#468)
0c84a37 
Signed-off-by: Patrick Zheng <patrickzheng@microsoft.com>
@dependabot
build(deps): bump github.com/golang-jwt/jwt/v4 from 4.5.0 to 4.5.1 (#474
c32fb1a 
)

Signed-off-by: Patrick Zheng <patrickzheng@microsoft.com>
@dependabot
build(deps): bump golang.org/x/crypto from 0.28.0 to 0.29.0 (#476)
5395b65 
Signed-off-by: Patrick Zheng <patrickzheng@microsoft.com>
fix: crl cache log and err msg (#475)
e277e40 
Signed-off-by: Patrick Zheng <patrickzheng@microsoft.com>
@dependabot
build(deps): bump golang.org/x/mod from 0.21.0 to 0.22.0 (#477)
5384dde 
Signed-off-by: Patrick Zheng <patrickzheng@microsoft.com>
@priteshbandi
chore: Improve error message in case of plugin timeout (#472)
2307de5 
When a plugin exceeds the specified timeout or deadline for content
processing, the current error message displayed is ```signal: killed```.
This PR updates the error message to a more informative message:
```[plugin_name] [command_name] command execution timeout: signal:
killed```

---------

Signed-off-by: Pritesh Bandi <priteshbandi@gmail.com>
Signed-off-by: Patrick Zheng <patrickzheng@microsoft.com>
@priteshbandi
fix: timestamping (#478)
ffc04d8 
Signed-off-by: Patrick Zheng <patrickzheng@microsoft.com>
Co-authored-by: Pritesh Bandi <priteshbandi@gmail.com>
Signed-off-by: Patrick Zheng <patrickzheng@microsoft.com>
@JeyJeyGao
fix: add warning message for non-revokable certificate (#479)
0a9ff2a 
Fix:
- added warning message for non-revokable certificate

---------

Signed-off-by: Junjie Gao <junjiegao@microsoft.com>
Signed-off-by: Patrick Zheng <patrickzheng@microsoft.com>
fix: enable timestamping cert chain revocation check during signing (#…
e7005a6 
…482)

Signed-off-by: Patrick Zheng <patrickzheng@microsoft.com>
@JeyJeyGao
perf(log): encode objects only when logged (#481)
5b21f2f 
Fix:
- replaced `.String()` with the `%v` format to avoid rendering the
string before actually logging it.

Resolves #480

Signed-off-by: Junjie Gao <junjiegao@microsoft.com>
Signed-off-by: Patrick Zheng <patrickzheng@microsoft.com>
@ghost ghost requested review from JeyJeyGao and shizhMSFT December 9, 2024 06:18
JeyJeyGao
JeyJeyGao previously approved these changes Dec 9, 2024
View reviewed changes
Copy link
Contributor

@JeyJeyGao JeyJeyGao left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@ghost
Copy link
Author

ghost commented Dec 9, 2024

The commit e723406 is required to be backported.

Updated.

@shizhMSFT
Copy link
Contributor

shizhMSFT commented Dec 9, 2024

Should cherry pick the following commits 84c2ec0...95bac00. Since #469 has merge conflicts, the related commit is covered by #489

shizhMSFT
shizhMSFT requested changes Dec 9, 2024
View reviewed changes
Copy link
Contributor

@shizhMSFT shizhMSFT left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

dd73327 should not be in this PR. Also, 11866a5 is missed.

Please create a new PR for bumping notation-core-go and merge after this PR.

@ghost
Copy link
Author

ghost commented Dec 9, 2024

dd73327 should not be in this PR. Also, 11866a5 is missed.

Please create a new PR for bumping notation-core-go and merge after this PR.

@shizhMSFT removed dd73327. However, cherry picking 11866a5 leads to conflict, so it has to be dropped. Will create another PR to bump up the dependencies.

@ghost ghost requested review from JeyJeyGao and shizhMSFT December 9, 2024 07:43
shizhMSFT
shizhMSFT approved these changes Dec 9, 2024
View reviewed changes
Copy link
Contributor

@shizhMSFT shizhMSFT left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

JeyJeyGao
JeyJeyGao approved these changes Dec 9, 2024
View reviewed changes
Copy link
Contributor

@JeyJeyGao JeyJeyGao left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

vaninrao10
vaninrao10 approved these changes Dec 9, 2024
View reviewed changes
Copy link

@vaninrao10 vaninrao10 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@ghost ghost merged commit 41d0380 into notaryproject:release-1.3 Dec 10, 2024
@ghost ghost deleted the release-1.3 branch December 10, 2024 00:13
This was referenced Dec 12, 2024
Closed
Merged
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@gokarnm gokarnm Awaiting requested review from gokarnm gokarnm is a code owner

@NiazFK NiazFK Awaiting requested review from NiazFK NiazFK is a code owner

@priteshbandi priteshbandi Awaiting requested review from priteshbandi priteshbandi is a code owner

@rgnote rgnote Awaiting requested review from rgnote rgnote is a code owner

@toddysm toddysm Awaiting requested review from toddysm toddysm is a code owner

@yizha1 yizha1 Awaiting requested review from yizha1 yizha1 is a code owner

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@shizhMSFT @JeyJeyGao @vaninrao10 @AdamKorcz @priteshbandi