@@ -388,7 +388,6 @@ func initAuthorities(t *testing.T) (*DummyValidationAuthority, sapb.StorageAutho
388388 ra .SA = sa
389389 ra .VA = va
390390 ra .CA = ca
391- ra .OCSP = & mocks.MockOCSPGenerator {}
392391 ra .PA = pa
393392 return dummyVA , sa , ra , rlSource , fc , cleanUp
394393}
@@ -3630,125 +3629,16 @@ func (msar *mockSARevocation) UpdateRevokedCertificate(_ context.Context, req *s
36303629 return & emptypb.Empty {}, nil
36313630}
36323631
3633- type mockOCSPA struct {
3634- mocks.MockCA
3635- }
3636-
3637- func (mcao * mockOCSPA ) GenerateOCSP (context.Context , * capb.GenerateOCSPRequest , ... grpc.CallOption ) (* capb.OCSPResponse , error ) {
3638- return & capb.OCSPResponse {Response : []byte {1 , 2 , 3 }}, nil
3639- }
3640-
36413632type mockPurger struct {}
36423633
36433634func (mp * mockPurger ) Purge (context.Context , * akamaipb.PurgeRequest , ... grpc.CallOption ) (* emptypb.Empty , error ) {
36443635 return & emptypb.Empty {}, nil
36453636}
36463637
3647- // mockSAGenerateOCSP is a mock SA that always returns a good OCSP response, with a constant NotAfter.
3648- type mockSAGenerateOCSP struct {
3649- sapb.StorageAuthorityClient
3650- expiration time.Time
3651- }
3652-
3653- func (msgo * mockSAGenerateOCSP ) GetCertificateStatus (_ context.Context , req * sapb.Serial , _ ... grpc.CallOption ) (* corepb.CertificateStatus , error ) {
3654- return & corepb.CertificateStatus {
3655- Serial : req .Serial ,
3656- Status : "good" ,
3657- NotAfter : timestamppb .New (msgo .expiration .UTC ()),
3658- }, nil
3659- }
3660-
3661- func TestGenerateOCSP (t * testing.T ) {
3662- _ , _ , ra , _ , clk , cleanUp := initAuthorities (t )
3663- defer cleanUp ()
3664-
3665- ra .OCSP = & mockOCSPA {}
3666- ra .SA = & mockSAGenerateOCSP {expiration : clk .Now ().Add (time .Hour )}
3667-
3668- req := & rapb.GenerateOCSPRequest {
3669- Serial : core .SerialToString (big .NewInt (1 )),
3670- }
3671-
3672- resp , err := ra .GenerateOCSP (context .Background (), req )
3673- test .AssertNotError (t , err , "generating OCSP" )
3674- test .AssertByteEquals (t , resp .Response , []byte {1 , 2 , 3 })
3675-
3676- ra .SA = & mockSAGenerateOCSP {expiration : clk .Now ().Add (- time .Hour )}
3677- _ , err = ra .GenerateOCSP (context .Background (), req )
3678- if ! errors .Is (err , berrors .NotFound ) {
3679- t .Errorf ("expected NotFound error, got %s" , err )
3680- }
3681- }
3682-
3683- // mockSALongExpiredSerial is a mock SA that treats every serial as if it expired a long time ago.
3684- // Specifically, it returns NotFound to GetCertificateStatus (simulating the serial having been
3685- // removed from the certificateStatus table), but returns success to GetSerialMetadata (simulating
3686- // a serial number staying in the `serials` table indefinitely).
3687- type mockSALongExpiredSerial struct {
3688- sapb.StorageAuthorityClient
3689- }
3690-
3691- func (msgo * mockSALongExpiredSerial ) GetCertificateStatus (_ context.Context , req * sapb.Serial , _ ... grpc.CallOption ) (* corepb.CertificateStatus , error ) {
3692- return nil , berrors .NotFoundError ("not found" )
3693- }
3694-
3695- func (msgo * mockSALongExpiredSerial ) GetSerialMetadata (_ context.Context , req * sapb.Serial , _ ... grpc.CallOption ) (* sapb.SerialMetadata , error ) {
3696- return & sapb.SerialMetadata {
3697- Serial : req .Serial ,
3698- }, nil
3699- }
3700-
3701- func TestGenerateOCSPLongExpiredSerial (t * testing.T ) {
3702- _ , _ , ra , _ , _ , cleanUp := initAuthorities (t )
3703- defer cleanUp ()
3704-
3705- ra .OCSP = & mockOCSPA {}
3706- ra .SA = & mockSALongExpiredSerial {}
3707-
3708- req := & rapb.GenerateOCSPRequest {
3709- Serial : core .SerialToString (big .NewInt (1 )),
3710- }
3711-
3712- _ , err := ra .GenerateOCSP (context .Background (), req )
3713- test .AssertError (t , err , "generating OCSP" )
3714- if ! errors .Is (err , berrors .NotFound ) {
3715- t .Errorf ("expected NotFound error, got %#v" , err )
3716- }
3717- }
3718-
3719- // mockSAUnknownSerial is a mock SA that always returns NotFound to certificate status and serial lookups.
3720- // It emulates an SA that has never issued a certificate.
3721- type mockSAUnknownSerial struct {
3722- mockSALongExpiredSerial
3723- }
3724-
3725- func (msgo * mockSAUnknownSerial ) GetSerialMetadata (_ context.Context , req * sapb.Serial , _ ... grpc.CallOption ) (* sapb.SerialMetadata , error ) {
3726- return nil , berrors .NotFoundError ("not found" )
3727- }
3728-
3729- func TestGenerateOCSPUnknownSerial (t * testing.T ) {
3730- _ , _ , ra , _ , _ , cleanUp := initAuthorities (t )
3731- defer cleanUp ()
3732-
3733- ra .OCSP = & mockOCSPA {}
3734- ra .SA = & mockSAUnknownSerial {}
3735-
3736- req := & rapb.GenerateOCSPRequest {
3737- Serial : core .SerialToString (big .NewInt (1 )),
3738- }
3739-
3740- _ , err := ra .GenerateOCSP (context .Background (), req )
3741- test .AssertError (t , err , "generating OCSP" )
3742- if ! errors .Is (err , berrors .UnknownSerial ) {
3743- t .Errorf ("expected UnknownSerial error, got %#v" , err )
3744- }
3745- }
3746-
37473638func TestRevokeCertByApplicant_Subscriber (t * testing.T ) {
37483639 _ , _ , ra , _ , clk , cleanUp := initAuthorities (t )
37493640 defer cleanUp ()
37503641
3751- ra .OCSP = & mockOCSPA {}
37523642 ra .purger = & mockPurger {}
37533643
37543644 // Use the same self-signed cert as both issuer and issuee for revocation.
@@ -3823,7 +3713,6 @@ func TestRevokeCertByApplicant_Controller(t *testing.T) {
38233713 _ , _ , ra , _ , clk , cleanUp := initAuthorities (t )
38243714 defer cleanUp ()
38253715
3826- ra .OCSP = & mockOCSPA {}
38273716 ra .purger = & mockPurger {}
38283717
38293718 // Use the same self-signed cert as both issuer and issuee for revocation.
@@ -3864,7 +3753,6 @@ func TestRevokeCertByKey(t *testing.T) {
38643753 _ , _ , ra , _ , clk , cleanUp := initAuthorities (t )
38653754 defer cleanUp ()
38663755
3867- ra .OCSP = & mockOCSPA {}
38683756 ra .purger = & mockPurger {}
38693757
38703758 // Use the same self-signed cert as both issuer and issuee for revocation.
@@ -3916,7 +3804,6 @@ func TestAdministrativelyRevokeCertificate(t *testing.T) {
39163804 _ , _ , ra , _ , clk , cleanUp := initAuthorities (t )
39173805 defer cleanUp ()
39183806
3919- ra .OCSP = & mockOCSPA {}
39203807 ra .purger = & mockPurger {}
39213808
39223809 // Use the same self-signed cert as both issuer and issuee for revocation.
0 commit comments