-
Notifications
You must be signed in to change notification settings - Fork 29
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Feat: - CRL support, including CRL downloading, validation, and revocation list checks. - OCSP fallback to CRL when OCSP is unavailable or encounters an unknown issue. Refactor: - move OCSP to internal package to export `ocsp.CertCheckStatus` and `ocsp.Supported` function for `revocation` package The PR implements a subset of RFC 5280: - It only supports X.509 v2 CRL, as the Golang CRL parser only supports v2. - It only verifies that the CRL issuer is the certificate's CA with the same key. - Delta CRL and indirect CRL are not supported. > NOTE: CRL cache is not included. Resolves part 1 of #125 Signed-off-by: Junjie Gao <[email protected]> --------- Signed-off-by: Junjie Gao <[email protected]>
- Loading branch information
Showing
17 changed files
with
2,294 additions
and
404 deletions.
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,288 @@ | ||
// Copyright The Notary Project Authors. | ||
// Licensed under the Apache License, Version 2.0 (the "License"); | ||
// you may not use this file except in compliance with the License. | ||
// You may obtain a copy of the License at | ||
// | ||
// http://www.apache.org/licenses/LICENSE-2.0 | ||
// | ||
// Unless required by applicable law or agreed to in writing, software | ||
// distributed under the License is distributed on an "AS IS" BASIS, | ||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
// See the License for the specific language governing permissions and | ||
// limitations under the License. | ||
|
||
// Package crl provides methods for checking the revocation status of a | ||
// certificate using CRL | ||
package crl | ||
|
||
import ( | ||
"context" | ||
"crypto/x509" | ||
"encoding/asn1" | ||
"errors" | ||
"fmt" | ||
"io" | ||
"net/http" | ||
"net/url" | ||
"time" | ||
|
||
"github.com/notaryproject/notation-core-go/revocation/result" | ||
) | ||
|
||
var ( | ||
// oidFreshestCRL is the object identifier for the distribution point | ||
// for the delta CRL. (See RFC 5280, Section 5.2.6) | ||
oidFreshestCRL = asn1.ObjectIdentifier{2, 5, 29, 46} | ||
|
||
// oidIssuingDistributionPoint is the object identifier for the issuing | ||
// distribution point CRL extension. (See RFC 5280, Section 5.2.5) | ||
oidIssuingDistributionPoint = asn1.ObjectIdentifier{2, 5, 29, 28} | ||
|
||
// oidInvalidityDate is the object identifier for the invalidity date | ||
// CRL entry extension. (See RFC 5280, Section 5.3.2) | ||
oidInvalidityDate = asn1.ObjectIdentifier{2, 5, 29, 24} | ||
) | ||
|
||
// maxCRLSize is the maximum size of CRL in bytes | ||
// | ||
// CRL examples: https://chasersystems.com/blog/an-analysis-of-certificate-revocation-list-sizes/ | ||
const maxCRLSize = 32 * 1024 * 1024 // 32 MiB | ||
|
||
// CertCheckStatusOptions specifies values that are needed to check CRL | ||
type CertCheckStatusOptions struct { | ||
// HTTPClient is the HTTP client used to download CRL | ||
HTTPClient *http.Client | ||
|
||
// SigningTime is used to compare with the invalidity date during revocation | ||
// check | ||
SigningTime time.Time | ||
} | ||
|
||
// CertCheckStatus checks the revocation status of a certificate using CRL | ||
// | ||
// The function checks the revocation status of the certificate by downloading | ||
// the CRL from the CRL distribution points specified in the certificate. | ||
// | ||
// If the invalidity date extension is present in the CRL entry and SigningTime | ||
// is not zero, the certificate is considered revoked if the SigningTime is | ||
// after the invalidity date. (See RFC 5280, Section 5.3.2) | ||
func CertCheckStatus(ctx context.Context, cert, issuer *x509.Certificate, opts CertCheckStatusOptions) *result.CertRevocationResult { | ||
if !Supported(cert) { | ||
// CRL not enabled for this certificate. | ||
return &result.CertRevocationResult{ | ||
Result: result.ResultNonRevokable, | ||
ServerResults: []*result.ServerResult{{ | ||
RevocationMethod: result.RevocationMethodCRL, | ||
Result: result.ResultNonRevokable, | ||
}}, | ||
RevocationMethod: result.RevocationMethodCRL, | ||
} | ||
} | ||
|
||
// The CRLDistributionPoints contains the URIs of all the CRL distribution | ||
// points. Since it does not distinguish the reason field, it needs to check | ||
// all the URIs to avoid missing any partial CRLs. | ||
// | ||
// For the majority of the certificates, there is only one CRL distribution | ||
// point with one CRL URI, which will be cached, so checking all the URIs is | ||
// not a performance issue. | ||
var ( | ||
serverResults = make([]*result.ServerResult, 0, len(cert.CRLDistributionPoints)) | ||
lastErr error | ||
crlURL string | ||
) | ||
for _, crlURL = range cert.CRLDistributionPoints { | ||
baseCRL, err := download(ctx, crlURL, opts.HTTPClient) | ||
if err != nil { | ||
lastErr = fmt.Errorf("failed to download CRL from %s: %w", crlURL, err) | ||
break | ||
} | ||
|
||
if err = validate(baseCRL, issuer); err != nil { | ||
lastErr = fmt.Errorf("failed to validate CRL from %s: %w", crlURL, err) | ||
break | ||
} | ||
|
||
crlResult, err := checkRevocation(cert, baseCRL, opts.SigningTime, crlURL) | ||
if err != nil { | ||
lastErr = fmt.Errorf("failed to check revocation status from %s: %w", crlURL, err) | ||
break | ||
} | ||
if crlResult.Result == result.ResultRevoked { | ||
return &result.CertRevocationResult{ | ||
Result: result.ResultRevoked, | ||
ServerResults: []*result.ServerResult{crlResult}, | ||
RevocationMethod: result.RevocationMethodCRL, | ||
} | ||
} | ||
|
||
serverResults = append(serverResults, crlResult) | ||
} | ||
|
||
if lastErr != nil { | ||
return &result.CertRevocationResult{ | ||
Result: result.ResultUnknown, | ||
ServerResults: []*result.ServerResult{ | ||
{ | ||
Result: result.ResultUnknown, | ||
Server: crlURL, | ||
Error: lastErr, | ||
RevocationMethod: result.RevocationMethodCRL, | ||
}}, | ||
RevocationMethod: result.RevocationMethodCRL, | ||
} | ||
} | ||
|
||
return &result.CertRevocationResult{ | ||
Result: result.ResultOK, | ||
ServerResults: serverResults, | ||
RevocationMethod: result.RevocationMethodCRL, | ||
} | ||
} | ||
|
||
// Supported checks if the certificate supports CRL. | ||
func Supported(cert *x509.Certificate) bool { | ||
return cert != nil && len(cert.CRLDistributionPoints) > 0 | ||
} | ||
|
||
func validate(crl *x509.RevocationList, issuer *x509.Certificate) error { | ||
// check signature | ||
if err := crl.CheckSignatureFrom(issuer); err != nil { | ||
return fmt.Errorf("CRL is not signed by CA %s: %w,", issuer.Subject, err) | ||
} | ||
|
||
// check validity | ||
now := time.Now() | ||
if !crl.NextUpdate.IsZero() && now.After(crl.NextUpdate) { | ||
return fmt.Errorf("expired CRL. Current time %v is after CRL NextUpdate %v", now, crl.NextUpdate) | ||
} | ||
|
||
for _, ext := range crl.Extensions { | ||
switch { | ||
case ext.Id.Equal(oidFreshestCRL): | ||
return ErrDeltaCRLNotSupported | ||
case ext.Id.Equal(oidIssuingDistributionPoint): | ||
// IssuingDistributionPoint is a critical extension that identifies | ||
// the scope of the CRL. Since we will check all the CRL | ||
// distribution points, it is not necessary to check this extension. | ||
default: | ||
if ext.Critical { | ||
// unsupported critical extensions is not allowed. (See RFC 5280, Section 5.2) | ||
return fmt.Errorf("unsupported critical extension found in CRL: %v", ext.Id) | ||
} | ||
} | ||
} | ||
|
||
return nil | ||
} | ||
|
||
// checkRevocation checks if the certificate is revoked or not | ||
func checkRevocation(cert *x509.Certificate, baseCRL *x509.RevocationList, signingTime time.Time, crlURL string) (*result.ServerResult, error) { | ||
if cert == nil { | ||
return nil, errors.New("certificate cannot be nil") | ||
} | ||
|
||
if baseCRL == nil { | ||
return nil, errors.New("baseCRL cannot be nil") | ||
} | ||
|
||
for _, revocationEntry := range baseCRL.RevokedCertificateEntries { | ||
if revocationEntry.SerialNumber.Cmp(cert.SerialNumber) == 0 { | ||
extensions, err := parseEntryExtensions(revocationEntry) | ||
if err != nil { | ||
return nil, err | ||
} | ||
|
||
// validate signingTime and invalidityDate | ||
if !signingTime.IsZero() && !extensions.invalidityDate.IsZero() && | ||
signingTime.Before(extensions.invalidityDate) { | ||
// signing time is before the invalidity date which means the | ||
// certificate is not revoked at the time of signing. | ||
break | ||
} | ||
|
||
// revoked | ||
return &result.ServerResult{ | ||
Result: result.ResultRevoked, | ||
Server: crlURL, | ||
RevocationMethod: result.RevocationMethodCRL, | ||
}, nil | ||
} | ||
} | ||
|
||
return &result.ServerResult{ | ||
Result: result.ResultOK, | ||
Server: crlURL, | ||
RevocationMethod: result.RevocationMethodCRL, | ||
}, nil | ||
} | ||
|
||
type entryExtensions struct { | ||
// invalidityDate is the date when the key is invalid. | ||
invalidityDate time.Time | ||
} | ||
|
||
func parseEntryExtensions(entry x509.RevocationListEntry) (entryExtensions, error) { | ||
var extensions entryExtensions | ||
for _, ext := range entry.Extensions { | ||
switch { | ||
case ext.Id.Equal(oidInvalidityDate): | ||
var invalidityDate time.Time | ||
rest, err := asn1.UnmarshalWithParams(ext.Value, &invalidityDate, "generalized") | ||
if err != nil { | ||
return entryExtensions{}, fmt.Errorf("failed to parse invalidity date: %w", err) | ||
} | ||
if len(rest) > 0 { | ||
return entryExtensions{}, fmt.Errorf("invalid invalidity date extension: trailing data") | ||
} | ||
|
||
extensions.invalidityDate = invalidityDate | ||
default: | ||
if ext.Critical { | ||
// unsupported critical extensions is not allowed. (See RFC 5280, Section 5.2) | ||
return entryExtensions{}, fmt.Errorf("unsupported critical extension found in CRL: %v", ext.Id) | ||
} | ||
} | ||
} | ||
|
||
return extensions, nil | ||
} | ||
|
||
func download(ctx context.Context, crlURL string, client *http.Client) (*x509.RevocationList, error) { | ||
// validate URL | ||
parsedURL, err := url.Parse(crlURL) | ||
if err != nil { | ||
return nil, fmt.Errorf("invalid CRL URL: %w", err) | ||
} | ||
if parsedURL.Scheme != "http" { | ||
return nil, fmt.Errorf("unsupported CRL endpoint: %s. Only urls with HTTP scheme is supported", crlURL) | ||
} | ||
|
||
// download CRL | ||
req, err := http.NewRequestWithContext(ctx, http.MethodGet, crlURL, nil) | ||
if err != nil { | ||
return nil, fmt.Errorf("failed to create CRL request %q: %w", crlURL, err) | ||
} | ||
resp, err := client.Do(req) | ||
if err != nil { | ||
return nil, fmt.Errorf("request failed for %q: %w", crlURL, err) | ||
} | ||
defer resp.Body.Close() | ||
|
||
// check response | ||
if resp.StatusCode < 200 || resp.StatusCode >= 300 { | ||
return nil, fmt.Errorf("%s %q: failed to download with status code: %d", resp.Request.Method, resp.Request.URL, resp.StatusCode) | ||
} | ||
|
||
// read with size limit | ||
limitedReader := io.LimitReader(resp.Body, maxCRLSize) | ||
data, err := io.ReadAll(limitedReader) | ||
if err != nil { | ||
return nil, fmt.Errorf("failed to read CRL response from %q: %w", resp.Request.URL, err) | ||
} | ||
if len(data) == maxCRLSize { | ||
return nil, fmt.Errorf("%s %q: CRL size reached the %d MiB size limit", resp.Request.Method, resp.Request.URL, maxCRLSize/1024/1024) | ||
} | ||
|
||
return x509.ParseRevocationList(data) | ||
} |
Oops, something went wrong.