3pp-mirror/pomerium
1
0
Fork 0
mirror of https://github.com/pomerium/pomerium.git synced 2025-07-14 07:18:21 +02:00
Code Issues Projects Releases Packages Wiki Activity

cryptutil: update CRL parsing

Browse source 
Move the parseCRLs() method from package 'authorize/evaluator' to
'pkg/cryptutil', replacing the existing DecodeCRL() method. This method
will parse all CRLs found in the PEM input, rather than just the first.

This removes our usage of the deprecated method x509.ParseDERCRL().

Update this method to return an error if there is non-PEM data found in
the input, to satisfy the existing test that raw DER-encoded CRLs are
not permitted.

Delete the CRLFromBase64() and CRLFromFile() methods, as these are no
longer used.
This commit is contained in:
Kenneth Jenkins 2023-08-10 14:20:31 -07:00
parent 50e6cf7466
commit 2601debb22
6 changed files with 29 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

22
authorize/evaluator/functions.go
View file

@ -11,6 +11,7 @@ import (
lru "github.com/hashicorp/golang-lru/v2"
"github.com/pomerium/pomerium/internal/log"
"github.com/pomerium/pomerium/pkg/cryptutil"
)
// ClientCertConstraints contains additional constraints to validate when
@ -61,7 +62,7 @@ func isValidClientCertificate(
return false, err
}
crls, err := parseCRLs([]byte(crl))
crls, err := cryptutil.ParseCRLs([]byte(crl))
if err != nil {
return false, err
}
@ -168,22 +169,3 @@ func parseCertificate(pemStr string) (*x509.Certificate, error) {
}
return x509.ParseCertificate(block.Bytes)
}
func parseCRLs(crl []byte) (map[string]*x509.RevocationList, error) {
m := make(map[string]*x509.RevocationList)
for {
var block *pem.Block
block, crl = pem.Decode(crl)
if block == nil {
return m, nil
}
if block.Type != "X509 CRL" {
continue
}
l, err := x509.ParseRevocationList(block.Bytes)
if err != nil {
return nil, err
}
m[string(l.RawIssuer)] = l
}
}