c4e81ed092
The OAuth2/OIDC server accepted its signing key via a file path (key-file), while every other PEM key in the probod config (SAML private key, ACME account key) is embedded inline. Switch the field to a private-key string so the convention is uniform. The signing key is operator-supplied material that must outlive any process restart, so the bootstrap builder now treats OAUTH2_SERVER_SIGNING_KEY as required and refuses to start without one; silently minting a fresh key per boot would break token validation across rollouts. The OAUTH2_SERVER_* env vars otherwise flow through builder.Build like the existing SAML block so the new OAuth2Server section is populated end-to-end. Rework the e2e harness to render its config via bootstrap at test setup, which removes the static e2e/console/testdata/config.yaml and the previously generated test-only PEM file. A per-run RSA key is minted via bootstrap.GenerateOAuth2SigningKey (kept public for test tooling) and injected through the builder env map. CI now passes ACME_ROOT_CA inline instead of mutating a YAML on disk. Signed-off-by: Bryan Frimin <bryan@getprobo.com>
99 lines
3.5 KiB
Go
99 lines
3.5 KiB
Go
// Copyright (c) 2025-2026 Probo Inc <hello@getprobo.com>.
|
|
//
|
|
// Permission to use, copy, modify, and/or distribute this software for any
|
|
// purpose with or without fee is hereby granted, provided that the above
|
|
// copyright notice and this permission notice appear in all copies.
|
|
//
|
|
// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
|
|
// REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
|
|
// AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
|
|
// INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
|
|
// LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
|
|
// OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
|
|
// PERFORMANCE OF THIS SOFTWARE.
|
|
|
|
package probod
|
|
|
|
import (
|
|
"encoding/base64"
|
|
"fmt"
|
|
)
|
|
|
|
type AuthConfig struct {
|
|
Cookie CookieConfig `json:"cookie"`
|
|
Password PasswordConfig `json:"password"`
|
|
DisableSignup bool `json:"disable-signup"`
|
|
InvitationConfirmationTokenValidity int `json:"invitation-confirmation-token-validity"`
|
|
PasswordResetTokenValidity int `json:"password-reset-token-validity"`
|
|
MagicLinkTokenValidity int `json:"magic-link-token-validity"`
|
|
SAML SAMLConfig `json:"saml"`
|
|
Google OIDCProviderConfig `json:"google"`
|
|
Microsoft OIDCProviderConfig `json:"microsoft"`
|
|
OAuth2Server OAuth2ServerConfig `json:"oauth2-server"`
|
|
}
|
|
|
|
type OAuth2ServerConfig struct {
|
|
SigningKeys []OAuth2SigningKeyConfig `json:"signing-keys"`
|
|
AccessTokenDuration int `json:"access-token-duration"`
|
|
RefreshTokenDuration int `json:"refresh-token-duration"`
|
|
AuthorizationCodeDuration int `json:"authorization-code-duration"`
|
|
DeviceCodeDuration int `json:"device-code-duration"`
|
|
}
|
|
|
|
type OAuth2SigningKeyConfig struct {
|
|
PrivateKey string `json:"private-key"`
|
|
KID string `json:"kid"`
|
|
Active bool `json:"active"`
|
|
}
|
|
|
|
type CookieConfig struct {
|
|
Domain string `json:"domain"`
|
|
Secret string `json:"secret"`
|
|
Duration int `json:"duration"`
|
|
Name string `json:"name"`
|
|
Secure bool `json:"secure"`
|
|
}
|
|
|
|
type PasswordConfig struct {
|
|
Iterations int `json:"iterations"`
|
|
Pepper string `json:"pepper"`
|
|
}
|
|
|
|
func (c AuthConfig) GetPepperBytes() ([]byte, error) {
|
|
if c.Password.Pepper == "" {
|
|
return nil, fmt.Errorf("pepper cannot be empty")
|
|
}
|
|
|
|
if decoded, err := base64.StdEncoding.DecodeString(c.Password.Pepper); err == nil {
|
|
if len(decoded) < 32 {
|
|
return nil, fmt.Errorf("decoded pepper must be at least 32 bytes long")
|
|
}
|
|
return decoded, nil
|
|
}
|
|
|
|
if len(c.Password.Pepper) < 32 {
|
|
return nil, fmt.Errorf("pepper must be at least 32 bytes long")
|
|
}
|
|
|
|
return []byte(c.Password.Pepper), nil
|
|
}
|
|
|
|
func (c AuthConfig) GetCookieSecretBytes() ([]byte, error) {
|
|
if c.Cookie.Secret == "" {
|
|
return nil, fmt.Errorf("cookie secret cannot be empty")
|
|
}
|
|
|
|
if decoded, err := base64.StdEncoding.DecodeString(c.Cookie.Secret); err == nil {
|
|
if len(decoded) < 32 {
|
|
return nil, fmt.Errorf("decoded cookie secret must be at least 32 bytes long")
|
|
}
|
|
return decoded, nil
|
|
}
|
|
|
|
if len(c.Cookie.Secret) < 32 {
|
|
return nil, fmt.Errorf("cookie secret must be at least 32 bytes long")
|
|
}
|
|
|
|
return []byte(c.Cookie.Secret), nil
|
|
}
|