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

fix coverage (#1741)

Browse source 
* fix coverage

* fix data races
This commit is contained in:
Caleb Doxsey 2021-01-06 08:30:38 -07:00 • committed by GitHub
parent 6ea8d34b8f
commit 4f0ce4bc82
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 18 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

21
authorize/evaluator/evaluator.go
View file

@ -224,27 +224,30 @@ func (e *Evaluator) JWTPayload(req *Request) map[string]interface{} {
}
func newSigner(options *config.Options) (jose.Signer, *jose.JSONWebKey, error) {
var decodedCert []byte
// if we don't have a signing key, generate one
if options.SigningKey == "" {
key, err := cryptutil.NewSigningKey()
if err != nil {
return nil, nil, fmt.Errorf("couldn't generate signing key: %w", err)
}
generatedKey, err := cryptutil.EncodePrivateKey(key)
decodedCert, err = cryptutil.EncodePrivateKey(key)
if err != nil {
return nil, nil, fmt.Errorf("bad signing key: %w", err)
}
} else {
var err error
decodedCert, err = base64.StdEncoding.DecodeString(options.SigningKey)
if err != nil {
return nil, nil, fmt.Errorf("bad signing key: %w", err)
}
options.SigningKey = base64.StdEncoding.EncodeToString(generatedKey)
}
if options.SigningKeyAlgorithm == "" {
options.SigningKeyAlgorithm = string(jose.ES256)
signingKeyAlgorithm := options.SigningKeyAlgorithm
if signingKeyAlgorithm == "" {
signingKeyAlgorithm = string(jose.ES256)
}
decodedCert, err := base64.StdEncoding.DecodeString(options.SigningKey)
if err != nil {
return nil, nil, fmt.Errorf("bad signing key: %w", err)
}
jwk, err := cryptutil.PrivateJWKFromBytes(decodedCert, jose.SignatureAlgorithm(options.SigningKeyAlgorithm))
jwk, err := cryptutil.PrivateJWKFromBytes(decodedCert, jose.SignatureAlgorithm(signingKeyAlgorithm))
if err != nil {
return nil, nil, fmt.Errorf("couldn't generate signing key: %w", err)
}