Skip to content

Agent Mesh

oidc issuer and discovery

Antonio Ojeab2104fe28943
diff --git a/cmd/sam-node/main.go b/cmd/sam-node/main.go
index 81c45119..e40166dc 100644
--- a/cmd/sam-node/main.go
+++ b/cmd/sam-node/main.go
@@ -55,7 +55,7 @@ var (
jwtPathFlag string
clientIDFlag string
clientSecretFlag string
- tokenURLFlag string
+ oidcIssuerFlag string
deviceAuthURLFlag string
audienceFlag string
hubPublicKeyFlag string
@@ -148,11 +148,15 @@ func main() {
logger.Fatalf("Failed to read JWT file: %v", err)
}
jwtStr = strings.TrimSpace(string(data))
- } else if tokenURLFlag != "" {
- logger.Info("Fetching JWT via OIDC Client Credentials...")
+ } else if oidcIssuerFlag != "" {
+ logger.Info("Discovering OIDC endpoints...")
dummyNode := &SamNode{}
- var err error
- jwtStr, err = dummyNode.FetchJWT(context.Background(), tokenURLFlag, clientIDFlag, clientSecretFlag)
+ tokenURL, err := dummyNode.DiscoverTokenURL(context.Background(), oidcIssuerFlag)
+ if err != nil {
+ logger.Fatalf("Failed to discover OIDC endpoints: %v", err)
+ }
+ logger.Info("Fetching JWT via OIDC Client Credentials...")
+ jwtStr, err = dummyNode.FetchJWT(context.Background(), tokenURL, clientIDFlag, clientSecretFlag)
if err != nil {
logger.Fatalf("Failed to fetch JWT: %v", err)
}
@@ -220,7 +224,7 @@ func main() {
}
// Start renewal loop
- node.StartRenewalLoop(ctx, tokenURLFlag, clientIDFlag, clientSecretFlag, jwtPathFlag)
+ node.StartRenewalLoop(ctx, oidcIssuerFlag, clientIDFlag, clientSecretFlag, jwtPathFlag)
node.Host.SetStreamHandler(api.AuthProtocolID, node.HandleAuthHandshake)
@@ -261,10 +265,20 @@ func main() {
dummyNode := &SamNode{Store: store}
deviceAuthURL := deviceAuthURLFlag
+ tokenURL := ""
+
+ if oidcIssuerFlag != "" {
+ logger.Info("Discovering OIDC endpoints...")
+ var err error
+ tokenURL, deviceAuthURL, err = dummyNode.DiscoverEndpoints(context.Background(), oidcIssuerFlag)
+ if err != nil {
+ logger.Fatalf("Failed to discover OIDC endpoints: %v", err)
+ }
+ }
+
if deviceAuthURL == "" {
deviceAuthURL = "https://oauth2.googleapis.com/device/code"
}
- tokenURL := tokenURLFlag
if tokenURL == "" {
tokenURL = "https://oauth2.googleapis.com/token"
}
@@ -332,7 +346,7 @@ func main() {
runCmd.Flags().StringVar(&tlsCAFlag, "tls-ca", "", "Path to TLS CA for sidecar API mTLS")
rootCmd.PersistentFlags().StringVar(&hubAddr, "hub", DefaultHubURL, "Hub URL")
rootCmd.PersistentFlags().StringVar(&configFile, "config", DefaultConfigFile, "Path to sam-node.yaml configuration file")
- rootCmd.PersistentFlags().StringVar(&tokenURLFlag, "token-url", "", "OIDC Token URL")
+ rootCmd.PersistentFlags().StringVar(&oidcIssuerFlag, "oidc-issuer", "", "OIDC Issuer URL")
rootCmd.PersistentFlags().StringVar(&deviceAuthURLFlag, "device-auth-url", "", "OIDC Device Authorization URL")
rootCmd.PersistentFlags().StringVar(&audienceFlag, "audience", api.DefaultAudience, "OIDC Audience")
diff --git a/cmd/sam-node/middleware.go b/cmd/sam-node/middleware.go
index 68386919..b7b1b36f 100644
--- a/cmd/sam-node/middleware.go
+++ b/cmd/sam-node/middleware.go
@@ -149,10 +149,15 @@ func (n *SamNode) WithBiscuitAuth(next network.StreamHandler) network.StreamHand
var jwtStr string
var err error
- if tokenURLFlag != "" {
- jwtStr, err = n.FetchJWT(context.Background(), tokenURLFlag, clientIDFlag, clientSecretFlag)
+ if oidcIssuerFlag != "" {
+ tokenURL, err := n.DiscoverTokenURL(context.Background(), oidcIssuerFlag)
if err != nil {
- logger.Errorf("[Auth] Failed to fetch JWT for fallback: %v", err)
+ logger.Errorf("[Auth] Failed to discover OIDC endpoints for fallback: %v", err)
+ } else {
+ jwtStr, err = n.FetchJWT(context.Background(), tokenURL, clientIDFlag, clientSecretFlag)
+ if err != nil {
+ logger.Errorf("[Auth] Failed to fetch JWT for fallback: %v", err)
+ }
}
} else if jwtPathFlag != "" {
data, err := os.ReadFile(jwtPathFlag)
diff --git a/cmd/sam-node/oidc.go b/cmd/sam-node/oidc.go
index 9e47b494..eae93dbc 100644
--- a/cmd/sam-node/oidc.go
+++ b/cmd/sam-node/oidc.go
@@ -24,6 +24,7 @@ import (
"strings"
"time"
+ "github.com/coreos/go-oidc/v3/oidc"
"golang.org/x/oauth2/clientcredentials"
)
@@ -178,3 +179,37 @@ func (n *SamNode) InteractiveLogin(ctx context.Context, deviceAuthURL, tokenURL,
}
}
}
+
+// DiscoverTokenURL discovers the token URL from the OIDC issuer.
+func (n *SamNode) DiscoverTokenURL(ctx context.Context, issuerURL string) (string, error) {
+ provider, err := oidc.NewProvider(ctx, issuerURL)
+ if err != nil {
+ return "", fmt.Errorf("failed to create OIDC provider: %w", err)
+ }
+ var claims struct {
+ TokenURL string `json:"token_endpoint"`
+ }
+ if err := provider.Claims(&claims); err != nil {
+ return "", fmt.Errorf("failed to extract claims: %w", err)
+ }
+ if claims.TokenURL == "" {
+ return "", fmt.Errorf("token_endpoint not found in discovery document")
+ }
+ return claims.TokenURL, nil
+}
+
+// DiscoverEndpoints discovers both token and device auth endpoints.
+func (n *SamNode) DiscoverEndpoints(ctx context.Context, issuerURL string) (tokenURL, deviceURL string, err error) {
+ provider, err := oidc.NewProvider(ctx, issuerURL)
+ if err != nil {
+ return "", "", fmt.Errorf("failed to create OIDC provider: %w", err)
+ }
+ var claims struct {
+ TokenURL string `json:"token_endpoint"`
+ DeviceURL string `json:"device_authorization_endpoint"`
+ }
+ if err := provider.Claims(&claims); err != nil {
+ return "", "", fmt.Errorf("failed to extract claims: %w", err)
+ }
+ return claims.TokenURL, claims.DeviceURL, nil
+}
diff --git a/cmd/sam-node/oidc_test.go b/cmd/sam-node/oidc_test.go
index eed5b009..89f79b59 100644
--- a/cmd/sam-node/oidc_test.go
+++ b/cmd/sam-node/oidc_test.go
@@ -92,3 +92,35 @@ func TestInteractiveLogin(t *testing.T) {
t.Errorf("Expected token 'id_token_abc', got '%s'", res.token)
}
}
+
+func TestDiscoverEndpoints(t *testing.T) {
+ mux := http.NewServeMux()
+ mux.HandleFunc("/.well-known/openid-configuration", func(w http.ResponseWriter, r *http.Request) {
+ w.Header().Set("Content-Type", "application/json")
+ if err := json.NewEncoder(w).Encode(map[string]interface{}{
+ "issuer": "http://" + r.Host,
+ "token_endpoint": "http://" + r.Host + "/token",
+ "device_authorization_endpoint": "http://" + r.Host + "/device/code",
+ }); err != nil {
+ t.Errorf("Failed to encode response: %v", err)
+ }
+ })
+
+ server := httptest.NewServer(mux)
+ defer server.Close()
+
+ node := &SamNode{}
+ ctx := context.Background()
+
+ tokenURL, deviceURL, err := node.DiscoverEndpoints(ctx, server.URL)
+ if err != nil {
+ t.Fatalf("DiscoverEndpoints failed: %v", err)
+ }
+
+ if tokenURL != server.URL+"/token" {
+ t.Errorf("Expected tokenURL %s, got %s", server.URL+"/token", tokenURL)
+ }
+ if deviceURL != server.URL+"/device/code" {
+ t.Errorf("Expected deviceURL %s, got %s", server.URL+"/device/code", deviceURL)
+ }
+}
diff --git a/tests/e2e/auth_flows.bats b/tests/e2e/auth_flows.bats
index 078fd8aa..3f679a93 100644
--- a/tests/e2e/auth_flows.bats
+++ b/tests/e2e/auth_flows.bats
@@ -60,7 +60,7 @@ teardown() {
-v "${data_vol}:/root/.config/sam-mesh" \
-i \
"sam-node:local" \
- login --hub "/dns4/sam-hub/tcp/4002/p2p/${hub_peer_id}" --token-url "http://mock-oidc:18080/token" --device-auth-url "http://mock-oidc:18080/device/code"
+ login --hub "/dns4/sam-hub/tcp/4002/p2p/${hub_peer_id}" --oidc-issuer "http://mock-oidc:18080"
# Now run the node with the stored identity
docker run -d \
diff --git a/tests/e2e/lib/container_mesh.bash b/tests/e2e/lib/container_mesh.bash
index cc5b8328..3c6fb877 100644
--- a/tests/e2e/lib/container_mesh.bash
+++ b/tests/e2e/lib/container_mesh.bash
@@ -243,7 +243,7 @@ if [[ -z "${MESH_HELPERS_LOADED:-}" ]]; then
--hub "/dns4/sam-hub/tcp/4002/p2p/${hub_peer_id}" \
--client-id "sam-mesh-audience" \
--client-secret "sam-e2e-secret" \
- --token-url "http://mock-oidc:18080/token" \
+ --oidc-issuer "http://mock-oidc:18080" \
--listen "/ip4/0.0.0.0/udp/5001/quic-v1" \
--listen "/ip4/0.0.0.0/tcp/5002" \
--bind-addr "0.0.0.0:8080" \
diff --git a/tests/e2e/policy.bats b/tests/e2e/policy.bats
index 940c4a05..1cc91699 100644
--- a/tests/e2e/policy.bats
+++ b/tests/e2e/policy.bats
@@ -213,7 +213,7 @@ EOF"
--hub "/dns4/sam-hub/tcp/4002/p2p/${hub_peer_id}" \
--client-id "sam-e2e" \
--client-secret "sam-e2e-secret" \
- --token-url "http://mock-oidc:18080/token" \
+ --oidc-issuer "http://mock-oidc:18080" \
--listen "/ip4/0.0.0.0/udp/5001/quic-v1" \
--listen "/ip4/0.0.0.0/tcp/5002" \
--bind-addr "0.0.0.0:8080" \
diff --git a/tests/integration/login_test.go b/tests/integration/login_test.go
index e142c0ab..29ae7085 100644
--- a/tests/integration/login_test.go
+++ b/tests/integration/login_test.go
@@ -37,6 +37,16 @@ func TestSamNodeLogin(t *testing.T) {
// Mock OIDC server for device flow
mux := http.NewServeMux()
+ mux.HandleFunc("/.well-known/openid-configuration", func(w http.ResponseWriter, r *http.Request) {
+ w.Header().Set("Content-Type", "application/json")
+ if err := json.NewEncoder(w).Encode(map[string]interface{}{
+ "issuer": "http://" + r.Host,
+ "token_endpoint": "http://" + r.Host + "/token",
+ "device_authorization_endpoint": "http://" + r.Host + "/device/code",
+ }); err != nil {
+ t.Errorf("Failed to encode response: %v", err)
+ }
+ })
mux.HandleFunc("/device/code", func(w http.ResponseWriter, r *http.Request) {
w.Header().Set("Content-Type", "application/json")
if err := json.NewEncoder(w).Encode(map[string]interface{}{
@@ -70,8 +80,7 @@ func TestSamNodeLogin(t *testing.T) {
nodeBin,
"login",
"--hub", hubAddr,
- "--token-url", server.URL+"/token",
- "--device-auth-url", server.URL+"/device/code",
+ "--oidc-issuer", server.URL,
)
if err != nil {
t.Fatalf("login command failed: %v\nstdout:\n%s\nstderr:\n%s", err, stdout, stderr)