letsencrypt
/
boulder
mirror of https://github.com/letsencrypt/boulder.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ra: remove special case for empty DNSNames (#7795) 

This case was added to work around a test case that didn't fill it out;
instead, fill DNSNames for that test case.
This commit is contained in:
Jacob Hoffman-Andrews 2024-11-11 08:07:20 -08:00 committed by GitHub
parent a79a830f3b
commit 1d8cf3e212
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ra/ra.go
View File

@ -1336,16 +1336,11 @@ func (ra *RegistrationAuthorityImpl) issueCertificateInner(
return nil, nil, wrapError(err, "getting SCTs") return nil, nil, wrapError(err, "getting SCTs")
} }
var isRenewal bool
if len(parsedPrecert.DNSNames) > 0 {
// This should never happen under normal operation, but it sometimes
// occurs under test.
exists, err := ra.SA.FQDNSetExists(ctx, &sapb.FQDNSetExistsRequest{DnsNames: parsedPrecert.DNSNames}) exists, err := ra.SA.FQDNSetExists(ctx, &sapb.FQDNSetExistsRequest{DnsNames: parsedPrecert.DNSNames})
if err != nil { if err != nil {
return nil, nil, wrapError(err, "checking if certificate is a renewal") return nil, nil, wrapError(err, "checking if certificate is a renewal")
} }
isRenewal = exists.Exists isRenewal := exists.Exists
}
cert, err := ra.CA.IssueCertificateForPrecertificate(ctx, &capb.IssueCertificateForPrecertificateRequest{ cert, err := ra.CA.IssueCertificateForPrecertificate(ctx, &capb.IssueCertificateForPrecertificateRequest{
DER: precert.DER, DER: precert.DER,

11
ra/ra_test.go
View File

@ -3755,15 +3755,20 @@ type mockCAFailCertForPrecert struct {
// IssuePrecertificate needs to be mocked for mockCAFailCertForPrecert's `IssueCertificateForPrecertificate` to get called. // IssuePrecertificate needs to be mocked for mockCAFailCertForPrecert's `IssueCertificateForPrecertificate` to get called.
func (ca *mockCAFailCertForPrecert) IssuePrecertificate( func (ca *mockCAFailCertForPrecert) IssuePrecertificate(
context.Context, ctx context.Context,
*capb.IssueCertificateRequest, req *capb.IssueCertificateRequest,
...grpc.CallOption) (*capb.IssuePrecertificateResponse, error) { opts ...grpc.CallOption) (*capb.IssuePrecertificateResponse, error) {
k, err := ecdsa.GenerateKey(elliptic.P256(), rand.Reader) k, err := ecdsa.GenerateKey(elliptic.P256(), rand.Reader)
if err != nil { if err != nil {
return nil, err return nil, err
} }
parsedCSR, err := x509.ParseCertificateRequest(req.Csr)
if err != nil {
return nil, err
}
tmpl := &ctx509.Certificate{ tmpl := &ctx509.Certificate{
SerialNumber: big.NewInt(1), SerialNumber: big.NewInt(1),
DNSNames: parsedCSR.DNSNames,
ExtraExtensions: []ctpkix.Extension{ ExtraExtensions: []ctpkix.Extension{
{ {
Id: ctx509.OIDExtensionCTPoison, Id: ctx509.OIDExtensionCTPoison,