🪢 Open source agent evals & observability: Trace, evaluate, and improve LLM applications with one open platform.
TypeScript analyticsautogenevaluationlangchainlarge-language-modelsllama-indexllmllm-evaluationllm-observabilityllmopsmonitoringobservabilityopen-sourceopenaiplaygroundprompt-engineeringprompt-managementself-hostedycombinator
fix(sso): use one discovery URL for OneLogin validation and sign-in (#18951)
Nobuchika Kamon8d6ed36c39b0
diff --git a/web/src/__tests__/server/ssoConfigRouter.servertest.ts b/web/src/__tests__/server/ssoConfigRouter.servertest.tsindex 6c401847cd..3f27780859 100644--- a/web/src/__tests__/server/ssoConfigRouter.servertest.ts+++ b/web/src/__tests__/server/ssoConfigRouter.servertest.ts@@ -980,6 +980,84 @@ describe("ssoConfigRouter.save — IdP discovery validation", () => {}});+ describe("OneLogin", () => {+ /** Tenant URLs (NextAuth's form) and full issuers (OneLogin console's form) both validate against the sign-in discovery doc. */+ it.each([+ "https://example.com",+ "https://example.com/",+ "https://example.com/oidc/2",+ "https://example.com/oidc/2/",+ ])(+ "validates %s against the /oidc/2 discovery doc and stores it as entered",+ async (issuer) => {+ const { org, caller } = await prepare();+ const domain = `onelogin-${uuidv4().slice(0, 8)}.com`;+ await addVerifiedDomain(org.id, domain);+ mockDiscoveryOk("https://example.com/oidc/2");++ await caller.ssoConfig.save({+ orgId: org.id,+ payload: oneLoginPayload(domain, issuer),+ });++ expect(fetchMock).toHaveBeenCalledWith(+ "https://example.com/oidc/2/.well-known/openid-configuration",+ expect.any(Object),+ );+ const stored = await prisma.ssoConfig.findUniqueOrThrow({+ where: { domain },+ });+ expect((stored.authConfig as Record<string, unknown>).issuer).toBe(+ issuer,+ );+ },+ );++ it("rejects a tenant URL whose discovery doc reports the tenant URL as issuer", async () => {+ const { org, caller } = await prepare();+ const domain = `onelogin-raw-${uuidv4().slice(0, 8)}.com`;+ await addVerifiedDomain(org.id, domain);+ mockDiscoveryOk("https://example.com");++ await expect(+ caller.ssoConfig.save({+ orgId: org.id,+ payload: oneLoginPayload(domain, "https://example.com"),+ }),+ ).rejects.toMatchObject({ code: "PRECONDITION_FAILED" });+ });++ it("rejects a tenant URL with embedded credentials", async () => {+ const { org, caller } = await prepare();+ const domain = `onelogin-creds-${uuidv4().slice(0, 8)}.com`;+ await addVerifiedDomain(org.id, domain);++ await expect(+ caller.ssoConfig.save({+ orgId: org.id,+ payload: oneLoginPayload(domain, "https://user:[email protected]"),+ }),+ ).rejects.toMatchObject({ code: "PRECONDITION_FAILED" });++ expect(fetchMock).not.toHaveBeenCalled();+ const row = await prisma.ssoConfig.findUnique({ where: { domain } });+ expect(row).toBeNull();+ });++ function oneLoginPayload(domain: string, issuer: string) {+ return {+ domain,+ authProvider: "onelogin" as const,+ authConfig: {+ clientId: "onelogin-client",+ clientSecret: "onelogin-secret",+ issuer,+ allowDangerousEmailAccountLinking: false,+ },+ };+ }+ });+it("skips discovery for OAuth-only providers (github)", async () => {const { org, caller } = await prepare();const domain = `github-skip-${uuidv4().slice(0, 8)}.com`;diff --git a/web/src/__tests__/server/unit/multiTenantSsoOneLoginProvider.servertest.ts b/web/src/__tests__/server/unit/multiTenantSsoOneLoginProvider.servertest.tsnew file mode 100644index 0000000000..91246b0565--- /dev/null+++ b/web/src/__tests__/server/unit/multiTenantSsoOneLoginProvider.servertest.ts@@ -0,0 +1,61 @@+import { encrypt } from "@langfuse/shared/encryption";+import { describe, expect, it, vi } from "vitest";+import { loadSsoProviders } from "@/src/ee/features/multi-tenant-sso/utils";++const { mockFindMany } = vi.hoisted(() => ({ mockFindMany: vi.fn() }));++vi.mock("@langfuse/shared/src/db", async (importOriginal) => ({+ ...(await importOriginal<Record<string, unknown>>()),+ prisma: {+ $transaction: (fn: (tx: unknown) => unknown) =>+ fn({ ssoConfig: { findMany: mockFindMany } }),+ },+}));++vi.mock("@/src/ee/features/multi-tenant-sso/multiTenantSsoAvailable", () => ({+ multiTenantSsoAvailable: true,+}));++describe("loadSsoProviders — OneLogin", () => {+ it("uses a single /oidc/2 in the discovery URL for every issuer form", async () => {+ /** All rows load in one call because getSsoConfigs caches them at module level. */+ mockFindMany.mockResolvedValue([+ oneLoginRow("tenant.example", "https://example.com"),+ oneLoginRow("issuer.example", "https://example.com/oidc/2"),+ oneLoginRow("prefix.example", "https://example.com/prefix"),+ ]);++ const providers = await loadSsoProviders();++ /** `??` mirrors NextAuth's unexported merge of provider `options` over its defaults. */+ const wellKnownById = Object.fromEntries(+ providers.flatMap((p) =>+ p.type === "oauth"+ ? [[p.options?.id ?? p.id, p.options?.wellKnown ?? p.wellKnown]]+ : [],+ ),+ );+ expect(wellKnownById).toEqual({+ "tenant.example.onelogin":+ "https://example.com/oidc/2/.well-known/openid-configuration",+ "issuer.example.onelogin":+ "https://example.com/oidc/2/.well-known/openid-configuration",+ "prefix.example.onelogin":+ "https://example.com/prefix/oidc/2/.well-known/openid-configuration",+ });+ });+});++function oneLoginRow(domain: string, issuer: string) {+ return {+ domain,+ authProvider: "onelogin",+ authConfig: {+ clientId: "onelogin-client",+ clientSecret: encrypt("onelogin-secret"),+ issuer,+ },+ createdAt: new Date(),+ updatedAt: new Date(),+ };+}diff --git a/web/src/ee/features/multi-tenant-sso/oidcDiscovery.ts b/web/src/ee/features/multi-tenant-sso/oidcDiscovery.tsnew file mode 100644index 0000000000..6b89afb8c8--- /dev/null+++ b/web/src/ee/features/multi-tenant-sso/oidcDiscovery.ts@@ -0,0 +1,21 @@+const oneLoginOidcPath = "/oidc/2";++/**+ * resolveOneLoginIssuer returns the OIDC issuer for a configured OneLogin URL.+ * A URL ending in `/oidc/2` (`https://acme.onelogin.com/oidc/2`) is already the+ * issuer; anything else (`https://acme.onelogin.com`) gets `/oidc/2` appended,+ * matching NextAuth's OneLogin provider. The trailing slash is removed.+ */+export function resolveOneLoginIssuer(configured: string): string {+ const base = stripTrailingSlash(configured);+ return base.endsWith(oneLoginOidcPath) ? base : `${base}${oneLoginOidcPath}`;+}++/** getDiscoveryUrl builds the discovery-document URL for issuer. */+export function getDiscoveryUrl(issuer: string): string {+ return `${stripTrailingSlash(issuer)}/.well-known/openid-configuration`;+}++export function stripTrailingSlash(url: string): string {+ return url.replace(/\/$/, "");+}diff --git a/web/src/ee/features/multi-tenant-sso/utils.ts b/web/src/ee/features/multi-tenant-sso/utils.tsindex 4bae4770f2..bcfbac456a 100644--- a/web/src/ee/features/multi-tenant-sso/utils.ts+++ b/web/src/ee/features/multi-tenant-sso/utils.ts@@ -14,6 +14,7 @@ import { multiTenantSsoAvailable } from "@/src/ee/features/multi-tenant-sso/multimport { type SsoConfig, prisma } from "@langfuse/shared/src/db";import { decrypt } from "@langfuse/shared/encryption";import { SsoProviderSchema } from "./types";+import { getDiscoveryUrl, resolveOneLoginIssuer } from "./oidcDiscovery";import {CustomSSOProvider,GitHubEnterpriseProvider,@@ -245,6 +246,10 @@ const dbToNextAuthProvider = (provider: SsoProviderSchema): Provider | null => {id: getAuthProviderIdForSsoConfig(provider), // use the domain as the provider id as we use domain-specific credentials...provider.authConfig,clientSecret: decrypt(provider.authConfig.clientSecret),+ /** Same discovery URL as save-time validation; NextAuth's default appends /oidc/2 to any issuer. */+ wellKnown: getDiscoveryUrl(+ resolveOneLoginIssuer(provider.authConfig.issuer),+ ),...getClientConfig(provider.authConfig),});else if (provider.authProvider === "azure-ad") {diff --git a/web/src/ee/features/multi-tenant-sso/validateSsoConfig.ts b/web/src/ee/features/multi-tenant-sso/validateSsoConfig.tsindex 5c9ceb6aea..20355ecb45 100644--- a/web/src/ee/features/multi-tenant-sso/validateSsoConfig.ts+++ b/web/src/ee/features/multi-tenant-sso/validateSsoConfig.ts@@ -7,6 +7,11 @@ import {} from "@langfuse/shared/src/server";import { env } from "@langfuse/shared/src/env";import { type SsoProviderSchema } from "@/src/ee/features/multi-tenant-sso/types";+import {+ getDiscoveryUrl,+ resolveOneLoginIssuer,+ stripTrailingSlash,+} from "@/src/ee/features/multi-tenant-sso/oidcDiscovery";const discoveryTimeoutMs = 5000;@@ -39,7 +44,7 @@ export async function validateSsoConfig(}}-/** getDiscoveryIssuer returns the provider's configured issuer URL, or null when the provider has no OIDC discovery (GitHub family is OAuth2-only). */+/** getDiscoveryIssuer returns the provider's OIDC issuer URL (for OneLogin, resolved the same way as at sign-in), or null when the provider has no OIDC discovery (GitHub family is OAuth2-only). */function getDiscoveryIssuer(payload: SsoProviderSchema): string | null {switch (payload.authProvider) {case "github":@@ -56,22 +61,18 @@ function getDiscoveryIssuer(payload: SsoProviderSchema): string | null {case "auth0":case "okta":case "authentik":- case "onelogin":case "cognito":case "keycloak":case "jumpcloud":case "custom":return payload.authConfig?.issuer ?? null;+ case "onelogin":+ return payload.authConfig+ ? resolveOneLoginIssuer(payload.authConfig.issuer)+ : null;}}-/** getDiscoveryUrl builds the discovery-document URL for issuer. */-function getDiscoveryUrl(issuer: string): string {- return `${stripTrailingSlash(issuer)}/.well-known/openid-configuration`;-}--const stripTrailingSlash = (url: string) => url.replace(/\/$/, "");-/** fetchWithSsrfDefense fetches url with internal-address blocking and the operator whitelist applied. */async function fetchWithSsrfDefense(url: string): Promise<Response> {try {