Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 7 additions & 17 deletions extension/oidcauthextension/extension.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import (
"context"
"crypto/tls"
"crypto/x509"
"encoding/base64"
"encoding/json"
"encoding/pem"
"errors"
Expand All @@ -20,6 +19,7 @@ import (
"time"

"github.com/coreos/go-oidc/v3/oidc"
"github.com/go-jose/go-jose/v4"
"go.opentelemetry.io/collector/client"
"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/extension"
Expand Down Expand Up @@ -290,6 +290,8 @@ func getIssuerCACertFromPath(path string) (*x509.Certificate, error) {
return x509.ParseCertificate(block.Bytes)
}

// This struct is kept minimal to avoid unnecessary allocations, especially
// if the JWT is malicious and contains too many claims.
type idToken struct {
Issuer string `json:"iss"`
}
Expand All @@ -299,26 +301,14 @@ type idToken struct {
// It should only be used to determine which verifier to use for the token.
func getIssuerFromUnverifiedJWT(rawIDToken string) (string, error) {
// TODO: it would be nice if we didn't have to parse the JWT here and then again in the verifier...
payload, err := parseJWT(rawIDToken)
supportedSigAlgs := []jose.SignatureAlgorithm{jose.RS256, "none"}
jws, err := jose.ParseSigned(rawIDToken, supportedSigAlgs)
if err != nil {
return "", fmt.Errorf("oidc: malformed jwt: %w", err)
return "", fmt.Errorf("oidc: malformed jws: %w", err)
}
var token idToken
if err := json.Unmarshal(payload, &token); err != nil {
if err := json.Unmarshal(jws.UnsafePayloadWithoutVerification(), &token); err != nil {
return "", fmt.Errorf("oidc: failed to unmarshal claims: %w", err)
}
return token.Issuer, nil
}

// https://github.com/coreos/go-oidc/blob/a7c457eacb849c163a496b29274242474a8f44ab/oidc/verify.go#L148
func parseJWT(p string) ([]byte, error) {
parts := strings.Split(p, ".")
if len(parts) < 2 {
return nil, fmt.Errorf("oidc: malformed jwt, expected 3 parts got %d", len(parts))
}
payload, err := base64.RawURLEncoding.DecodeString(parts[1])
if err != nil {
return nil, fmt.Errorf("oidc: malformed jwt payload: %w", err)
}
return payload, nil
}
2 changes: 1 addition & 1 deletion extension/oidcauthextension/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ go 1.23.0

require (
github.com/coreos/go-oidc/v3 v3.15.0
github.com/go-jose/go-jose/v4 v4.0.5
github.com/stretchr/testify v1.10.0
go.opentelemetry.io/collector/client v1.37.1-0.20250801020258-8b73477b9810
go.opentelemetry.io/collector/component v1.37.1-0.20250801020258-8b73477b9810
Expand All @@ -19,7 +20,6 @@ require (

require (
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/go-jose/go-jose/v4 v4.0.5 // indirect
github.com/go-logr/logr v1.4.3 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
Expand Down
Loading