feat: add OCSP and CRL revocation checks #128
+1,725
−0
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -257,6 +257,14 @@ func (e *envelope) Verify() (*signature.EnvelopeContent, error) { | |
| return nil, &signature.InvalidSignatureError{Msg: "malformed leaf certificate"} | ||
| } | ||
|
|
||
| rc := signature.NewRevocationChecker() | ||
| revoked, err := rc.CheckRevocationStatus(cert) | ||
| if err != nil { | ||
| return nil, err | ||
| } else if revoked { | ||
| return nil, &signature.InvalidSignatureError{Msg: "certificate has been revoked"} | ||
| } | ||
|
Comment on lines
+260
to
+266
There was a problem hiding this comment. Check should be done in notation-go, depending upon trust policy configuration the outcome of verification will change. The idea is that functions to check for revocation status should be in notation-core-go but actual check should happen in notation-go |
||
|
|
||
| // core verify process, verify integrity of COSE envelope | ||
| publicKeyAlg, err := getSignatureAlgorithm(cert) | ||
| if err != nil { | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,7 @@ | ||
| package jws | ||
|
|
||
| import ( | ||
| "context" | ||
| "crypto" | ||
| "crypto/ecdsa" | ||
| "crypto/rand" | ||
|
|
@@ -13,12 +14,14 @@ import ( | |
| "math" | ||
| "reflect" | ||
| "strings" | ||
| "sync" | ||
| "testing" | ||
| "time" | ||
|
|
||
| "github.com/notaryproject/notation-core-go/signature" | ||
| "github.com/notaryproject/notation-core-go/signature/internal/signaturetest" | ||
| "github.com/notaryproject/notation-core-go/testhelper" | ||
| "golang.org/x/crypto/ocsp" | ||
| ) | ||
|
|
||
| // remoteMockSigner is used to mock remote signer | ||
|
|
@@ -336,6 +339,85 @@ func TestVerify(t *testing.T) { | |
| checkErrorEqual(t, "malformed leaf certificate", err.Error()) | ||
| }) | ||
|
|
||
| t.Run("nonrevoked certificate", func(t *testing.T) { | ||
| revokableCertTuple := testhelper.GetRevokableRSALeafCertificate() | ||
| revokableCert := revokableCertTuple.Cert | ||
| revokableKey := revokableCertTuple.PrivateKey | ||
|
|
||
| serverShutdownWaitGroup := &sync.WaitGroup{} | ||
| serverShutdownWaitGroup.Add(1) | ||
| srv := testhelper.MockServer(revokableCert, revokableKey, ocsp.Good, false, serverShutdownWaitGroup) | ||
|
|
||
| // get envelope | ||
| env, err := getSignedEnvelope(signature.SigningSchemeX509, true, extSignedAttr) | ||
| checkNoError(t, err) | ||
|
|
||
| // change cert to revokable cert | ||
| env.Header.CertChain[0] = revokableCert.Raw | ||
|
|
||
| // Integrity of the envelope has been invalidated, so signature will fail, but this is after revoke check | ||
| err = verifyEnvelope(env) | ||
| unexpected := errors.New("certificate has been revoked") | ||
| if err == unexpected { | ||
| t.Errorf("did not expect to not get error: %v, but got: %v.", unexpected, err) | ||
| } | ||
|
|
||
| if err := srv.Shutdown(context.TODO()); err != nil { | ||
| t.Errorf("Error while shutting down server: %v", err) | ||
| } | ||
| serverShutdownWaitGroup.Wait() | ||
| }) | ||
|
|
||
| t.Run("OCSP revoked certificate", func(t *testing.T) { | ||
| revokableCertTuple := testhelper.GetRevokableRSALeafCertificate() | ||
| revokableCert := revokableCertTuple.Cert | ||
| revokableKey := revokableCertTuple.PrivateKey | ||
|
|
||
| serverShutdownWaitGroup := &sync.WaitGroup{} | ||
| serverShutdownWaitGroup.Add(1) | ||
| srv := testhelper.MockServer(revokableCert, revokableKey, ocsp.Revoked, false, serverShutdownWaitGroup) | ||
|
|
||
| // get envelope | ||
| env, err := getSignedEnvelope(signature.SigningSchemeX509, true, extSignedAttr) | ||
| checkNoError(t, err) | ||
|
|
||
| // change cert to revokable cert | ||
| env.Header.CertChain[0] = revokableCert.Raw | ||
|
|
||
| err = verifyEnvelope(env) | ||
| checkErrorEqual(t, "certificate has been revoked", err.Error()) | ||
|
|
||
| if err := srv.Shutdown(context.TODO()); err != nil { | ||
| t.Errorf("Error while shutting down server: %v", err) | ||
| } | ||
| serverShutdownWaitGroup.Wait() | ||
| }) | ||
|
|
||
| t.Run("CRL revoked certificate", func(t *testing.T) { | ||
| revokableCertTuple := testhelper.GetRevokableRSALeafCertificate() | ||
| revokableCert := revokableCertTuple.Cert | ||
| revokableKey := revokableCertTuple.PrivateKey | ||
|
|
||
| serverShutdownWaitGroup := &sync.WaitGroup{} | ||
| serverShutdownWaitGroup.Add(1) | ||
| srv := testhelper.MockServer(revokableCert, revokableKey, ocsp.Good, true, serverShutdownWaitGroup) | ||
|
|
||
| // get envelope | ||
| env, err := getSignedEnvelope(signature.SigningSchemeX509, true, extSignedAttr) | ||
| checkNoError(t, err) | ||
|
|
||
| // change cert to revokable cert | ||
| env.Header.CertChain[0] = revokableCert.Raw | ||
|
|
||
| err = verifyEnvelope(env) | ||
| checkErrorEqual(t, "certificate has been revoked", err.Error()) | ||
|
|
||
| if err := srv.Shutdown(context.TODO()); err != nil { | ||
| t.Errorf("Error while shutting down server: %v", err) | ||
| } | ||
| serverShutdownWaitGroup.Wait() | ||
| }) | ||
|
|
||
| t.Run("malformed protected header base64 encoded", func(t *testing.T) { | ||
| // get envelope | ||
| env, err := getSignedEnvelope(signature.SigningSchemeX509, true, extSignedAttr) | ||
|
|
||
|
There was a problem hiding this comment. Please document all exported types and methods. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| package signature | ||
|
|
||
| import ( | ||
| "crypto/x509" | ||
| "net/http" | ||
|
|
||
| "github.com/cloudflare/cfssl/revoke" | ||
| ) | ||
|
|
||
| type RevocationChecker struct { | ||
| HTTPClient *http.Client | ||
| } | ||
|
|
||
| func NewRevocationChecker(httpClients ...http.Client) *RevocationChecker { | ||
|
There was a problem hiding this comment. What's the scenario to take multiple http client? |
||
| if len(httpClients) == 0 { | ||
| return &RevocationChecker{HTTPClient: http.DefaultClient} | ||
| } else { | ||
| return &RevocationChecker{HTTPClient: &httpClients[0]} | ||
| } | ||
| } | ||
|
|
||
| func (r RevocationChecker) CheckRevocationStatus(cert *x509.Certificate) (bool, error) { | ||
| revoke.HTTPClient = r.HTTPClient | ||
|
There was a problem hiding this comment. Setting to a global variable |
||
| revoked, _, err := revoke.VerifyCertificateError(cert) | ||
|
There was a problem hiding this comment. Does it do OSCP check first then CRL? There was a problem hiding this comment. This method does more than revocation check which we dont want |
||
| return revoked, err | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
A tagged version of
golang.org/x/cryptoshould be used. The current latest one is v0.7.0