forked from letsencrypt/pebble
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
ca: Pass OCSP Must-Staple from CSR into generated certificate (letsen…
…crypt#436) Fixes letsencrypt#433
- Loading branch information
1 parent
ace9542
commit da4c770
Showing
3 changed files
with
169 additions
and
4 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
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 |
|---|---|---|
| @@ -0,0 +1,138 @@ | ||
| package ca | ||
|
|
||
| import ( | ||
| "bytes" | ||
| "crypto/ecdsa" | ||
| "crypto/elliptic" | ||
| "crypto/rand" | ||
| "crypto/x509" | ||
| "crypto/x509/pkix" | ||
| "encoding/asn1" | ||
| "log" | ||
| "net" | ||
| "os" | ||
| "testing" | ||
| "time" | ||
|
|
||
| "github.com/letsencrypt/pebble/v2/acme" | ||
| "github.com/letsencrypt/pebble/v2/core" | ||
| "github.com/letsencrypt/pebble/v2/db" | ||
| ) | ||
|
|
||
| var ( | ||
| ocspID = asn1.ObjectIdentifier{1, 3, 6, 1, 5, 5, 7, 1, 24} | ||
| ocspValue = []byte{0x30, 0x03, 0x02, 0x01, 0x05} | ||
| ) | ||
|
|
||
| func makeCa() *CAImpl { | ||
| logger := log.New(os.Stdout, "Pebble ", log.LstdFlags) | ||
| db := db.NewMemoryStore() | ||
| return New(logger, db, "", 0, 1, 0) | ||
| } | ||
|
|
||
| func makeCertOrderWithExtensions(extensions []pkix.Extension) core.Order { | ||
| privateKey, err := ecdsa.GenerateKey(elliptic.P256(), rand.Reader) | ||
| if err != nil { | ||
| panic(err) | ||
| } | ||
| csr := x509.CertificateRequest{ | ||
| DNSNames: []string{"fake.domain"}, | ||
| IPAddresses: []net.IP{[]byte{192, 0, 2, 1}}, | ||
| PublicKey: &privateKey.PublicKey, | ||
| Extensions: extensions, | ||
| } | ||
| return core.Order{ | ||
| ID: "randomstring", | ||
| AccountID: "accountid", | ||
| ParsedCSR: &csr, | ||
| BeganProcessing: true, | ||
| Order: acme.Order{ | ||
| Status: acme.StatusPending, | ||
| Expires: time.Now().AddDate(0, 0, 1).UTC().Format(time.RFC3339), | ||
| Identifiers: []acme.Identifier{}, | ||
| NotBefore: time.Now().UTC().Format(time.RFC3339), | ||
| NotAfter: time.Now().AddDate(30, 0, 0).UTC().Format(time.RFC3339), | ||
| }, | ||
| ExpiresDate: time.Now().AddDate(0, 0, 1).UTC(), | ||
| } | ||
| } | ||
|
|
||
| func getOCSPMustStapleExtension(cert *x509.Certificate) *pkix.Extension { | ||
| for _, ext := range cert.Extensions { | ||
| if ext.Id.Equal(ocspID) && bytes.Equal(ext.Value, ocspValue) { | ||
| return &ext | ||
| } | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| func TestNoExtensions(t *testing.T) { | ||
| ca := makeCa() | ||
| order := makeCertOrderWithExtensions([]pkix.Extension{}) | ||
| ca.CompleteOrder(&order) | ||
| foundOCSPExtension := getOCSPMustStapleExtension(order.CertificateObject.Cert) | ||
| if foundOCSPExtension != nil { | ||
| t.Error("Expected no OCSP Must-Staple extension in complete cert, but found one") | ||
| } | ||
| } | ||
|
|
||
| func TestSettingOCSPMustStapleExtension(t *testing.T) { | ||
| // Base case | ||
| ca := makeCa() | ||
| order := makeCertOrderWithExtensions([]pkix.Extension{ | ||
| { | ||
| Id: ocspID, | ||
| Critical: false, | ||
| Value: ocspValue, | ||
| }, | ||
| }) | ||
| ca.CompleteOrder(&order) | ||
| foundOCSPExtension := getOCSPMustStapleExtension(order.CertificateObject.Cert) | ||
| if foundOCSPExtension == nil { | ||
| t.Error("Expected OCSP Must-Staple extension in complete cert, but didn't find it") | ||
| } else if foundOCSPExtension.Critical { | ||
| t.Error("Expected foundOCSPExtension.Critical to be false, but it was true") | ||
| } | ||
|
|
||
| // Test w/ improperly set Critical value | ||
| ca = makeCa() | ||
| order = makeCertOrderWithExtensions([]pkix.Extension{ | ||
| { | ||
| Id: ocspID, | ||
| Critical: true, | ||
| Value: ocspValue, | ||
| }, | ||
| }) | ||
| ca.CompleteOrder(&order) | ||
| foundOCSPExtension = getOCSPMustStapleExtension(order.CertificateObject.Cert) | ||
| if foundOCSPExtension == nil { | ||
| t.Error("Expected OCSP Must-Staple extension in complete cert, but didn't find it") | ||
| } else if foundOCSPExtension.Critical { | ||
| t.Error("Expected foundOCSPExtension.Critical to be false, but it was true") | ||
| } | ||
|
|
||
| // Test w/ duplicate extensions | ||
| ca = makeCa() | ||
| order = makeCertOrderWithExtensions([]pkix.Extension{ | ||
| { | ||
| Id: ocspID, | ||
| Critical: true, | ||
| Value: ocspValue, | ||
| }, | ||
| { | ||
| Id: ocspID, | ||
| Critical: true, | ||
| Value: ocspValue, | ||
| }, | ||
| }) | ||
| ca.CompleteOrder(&order) | ||
| numOCSPMustStapleExtensions := 0 | ||
| for _, ext := range order.CertificateObject.Cert.Extensions { | ||
| if ext.Id.Equal(ocspID) && bytes.Equal(ext.Value, ocspValue) { | ||
| numOCSPMustStapleExtensions++ | ||
| } | ||
| } | ||
| if numOCSPMustStapleExtensions != 1 { | ||
| t.Errorf("Expected exactly 1 OCSP Must-Staple extension, found %d", numOCSPMustStapleExtensions) | ||
| } | ||
| } |