Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: discard crl cache error #1076

Merged
merged 6 commits into from
Nov 5, 2024
Merged

fix: discard crl cache error #1076

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3cbad75
discard cache error
Two-Hearts Nov 1, 2024
4bc418e
fix test
Two-Hearts Nov 1, 2024
fa94c28
update
Two-Hearts Nov 1, 2024
462e23b
Merge branch 'notaryproject:main' into crl
Two-Hearts Nov 4, 2024
7fe359e
update
Two-Hearts Nov 4, 2024
06fe8b7
update
Two-Hearts Nov 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions cmd/notation/verify.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,7 @@ func getVerifier(ctx context.Context) (notation.Verifier, error) {
if err != nil {
return nil, err
}
crlFetcher.DiscardCacheError = true // discard cache error
Two-Hearts marked this conversation as resolved.
Show resolved Hide resolved
revocationCodeSigningValidator, err := revocation.NewWithOptions(revocation.Options{
OCSPHTTPClient: ocspHttpClient,
CRLFetcher: crlFetcher,
Expand Down
40 changes: 40 additions & 0 deletions cmd/notation/verify_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,15 @@ package main

import (
"context"
"encoding/json"
"os"
"path/filepath"
"reflect"
"runtime"
"testing"

"github.com/notaryproject/notation-go/dir"
"github.com/notaryproject/notation-go/verifier/trustpolicy"
)

func TestVerifyCommand_BasicArgs(t *testing.T) {
Expand Down Expand Up @@ -86,6 +90,27 @@ func TestVerifyCommand_MissingArgs(t *testing.T) {
}

func TestGetVerifier(t *testing.T) {
defer func(oldConfiDir, oldCacheDir string) {
dir.UserConfigDir = oldConfiDir
dir.UserCacheDir = oldCacheDir
}(dir.UserConfigDir, dir.UserCacheDir)

t.Run("success", func(t *testing.T) {
tempRoot := t.TempDir()
dir.UserConfigDir = tempRoot
path := filepath.Join(tempRoot, "trustpolicy.json")
policyJson, _ := json.Marshal(dummyOCIPolicyDocument())
if err := os.WriteFile(path, policyJson, 0600); err != nil {
t.Fatalf("TestLoadOCIDocument write policy file failed. Error: %v", err)
}
t.Cleanup(func() { os.RemoveAll(tempRoot) })

_, err := getVerifier(context.Background())
if err != nil {
t.Fatal(err)
}
})

t.Run("non-existing trust policy", func(t *testing.T) {
dir.UserConfigDir = "/"
expectedErrMsg := "trust policy is not present. To create a trust policy, see: https://notaryproject.dev/docs/quickstart/#create-a-trust-policy"
Expand All @@ -107,3 +132,18 @@ func TestGetVerifier(t *testing.T) {
}
})
}

func dummyOCIPolicyDocument() trustpolicy.OCIDocument {
return trustpolicy.OCIDocument{
Version: "1.0",
TrustPolicies: []trustpolicy.OCITrustPolicy{
{
Name: "test-statement-name",
RegistryScopes: []string{"registry.acme-rockets.io/software/net-monitor"},
SignatureVerification: trustpolicy.SignatureVerification{VerificationLevel: "strict"},
TrustStores: []string{"ca:valid-trust-store", "signingAuthority:valid-trust-store"},
TrustedIdentities: []string{"x509.subject:CN=Notation Test Root,O=Notary,L=Seattle,ST=WA,C=US"},
},
},
}
}
Loading