3pp-mirror/pomerium
1
0
Fork 0
mirror of https://github.com/pomerium/pomerium.git synced 2025-08-03 00:40:25 +02:00
Code Issues Projects Releases Packages Wiki Activity

options: support multiple signing keys (#3828)

Browse source 
* options: support multiple signing keys

* fix controlplane method, errors
This commit is contained in:
Caleb Doxsey 2022-12-22 09:31:09 -07:00 • committed by GitHub
parent 753eeff12f
commit 3e892a8533
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 233 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

19
config/options.go
View file

@ -1176,18 +1176,27 @@ func (o *Options) GetCookieSecret() ([]byte, error) {
}
// GetSigningKey gets the signing key.
func (o *Options) GetSigningKey() (string, error) {
func (o *Options) GetSigningKey() ([]byte, error) {
if o == nil {
return "", nil
return nil, nil
}
rawSigningKey := o.SigningKey
if o.SigningKeyFile != "" {
bs, err := os.ReadFile(o.SigningKeyFile)
if err != nil {
return "", err
return nil, err
}
return string(bs), nil
rawSigningKey = string(bs)
}
return o.SigningKey, nil
rawSigningKey = strings.TrimSpace(rawSigningKey)
if bs, err := base64.StdEncoding.DecodeString(rawSigningKey); err == nil {
return bs, nil
}
return []byte(rawSigningKey), nil
}
// Checksum returns the checksum of the current options struct