Skip to content

fix: OIDC issuerCA to load all certificates from PEM bundle #874

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JoaoBraveCoding wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: OIDC issuerCA to load all certificates from PEM bundle #874

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 25 additions & 12 deletions authentication/oidc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ type oidcConfig struct {
GroupClaim string `json:"groupClaim"`
IssuerRawCA []byte `json:"issuerCA"`
IssuerCAPath string `json:"issuerCAPath"`
issuerCA *x509.Certificate
issuerCAs []*x509.Certificate
IssuerURL string `json:"issuerURL"`
RedirectURL string `json:"redirectURL"`
UsernameClaim string `json:"usernameClaim"`
Expand Down Expand Up @@ -96,17 +96,28 @@ func newOIDCAuthenticator(c map[string]interface{}, tenant string,
}

if len(config.IssuerRawCA) != 0 {
block, _ := pem.Decode(config.IssuerRawCA)
if block == nil {
return nil, fmt.Errorf("failed to parse issuer CA certificate PEM")
}
var (
block *pem.Block
rest = config.IssuerRawCA
)

for {
block, rest = pem.Decode(rest)
if block == nil {
if len(config.issuerCAs) == 0 {
return nil, fmt.Errorf("failed to parse issuer CA certificate PEM")
}

cert, err := x509.ParseCertificate(block.Bytes)
if err != nil {
return nil, fmt.Errorf("failed to parse issuer certificate: %s", err.Error())
}
break
}

config.issuerCA = cert
cert, err := x509.ParseCertificate(block.Bytes)
if err != nil {
return nil, fmt.Errorf("failed to parse issuer certificate: %s", err.Error())
}

config.issuerCAs = append(config.issuerCAs, cert)
}
}

t := &http.Transport{
Expand All @@ -122,11 +133,13 @@ func newOIDCAuthenticator(c map[string]interface{}, tenant string,
ExpectContinueTimeout: 1 * time.Second,
}

if config.issuerCA != nil {
if len(config.issuerCAs) > 0 {
t.TLSClientConfig = &tls.Config{
RootCAs: x509.NewCertPool(),
}
t.TLSClientConfig.RootCAs.AddCert(config.issuerCA)
for _, ca := range config.issuerCAs {
t.TLSClientConfig.RootCAs.AddCert(ca)
}
}

client := &http.Client{
Expand Down
2 changes: 1 addition & 1 deletion main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ type tenant struct {
GroupClaim string `json:"groupClaim"`
IssuerRawCA []byte `json:"issuerCA"`
IssuerCAPath string `json:"issuerCAPath"`
issuerCA *x509.Certificate
issuerCAs []*x509.Certificate
IssuerURL string `json:"issuerURL"`
RedirectURL string `json:"redirectURL"`
UsernameClaim string `json:"usernameClaim"`
Expand Down