diff --git a/.changeset/fresh-logins-settle.md b/.changeset/fresh-logins-settle.md new file mode 100644 index 0000000000..cde351f2d1 --- /dev/null +++ b/.changeset/fresh-logins-settle.md @@ -0,0 +1,6 @@ +--- +'@hyperdx/app': patch +--- + +Fix repeated login redirects after a session expires by clearing cached +authentication state with a full navigation to the login page. diff --git a/.changeset/keycloak-oidc-login.md b/.changeset/keycloak-oidc-login.md new file mode 100644 index 0000000000..b1381caea8 --- /dev/null +++ b/.changeset/keycloak-oidc-login.md @@ -0,0 +1,8 @@ +--- +'@hyperdx/api': minor +'@hyperdx/app': minor +'@hyperdx/common-utils': patch +--- + +Add optional Keycloak OIDC login with invitation-based provisioning, explicit +identity mapping, existing Passport sessions, and an opt-in required SSO mode. diff --git a/.changeset/quiet-teams-expire.md b/.changeset/quiet-teams-expire.md new file mode 100644 index 0000000000..34a6cc7edb --- /dev/null +++ b/.changeset/quiet-teams-expire.md @@ -0,0 +1,9 @@ +--- +'@hyperdx/api': patch +'@hyperdx/app': patch +'@hyperdx/common-utils': patch +--- + +Add optional session idle and absolute limits, and a team administrator +allowlist for member, source, connection, and integration management across the +UI and APIs. diff --git a/README.md b/README.md index 32e56a4c9f..2b58bd9bbd 100644 --- a/README.md +++ b/README.md @@ -43,6 +43,43 @@ ClickHouse).
Search logs and traces all in one place +## Authentication changes in this fork + +This fork adds Keycloak OIDC login to HyperDX's existing Passport and MongoDB +sessions. It also adds configurable session limits and an optional team settings +allowlist for Members, Data, and Integrations, enforced by the API and MCP as +well as the UI. Existing authentication and team access remain unchanged until +these options are configured. + +Set the following on the API server (keep secrets out of frontend variables): + +```dotenv +FRONTEND_URL=https://hyperdx.example.com +KEYCLOAK_ISSUER=https://identity.example.com/realms/hyperdx +KEYCLOAK_CLIENT_ID=hyperdx +KEYCLOAK_CLIENT_SECRET= +KEYCLOAK_REQUIRED=false +SESSION_MAX_AGE_SECONDS=86400 +SESSION_IDLE_TIMEOUT_SECONDS=1800 +``` + +Configure the Keycloak client with the exact callback +`https://hyperdx.example.com/api/login/keycloak/callback` and post-logout URI +`https://hyperdx.example.com/login`. Users need an explicitly linked HyperDX +account or a valid team invitation; matching email addresses never link accounts +automatically. Verify login before setting `KEYCLOAK_REQUIRED=true` to disable +password login and existing password sessions. + +The sample session policy is a 24-hour maximum with a 30-minute idle timeout. +Configure Keycloak's session limits separately. Keycloak and HyperDX sessions +are independent; back-channel logout is not implemented. + +See the [Keycloak setup guide](./docs/keycloak.md) for client settings, account +migration, proxy configuration, settings permissions, and +[regression test commands](./docs/keycloak.md#regression-tests). Build images +from this branch to use these changes; the upstream images below do not include +this fork's additions. + ## Spinning Up HyperDX HyperDX can be deployed as part of ClickStack, which includes ClickHouse, diff --git a/docker-compose.yml b/docker-compose.yml index 8de2decf04..b47d5b9148 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -83,6 +83,10 @@ services: # tokens; unset means they are stored in plain text. TOKEN_ENCRYPTION_KEY: ${TOKEN_ENCRYPTION_KEY:-} EXPRESS_SESSION_SECRET: ${EXPRESS_SESSION_SECRET:-} + KEYCLOAK_ISSUER: ${KEYCLOAK_ISSUER:-} + KEYCLOAK_CLIENT_ID: ${KEYCLOAK_CLIENT_ID:-} + KEYCLOAK_CLIENT_SECRET: ${KEYCLOAK_CLIENT_SECRET:-} + KEYCLOAK_REQUIRED: ${KEYCLOAK_REQUIRED:-false} # Uncomment the next two lines to enable PromQL (Prometheus-compatible metrics) # ENABLE_PROMQL: 'true' # NEXT_PUBLIC_ENABLE_PROMQL: 'true' diff --git a/docs/keycloak.md b/docs/keycloak.md new file mode 100644 index 0000000000..ace0d764bb --- /dev/null +++ b/docs/keycloak.md @@ -0,0 +1,181 @@ +# Keycloak authentication + +Keycloak authenticates users; HyperDX retains its users, teams, personal API +keys, and authorization rules. Realm roles and groups do not grant HyperDX +access. Password login remains available until required mode is enabled. + +## Configuration + +Set these variables on the **API server**, never as `NEXT_PUBLIC_*` variables: + +```dotenv +FRONTEND_URL=https://hyperdx.example.com +EXPRESS_SESSION_SECRET= +KEYCLOAK_ISSUER=https://identity.example.com/realms/hyperdx +KEYCLOAK_CLIENT_ID=hyperdx +KEYCLOAK_CLIENT_SECRET= +KEYCLOAK_REQUIRED=false +``` + +The issuer and client ID enable Keycloak. The secret is required for a +confidential client; omit it only for a public client. Partial configuration +fails startup. HTTPS is required in production; outside production, HTTP is +allowed only on loopback hosts. Local/no-auth app mode cannot enable Keycloak. + +The root Docker Compose file forwards the four Keycloak variables from `.env`. +Set `FRONTEND_URL` to the browser-facing origin in your Compose override when +using an HTTPS reverse proxy. For `yarn dev`, use the API environment above +(examples are in `packages/api/.env.development`). No frontend secret or +frontend environment flag is needed. + +Create an OpenID Connect client in Keycloak: + +- Enable **Standard flow** (Authorization Code). Enable client authentication + for a confidential client. Disable implicit flow and direct access grants. +- Require PKCE **S256**. Make the `email` scope available and include `email` + and `email_verified` in ID tokens. Require email verification for invitees. +- Set the exact valid redirect URI to + `https://hyperdx.example.com/api/login/keycloak/callback`. +- Set the exact valid post-logout redirect URI to + `https://hyperdx.example.com/login`. Avoid wildcards. + +Endpoints come from OIDC discovery. The callback is derived from `FRONTEND_URL` +and uses the existing frontend `/api` proxy. Keep the API private behind the +trusted proxy: Express currently trusts one proxy hop. Preserve HTTPS forwarding +headers so the existing Secure, HttpOnly, SameSite=Lax session cookie works. +All replicas need the same MongoDB, session secret, and Keycloak settings. + +## Provisioning and migration + +1. Bootstrap an empty installation with the existing password registration flow + **before** enabling required mode. Keycloak login never creates a team. +2. Explicitly map existing users as below. An email match never links accounts. +3. Invite new users through HyperDX's existing team invitation UI. The invitee + opens that link and chooses **Sign in with Keycloak**. Their verified email + must match the invitation; the invitation must be less than 30 days old. + Only that invited team is assigned. Existing accounts must be mapped instead. +4. Verify login, access, and logout, then set `KEYCLOAK_REQUIRED=true` on every + API replica. Password login, registration, and password invitation acceptance + return 403. Existing password sessions stop working on protected routes. + +For an existing user, an operator with database access must verify the intended +person's exact OIDC issuer and subject independently. Do not infer them from an +email or username. After starting this version (which creates the partial unique +identity index), use `mongosh` against the intended HyperDX database: + +```javascript +db.users.updateOne( + { + _id: ObjectId(''), + team: ObjectId(''), + keycloak: { $exists: false }, + }, + { $set: { keycloak: { + issuer: 'https://identity.example.com/realms/hyperdx', + subject: '', + } } }, +); +``` + +Require `modifiedCount: 1`. A zero match or duplicate-key error requires +investigation; do not remove the filter or overwrite an existing identity. +The compound unique index prevents one identity from belonging to two users. +Mapping preserves the user's team, password, and API key. Changing email at +Keycloak does not change the identity mapping or HyperDX's stored email. + +## Sessions and logout + +Login validates state, nonce, PKCE, issuer, audience, signature, and expiry using +[`openid-client`](https://github.com/panva/openid-client). Passport rotates the +session ID. Only issuer, subject, and expiry are stored alongside the existing +Passport user ID; no access, refresh, or ID tokens are persisted. + +By default, HyperDX's Keycloak sessions end at ID token expiry, capped at 30 +days, and password sessions retain their rolling 30-day behavior. To apply a +24-hour absolute limit and 30-minute idle timeout to both login methods, set on +the API: + +```dotenv +SESSION_MAX_AGE_SECONDS=86400 +SESSION_IDLE_TIMEOUT_SECONDS=1800 +``` + +Both values must be positive whole seconds, at most 30 days, with idle no +greater than maximum. Enabling the maximum requires existing users to sign in +again. The server enforces the absolute deadline even if the browser replays a +cookie; MongoDB session expiry enforces inactivity. Dashboard polling counts as +activity. + +With an explicit maximum, HyperDX creates an application session after +validating the ID token; token expiry does not end that session. Keep Keycloak +tokens short (for example 5 minutes). Set Keycloak's SSO Session Max to 24 hours +and SSO Session Idle to 30 minutes separately; those realm settings affect other +clients too. The two session timers are independent: HyperDX traffic does not +renew Keycloak's idle timer, and an existing SSO session may let users sign back +in without a credential prompt. No refresh tokens are stored. + +The logout menu submits a same-origin POST, destroys the local session, then +uses the discovered end-session endpoint. Keycloak may ask for confirmation +because no ID token hint is retained. See +[Keycloak logout](https://www.keycloak.org/securing-apps/oidc-layers#_logout). + +**Back-channel logout and token refresh are not implemented.** Logging out at +Keycloak, disabling a realm account, or changing realm roles does not immediately +invalidate an existing HyperDX session. It remains usable until its deadline. +Deleting the HyperDX user or removing its mapping revokes browser access on the +next protected request. Personal API keys retain existing behavior and must be +revoked separately; required mode governs interactive login. + +## Team settings access + +Operators can set `settingsAdminIds` on the existing MongoDB team document to an +array of that team's HyperDX user ObjectIds. Only those users see the Members, +Data, and Integrations tabs or manage members, invitations, connections, +sources, and webhooks through the internal API, personal API keys, or MCP. +Permission changes take effect on the next request. New invitees do not inherit +access. + +An absent field preserves upstream access for all members; an empty array grants +nobody. Verify team membership and keep at least one administrator when setting +the array. Read access needed for searches, dashboards, and alert configuration +is preserved. This is a settings permission, not a ClickHouse query sandbox. + +Keep auth query strings, request bodies, and redirect headers out of reverse +proxy/APM logs. Application request logs redact the new auth URLs and never log +protocol error objects. To roll back, disable required mode first; removing all +Keycloak variables also disables its routes and invalidates its browser sessions. + +## Regression tests + +Use Node.js 22.16 or later and the repository's pinned Yarn version. After +`yarn install` and `yarn build:common-utils`, run the focused unit/UI suites +from the repository root: + +```bash +yarn workspace @hyperdx/api ci:unit --runInBand keycloakConfig sessionPolicyConfig logger +yarn workspace @hyperdx/app ci:unit --runInBand KeycloakAuth TeamSettingsAccess +``` + +The authentication integration suites use real Passport sessions, MongoDB and +the existing `oidc-provider` test fixture. They need no running Keycloak or +ClickHouse server. Start a disposable MongoDB and run from the repository root: + +```bash +docker run -d --rm --name hdx-auth-test-mongo \ + -p 127.0.0.1:27080:27017 mongo:7.0.45 +cd packages/api +NODE_ENV=test DOTENV_CONFIG_PATH=/dev/null \ + MONGO_URI=mongodb://127.0.0.1:27080/hdx_auth_test \ + yarn jest --config jest.int.config.js --runInBand --forceExit \ + keycloak.int.test.ts sessionPolicy.int.test.ts teamSettingsAccess.int.test.ts +docker stop hdx-auth-test-mongo +``` + +Wait for MongoDB to accept connections before running Jest. Use only a +disposable database: the fixtures clear collections and drop it during cleanup. +The suites cover callback validation and replay, safe identity mapping and +invitation provisioning, session rotation/expiry/logout, password and required +modes, and settings permissions through browser sessions, API keys and MCP. UI +tests cover login choices and restricted tab deep links and permission changes. +These checks do not replace verifying the deployed Keycloak client, HTTPS proxy, +and logout flow in a browser. diff --git a/packages/api/.env.development b/packages/api/.env.development index d97b0ff888..e53d65ce64 100644 --- a/packages/api/.env.development +++ b/packages/api/.env.development @@ -2,6 +2,11 @@ HYPERDX_LOG_LEVEL=debug # Development only: keep sessions valid across nodemon restarts. EXPRESS_SESSION_SECRET="local-development-only" +# Optional Keycloak login; see docs/keycloak.md. Use the public realm issuer. +# KEYCLOAK_ISSUER=http://localhost:8080/realms/hyperdx +# KEYCLOAK_CLIENT_ID=hyperdx +# KEYCLOAK_CLIENT_SECRET= +# KEYCLOAK_REQUIRED=false FRONTEND_URL="http://localhost:${HYPERDX_APP_PORT}" HDX_NODE_ADVANCED_NETWORK_CAPTURE=1 HDX_NODE_BETA_MODE=1 diff --git a/packages/api/jest.config.js b/packages/api/jest.config.js index d34b88a93a..f221493b16 100644 --- a/packages/api/jest.config.js +++ b/packages/api/jest.config.js @@ -26,5 +26,5 @@ module.exports = { '@/(.*)$': '/$1', }, // Keep in sync with jest.int.config.js. - transformIgnorePatterns: ['/node_modules/(?!(ai|@ai-sdk|@workflow/serde)/)'], + transformIgnorePatterns: ['/node_modules/(?!(ai|@ai-sdk|@workflow/serde|openid-client|oauth4webapi|jose)/)'], }; diff --git a/packages/api/jest.int.config.js b/packages/api/jest.int.config.js index 0e8fe29158..5882c67588 100644 --- a/packages/api/jest.int.config.js +++ b/packages/api/jest.int.config.js @@ -23,7 +23,7 @@ module.exports = { moduleFileExtensions: ['js', 'mjs', 'json', 'ts', 'tsx', 'node'], // Superset of the unit config's list (AI SDK packages) plus the proxy deps. transformIgnorePatterns: [ - '/node_modules/(?!(ai|@ai-sdk|@workflow/serde|http-proxy-middleware|httpxy|is-plain-obj)/)', + '/node_modules/(?!(ai|@ai-sdk|@workflow/serde|http-proxy-middleware|httpxy|is-plain-obj|openid-client|oauth4webapi|jose|oidc-provider)/)', ], testMatch: ['**/__tests__/**/*.int.test.ts?(x)'], // Override the unit config's ignore list: it excludes `.int.test.ts`, which diff --git a/packages/api/package.json b/packages/api/package.json index 390af6805e..90c819037b 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -53,6 +53,7 @@ "mongoose": "^6.13.10", "ms": "^2.1.3", "on-headers": "^1.1.0", + "openid-client": "^6.8.8", "passport": "^0.6.0", "passport-local": "^1.0.0", "pino": "^10.0.0", @@ -76,6 +77,7 @@ "@types/lodash": "^4.14.198", "@types/minimist": "^1.2.2", "@types/ms": "^0.7.31", + "@types/oidc-provider": "^9.13.0", "@types/passport-local": "^1.0.34", "@types/sqlstring": "^2.3.0", "@types/supertest": "^2.0.12", @@ -85,6 +87,7 @@ "jest": "^30.2.0", "migrate-mongo": "^11.0.0", "nodemon": "^2.0.20", + "oidc-provider": "^9.12.0", "pino-pretty": "^13.1.1", "rimraf": "^4.4.1", "supertest": "^6.3.1", diff --git a/packages/api/src/__tests__/keycloakConfig.test.ts b/packages/api/src/__tests__/keycloakConfig.test.ts new file mode 100644 index 0000000000..03cb3057c5 --- /dev/null +++ b/packages/api/src/__tests__/keycloakConfig.test.ts @@ -0,0 +1,73 @@ +describe('Keycloak configuration', () => { + const originalEnv = { ...process.env }; + + beforeEach(() => { + jest.resetModules(); + for (const key of Object.keys(process.env)) { + if (key.startsWith('KEYCLOAK_')) delete process.env[key]; + } + process.env.NODE_ENV = 'production'; + process.env.FRONTEND_URL = 'https://hyperdx.example.com'; + delete process.env.IS_LOCAL_APP_MODE; + }); + + afterEach(() => { + process.env = { ...originalEnv }; + }); + + const readConfig = () => + jest.requireActual('@/config'); + + it('leaves Keycloak disabled without configuration', () => { + expect(readConfig().KEYCLOAK).toBeUndefined(); + expect(readConfig().KEYCLOAK_REQUIRED).toBe(false); + }); + + it('derives the callback from the public frontend URL', () => { + process.env.KEYCLOAK_ISSUER = 'https://identity.example.com/realms/hyperdx'; + process.env.KEYCLOAK_CLIENT_ID = 'hyperdx'; + expect(readConfig().KEYCLOAK).toMatchObject({ + issuer: 'https://identity.example.com/realms/hyperdx', + clientId: 'hyperdx', + callbackUrl: 'https://hyperdx.example.com/api/login/keycloak/callback', + }); + }); + + it.each([ + { KEYCLOAK_REQUIRED: 'true' }, + { KEYCLOAK_REQUIRED: 'tru' }, + { KEYCLOAK_ISSUER: 'https://id.example.com/realms/test' }, + { KEYCLOAK_CLIENT_SECRET: 'secret-sentinel' }, + { + KEYCLOAK_ISSUER: 'http://id.example.com/realms/test', + KEYCLOAK_CLIENT_ID: 'hdx', + }, + { + KEYCLOAK_ISSUER: 'https://id.example.com/realms/test?x=1', + KEYCLOAK_CLIENT_ID: 'hdx', + }, + { + KEYCLOAK_ISSUER: 'https://id.example.com/realms/test', + KEYCLOAK_CLIENT_ID: 'hdx', + FRONTEND_URL: 'http://hdx.example.com', + }, + { + KEYCLOAK_ISSUER: 'https://id.example.com/realms/test', + KEYCLOAK_CLIENT_ID: 'hdx', + FRONTEND_URL: '//hdx.example.com', + }, + { + KEYCLOAK_ISSUER: 'https://id.example.com/realms/test', + KEYCLOAK_CLIENT_ID: 'hdx', + IS_LOCAL_APP_MODE: 'DANGEROUSLY_is_local_app_mode💀', + }, + ])('rejects incomplete or unsafe settings (%j)', settings => { + Object.assign(process.env, settings); + expect(readConfig).toThrow(/Keycloak/); + try { + readConfig(); + } catch (error) { + expect(String(error)).not.toContain('secret-sentinel'); + } + }); +}); diff --git a/packages/api/src/__tests__/sessionPolicyConfig.test.ts b/packages/api/src/__tests__/sessionPolicyConfig.test.ts new file mode 100644 index 0000000000..fb3287bef0 --- /dev/null +++ b/packages/api/src/__tests__/sessionPolicyConfig.test.ts @@ -0,0 +1,35 @@ +describe('session policy configuration', () => { + const originalEnv = { ...process.env }; + beforeEach(() => { + jest.resetModules(); + delete process.env.SESSION_MAX_AGE_SECONDS; + delete process.env.SESSION_IDLE_TIMEOUT_SECONDS; + }); + afterEach(() => { + process.env = { ...originalEnv }; + }); + const readConfig = () => + jest.requireActual('@/config'); + + it('retains legacy defaults when no policy is configured', () => { + expect(readConfig().SESSION_MAX_AGE_SECONDS).toBeUndefined(); + expect(readConfig().SESSION_IDLE_TIMEOUT_SECONDS).toBe(2592000); + }); + + it.each(['', '0', '-1', '1.5', 'NaN', 'Infinity', '2592001'])( + 'rejects an invalid session limit (%s)', + value => { + process.env.SESSION_MAX_AGE_SECONDS = value; + expect(readConfig).toThrow(/SESSION/); + delete process.env.SESSION_MAX_AGE_SECONDS; + process.env.SESSION_IDLE_TIMEOUT_SECONDS = value; + expect(readConfig).toThrow(/SESSION/); + }, + ); + + it('rejects an idle period longer than the absolute lifetime', () => { + process.env.SESSION_MAX_AGE_SECONDS = '86400'; + process.env.SESSION_IDLE_TIMEOUT_SECONDS = '86401'; + expect(readConfig).toThrow(/must not exceed/); + }); +}); diff --git a/packages/api/src/api-app.ts b/packages/api/src/api-app.ts index cf19282309..fd8d7f5c58 100644 --- a/packages/api/src/api-app.ts +++ b/packages/api/src/api-app.ts @@ -4,6 +4,8 @@ import express from 'express'; import session from 'express-session'; import onHeaders from 'on-headers'; +import { requireTeamSettingsWriteAccess } from '@/middleware/teamSettings'; + import * as config from './config'; import mcpRouter from './mcp/app'; import { isUserAuthenticated } from './middleware/auth'; @@ -40,7 +42,7 @@ const sess: session.SessionOptions & { cookie: session.CookieOptions } = { cookie: { secure: false, sameSite: 'lax', - maxAge: 1000 * 60 * 60 * 24 * 30, // 30 days + maxAge: config.SESSION_IDLE_TIMEOUT_SECONDS * 1000, }, rolling: true, store: new MongoStore({ mongoUrl: config.MONGO_URI }), @@ -112,9 +114,24 @@ app.use('/alerts', isUserAuthenticated, routers.alertsRouter); app.use('/dashboards', isUserAuthenticated, routers.dashboardRouter); app.use('/me', isUserAuthenticated, routers.meRouter); app.use('/team', isUserAuthenticated, routers.teamRouter); -app.use('/webhooks', isUserAuthenticated, routers.webhooksRouter); -app.use('/connections', isUserAuthenticated, connectionsRouter); -app.use('/sources', isUserAuthenticated, sourcesRouter); +app.use( + '/webhooks', + isUserAuthenticated, + requireTeamSettingsWriteAccess, + routers.webhooksRouter, +); +app.use( + '/connections', + isUserAuthenticated, + requireTeamSettingsWriteAccess, + connectionsRouter, +); +app.use( + '/sources', + isUserAuthenticated, + requireTeamSettingsWriteAccess, + sourcesRouter, +); app.use('/saved-search', isUserAuthenticated, savedSearchRouter); app.use('/favorites', isUserAuthenticated, favoritesRouter); app.use('/pinned-filters', isUserAuthenticated, pinnedFiltersRouter); diff --git a/packages/api/src/config.ts b/packages/api/src/config.ts index 9ac7104ac9..c82a8d75ed 100644 --- a/packages/api/src/config.ts +++ b/packages/api/src/config.ts @@ -40,6 +40,32 @@ export const IS_LOCAL_IMAGE = HYPERDX_IMAGE === 'all-in-one-noauth'; // hosts, so absolute URLs anchored at FRONTEND_URL are required. export const IS_INLINE_API = env.HDX_PREVIEW_INLINE_API === 'true'; export const FRONTEND_REDIRECT_BASE = IS_INLINE_API ? '' : FRONTEND_URL; +export const SESSION_MAX_AGE_SECONDS = + env.SESSION_MAX_AGE_SECONDS === undefined + ? undefined + : Number(env.SESSION_MAX_AGE_SECONDS); +export const SESSION_IDLE_TIMEOUT_SECONDS = Number( + env.SESSION_IDLE_TIMEOUT_SECONDS ?? 2592000, +); +for (const [name, value] of Object.entries({ + SESSION_MAX_AGE_SECONDS, + SESSION_IDLE_TIMEOUT_SECONDS, +})) { + if ( + value !== undefined && + (!Number.isSafeInteger(value) || value <= 0 || value > 2592000) + ) { + throw new Error(`${name} must be an integer between 1 and 2592000 seconds`); + } +} +if ( + SESSION_MAX_AGE_SECONDS && + SESSION_IDLE_TIMEOUT_SECONDS > SESSION_MAX_AGE_SECONDS +) { + throw new Error( + 'SESSION_IDLE_TIMEOUT_SECONDS must not exceed SESSION_MAX_AGE_SECONDS', + ); +} export const INGESTION_API_KEY = env.INGESTION_API_KEY ?? ''; // Opt-in: emit the contrib `datadogreceiver` on the collector so a // Datadog Agent can ship APM traces (DD trace API -> OTLP -> ClickHouse). @@ -51,6 +77,57 @@ export const HYPERDX_LOG_LEVEL = env.HYPERDX_LOG_LEVEL as string; export const IS_CI = NODE_ENV === 'test'; export const IS_DEV = NODE_ENV === 'development'; export const IS_PROD = NODE_ENV === 'production'; +export const KEYCLOAK_REQUIRED = env.KEYCLOAK_REQUIRED === 'true'; +export const KEYCLOAK = (() => { + if ( + env.KEYCLOAK_REQUIRED && + !['true', 'false'].includes(env.KEYCLOAK_REQUIRED) + ) { + throw new Error('Keycloak: KEYCLOAK_REQUIRED must be true or false'); + } + if ( + !env.KEYCLOAK_ISSUER && + !env.KEYCLOAK_CLIENT_ID && + !env.KEYCLOAK_CLIENT_SECRET && + !KEYCLOAK_REQUIRED + ) + return; + + if (!env.KEYCLOAK_ISSUER || !env.KEYCLOAK_CLIENT_ID || IS_LOCAL_APP_MODE) { + throw new Error( + 'Keycloak requires an issuer, client ID, and authenticated app mode', + ); + } + try { + const issuer = new URL(env.KEYCLOAK_ISSUER); + const frontend = new URL(FRONTEND_URL); + for (const url of [issuer, frontend]) { + const localHttp = + !IS_PROD && + url.protocol === 'http:' && + ['localhost', '127.0.0.1', '[::1]'].includes(url.hostname); + if ( + (url.protocol !== 'https:' && !localHttp) || + url.username || + url.password || + url.search || + url.hash + ) + throw new Error(); + } + if (frontend.pathname !== '/') throw new Error(); + return { + issuer: env.KEYCLOAK_ISSUER, + clientId: env.KEYCLOAK_CLIENT_ID, + clientSecret: env.KEYCLOAK_CLIENT_SECRET, + callbackUrl: new URL('/api/login/keycloak/callback', frontend).href, + }; + } catch { + throw new Error( + 'Keycloak requires an HTTPS issuer and FRONTEND_URL origin (HTTP loopback allowed outside production)', + ); + } +})(); export const MONGO_URI = env.MONGO_URI; export const OTEL_SERVICE_NAME = env.OTEL_SERVICE_NAME as string; export const PORT = Number.parseInt(env.PORT as string); diff --git a/packages/api/src/controllers/__tests__/keycloak.int.test.ts b/packages/api/src/controllers/__tests__/keycloak.int.test.ts new file mode 100644 index 0000000000..775d9818fb --- /dev/null +++ b/packages/api/src/controllers/__tests__/keycloak.int.test.ts @@ -0,0 +1,169 @@ +import type { IDToken } from 'openid-client'; + +import { resolveKeycloakUser } from '@/controllers/keycloak'; +import { clearDBCollections, closeDB, connectDB } from '@/fixtures'; +import Team from '@/models/team'; +import TeamInvite from '@/models/teamInvite'; +import User from '@/models/user'; + +const claims: IDToken = { + iss: 'https://id.example.com/realms/hdx', + sub: 'stable-subject', + aud: 'hyperdx', + iat: 1, + exp: 9999999999, + email: 'member@example.com', + email_verified: true, +}; +const identity = { issuer: claims.iss, subject: claims.sub }; + +describe('Keycloak identity and invitation authorization', () => { + beforeAll(async () => { + await connectDB(); + await User.init(); + await TeamInvite.init(); + }); + afterEach(clearDBCollections); + afterAll(closeDB); + + async function invite(email = 'member@example.com') { + const team = await Team.create({ name: 'Inviting team' }); + const invitation = await TeamInvite.create({ + teamId: team._id, + email, + token: 'invitation-token', + }); + return { team, invitation }; + } + + it('rejects an unknown subject without provisioning a team or user', async () => { + expect(await resolveKeycloakUser(claims)).toBeNull(); + expect(await User.countDocuments()).toBe(0); + expect(await Team.countDocuments()).toBe(0); + }); + + it('logs in an explicitly mapped user even after their Keycloak email changes', async () => { + const { team } = await invite(); + const user = await User.create({ + email: 'old@example.com', + team: team._id, + keycloak: identity, + }); + expect((await resolveKeycloakUser(claims))?._id).toEqual(user._id); + expect(await User.countDocuments()).toBe(1); + }); + + it('does not link an existing account by email, even with an invitation', async () => { + const { team, invitation } = await invite(); + const existing = await User.create({ email: claims.email, team: team._id }); + expect(await resolveKeycloakUser(claims, invitation.token)).toBeNull(); + expect((await User.findById(existing._id))?.keycloak).toBeUndefined(); + expect(await TeamInvite.findById(invitation._id)).not.toBeNull(); + }); + + it('does not authenticate the same subject from a different issuer', async () => { + const { team } = await invite(); + await User.create({ + email: claims.email, + team: team._id, + keycloak: identity, + }); + expect( + await resolveKeycloakUser({ + ...claims, + iss: 'https://other.example.com', + }), + ).toBeNull(); + expect(await User.countDocuments()).toBe(1); + }); + + it('provisions only the team named in a valid invitation', async () => { + const { team, invitation } = await invite(); + const user = await resolveKeycloakUser(claims, invitation.token); + expect(user?.team).toEqual(team._id); + expect(user?.keycloak).toMatchObject(identity); + expect(await TeamInvite.findById(invitation._id)).toBeNull(); + expect(await Team.countDocuments()).toBe(1); + }); + + it.each([ + { email_verified: false }, + { email_verified: undefined }, + { email: 'someone-else@example.com' }, + { email: undefined }, + ])( + 'rejects unverified or mismatched invitation claims (%j)', + async changes => { + const { invitation } = await invite(); + expect( + await resolveKeycloakUser({ ...claims, ...changes }, invitation.token), + ).toBeNull(); + expect(await User.countDocuments()).toBe(0); + }, + ); + + it('rejects expired invitations without relying on the Mongo TTL sweep', async () => { + const { invitation } = await invite(); + await TeamInvite.collection.updateOne( + { _id: invitation._id }, + { $set: { createdAt: new Date(Date.now() - 31 * 86400000) } }, + ); + expect(await resolveKeycloakUser(claims, invitation.token)).toBeNull(); + }); + + it('rejects identities and invitations whose team was deleted', async () => { + const { team, invitation } = await invite(); + await Team.deleteOne({ _id: team._id }); + expect(await resolveKeycloakUser(claims, invitation.token)).toBeNull(); + await User.create({ + email: claims.email, + team: team._id, + keycloak: identity, + }); + expect(await resolveKeycloakUser(claims)).toBeNull(); + }); + + it('does not move a mapped user to another invited team', async () => { + const originalTeam = await Team.create({ name: 'Original team' }); + const user = await User.create({ + email: claims.email, + team: originalTeam._id, + keycloak: identity, + }); + const { invitation } = await invite(); + expect((await resolveKeycloakUser(claims, invitation.token))?.team).toEqual( + originalTeam._id, + ); + expect((await User.findById(user._id))?.team).toEqual(originalTeam._id); + }); + + it('enforces uniqueness on issuer and subject while allowing users without an identity', async () => { + await User.create([ + { email: 'local1@example.com' }, + { email: 'local2@example.com' }, + ]); + await User.create({ email: 'first@example.com', keycloak: identity }); + await expect( + User.create({ email: 'second@example.com', keycloak: identity }), + ).rejects.toMatchObject({ code: 11000 }); + await expect( + User.create({ + email: 'third@example.com', + keycloak: { ...identity, issuer: 'https://other.example.com' }, + }), + ).resolves.toBeDefined(); + }); + + it('never creates duplicate accounts during concurrent first logins', async () => { + const { invitation } = await invite(); + const users = await Promise.all([ + resolveKeycloakUser(claims, invitation.token), + resolveKeycloakUser(claims, invitation.token), + ]); + expect(users.some(Boolean)).toBe(true); + expect(await User.countDocuments()).toBe(1); + const created = await User.findOne({ 'keycloak.subject': claims.sub }); + for (const user of users.filter(u => u != null)) + expect(user._id).toEqual(created?._id); + }); +}); diff --git a/packages/api/src/controllers/keycloak.ts b/packages/api/src/controllers/keycloak.ts new file mode 100644 index 0000000000..2f35a0abf3 --- /dev/null +++ b/packages/api/src/controllers/keycloak.ts @@ -0,0 +1,69 @@ +import mongoose from 'mongoose'; +import ms from 'ms'; +import type { IDToken } from 'openid-client'; + +import { findUserByEmail } from '@/controllers/user'; +import Team from '@/models/team'; +import TeamInvite from '@/models/teamInvite'; +import User from '@/models/user'; +import { setBusinessContext } from '@/utils/instrumentation'; + +export async function resolveKeycloakUser( + claims: IDToken, + inviteToken?: string, +) { + // Wait for the unique identity index before accepting concurrent first logins. + await User.init(); + const identity = { issuer: claims.iss, subject: claims.sub }; + const filter = { + 'keycloak.issuer': identity.issuer, + 'keycloak.subject': identity.subject, + }; + const existing = await User.findOne(filter); + if (existing) { + return existing.team && (await Team.exists({ _id: existing.team })) + ? existing + : null; + } + if ( + !inviteToken || + claims.email_verified !== true || + typeof claims.email !== 'string' + ) { + return null; + } + + const email = claims.email.toLowerCase(); + const invitation = await TeamInvite.findOne({ + token: inviteToken, + email, + createdAt: { $gt: new Date(Date.now() - ms('30d')) }, + }); + if ( + !invitation || + !(await Team.exists({ _id: invitation.teamId })) || + (await findUserByEmail(email)) + ) + return null; + + setBusinessContext({ teamId: invitation.teamId.toString(), email }); + try { + const user = await User.create({ + email, + name: email, + team: invitation.teamId, + keycloak: identity, + }); + await TeamInvite.deleteOne({ _id: invitation._id }); + return user; + } catch (error) { + if ( + error instanceof mongoose.mongo.MongoServerError && + error.code === 11000 + ) { + // Only a concurrent creation of this identity in the invited team can win. + return User.findOne({ ...filter, team: invitation.teamId }); + } + throw error; + } +} diff --git a/packages/api/src/controllers/user.ts b/packages/api/src/controllers/user.ts index 7c80b782be..d7aaf6d71f 100644 --- a/packages/api/src/controllers/user.ts +++ b/packages/api/src/controllers/user.ts @@ -32,7 +32,9 @@ export function findUserByEmail(email: string) { } export function findUsersByTeam(team: string | ObjectId) { - return User.find({ team }).sort({ createdAt: 1 }); + // Member endpoints whitelist response fields; the hash is only used by the + // hasPasswordAuth virtual and must never be included in their responses. + return User.find({ team }).select('+hash').sort({ createdAt: 1 }); } // Type-guard wrapper over the shared 24-hex check; rejects the synthetic diff --git a/packages/api/src/mcp/tools/alerts/deleteWebhook.ts b/packages/api/src/mcp/tools/alerts/deleteWebhook.ts index b2668c0e89..1744358efd 100644 --- a/packages/api/src/mcp/tools/alerts/deleteWebhook.ts +++ b/packages/api/src/mcp/tools/alerts/deleteWebhook.ts @@ -5,6 +5,7 @@ import { deleteWebhook } from '@/controllers/webhook'; import { IDEMPOTENT_DESTRUCTIVE_TOOL } from '@/mcp/tools/annotations'; import type { ToolRegistrar } from '@/mcp/tools/types'; import { mcpUserError } from '@/mcp/utils/errors'; +import { canManageTeamSettings } from '@/middleware/teamSettings'; import { objectIdSchema } from '@/utils/zod'; export function registerDeleteWebhook({ @@ -29,6 +30,9 @@ export function registerDeleteWebhook({ }), }, async ({ id: webhookId }) => { + if (!(await canManageTeamSettings(context.teamId, context.userId))) { + return mcpUserError('Forbidden: team settings access required'); + } const result = await deleteWebhook( new mongoose.Types.ObjectId(teamId), webhookId, diff --git a/packages/api/src/mcp/tools/alerts/saveWebhook.ts b/packages/api/src/mcp/tools/alerts/saveWebhook.ts index 5542f47f60..9e55058d19 100644 --- a/packages/api/src/mcp/tools/alerts/saveWebhook.ts +++ b/packages/api/src/mcp/tools/alerts/saveWebhook.ts @@ -10,6 +10,7 @@ import { mcpUserError, validateObjectId, } from '@/mcp/utils/errors'; +import { canManageTeamSettings } from '@/middleware/teamSettings'; import { isDuplicateKeyError } from '@/utils/errors'; import { isWebhookValidationError } from '@/utils/validators'; import { externalWebhookCreateSchema } from '@/utils/zod'; @@ -121,6 +122,9 @@ export function registerSaveWebhook({ inputSchema: mcpSaveWebhookSchema, }, async input => { + if (!(await canManageTeamSettings(context.teamId, context.userId))) { + return mcpUserError('Forbidden: team settings access required'); + } const webhookId = input.id; if (webhookId != null) { const idError = validateObjectId(webhookId, 'webhook ID'); diff --git a/packages/api/src/mcp/tools/sources/deleteSource.ts b/packages/api/src/mcp/tools/sources/deleteSource.ts index c3c064301f..039a21e704 100644 --- a/packages/api/src/mcp/tools/sources/deleteSource.ts +++ b/packages/api/src/mcp/tools/sources/deleteSource.ts @@ -5,6 +5,7 @@ import { IDEMPOTENT_DESTRUCTIVE_TOOL } from '@/mcp/tools/annotations'; import type { ToolRegistrar } from '@/mcp/tools/types'; import { mcpUserError } from '@/mcp/utils/errors'; import { isHiddenSource } from '@/mcp/utils/promql'; +import { canManageTeamSettings } from '@/middleware/teamSettings'; import { objectIdSchema } from '@/utils/zod'; export function registerDeleteSource({ @@ -30,6 +31,9 @@ export function registerDeleteSource({ }), }, async ({ id: sourceId }) => { + if (!(await canManageTeamSettings(context.teamId, context.userId))) { + return mcpUserError('Forbidden: team settings access required'); + } const source = await getSource(teamId, sourceId); if (source && isHiddenSource(context, source)) { return mcpUserError('Source not found'); diff --git a/packages/api/src/mcp/tools/sources/saveSource.ts b/packages/api/src/mcp/tools/sources/saveSource.ts index ed90ed4ef0..430a1067e4 100644 --- a/packages/api/src/mcp/tools/sources/saveSource.ts +++ b/packages/api/src/mcp/tools/sources/saveSource.ts @@ -12,6 +12,7 @@ import { validateObjectId, } from '@/mcp/utils/errors'; import { isPromqlEnabled } from '@/mcp/utils/promql'; +import { canManageTeamSettings } from '@/middleware/teamSettings'; import { isDuplicateKeyError } from '@/utils/errors'; import { buildMcpSaveSourceSchema, buildSourceInput } from './schemas'; @@ -44,6 +45,9 @@ export function registerSaveSource({ inputSchema: buildMcpSaveSourceSchema(isPromqlEnabled(context)), }, async input => { + if (!(await canManageTeamSettings(context.teamId, context.userId))) { + return mcpUserError('Forbidden: team settings access required'); + } const sourceId = input.id; if (sourceId != null) { const idError = validateObjectId(sourceId, 'source ID'); diff --git a/packages/api/src/middleware/auth.ts b/packages/api/src/middleware/auth.ts index 5be32c9798..59d5e769ff 100644 --- a/packages/api/src/middleware/auth.ts +++ b/packages/api/src/middleware/auth.ts @@ -1,6 +1,7 @@ import { withQueryAttribution } from '@hyperdx/common-utils/dist/clickhouse/node'; import { Connection } from '@hyperdx/common-utils/dist/types'; import type { NextFunction, Request, Response } from 'express'; +import type { SessionData } from 'express-session'; import { serializeError } from 'serialize-error'; import * as config from '@/config'; @@ -20,6 +21,9 @@ declare global { namespace Express { // eslint-disable-next-line @typescript-eslint/no-empty-object-type interface User extends UserDocument {} + interface AuthInfo { + keycloak?: SessionData['keycloak']; + } interface Request { _hdx_connection?: Connection; } @@ -27,6 +31,17 @@ declare global { } declare module 'express-session' { + interface SessionData { + authExpiresAt?: number; + oidc?: { + state: string; + nonce: string; + codeVerifier: string; + createdAt: number; + inviteToken?: string; + }; + keycloak?: { issuer: string; subject: string; expiresAt: number }; + } interface Session { messages: string[]; // Set by passport passport: { user: string }; // Set by passport @@ -155,6 +170,24 @@ export function isUserAuthenticated( } if (req.isAuthenticated()) { + const keycloak = req.session.keycloak; + if ( + (req.session.cookie.originalMaxAge ?? 0) > + config.SESSION_IDLE_TIMEOUT_SECONDS * 1000 || + (config.SESSION_MAX_AGE_SECONDS && + (!req.session.authExpiresAt || + req.session.authExpiresAt <= Date.now())) || + (config.KEYCLOAK_REQUIRED && !keycloak) || + (keycloak && + (keycloak.expiresAt <= Date.now() || + keycloak.issuer !== config.KEYCLOAK?.issuer || + keycloak.issuer !== req.user?.keycloak?.issuer || + keycloak.subject !== req.user?.keycloak?.subject)) + ) { + return req.session.destroy(error => + error ? next(error) : res.sendStatus(401), + ); + } // Attach incident-remediation context to the trace and active span. setBusinessContext({ teamId: req.user?.team?.toString(), diff --git a/packages/api/src/middleware/teamSettings.ts b/packages/api/src/middleware/teamSettings.ts new file mode 100644 index 0000000000..20cb782e36 --- /dev/null +++ b/packages/api/src/middleware/teamSettings.ts @@ -0,0 +1,46 @@ +import type { RequestHandler } from 'express'; +import type { Types } from 'mongoose'; + +import { IS_LOCAL_APP_MODE } from '@/config'; +import Team from '@/models/team'; + +export async function canManageTeamSettings( + teamId: string | Types.ObjectId | undefined, + userId: string | Types.ObjectId | undefined, +): Promise { + if (IS_LOCAL_APP_MODE) return true; + if (!teamId || !userId) return false; + const team = await Team.findById(teamId).select('settingsAdminIds'); + if (!team) return false; + // An absent policy preserves upstream behavior; an empty policy grants nobody. + return ( + team.settingsAdminIds === undefined || + team.settingsAdminIds.some(id => id.toString() === userId.toString()) + ); +} + +export const requireTeamSettingsAccess: RequestHandler = async ( + req, + res, + next, +) => { + try { + if (!(await canManageTeamSettings(req.user?.team, req.user?._id))) { + res.sendStatus(403); + return; + } + next(); + } catch (error) { + next(error); + } +}; + +export const requireTeamSettingsWriteAccess: RequestHandler = ( + req, + res, + next, +) => { + // Source/connection catalogs and webhook choices are needed outside settings. + if (['GET', 'HEAD', 'OPTIONS'].includes(req.method)) return next(); + return requireTeamSettingsAccess(req, res, next); +}; diff --git a/packages/api/src/models/team.ts b/packages/api/src/models/team.ts index 1954e0ac7a..fd7385e646 100644 --- a/packages/api/src/models/team.ts +++ b/packages/api/src/models/team.ts @@ -6,6 +6,7 @@ type ObjectId = mongoose.Types.ObjectId; export interface ITeam extends Team { _id: ObjectId; + settingsAdminIds?: ObjectId[]; createdAt: Date; updatedAt: Date; } @@ -17,6 +18,10 @@ export default mongoose.model( new Schema( { name: String, + settingsAdminIds: { + type: [{ type: mongoose.Schema.Types.ObjectId, ref: 'User' }], + default: undefined, + }, allowedAuthMethods: [String], hookId: { type: String, diff --git a/packages/api/src/models/user.ts b/packages/api/src/models/user.ts index e5756cc418..56d9835fd0 100644 --- a/packages/api/src/models/user.ts +++ b/packages/api/src/models/user.ts @@ -15,6 +15,7 @@ export interface IUser { createdAt: Date; email: string; name: string; + keycloak?: { issuer: string; subject: string }; // Optional for docs predating this field; the `me` route defaults it. onboardingData?: OnboardingData; team: ObjectId; @@ -25,6 +26,15 @@ export type UserDocument = mongoose.HydratedDocument; const UserSchema = new Schema( { name: String, + keycloak: { + type: new Schema( + { + issuer: { type: String, required: true }, + subject: { type: String, required: true }, + }, + { _id: false }, + ), + }, email: { type: String, required: true, @@ -56,8 +66,8 @@ const UserSchema = new Schema( }, ); -UserSchema.virtual('hasPasswordAuth').get(function (this: IUser) { - return true; +UserSchema.virtual('hasPasswordAuth').get(function (this: UserDocument) { + return Boolean(this.get('hash')); }); UserSchema.plugin(passportLocalMongoose, { @@ -68,5 +78,15 @@ UserSchema.plugin(passportLocalMongoose, { UserSchema.index({ email: 1 }, { unique: true }); UserSchema.index({ accessKey: 1 }, { unique: true }); +UserSchema.index( + { 'keycloak.issuer': 1, 'keycloak.subject': 1 }, + { + unique: true, + partialFilterExpression: { + 'keycloak.issuer': { $type: 'string' }, + 'keycloak.subject': { $type: 'string' }, + }, + }, +); export default mongoose.model('User', UserSchema); diff --git a/packages/api/src/routers/api/__tests__/keycloak.int.test.ts b/packages/api/src/routers/api/__tests__/keycloak.int.test.ts new file mode 100644 index 0000000000..238bc82de6 --- /dev/null +++ b/packages/api/src/routers/api/__tests__/keycloak.int.test.ts @@ -0,0 +1,388 @@ +import mongoose from 'mongoose'; +import request from 'supertest'; + +import app from '@/api-app'; +import * as config from '@/config'; +import { clearDBCollections, closeDB, connectDB } from '@/fixtures'; +import Team from '@/models/team'; +import TeamInvite from '@/models/teamInvite'; +import User from '@/models/user'; + +import { startKeycloakTestProvider } from './keycloakProvider'; + +jest.mock('@/config', () => ({ + __esModule: true, + ...jest.requireActual('@/config'), + FRONTEND_URL: 'http://127.0.0.1:4500', + FRONTEND_REDIRECT_BASE: 'http://127.0.0.1:4500', + KEYCLOAK_REQUIRED: false, + KEYCLOAK: { + issuer: '', + clientId: 'hyperdx', + clientSecret: 'test-only-secret', + callbackUrl: 'http://127.0.0.1:4500/api/login/keycloak/callback', + }, +})); + +describe('Keycloak OIDC routes with real provider, Passport, and Mongo sessions', () => { + let provider: Awaited>; + const { realFetch } = globalThis as typeof globalThis & { + realFetch: typeof fetch; + }; + + beforeAll(async () => { + jest.mocked(fetch).mockImplementation(realFetch); + provider = await startKeycloakTestProvider(); + if (config.KEYCLOAK) config.KEYCLOAK.issuer = provider.issuer; + await connectDB(); + await User.init(); + }); + afterEach(async () => { + jest.restoreAllMocks(); + jest.mocked(fetch).mockImplementation(realFetch); + provider.settings.idTokenTtl = 300; + await clearDBCollections(); + }); + afterAll(async () => { + await provider.stop(); + await closeDB(); + }); + + async function mappedUser() { + const team = await Team.create({ name: 'Existing team' }); + return User.create({ + email: provider.account.email, + team: team._id, + keycloak: { issuer: provider.issuer, subject: provider.account.sub }, + }); + } + + async function login(agent = request.agent(app), suffix = '') { + const start = await agent.get(`/login/keycloak${suffix}`).expect(302); + const callback = await provider.authorize(start.headers.location); + const result = await agent.get(callback).expect(303); + return { agent, start, callback, result }; + } + + it('uses code flow with PKCE, state, nonce and a fixed callback', async () => { + const response = await request + .agent(app) + .get('/login/keycloak?redirect=https://evil.example') + .expect(302); + const authorization = new URL(response.headers.location); + expect(authorization.origin).toBe(provider.issuer); + expect(authorization.searchParams.get('response_type')).toBe('code'); + expect(authorization.searchParams.get('code_challenge_method')).toBe( + 'S256', + ); + expect(authorization.searchParams.get('code_challenge')).toBeTruthy(); + expect(authorization.searchParams.get('state')).toBeTruthy(); + expect(authorization.searchParams.get('nonce')).toBeTruthy(); + expect(authorization.searchParams.get('redirect_uri')).toBe( + 'http://127.0.0.1:4500/api/login/keycloak/callback', + ); + expect(response.headers.location).not.toContain('test-only-secret'); + }); + + it('creates a Passport session, rotates its ID and retains no OIDC tokens', async () => { + const user = await mappedUser(); + const { agent, start, result } = await login(); + expect(result.headers.location).toBe('http://127.0.0.1:4500/'); + const beforeCookie = start.headers['set-cookie'][0].split(';')[0]; + const afterCookie = result.headers['set-cookie'][0].split(';')[0]; + expect(afterCookie).not.toBe(beforeCookie); + const me = await agent.get('/me').expect(200); + expect(me.body.id).toBe(user.id); + await request(app).get('/me').set('Cookie', beforeCookie).expect(401); + const sessions = await mongoose.connection + .collection('sessions') + .find({}) + .toArray(); + const session = sessions + .map(s => JSON.parse(s.session)) + .find(s => s.passport); + expect(session.passport.user).toBe(user.id); + expect(session.keycloak.expiresAt).toBeGreaterThan(Date.now()); + expect(JSON.stringify(sessions)).not.toMatch( + /access_token|refresh_token|id_token|test-only-secret/, + ); + }); + + it('rejects unknown identities without creating accounts', async () => { + const { agent, result } = await login(); + expect(result.headers.location).toContain('err=keycloak'); + await agent.get('/me').expect(401); + expect(await User.countDocuments()).toBe(0); + }); + + it('accepts an invitation through the existing team membership model', async () => { + const team = await Team.create({ name: 'Inviting team' }); + await TeamInvite.create({ + teamId: team._id, + email: provider.account.email, + token: 'invite-token', + }); + const { agent } = await login(request.agent(app), '?token=invite-token'); + const me = await agent.get('/me').expect(200); + expect(me.body.team._id).toBe(team.id); + expect(await TeamInvite.countDocuments()).toBe(0); + const members = await agent.get('/team/members').expect(200); + expect(members.body.data[0].hasPasswordAuth).toBe(false); + expect(JSON.stringify(members.body)).not.toMatch(/hash|salt/); + }); + + it('accepts an invited member without granting restricted team settings access', async () => { + const team = await Team.create({ + name: 'Restricted team', + settingsAdminIds: [new mongoose.Types.ObjectId()], + }); + await TeamInvite.create({ + teamId: team._id, + email: provider.account.email, + token: 'member-invite', + }); + const { agent } = await login(request.agent(app), '?token=member-invite'); + const me = await agent.get('/me').expect(200); + expect(me.body.team._id).toBe(team.id); + expect(me.body.canManageTeamSettings).toBe(false); + await agent.get('/team/members').expect(403); + await agent.get('/dashboards').expect(200); + expect((await Team.findById(team._id))?.settingsAdminIds).toEqual( + team.settingsAdminIds, + ); + }); + + it.each(['removed', 'issuer', 'subject', 'deleted user'])( + 'revokes an existing browser session after identity change: %s', + async change => { + const user = await mappedUser(); + const { agent, result } = await login(); + const cookie = result.headers['set-cookie'][0].split(';')[0]; + await agent.get('/me').expect(200); + if (change === 'deleted user') { + await User.deleteOne({ _id: user._id }); + } else { + await User.updateOne( + { _id: user._id }, + change === 'removed' + ? { $unset: { keycloak: '' } } + : { $set: { [`keycloak.${change}`]: 'different-identity' } }, + ); + } + await agent.get('/me').expect(401); + await request(app).get('/dashboards').set('Cookie', cookie).expect(401); + }, + ); + + it.each(['nonce', 'codeVerifier', 'createdAt'])( + 'rejects a callback with invalid stored %s', + async field => { + await mappedUser(); + const agent = request.agent(app); + const start = await agent.get('/login/keycloak').expect(302); + const callback = await provider.authorize(start.headers.location); + const store = mongoose.connection.collection('sessions'); + const session = await store.findOne({ session: { $regex: '"oidc"' } }); + if (!session) throw new Error('Missing OIDC transaction'); + const data = JSON.parse(session.session); + data.oidc[field] = + field === 'createdAt' ? Date.now() - 11 * 60 * 1000 : 'incorrect'; + await store.updateOne( + { _id: session._id }, + { $set: { session: JSON.stringify(data) } }, + ); + const rejected = await agent.get(callback).expect(303); + expect(rejected.headers.location).toContain('err=keycloak'); + await agent.get('/me').expect(401); + }, + ); + + it('rejects an authorization response from another issuer', async () => { + await mappedUser(); + const agent = request.agent(app); + const start = await agent.get('/login/keycloak').expect(302); + const callback = new URL( + await provider.authorize(start.headers.location), + config.FRONTEND_URL, + ); + callback.searchParams.set('iss', 'https://other.example.com'); + expect( + (await agent.get(callback.pathname + callback.search).expect(303)).headers + .location, + ).toContain('err=keycloak'); + await agent.get('/me').expect(401); + }); + + it('rejects a token whose signature was altered in transit', async () => { + await mappedUser(); + jest.mocked(fetch).mockImplementation(async (input, init) => { + const response = await realFetch(input, init); + if (new URL(response.url).pathname !== '/token') return response; + const body = await response.json(); + body.id_token = body.id_token.slice(0, -8) + 'tampered'; + return new Response(JSON.stringify(body), { + status: 200, + headers: response.headers, + }); + }); + const { agent, result } = await login(); + expect(result.headers.location).toContain('err=keycloak'); + await agent.get('/me').expect(401); + }); + + it('rejects an expired ID token', async () => { + await mappedUser(); + provider.settings.idTokenTtl = -120; + const { agent, result } = await login(); + expect(result.headers.location).toContain('err=keycloak'); + await agent.get('/me').expect(401); + }); + + it('preserves password registration/login in optional mode and rejects that session in required mode', async () => { + const credentials = { + email: 'local@example.com', + password: 'TacoCat!2#4X', + confirmPassword: 'TacoCat!2#4X', + }; + await request(app).post('/register/password').send(credentials).expect(200); + const agent = request.agent(app); + await agent + .post('/login/password') + .type('form') + .send(credentials) + .expect(303); + await agent.get('/me').expect(200); + const members = await agent.get('/team/members').expect(200); + expect(members.body.data[0].hasPasswordAuth).toBe(true); + expect(JSON.stringify(members.body)).not.toMatch(/hash|salt/); + jest.replaceProperty(config, 'KEYCLOAK_REQUIRED', true); + await agent.get('/me').expect(401); + }); + + it('exposes only nonsecret rollout flags through installation', async () => { + const response = await request(app).get('/installation').expect(200); + expect(response.body).toEqual({ + isTeamExisting: false, + keycloakEnabled: true, + keycloakRequired: false, + }); + }); + + it.each(['missing', 'wrong', 'provider_error'])( + 'rejects %s state/callback without a session', + async failure => { + await mappedUser(); + const agent = request.agent(app); + const start = await agent.get('/login/keycloak').expect(302); + const callback = new URL( + await provider.authorize(start.headers.location), + config.FRONTEND_URL, + ); + if (failure === 'missing') callback.searchParams.delete('state'); + if (failure === 'wrong') callback.searchParams.set('state', 'incorrect'); + if (failure === 'provider_error') { + callback.searchParams.delete('code'); + callback.searchParams.set('error', 'access_denied'); + } + const rejected = await agent + .get(callback.pathname + callback.search) + .expect(303); + expect(rejected.headers.location).toContain('err=keycloak'); + await agent.get('/me').expect(401); + }, + ); + + it('rejects an unsolicited callback and replay of a completed callback', async () => { + await request(app) + .get('/login/keycloak/callback?code=unsolicited&state=x') + .expect(303); + await mappedUser(); + const { agent, callback } = await login(); + const replay = await agent.get(callback).expect(303); + expect(replay.headers.location).toContain('err=keycloak'); + }); + + it('consumes a failed callback so correcting its state cannot reuse the transaction', async () => { + await mappedUser(); + const agent = request.agent(app); + const start = await agent.get('/login/keycloak').expect(302); + const callback = await provider.authorize(start.headers.location); + const invalid = new URL(callback, config.FRONTEND_URL); + invalid.searchParams.set('state', 'incorrect'); + await agent.get(invalid.pathname + invalid.search).expect(303); + const retry = await agent.get(callback).expect(303); + expect(retry.headers.location).toContain('err=keycloak'); + await agent.get('/me').expect(401); + }); + + it('enforces absolute session expiry even when the Mongo cookie is still live', async () => { + await mappedUser(); + const { agent } = await login(); + const store = mongoose.connection.collection('sessions'); + const session = await store.findOne({ session: { $regex: '"passport"' } }); + if (!session) throw new Error('Missing authenticated session'); + const data = JSON.parse(session.session); + data.keycloak.expiresAt = Date.now() - 1; + await store.updateOne( + { _id: session._id }, + { $set: { session: JSON.stringify(data) } }, + ); + await agent.get('/me').expect(401); + }); + + it('caps unusually long ID token lifetimes at the existing session limit', async () => { + await mappedUser(); + provider.settings.idTokenTtl = 60 * 86400; + await login(); + const session = await mongoose.connection + .collection('sessions') + .findOne({ session: { $regex: '"passport"' } }); + if (!session) throw new Error('Missing authenticated session'); + const data = JSON.parse(session.session); + expect(data.keycloak.expiresAt).toBeLessThanOrEqual( + Date.now() + 30 * 86400000, + ); + }); + + it('requires same-origin POST logout and invalidates the stored session', async () => { + await mappedUser(); + const { agent, result } = await login(); + const cookie = result.headers['set-cookie'][0].split(';')[0]; + await agent.get('/logout').expect(405); + await agent + .post('/logout') + .set('Origin', 'https://evil.example') + .expect(403); + await agent.get('/me').expect(200); + const logout = await agent + .post('/logout') + .set('Origin', config.FRONTEND_URL) + .expect(303); + const destination = new URL(logout.headers.location); + expect(destination.origin).toBe(provider.issuer); + expect(destination.searchParams.get('client_id')).toBe('hyperdx'); + expect(destination.searchParams.get('post_logout_redirect_uri')).toBe( + 'http://127.0.0.1:4500/login', + ); + await request(app).get('/me').set('Cookie', cookie).expect(401); + }); + + it('blocks every password entry point and old password sessions in required mode', async () => { + jest.replaceProperty(config, 'KEYCLOAK_REQUIRED', true); + for (const path of [ + '/login/password', + '/register/password', + '/team/setup/invite', + ]) { + await request(app) + .post(path) + .send({ + email: 'local@example.com', + password: 'TacoCat!2#4X', + confirmPassword: 'TacoCat!2#4X', + }) + .expect(403); + } + expect(await User.countDocuments()).toBe(0); + }); +}); diff --git a/packages/api/src/routers/api/__tests__/keycloakProvider.ts b/packages/api/src/routers/api/__tests__/keycloakProvider.ts new file mode 100644 index 0000000000..18980769b3 --- /dev/null +++ b/packages/api/src/routers/api/__tests__/keycloakProvider.ts @@ -0,0 +1,97 @@ +import express from 'express'; +import { createServer } from 'http'; +import Provider from 'oidc-provider'; +import request from 'supertest'; + +export async function startKeycloakTestProvider() { + const app = express(); + const server = createServer(app); + await new Promise(resolve => server.listen(0, '127.0.0.1', resolve)); + const address = server.address(); + if (!address || typeof address === 'string') + throw new Error('Missing test port'); + const issuer = `http://127.0.0.1:${address.port}`; + const account = { + sub: 'test-subject', + email: 'member@example.com', + email_verified: true, + }; + const settings = { idTokenTtl: 300 }; + const provider = new Provider(issuer, { + clients: [ + { + client_id: 'hyperdx', + client_secret: 'test-only-secret', + redirect_uris: ['http://127.0.0.1:4500/api/login/keycloak/callback'], + post_logout_redirect_uris: ['http://127.0.0.1:4500/login'], + response_types: ['code'], + grant_types: ['authorization_code'], + token_endpoint_auth_method: 'client_secret_post', + }, + ], + features: { devInteractions: { enabled: false } }, + claims: { openid: ['sub'], email: ['email', 'email_verified'] }, + conformIdTokenClaims: false, + ttl: { + IdToken: () => settings.idTokenTtl, + AccessToken: 300, + Interaction: 300, + Session: 300, + Grant: 300, + }, + pkce: { required: () => true }, + findAccount: async () => ({ + accountId: account.sub, + claims: async () => ({ ...account }), + }), + }); + app.get('/interaction/:uid', async (req, res, next) => { + try { + await provider.interactionDetails(req, res); + const grant = new provider.Grant({ + accountId: account.sub, + clientId: 'hyperdx', + }); + grant.addOIDCScope('openid email'); + await provider.interactionFinished( + req, + res, + { + login: { accountId: account.sub }, + consent: { grantId: await grant.save() }, + }, + { mergeWithLastSubmission: false }, + ); + } catch (error) { + next(error); + } + }); + app.use(provider.callback()); + + return { + issuer, + account, + settings, + async authorize(url: string) { + const agent = request.agent(server); + let destination = new URL(url); + for (let i = 0; i < 6 && destination.origin === issuer; i++) { + const response = await agent.get( + destination.pathname + destination.search, + ); + if (![302, 303].includes(response.status)) + throw new Error( + `OIDC provider returned ${response.status}: ${response.text}`, + ); + destination = new URL(response.headers.location, issuer); + } + if (destination.origin === issuer) + throw new Error('OIDC interaction did not finish'); + return destination.pathname.replace(/^\/api/, '') + destination.search; + }, + stop: () => + new Promise((resolve, reject) => + server.close(error => (error ? reject(error) : resolve())), + ), + }; +} diff --git a/packages/api/src/routers/api/__tests__/sessionPolicy.int.test.ts b/packages/api/src/routers/api/__tests__/sessionPolicy.int.test.ts new file mode 100644 index 0000000000..c9e631eff9 --- /dev/null +++ b/packages/api/src/routers/api/__tests__/sessionPolicy.int.test.ts @@ -0,0 +1,169 @@ +import mongoose from 'mongoose'; +import request from 'supertest'; + +import app from '@/api-app'; +import * as config from '@/config'; +import { clearDBCollections, closeDB, connectDB } from '@/fixtures'; +import Team from '@/models/team'; +import User from '@/models/user'; + +import { startKeycloakTestProvider } from './keycloakProvider'; + +jest.mock('@/config', () => ({ + __esModule: true, + ...jest.requireActual('@/config'), + FRONTEND_URL: 'http://127.0.0.1:4500', + FRONTEND_REDIRECT_BASE: 'http://127.0.0.1:4500', + SESSION_MAX_AGE_SECONDS: 86400, + SESSION_IDLE_TIMEOUT_SECONDS: 1800, + KEYCLOAK_REQUIRED: false, + KEYCLOAK: { + issuer: '', + clientId: 'hyperdx', + clientSecret: 'test-only-secret', + callbackUrl: 'http://127.0.0.1:4500/api/login/keycloak/callback', + }, +})); + +describe('configured session lifetime', () => { + let provider: Awaited>; + const { realFetch } = globalThis as typeof globalThis & { + realFetch: typeof fetch; + }; + beforeAll(async () => { + jest.mocked(fetch).mockImplementation(realFetch); + provider = await startKeycloakTestProvider(); + if (config.KEYCLOAK) config.KEYCLOAK.issuer = provider.issuer; + await connectDB(); + }); + afterEach(async () => { + jest.restoreAllMocks(); + jest.mocked(fetch).mockImplementation(realFetch); + await clearDBCollections(); + }); + afterAll(async () => { + await provider.stop(); + await closeDB(); + }); + + async function login(method: 'password' | 'keycloak') { + const agent = request.agent(app); + if (method === 'password') { + const credentials = { + email: 'password@example.com', + password: 'TacoCat!2#4X', + }; + await agent + .post('/register/password') + .send({ ...credentials, confirmPassword: credentials.password }) + .expect(200); + await agent.post('/login/password').send(credentials).expect(303); + } else { + const team = await Team.create({ name: 'Test' }); + await User.create({ + email: provider.account.email, + team: team._id, + keycloak: { issuer: provider.issuer, subject: provider.account.sub }, + }); + const start = await agent.get('/login/keycloak').expect(302); + const callback = await provider.authorize(start.headers.location); + await agent.get(callback).expect(303); + } + const store = mongoose.connection.collection('sessions'); + const session = await store.findOne({ session: { $regex: '"passport"' } }); + if (!session) throw new Error('Missing authenticated session'); + return { agent, store, session, data: JSON.parse(session.session) }; + } + + it.each(['password', 'keycloak'] as const)( + '%s sessions survive short token lifetimes but expire at 24 hours despite activity', + async method => { + const before = Date.now(); + const { agent, data, store, session } = await login(method); + expect(data.authExpiresAt).toBeGreaterThanOrEqual(before + 86400000); + expect(data.authExpiresAt).toBeLessThanOrEqual(Date.now() + 86400000); + expect(data.cookie.originalMaxAge).toBe(1800000); + const now = Date.now(); + jest.spyOn(Date, 'now').mockReturnValue(now + 10 * 60 * 1000); + const active = await agent.get('/me').expect(200); + const cookie = active.headers['set-cookie'][0].split(';')[0]; + const updated = await store.findOne({ _id: session._id }); + expect(updated?.expires.getTime()).toBeGreaterThan( + session.expires.getTime(), + ); + expect(updated?.expires.getTime()).toBe(now + 40 * 60 * 1000); + expect(active.headers['set-cookie'][0]).toContain( + `Expires=${new Date(now + 40 * 60 * 1000).toUTCString()}`, + ); + expect(JSON.parse(updated?.session).authExpiresAt).toBe( + data.authExpiresAt, + ); + jest.spyOn(Date, 'now').mockReturnValue(now + 86400000); + await request(app).get('/me').set('Cookie', cookie).expect(401); + expect(await store.findOne({ _id: session._id })).toBeNull(); + }, + ); + + it.each(['password', 'keycloak'] as const)( + 'rejects an idle %s session even if its cookie is replayed', + async method => { + const { agent, store, session } = await login(method); + await store.updateOne( + { _id: session._id }, + { $set: { expires: new Date(Date.now() - 1) } }, + ); + await agent.get('/me').expect(401); + }, + ); + + it.each(['password', 'keycloak'] as const)( + 'requires same-origin logout and revokes the %s session before its deadline', + async method => { + const { agent, store, session } = await login(method); + const active = await agent.get('/me').expect(200); + const cookie = active.headers['set-cookie'][0].split(';')[0]; + await agent.post('/logout').expect(403); + await agent.get('/me').expect(200); + const logout = await agent + .post('/logout?redirect=https://evil.example') + .set('Sec-Fetch-Site', 'same-origin') + .expect(303); + expect(new URL(logout.headers.location).origin).toBe( + method === 'keycloak' ? provider.issuer : config.FRONTEND_URL, + ); + expect(await store.findOne({ _id: session._id })).toBeNull(); + await request(app).get('/me').set('Cookie', cookie).expect(401); + }, + ); + + it('requires login again for sessions predating the configured absolute limit', async () => { + const { agent, data, store, session } = await login('password'); + delete data.authExpiresAt; + await store.updateOne( + { _id: session._id }, + { $set: { session: JSON.stringify(data) } }, + ); + await agent.get('/me').expect(401); + }); + + it('invalidates sessions that retain a longer previous idle timeout', async () => { + const { agent, data, store, session } = await login('password'); + data.cookie.originalMaxAge = 86400000; + await store.updateOne( + { _id: session._id }, + { $set: { session: JSON.stringify(data) } }, + ); + await agent.get('/me').expect(401); + expect(await store.findOne({ _id: session._id })).toBeNull(); + }); + + it('accepts an existing session with a shorter idle limit', async () => { + const { agent, data, store, session } = await login('password'); + data.cookie.originalMaxAge = 300000; + await store.updateOne( + { _id: session._id }, + { $set: { session: JSON.stringify(data) } }, + ); + await agent.get('/me').expect(200); + }); +}); diff --git a/packages/api/src/routers/api/__tests__/teamSettingsAccess.int.test.ts b/packages/api/src/routers/api/__tests__/teamSettingsAccess.int.test.ts new file mode 100644 index 0000000000..9cbe87efd4 --- /dev/null +++ b/packages/api/src/routers/api/__tests__/teamSettingsAccess.int.test.ts @@ -0,0 +1,277 @@ +import mongoose from 'mongoose'; +import request from 'supertest'; + +import app from '@/api-app'; +import { clearDBCollections, closeDB, connectDB } from '@/fixtures'; +import { + callTool, + createTestClient, + getFirstText, +} from '@/mcp/__tests__/mcpTestUtils'; +import Team from '@/models/team'; +import User from '@/models/user'; +import Webhook from '@/models/webhook'; + +describe('team settings access', () => { + beforeAll(connectDB); + afterEach(clearDBCollections); + afterAll(closeDB); + + async function login() { + const agent = request.agent(app); + const credentials = { + email: 'member@example.com', + password: 'TacoCat!2#4X', + }; + await agent + .post('/register/password') + .send({ ...credentials, confirmPassword: credentials.password }) + .expect(200); + await agent.post('/login/password').send(credentials).expect(303); + const user = await User.findOne({ email: credentials.email }).orFail(); + return { agent, user }; + } + + it('preserves access for teams without a configured restriction', async () => { + const { agent } = await login(); + await agent.get('/team/members').expect(200); + expect( + (await agent.get('/me').expect(200)).body.canManageTeamSettings, + ).toBe(true); + }); + + it('grants access only to configured IDs and observes permission removal immediately', async () => { + const { agent, user } = await login(); + await Team.collection.updateOne( + { _id: user.team }, + { $set: { settingsAdminIds: [user._id] } }, + ); + expect( + (await agent.get('/me').expect(200)).body.canManageTeamSettings, + ).toBe(true); + await agent + .post('/team/invitation') + .send({ email: 'invite@example.com' }) + .expect(200); + await Team.collection.updateOne( + { _id: user.team }, + { $set: { settingsAdminIds: [] } }, + ); + expect( + (await agent.get('/me').expect(200)).body.canManageTeamSettings, + ).toBe(false); + await agent.get('/team/members').expect(403); + }); + + it('does not borrow permission from another team', async () => { + const { agent, user } = await login(); + await Team.collection.updateOne( + { _id: user.team }, + { $set: { settingsAdminIds: [] } }, + ); + await Team.collection.insertOne({ + _id: new mongoose.Types.ObjectId(), + name: 'Other', + settingsAdminIds: [user._id], + }); + await agent.get('/team/members').expect(403); + }); + + it.each(['', '/api/v2'])( + 'allows administrator writes through %s and preserves resources after access is revoked', + async prefix => { + const { agent, user } = await login(); + await Team.updateOne( + { _id: user.team }, + { $set: { settingsAdminIds: [user._id] } }, + ); + const client = prefix ? request(app) : agent; + const webhook = { + name: 'Alerts', + service: 'generic', + url: 'https://example.com/hook', + }; + await client + .post(`${prefix}/webhooks`) + .set('Authorization', `Bearer ${user.accessKey}`) + .send(webhook) + .expect(200); + const stored = await Webhook.findOne({ team: user.team }).orFail(); + expect(stored.url).toBe(webhook.url); + const path = `${prefix}/webhooks/${stored.id}`; + await client + .put(path) + .set('Authorization', `Bearer ${user.accessKey}`) + .send({ ...webhook, name: 'Renamed' }) + .expect(200); + expect((await Webhook.findById(stored._id))?.name).toBe('Renamed'); + + await Team.updateOne( + { _id: user.team }, + { $set: { settingsAdminIds: [] } }, + ); + await client + .put(path) + .set('Authorization', `Bearer ${user.accessKey}`) + .send({ ...webhook, name: 'Forbidden change' }) + .expect(403); + await client + .delete(path) + .set('Authorization', `Bearer ${user.accessKey}`) + .expect(403); + expect((await Webhook.findById(stored._id))?.name).toBe('Renamed'); + const catalog = await client + .get(`${prefix}/webhooks`) + .query({ service: 'generic' }) + .set('Authorization', `Bearer ${user.accessKey}`) + .expect(200); + expect(catalog.body.data).toEqual([ + expect.objectContaining({ name: 'Renamed' }), + ]); + + await Team.updateOne( + { _id: user.team }, + { $set: { settingsAdminIds: [user._id] } }, + ); + await client + .delete(path) + .set('Authorization', `Bearer ${user.accessKey}`) + .expect(200); + expect(await Webhook.findById(stored._id)).toBeNull(); + }, + ); + + it.each(['', '/api/v2'])( + 'blocks membership and configuration writes through %s', + async prefix => { + const { agent, user } = await login(); + await Team.collection.updateOne( + { _id: user.team }, + { $set: { settingsAdminIds: [] } }, + ); + const id = new mongoose.Types.ObjectId().toString(); + const endpoints: Array< + readonly ['get' | 'post' | 'put' | 'delete', string] + > = [ + ['get', '/team/members'], + ['get', '/team/invitations'], + ['post', '/team/invitation'], + ['delete', `/team/invitation/${id}`], + ['delete', `/team/member/${id}`], + ...['connections', 'sources', 'webhooks'].flatMap(resource => [ + ['post', `/${resource}`] as const, + ['put', `/${resource}/${id}`] as const, + ['delete', `/${resource}/${id}`] as const, + ]), + ]; + for (const [method, path] of endpoints) { + const response = await agent[method](prefix + path) + .set('Authorization', `Bearer ${user.accessKey}`) + .send({}); + expect({ method, path, status: response.status }).toEqual({ + method, + path, + status: 403, + }); + } + for (const path of ['/sources', '/connections', '/webhooks']) { + await agent + .get(prefix + path) + .query(path === '/webhooks' ? { service: 'generic' } : {}) + .set('Authorization', `Bearer ${user.accessKey}`) + .expect(200); + } + await agent.get('/dashboards').expect(200); + }, + ); + + it('blocks MCP source and webhook writes for non-administrators', async () => { + const { user } = await login(); + await Team.collection.updateOne( + { _id: user.team }, + { $set: { settingsAdminIds: [] } }, + ); + const client = await createTestClient({ + teamId: user.team.toString(), + userId: user.id, + }); + try { + const id = new mongoose.Types.ObjectId().toString(); + const calls = [ + { name: 'clickstack_delete_source', args: { id } }, + { name: 'clickstack_delete_webhook', args: { id } }, + { + name: 'clickstack_save_webhook', + args: { + name: 'Test', + service: 'generic', + url: 'https://example.com/hook', + }, + }, + { + name: 'clickstack_save_source', + args: { + name: 'Test', + kind: 'log', + connection: id, + databaseName: 'default', + tableName: 'logs', + timestampValueExpression: 'Timestamp', + defaultTableSelectExpression: 'Body', + }, + }, + ]; + for (const { name, args } of calls) { + const result = await callTool(client, name, args); + expect(result.isError).toBe(true); + expect(getFirstText(result)).toContain('Forbidden'); + } + } finally { + await client.close(); + } + }); + + it('rechecks permissions on an existing MCP connection before changing stored resources', async () => { + const { user } = await login(); + await Team.updateOne( + { _id: user.team }, + { $set: { settingsAdminIds: [user._id] } }, + ); + const client = await createTestClient({ + teamId: user.team.toString(), + userId: user.id, + }); + try { + const created = await callTool(client, 'clickstack_save_webhook', { + name: 'MCP alerts', + service: 'generic', + url: 'https://example.com/hook', + }); + expect(created.isError).toBeFalsy(); + const stored = await Webhook.findOne({ team: user.team }).orFail(); + expect(stored.name).toBe('MCP alerts'); + await Team.updateOne( + { _id: user.team }, + { $set: { settingsAdminIds: [] } }, + ); + const denied = await callTool(client, 'clickstack_delete_webhook', { + id: stored.id, + }); + expect(denied.isError).toBe(true); + expect(getFirstText(denied)).toContain('Forbidden'); + expect(await Webhook.findById(stored._id)).not.toBeNull(); + + await Team.updateOne( + { _id: user.team }, + { $set: { settingsAdminIds: [user._id] } }, + ); + const deleted = await callTool(client, 'clickstack_delete_webhook', { + id: stored.id, + }); + expect(deleted.isError).toBeFalsy(); + expect(await Webhook.findById(stored._id)).toBeNull(); + } finally { + await client.close(); + } + }); +}); diff --git a/packages/api/src/routers/api/keycloak.ts b/packages/api/src/routers/api/keycloak.ts new file mode 100644 index 0000000000..caec8fec50 --- /dev/null +++ b/packages/api/src/routers/api/keycloak.ts @@ -0,0 +1,153 @@ +import express, { type Request, type Response } from 'express'; +import * as oidc from 'openid-client'; + +import * as config from '@/config'; +import { resolveKeycloakUser } from '@/controllers/keycloak'; +import { redirectToDashboard } from '@/middleware/auth'; +import { getCounter, setBusinessContext } from '@/utils/instrumentation'; +import { getKeycloakClient } from '@/utils/keycloak'; +import logger from '@/utils/logger'; + +const authEvents = getCounter('hyperdx.auth.keycloak', { + description: 'Keycloak authentication outcomes.', +}); +const router = express.Router(); + +function authFailed(_req: Request, res: Response) { + authEvents.add(1, { outcome: 'failure' }); + // Protocol errors can contain token responses. Never pass them to the logger. + logger.warn('Keycloak authentication failed'); + res.redirect(303, `${config.FRONTEND_REDIRECT_BASE}/login?err=keycloak`); +} + +router.get('/login/keycloak', async (req, res) => { + if (!config.KEYCLOAK) return res.sendStatus(404); + res.set({ 'Cache-Control': 'no-store', 'Referrer-Policy': 'no-referrer' }); + try { + const client = await getKeycloakClient(); + const transaction = { + state: oidc.randomState(), + nonce: oidc.randomNonce(), + codeVerifier: oidc.randomPKCECodeVerifier(), + createdAt: Date.now(), + inviteToken: + typeof req.query.token === 'string' ? req.query.token : undefined, + }; + const destination = oidc.buildAuthorizationUrl(client, { + redirect_uri: config.KEYCLOAK.callbackUrl, + scope: 'openid email', + code_challenge: await oidc.calculatePKCECodeChallenge( + transaction.codeVerifier, + ), + code_challenge_method: 'S256', + state: transaction.state, + nonce: transaction.nonce, + }); + req.session.oidc = transaction; + await new Promise((resolve, reject) => + req.session.save(error => (error ? reject(error) : resolve())), + ); + res.redirect(destination.href); + } catch { + authFailed(req, res); + } +}); + +router.get('/login/keycloak/callback', async (req, res) => { + if (!config.KEYCLOAK) return res.sendStatus(404); + res.set({ 'Cache-Control': 'no-store', 'Referrer-Policy': 'no-referrer' }); + const transaction = req.session.oidc; + delete req.session.oidc; + let loginStarted = false; + try { + // Consume even failed callbacks; a fresh login must start a new transaction. + await new Promise((resolve, reject) => + req.session.save(error => (error ? reject(error) : resolve())), + ); + if (!transaction || Date.now() - transaction.createdAt > 10 * 60 * 1000) { + return authFailed(req, res); + } + const callback = new URL(config.KEYCLOAK.callbackUrl); + callback.search = new URL(req.originalUrl, config.FRONTEND_URL).search; + const tokens = await oidc.authorizationCodeGrant( + await getKeycloakClient(), + callback, + { + pkceCodeVerifier: transaction.codeVerifier, + expectedState: transaction.state, + expectedNonce: transaction.nonce, + idTokenExpected: true, + }, + ); + const claims = tokens.claims(); + if (!claims) return authFailed(req, res); + const user = await resolveKeycloakUser(claims, transaction.inviteToken); + if (!user) return authFailed(req, res); + + // serializeUser attaches this to Passport's regenerated session. Tokens + // remain request-local and are never saved. + req.authInfo = { + keycloak: { + issuer: claims.iss, + subject: claims.sub, + // The ID token is validated at login. An explicitly configured app + // session has its own lifetime; this does not extend any OIDC token. + expiresAt: config.SESSION_MAX_AGE_SECONDS + ? Date.now() + config.SESSION_MAX_AGE_SECONDS * 1000 + : claims.exp * 1000, + }, + }; + loginStarted = true; + await new Promise((resolve, reject) => + req.login(user, error => (error ? reject(error) : resolve())), + ); + setBusinessContext({ + teamId: user.team.toString(), + userId: user.id, + email: user.email, + }); + authEvents.add(1, { outcome: 'success' }); + redirectToDashboard(req, res); + } catch { + if (loginStarted) { + return req.session.destroy(() => authFailed(req, res)); + } + authFailed(req, res); + } +}); + +router.post('/logout', (req, res, next) => { + // Native same-origin forms send Origin. Fetch Metadata also supports inline + // previews, where FRONTEND_URL may point at the production deployment. + const sameOrigin = + req.get('Sec-Fetch-Site') === 'same-origin' || + (config.FRONTEND_URL && + req.get('Origin') === new URL(config.FRONTEND_URL).origin); + if (!sameOrigin) return res.sendStatus(403); + const wasKeycloak = Boolean(req.session.keycloak); + req.logout(error => { + if (error) return next(error); + req.session.destroy(async error => { + if (error) return next(error); + let destination = `${config.FRONTEND_REDIRECT_BASE}/login`; + if (wasKeycloak && config.KEYCLOAK) { + try { + const client = await getKeycloakClient(); + if (client.serverMetadata().end_session_endpoint) { + destination = oidc.buildEndSessionUrl(client, { + client_id: config.KEYCLOAK.clientId, + post_logout_redirect_uri: new URL('/login', config.FRONTEND_URL) + .href, + }).href; + } + } catch { + authEvents.add(1, { outcome: 'logout_provider_unavailable' }); + logger.warn('Local logout completed; Keycloak logout unavailable'); + } + } + res.redirect(303, destination); + }); + }); +}); + +export default router; diff --git a/packages/api/src/routers/api/me.ts b/packages/api/src/routers/api/me.ts index 4fc71aec0e..a6a2a95d55 100644 --- a/packages/api/src/routers/api/me.ts +++ b/packages/api/src/routers/api/me.ts @@ -18,6 +18,7 @@ import { rotateUserAccessKey, setOnboardingDismissed, } from '@/controllers/user'; +import { canManageTeamSettings } from '@/middleware/teamSettings'; import { Api404Error } from '@/utils/errors'; import { sendJson } from '@/utils/serialization'; @@ -55,6 +56,7 @@ router.get('/', async (req, res: express.Response, next) => { team, usageStatsEnabled: USAGE_STATS_ENABLED, aiAssistantEnabled: !!(AI_API_KEY || ANTHROPIC_API_KEY), + canManageTeamSettings: await canManageTeamSettings(teamId, id), }); } catch (e) { next(e); diff --git a/packages/api/src/routers/api/root.ts b/packages/api/src/routers/api/root.ts index 220ba6f27b..f6dd7ec7f0 100644 --- a/packages/api/src/routers/api/root.ts +++ b/packages/api/src/routers/api/root.ts @@ -15,6 +15,8 @@ import passport from '@/utils/passport'; import { isMongoConnected, mongoReadyStateName } from '@/utils/readiness'; import { passwordSchema } from '@/utils/validators'; +import keycloakRouter from './keycloak'; + const registrationSchema = z .object({ email: z.string().email(), @@ -27,6 +29,14 @@ const registrationSchema = z }); const router = express.Router(); +router.use(keycloakRouter); + +const requirePasswordAuth: express.RequestHandler = (_req, res, next) => { + if (config.KEYCLOAK_REQUIRED) { + return res.status(403).json({ error: 'passwordAuthNotAllowed' }); + } + next(); +}; // Liveness: 200 whenever the process can serve HTTP. Deliberately checks no // external dependencies — restarting the pod does not fix a Mongo outage. @@ -62,6 +72,8 @@ router.get('/installation', async (_, res: InstallationEspRes, next) => { const _isTeamExisting = await isTeamExisting(); return res.json({ isTeamExisting: _isTeamExisting, + keycloakEnabled: Boolean(config.KEYCLOAK), + keycloakRequired: config.KEYCLOAK_REQUIRED, }); } catch (e) { next(e); @@ -70,6 +82,7 @@ router.get('/installation', async (_, res: InstallationEspRes, next) => { router.post( '/login/password', + requirePasswordAuth, passport.authenticate('local', { failWithError: true, failureMessage: true, @@ -80,6 +93,7 @@ router.post( router.post( '/register/password', + requirePasswordAuth, validateRequest({ body: registrationSchema }), async (req, res, next) => { try { @@ -140,6 +154,7 @@ router.post( ); router.get('/logout', (req, res, next) => { + if (req.session.keycloak) return res.sendStatus(405); req.logout(function (err) { if (err) { return next(err); @@ -149,58 +164,62 @@ router.get('/logout', (req, res, next) => { }); // TODO: rename this ? -router.post('/team/setup/:token', async (req, res, next) => { - try { - const { password } = req.body; - const { token } = req.params; - - const passwordResult = passwordSchema.safeParse(password); - if (!passwordResult.success) { - // Emit one `reason` query param per failed requirement so the Join Team - // page can render them as a readable list rather than one run-on line. - const reasonParams = passwordResult.error.issues - .map(issue => `reason=${encodeURIComponent(issue.message)}`) - .join('&'); - return res.redirect( - `${config.FRONTEND_REDIRECT_BASE}/join-team?err=invalid&${reasonParams}&token=${token}`, - ); - } +router.post( + '/team/setup/:token', + requirePasswordAuth, + async (req, res, next) => { + try { + const { password } = req.body; + const { token } = req.params; + + const passwordResult = passwordSchema.safeParse(password); + if (!passwordResult.success) { + // Emit one `reason` query param per failed requirement so the Join Team + // page can render them as a readable list rather than one run-on line. + const reasonParams = passwordResult.error.issues + .map(issue => `reason=${encodeURIComponent(issue.message)}`) + .join('&'); + return res.redirect( + `${config.FRONTEND_REDIRECT_BASE}/join-team?err=invalid&${reasonParams}&token=${token}`, + ); + } - const teamInvite = await TeamInvite.findOne({ - token: req.params.token, - }); - if (!teamInvite) { - return res.status(401).send('Invalid token'); - } + const teamInvite = await TeamInvite.findOne({ + token: req.params.token, + }); + if (!teamInvite) { + return res.status(401).send('Invalid token'); + } - (User as any).register( - new User({ - email: teamInvite.email, - name: teamInvite.email, - team: teamInvite.teamId, - }), - password, - async (err: Error, user: any) => { - if (err) { - logger.error({ err: serializeError(err) }, 'Team setup error'); - return res.redirect( - `${config.FRONTEND_REDIRECT_BASE}/join-team?token=${token}&err=500`, - ); - } - - await TeamInvite.findByIdAndRemove(teamInvite._id); - - req.login(user, err => { + (User as any).register( + new User({ + email: teamInvite.email, + name: teamInvite.email, + team: teamInvite.teamId, + }), + password, + async (err: Error, user: any) => { if (err) { - return next(err); + logger.error({ err: serializeError(err) }, 'Team setup error'); + return res.redirect( + `${config.FRONTEND_REDIRECT_BASE}/join-team?token=${token}&err=500`, + ); } - redirectToDashboard(req, res); - }); - }, - ); - } catch (e) { - next(e); - } -}); + + await TeamInvite.findByIdAndRemove(teamInvite._id); + + req.login(user, err => { + if (err) { + return next(err); + } + redirectToDashboard(req, res); + }); + }, + ); + } catch (e) { + next(e); + } + }, +); export default router; diff --git a/packages/api/src/routers/api/team.ts b/packages/api/src/routers/api/team.ts index 40fc199486..a886e0b183 100644 --- a/packages/api/src/routers/api/team.ts +++ b/packages/api/src/routers/api/team.ts @@ -30,12 +30,18 @@ import { findUsersByTeam, } from '@/controllers/user'; import { getNonNullUserWithTeam } from '@/middleware/auth'; +import { requireTeamSettingsAccess } from '@/middleware/teamSettings'; import TeamInvite from '@/models/teamInvite'; import { sendJson } from '@/utils/serialization'; import { objectIdSchema } from '@/utils/zod'; const router = express.Router(); +router.use( + ['/members', '/member', '/invitation', '/invitations'], + requireTeamSettingsAccess, +); + type TeamApiExpRes = express.Response; router.get('/', async (req, res: TeamApiExpRes, next) => { try { diff --git a/packages/api/src/routers/external-api/v2/index.ts b/packages/api/src/routers/external-api/v2/index.ts index 6ef19d6d34..4e8ec6be3d 100644 --- a/packages/api/src/routers/external-api/v2/index.ts +++ b/packages/api/src/routers/external-api/v2/index.ts @@ -2,6 +2,7 @@ import express from 'express'; import { EXTERNAL_API_RATE_LIMIT_MAX } from '@/config'; import { validateUserAccessKey } from '@/middleware/auth'; +import { requireTeamSettingsWriteAccess } from '@/middleware/teamSettings'; import alertsRouter from '@/routers/external-api/v2/alerts'; import chartsRouter from '@/routers/external-api/v2/charts'; import connectionsRouter from '@/routers/external-api/v2/connections'; @@ -38,6 +39,7 @@ router.use( '/connections', defaultRateLimiter, validateUserAccessKey, + requireTeamSettingsWriteAccess, connectionsRouter, ); @@ -52,6 +54,7 @@ router.use( '/sources', defaultRateLimiter, validateUserAccessKey, + requireTeamSettingsWriteAccess, sourcesRouter, ); @@ -68,6 +71,7 @@ router.use( '/webhooks', defaultRateLimiter, validateUserAccessKey, + requireTeamSettingsWriteAccess, webhooksRouter, ); diff --git a/packages/api/src/routers/external-api/v2/team.ts b/packages/api/src/routers/external-api/v2/team.ts index 2b5dd7584a..abef42fb74 100644 --- a/packages/api/src/routers/external-api/v2/team.ts +++ b/packages/api/src/routers/external-api/v2/team.ts @@ -9,11 +9,17 @@ import { findUserByEmail, findUsersByTeam, } from '@/controllers/user'; +import { requireTeamSettingsAccess } from '@/middleware/teamSettings'; import TeamInvite from '@/models/teamInvite'; import { objectIdSchema } from '@/utils/zod'; const router = express.Router(); +router.use( + ['/members', '/member', '/invitation', '/invitations'], + requireTeamSettingsAccess, +); + /** * @openapi * /api/v2/team: diff --git a/packages/api/src/utils/__tests__/logger.test.ts b/packages/api/src/utils/__tests__/logger.test.ts index c0d60c7a71..b4653eb197 100644 --- a/packages/api/src/utils/__tests__/logger.test.ts +++ b/packages/api/src/utils/__tests__/logger.test.ts @@ -76,6 +76,14 @@ describe('logger redaction', () => { * path segment. */ describe('scrubUrlTokens', () => { + it.each([ + '/login/keycloak?token=invitation-secret', + '/login/keycloak/callback?code=code-secret&state=state-secret', + '/api/login/keycloak/callback?error=denied&error_description=secret', + ])('scrubs Keycloak credentials from %s', url => { + expect(scrubUrlTokens(url)).not.toContain('secret'); + expect(scrubUrlTokens(url)).toContain('[REDACTED]'); + }); it.each([ ['/team/setup/tok-xyz', '/team/setup/[REDACTED]'], ['/api/team/setup/tok-xyz', '/api/team/setup/[REDACTED]'], diff --git a/packages/api/src/utils/keycloak.ts b/packages/api/src/utils/keycloak.ts new file mode 100644 index 0000000000..13e429ecb5 --- /dev/null +++ b/packages/api/src/utils/keycloak.ts @@ -0,0 +1,34 @@ +import * as oidc from 'openid-client'; + +import { IS_PROD, KEYCLOAK } from '@/config'; + +let client: Promise | undefined; + +export function getKeycloakClient() { + if (!KEYCLOAK) throw new Error('Keycloak is not configured'); + if (!client) { + client = oidc + .discovery( + new URL(KEYCLOAK.issuer), + KEYCLOAK.clientId, + KEYCLOAK.clientSecret, + KEYCLOAK.clientSecret + ? oidc.ClientSecretPost(KEYCLOAK.clientSecret) + : oidc.None(), + { + timeout: 10, + execute: [ + oidc.enableNonRepudiationChecks, + ...(!IS_PROD && KEYCLOAK.issuer.startsWith('http:') + ? [oidc.allowInsecureRequests] + : []), + ], + }, + ) + .catch(error => { + client = undefined; + throw error; + }); + } + return client; +} diff --git a/packages/api/src/utils/logger.ts b/packages/api/src/utils/logger.ts index 162005d667..46c265edeb 100644 --- a/packages/api/src/utils/logger.ts +++ b/packages/api/src/utils/logger.ts @@ -61,6 +61,7 @@ const getTransport = () => { export const REDACTED_PATHS = [ 'req.headers.authorization', 'req.headers.cookie', + 'req.headers.referer', 'res.headers["set-cookie"]', // A redirect can carry a token in its target. 'res.headers.location', @@ -73,7 +74,9 @@ export const REDACTED_PATHS = [ const TOKEN_PATH_RE = /\/(team\/setup)\/[^/?#]+/g; export const scrubUrlTokens = (url: string): string => - url.replace(TOKEN_PATH_RE, '/$1/[REDACTED]'); + url + .replace(TOKEN_PATH_RE, '/$1/[REDACTED]') + .replace(/(\/login\/keycloak(?:\/callback)?)\?.*$/, '$1?[REDACTED]'); // pino-http wraps a user-supplied `req` serializer with // `wrapRequestSerializer` (its `wrapSerializers` option defaults to true), so diff --git a/packages/api/src/utils/passport.ts b/packages/api/src/utils/passport.ts index 99b89243e3..318d6d2ac3 100644 --- a/packages/api/src/utils/passport.ts +++ b/packages/api/src/utils/passport.ts @@ -1,14 +1,32 @@ import passport from 'passport'; import { Strategy as LocalStrategy } from 'passport-local'; +import { SESSION_MAX_AGE_SECONDS } from '@/config'; import { findUserById } from '@/controllers/user'; import type { UserDocument } from '@/models/user'; import User from '@/models/user'; import logger from './logger'; -passport.serializeUser(function (user, done) { - done(null, (user as any)._id); +passport.serializeUser(function (req, user, done) { + if (SESSION_MAX_AGE_SECONDS) { + req.session.authExpiresAt = Date.now() + SESSION_MAX_AGE_SECONDS * 1000; + } + // Passport saves immediately after serialization. Include the expiry in + // that same write so an incomplete OIDC session cannot become a local one. + if (req.authInfo?.keycloak) { + const expiresAt = Math.min( + req.authInfo.keycloak.expiresAt, + req.session.authExpiresAt ?? + Date.now() + (req.session.cookie.maxAge ?? Infinity), + ); + req.session.keycloak = { ...req.authInfo.keycloak, expiresAt }; + req.session.cookie.maxAge = Math.min( + req.session.cookie.maxAge ?? Infinity, + expiresAt - Date.now(), + ); + } + done(null, user._id); }); passport.deserializeUser(function (id: string, done) { diff --git a/packages/app/src/AuthPage.tsx b/packages/app/src/AuthPage.tsx index 8926e56b5e..cd5cbfbb43 100644 --- a/packages/app/src/AuthPage.tsx +++ b/packages/app/src/AuthPage.tsx @@ -153,66 +153,80 @@ export default function AuthPage({ action }: { action: 'register' | 'login' }) { - } - error={errors.email?.message} - required - {...form.email} - /> - } - error={errors.password?.message} - required - placeholder="Password" - {...form.password} - /> - {isRegister && ( + {installation?.keycloakEnabled && ( + + )} + {!installation?.keycloakRequired && ( <> - - Confirm Password - - } + } + error={errors.email?.message} required + {...form.email} + /> + } - error={errors.confirmPassword?.message} - placeholder="Confirm Password" - {...form.confirmPassword} + error={errors.password?.message} + required + placeholder="Password" + {...form.password} /> - - - + {isRegister && ( + <> + + Confirm Password + + } + size="md" + required + withAsterisk={false} + leftSection={} + error={errors.confirmPassword?.message} + placeholder="Confirm Password" + {...form.confirmPassword} + /> + + + + + )} + )} - @@ -223,17 +237,19 @@ export default function AuthPage({ action }: { action: 'register' | 'login' }) { color="red" data-test-id="auth-error-msg" > - {err === 'missing' - ? 'Please provide a valid email and password' - : err === 'invalid' - ? 'Email or password is invalid' - : err === 'authFail' - ? 'Failed to login with email and password, please try again.' - : err === 'passwordAuthNotAllowed' - ? 'Password authentication is not allowed by your team admin.' - : err === 'teamAlreadyExists' - ? 'Team already exists, please login instead.' - : 'Unknown error occurred, please try again later.'} + {err === 'keycloak' + ? 'Keycloak sign-in failed. Try your invitation link or contact your administrator if your account is not linked.' + : err === 'missing' + ? 'Please provide a valid email and password' + : err === 'invalid' + ? 'Email or password is invalid' + : err === 'authFail' + ? 'Failed to login with email and password, please try again.' + : err === 'passwordAuthNotAllowed' + ? 'Password authentication is not allowed by your team admin.' + : err === 'teamAlreadyExists' + ? 'Team already exists, please login instead.' + : 'Unknown error occurred, please try again later.'} )} diff --git a/packages/app/src/JoinTeamPage.tsx b/packages/app/src/JoinTeamPage.tsx index ec4e4e3b4a..e44aa9bf37 100644 --- a/packages/app/src/JoinTeamPage.tsx +++ b/packages/app/src/JoinTeamPage.tsx @@ -11,6 +11,7 @@ import { } from '@mantine/core'; import { usePageTitle } from './theme/ThemeProvider'; +import api from './api'; import { PasswordCheck } from './PasswordCheck'; export default function JoinTeam() { @@ -18,6 +19,7 @@ export default function JoinTeam() { const title = usePageTitle('Join Team'); const { err, reason, token } = router.query; const [password, setPassword] = useState(''); + const { data: installation } = api.useInstallation(); const invalidReasons = err === 'invalid' @@ -39,63 +41,76 @@ export default function JoinTeam() {
-
- setPassword(event.currentTarget.value)} - styles={{ - label: { - fontSize: '0.875rem', - color: 'var(--color-text-muted)', - marginBottom: 4, - }, - }} - /> - - - - {err != null && ( -
- {err !== 'invalid' ? ( - - Unknown error occurred, please try again later. - - ) : invalidReasons.length > 1 ? ( - - {invalidReasons.map(r => ( - {r} - ))} - - ) : ( - - {invalidReasons[0] ?? - 'Password does not meet the requirements.'} - - )} + {installation?.keycloakEnabled && typeof token === 'string' && ( + + )} + {!installation?.keycloakRequired && ( + + setPassword(event.currentTarget.value)} + styles={{ + label: { + fontSize: '0.875rem', + color: 'var(--color-text-muted)', + marginBottom: 4, + }, + }} + /> + + + + {err != null && ( +
+ {err !== 'invalid' ? ( + + Unknown error occurred, please try again later. + + ) : invalidReasons.length > 1 ? ( + + {invalidReasons.map(r => ( + {r} + ))} + + ) : ( + + {invalidReasons[0] ?? + 'Password does not meet the requirements.'} + + )} +
+ )} +
+
- )} -
- -
- + + )}
diff --git a/packages/app/src/TeamPage.tsx b/packages/app/src/TeamPage.tsx index b536fe5290..f0dec1a854 100644 --- a/packages/app/src/TeamPage.tsx +++ b/packages/app/src/TeamPage.tsx @@ -36,7 +36,7 @@ import TeamMembersSection from './components/TeamSettings/TeamMembersSection'; import TeamQueryConfigSection from './components/TeamSettings/TeamQueryConfigSection'; import { usePageTitle } from './theme/ThemeProvider'; import api from './api'; -import { IS_IAC_EXPORT_ENABLED } from './config'; +import { IS_IAC_EXPORT_ENABLED, IS_LOCAL_MODE } from './config'; import { APP_CONTENT_SCROLL_CONTAINER_ID, withAppNav } from './layout'; type TeamTab = { @@ -77,6 +77,9 @@ export default function TeamPage() { const router = useRouter(); const { data: team, refetch: refetchTeam, isLoading } = api.useTeam(); const setTeamName = api.useSetTeamName(); + const { data: me } = api.useMe(); + const canManageTeamSettings = + IS_LOCAL_MODE || me?.canManageTeamSettings === true; const allowedAuthMethods = team?.allowedAuthMethods ?? []; const hasAllowedAuthMethods = allowedAuthMethods.length > 0; @@ -204,7 +207,11 @@ export default function TeamPage() { }, ], }, - ]; + ].filter( + tab => + canManageTeamSettings || + !['team', 'data', 'integrations'].includes(tab.value), + ); const queryTab = typeof router.query.tab === 'string' ? router.query.tab : null; @@ -213,7 +220,12 @@ export default function TeamPage() { : tabs[0]?.value; useEffect(() => { - if (!router.isReady || !activeTab || queryTab === activeTab) { + if ( + (!IS_LOCAL_MODE && !me) || + !router.isReady || + !activeTab || + queryTab === activeTab + ) { return; } @@ -236,7 +248,7 @@ export default function TeamPage() { scroll: false, }, ); - }, [activeTab, queryTab, router]); + }, [activeTab, queryTab, router, me]); const handleTabChange = useCallback( (value: string | null) => { diff --git a/packages/app/src/__tests__/KeycloakAuth.test.tsx b/packages/app/src/__tests__/KeycloakAuth.test.tsx new file mode 100644 index 0000000000..bbb7ffae3c --- /dev/null +++ b/packages/app/src/__tests__/KeycloakAuth.test.tsx @@ -0,0 +1,70 @@ +import { screen } from '@testing-library/react'; + +import AuthPage from '@/AuthPage'; +import JoinTeamPage from '@/JoinTeamPage'; + +const mockInstallation = jest.fn(); +const mockRouter = { query: { token: 'invite&token' }, push: jest.fn() }; +jest.mock('next/router', () => ({ useRouter: () => mockRouter })); +jest.mock('next-seo', () => ({ NextSeo: () => null })); +jest.mock('@/LandingHeader', () => ({ __esModule: true, default: () => null })); +jest.mock('@/api', () => ({ + __esModule: true, + default: { + useInstallation: () => ({ data: mockInstallation() }), + useTeam: () => ({ data: undefined, isLoading: false }), + useRegisterPassword: () => ({ mutate: jest.fn() }), + }, +})); + +describe('Keycloak login controls', () => { + it('preserves password login when Keycloak is disabled', () => { + mockInstallation.mockReturnValue({ isTeamExisting: true }); + renderWithMantine(); + expect(screen.getByLabelText('Password')).toBeInTheDocument(); + expect( + screen.queryByRole('link', { name: 'Sign in with Keycloak' }), + ).not.toBeInTheDocument(); + }); + + it('offers both login methods during rollout', () => { + mockInstallation.mockReturnValue({ + isTeamExisting: true, + keycloakEnabled: true, + }); + renderWithMantine(); + expect(screen.getByLabelText('Password')).toBeInTheDocument(); + expect( + screen.getByRole('link', { name: 'Sign in with Keycloak' }), + ).toHaveAttribute('href', '/api/login/keycloak'); + }); + + it.each(['login', 'register'] as const)( + 'hides password controls in required mode on %s', + action => { + mockInstallation.mockReturnValue({ + isTeamExisting: true, + keycloakEnabled: true, + keycloakRequired: true, + }); + renderWithMantine(); + expect(screen.queryByLabelText('Password')).not.toBeInTheDocument(); + expect( + screen.getByRole('link', { name: 'Sign in with Keycloak' }), + ).toBeInTheDocument(); + }, + ); + + it('passes the invitation token safely and hides password setup in required mode', () => { + mockInstallation.mockReturnValue({ + isTeamExisting: true, + keycloakEnabled: true, + keycloakRequired: true, + }); + renderWithMantine(); + expect(screen.queryByLabelText('Password')).not.toBeInTheDocument(); + expect( + screen.getByRole('link', { name: 'Sign in with Keycloak' }), + ).toHaveAttribute('href', '/api/login/keycloak?token=invite%26token'); + }); +}); diff --git a/packages/app/src/__tests__/TeamSettingsAccess.test.tsx b/packages/app/src/__tests__/TeamSettingsAccess.test.tsx new file mode 100644 index 0000000000..e2c0b3b056 --- /dev/null +++ b/packages/app/src/__tests__/TeamSettingsAccess.test.tsx @@ -0,0 +1,125 @@ +import { screen } from '@testing-library/react'; + +import TeamPage from '@/TeamPage'; + +const mockMe = jest.fn(); +const mockRouter = { + query: { tab: 'team' }, + isReady: true, + pathname: '/team', + replace: jest.fn(), +}; +jest.mock('next/router', () => ({ useRouter: () => mockRouter })); +jest.mock('@/layout', () => ({ + withAppNav: jest.fn(), + APP_CONTENT_SCROLL_CONTAINER_ID: 'app', +})); +jest.mock('@/api', () => ({ + __esModule: true, + default: { + useMe: () => ({ data: mockMe() }), + useTeam: () => ({ + data: { name: 'Team', allowedAuthMethods: [] }, + isLoading: false, + }), + useSetTeamName: () => ({ mutate: jest.fn() }), + }, +})); +jest.mock('@/components/TeamSettings/ApiKeysSection', () => () => null); +jest.mock('@/components/TeamSettings/ConnectionsSection', () => () => null); +jest.mock('@/components/TeamSettings/IacMigrationSection', () => () => null); +jest.mock('@/components/TeamSettings/IntegrationsSection', () => () => null); +jest.mock('@/components/TeamSettings/McpServerSection', () => () => null); +jest.mock( + '@/components/TeamSettings/SecurityPoliciesSection', + () => () => null, +); +jest.mock('@/components/TeamSettings/SourcesSection', () => () => null); +jest.mock('@/components/TeamSettings/TeamMembersSection', () => () => null); +jest.mock('@/components/TeamSettings/TeamQueryConfigSection', () => () => null); + +describe('team settings tabs', () => { + beforeEach(() => { + mockRouter.replace.mockClear(); + mockRouter.query = { tab: 'team' }; + }); + + it.each([ + ['team', 'Members'], + ['data', 'Data'], + ['integrations', 'Integrations'], + ])( + 'preserves the %s deep link while administrator permissions load', + (tab, name) => { + mockRouter.query = { tab }; + mockMe.mockReturnValue(undefined); + const { rerender } = renderWithMantine(); + expect(mockRouter.replace).not.toHaveBeenCalled(); + mockMe.mockReturnValue({ canManageTeamSettings: true }); + rerender( + + + , + ); + expect(screen.getByRole('tab', { name })).toHaveAttribute( + 'aria-selected', + 'true', + ); + expect(mockRouter.replace).not.toHaveBeenCalled(); + }, + ); + it.each([false, undefined])( + 'hides restricted tabs without granted access (%s), including direct links', + allowed => { + mockMe.mockReturnValue( + allowed === undefined ? undefined : { canManageTeamSettings: allowed }, + ); + renderWithMantine(); + for (const name of ['Members', 'Data', 'Integrations']) { + expect(screen.queryByRole('tab', { name })).not.toBeInTheDocument(); + } + expect(screen.getByRole('tab', { name: 'API & Agents' })).toHaveAttribute( + 'aria-selected', + 'true', + ); + }, + ); + + it('shows the three management tabs for authorized users', () => { + mockMe.mockReturnValue({ canManageTeamSettings: true }); + renderWithMantine(); + for (const name of ['Members', 'Data', 'Integrations']) { + expect(screen.getByRole('tab', { name })).toBeInTheDocument(); + } + }); + + it.each([ + ['team', 'Members'], + ['data', 'Data'], + ['integrations', 'Integrations'], + ])('leaves the active %s tab when permission is revoked', (tab, name) => { + mockRouter.query = { tab }; + mockMe.mockReturnValue({ canManageTeamSettings: true }); + const { rerender } = renderWithMantine(); + expect(screen.getByRole('tab', { name })).toHaveAttribute( + 'aria-selected', + 'true', + ); + mockMe.mockReturnValue({ canManageTeamSettings: false }); + rerender( + + + , + ); + expect(screen.queryByRole('tab', { name })).not.toBeInTheDocument(); + expect(screen.getByRole('tab', { name: 'API & Agents' })).toHaveAttribute( + 'aria-selected', + 'true', + ); + expect(mockRouter.replace).toHaveBeenCalledWith( + expect.objectContaining({ query: { tab: 'api-agents' } }), + undefined, + { shallow: true, scroll: false }, + ); + }); +}); diff --git a/packages/app/src/api.ts b/packages/app/src/api.ts index 5271dcfdb2..e236b7cea5 100644 --- a/packages/app/src/api.ts +++ b/packages/app/src/api.ts @@ -59,6 +59,8 @@ type ServicesResponse = { >; }; +let loginRedirectStarted = false; + function loginHook(request: Request, options: any, response: Response) { // marketing pages const WHITELIST_PATHS = [ @@ -69,13 +71,20 @@ function loginHook(request: Request, options: any, response: Response) { '/register', '/reset-password', ]; - if (!WHITELIST_PATHS.includes(Router.pathname) && response.status === 401) { + if ( + !loginRedirectStarted && + !WHITELIST_PATHS.includes(Router.pathname) && + response.status === 401 + ) { + loginRedirectStarted = true; try { window.sessionStorage.setItem('hdx-login-redirect-url', Router.asPath); } catch (e: any) { console.error(e); } - Router.push('/login'); + // A client-side redirect retains cached team data, which makes AuthPage + // send an expired session back into the app. Reset that state on login. + window.location.replace(`${Router.basePath}/login`); } } diff --git a/packages/app/src/components/AppNav/AppNav.components.tsx b/packages/app/src/components/AppNav/AppNav.components.tsx index ab4994d3c3..96ac990bb0 100644 --- a/packages/app/src/components/AppNav/AppNav.components.tsx +++ b/packages/app/src/components/AppNav/AppNav.components.tsx @@ -168,15 +168,17 @@ export const AppNavUserMenu = ({ {logoutUrl && ( <> - } - component={Link} - href={logoutUrl} - > - Logout - +
+ } + component="button" + type="submit" + > + Logout + +
)} diff --git a/packages/app/tests/e2e/features/session-expiry.spec.ts b/packages/app/tests/e2e/features/session-expiry.spec.ts new file mode 100644 index 0000000000..f20f88e101 --- /dev/null +++ b/packages/app/tests/e2e/features/session-expiry.spec.ts @@ -0,0 +1,92 @@ +import { expect, test } from '../utils/base-test'; + +test.describe('Session expiry', { tag: ['@auth', '@full-stack'] }, () => { + test('returns to a fresh login page after expiry with cached team data', async ({ + page, + context, + }) => { + await page.goto('/team?tab=api-agents', { waitUntil: 'domcontentloaded' }); + await expect( + page.getByRole('tab', { name: 'API & Agents' }), + ).toHaveAttribute('aria-selected', 'true'); + + let loginDocuments = 0; + page.on('request', request => { + if ( + request.isNavigationRequest() && + new URL(request.url()).pathname === '/login' + ) + loginDocuments++; + }); + await context.clearCookies(); + const loginNavigation = page.waitForRequest( + request => + request.isNavigationRequest() && + new URL(request.url()).pathname === '/login', + ); + await page.evaluate(() => + window.dispatchEvent(new Event('visibilitychange')), + ); + await loginNavigation; + + await page.waitForURL(/\/login$/, { waitUntil: 'domcontentloaded' }); + await expect( + page.getByText('Welcome back!', { exact: true }), + ).toBeVisible(); + expect( + await page.evaluate(() => + sessionStorage.getItem('hdx-login-redirect-url'), + ), + ).toBe('/team?tab=api-agents'); + + await page + .getByLabel('Email', { exact: true }) + .fill('expired-session@example.com'); + const unauthorized = page.waitForResponse( + response => + new URL(response.url()).pathname === '/api/team' && + response.status() === 401, + ); + await page.evaluate(() => + window.dispatchEvent(new Event('visibilitychange')), + ); + await (await unauthorized).finished(); + await expect(page.getByLabel('Email', { exact: true })).toHaveValue( + 'expired-session@example.com', + ); + expect(new URL(page.url()).pathname).toBe('/login'); + expect(loginDocuments).toBe(1); + }); + + for (const status of [403, 500]) { + test(`does not discard an authenticated session on HTTP ${status}`, async ({ + page, + }) => { + await page.goto('/team?tab=api-agents', { + waitUntil: 'domcontentloaded', + }); + await expect( + page.getByRole('tab', { name: 'API & Agents' }), + ).toHaveAttribute('aria-selected', 'true'); + await page.route('**/api/team', route => + route.fulfill({ status, json: { message: 'Test request failure' } }), + ); + const rejected = page.waitForResponse( + response => + new URL(response.url()).pathname === '/api/team' && + response.status() === status, + ); + await page.evaluate(() => + window.dispatchEvent(new Event('visibilitychange')), + ); + await (await rejected).finished(); + expect((await page.request.get('/api/me')).status()).toBe(200); + expect(page.url()).toMatch(/\/team\?tab=api-agents$/); + expect( + await page.evaluate(() => + sessionStorage.getItem('hdx-login-redirect-url'), + ), + ).toBeNull(); + }); + } +}); diff --git a/packages/common-utils/src/types.ts b/packages/common-utils/src/types.ts index aa17728361..ecb358af4d 100644 --- a/packages/common-utils/src/types.ts +++ b/packages/common-utils/src/types.ts @@ -3282,6 +3282,8 @@ export type RotateApiKeyApiResponse = z.infer< // Installation export const InstallationApiResponseSchema = z.object({ isTeamExisting: z.boolean(), + keycloakEnabled: z.boolean().optional(), + keycloakRequired: z.boolean().optional(), }); export type InstallationApiResponse = z.infer< @@ -3347,6 +3349,7 @@ export const MeApiResponseSchema = z.object({ }).merge(TeamClickHouseSettingsSchema), usageStatsEnabled: z.boolean(), aiAssistantEnabled: z.boolean(), + canManageTeamSettings: z.boolean().optional(), }); export type MeApiResponse = z.infer; diff --git a/yarn.lock b/yarn.lock index ef8daba12c..41a8d5331a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4768,6 +4768,7 @@ __metadata: "@types/minimist": "npm:^1.2.2" "@types/ms": "npm:^0.7.31" "@types/node": "npm:^22.15.18" + "@types/oidc-provider": "npm:^9.13.0" "@types/passport-local": "npm:^1.0.34" "@types/sqlstring": "npm:^2.3.0" "@types/supertest": "npm:^2.0.12" @@ -4798,7 +4799,9 @@ __metadata: mongoose: "npm:^6.13.10" ms: "npm:^2.1.3" nodemon: "npm:^2.0.20" + oidc-provider: "npm:^9.12.0" on-headers: "npm:^1.1.0" + openid-client: "npm:^6.8.8" passport: "npm:^0.6.0" passport-local: "npm:^1.0.0" pino: "npm:^10.0.0" @@ -11380,6 +11383,15 @@ __metadata: languageName: node linkType: hard +"@types/accepts@npm:*": + version: 1.3.7 + resolution: "@types/accepts@npm:1.3.7" + dependencies: + "@types/node": "npm:*" + checksum: 10c0/7b21efc78b98ed57063ac31588f871f11501c080cd1201ca3743cf02ee0aee74bdb5a634183bc0987dc8dc582b26316789fd203650319ccc89a66cf88311d64f + languageName: node + linkType: hard + "@types/aria-query@npm:^5.0.1": version: 5.0.1 resolution: "@types/aria-query@npm:5.0.1" @@ -11491,6 +11503,13 @@ __metadata: languageName: node linkType: hard +"@types/content-disposition@npm:*": + version: 0.5.9 + resolution: "@types/content-disposition@npm:0.5.9" + checksum: 10c0/9fd520dae1a9c7b85909e59f548f905a670a6e2f83642f9734d1b05126f64ac8c8e2c282a663edf27d58bc34fbbacf46a4d4a95d3802b42106174a19a68175c8 + languageName: node + linkType: hard + "@types/cookie@npm:^0.6.0": version: 0.6.0 resolution: "@types/cookie@npm:0.6.0" @@ -11505,6 +11524,18 @@ __metadata: languageName: node linkType: hard +"@types/cookies@npm:*": + version: 0.9.2 + resolution: "@types/cookies@npm:0.9.2" + dependencies: + "@types/connect": "npm:*" + "@types/express": "npm:*" + "@types/keygrip": "npm:*" + "@types/node": "npm:*" + checksum: 10c0/75f00c83d50998b610d4fe2ddb2544fde7eb6dc683f5e68831a4ecb458b465260b8e2df4e369880a67c5b946558322c4627403781eb076ff72ca16c7ab8c47dd + languageName: node + linkType: hard + "@types/cors@npm:^2.8.14": version: 2.8.14 resolution: "@types/cors@npm:2.8.14" @@ -11772,6 +11803,20 @@ __metadata: languageName: node linkType: hard +"@types/http-assert@npm:*": + version: 1.5.6 + resolution: "@types/http-assert@npm:1.5.6" + checksum: 10c0/62d536440a5e09f4b7968112f4b235212407937033de800993f95b6f140181b4b2ad6075b73094e7ca0ccf7d9c80d68b93ca53fb1af196cc6d0257f3a4c3d5ba + languageName: node + linkType: hard + +"@types/http-errors@npm:^2": + version: 2.0.5 + resolution: "@types/http-errors@npm:2.0.5" + checksum: 10c0/00f8140fbc504f47356512bd88e1910c2f07e04233d99c88c854b3600ce0523c8cd0ba7d1897667243282eb44c59abb9245959e2428b9de004f93937f52f7c15 + languageName: node + linkType: hard + "@types/hyperdx__lucene@npm:@types/lucene@*": version: 2.1.7 resolution: "@types/lucene@npm:2.1.7" @@ -11869,6 +11914,38 @@ __metadata: languageName: node linkType: hard +"@types/keygrip@npm:*": + version: 1.0.6 + resolution: "@types/keygrip@npm:1.0.6" + checksum: 10c0/1045a79913259f539ac1d04384ea8f61cf29f1d299040eb4b67d92304ec3bcea59b7e4b83cf95a73aa251ff62e55924e380d0c563a21fe8f6e91de20cc610386 + languageName: node + linkType: hard + +"@types/koa-compose@npm:*": + version: 3.2.9 + resolution: "@types/koa-compose@npm:3.2.9" + dependencies: + "@types/koa": "npm:*" + checksum: 10c0/d89993ffadac74488cdb2ab0fc519ec43eab5e3e7b8baa37cb7fc5043c86d812c24a179efae1324d5e80c2f7b7ddfbc944df7052cab6ff98daf1df4a084ac348 + languageName: node + linkType: hard + +"@types/koa@npm:*": + version: 3.0.3 + resolution: "@types/koa@npm:3.0.3" + dependencies: + "@types/accepts": "npm:*" + "@types/content-disposition": "npm:*" + "@types/cookies": "npm:*" + "@types/http-assert": "npm:*" + "@types/http-errors": "npm:^2" + "@types/keygrip": "npm:*" + "@types/koa-compose": "npm:*" + "@types/node": "npm:*" + checksum: 10c0/f5bb89fe7b35611ef0e96888ad15727b0b7e9153145f88100a2c9ef43f70e5fcc4ae496cc975efabb1f945dce8b1b2f33bcd6d752ad34e6a3a2ba7e523ee9596 + languageName: node + linkType: hard + "@types/lodash@npm:^4.14.186": version: 4.14.191 resolution: "@types/lodash@npm:4.14.191" @@ -12037,6 +12114,17 @@ __metadata: languageName: node linkType: hard +"@types/oidc-provider@npm:^9.13.0": + version: 9.13.0 + resolution: "@types/oidc-provider@npm:9.13.0" + dependencies: + "@types/keygrip": "npm:*" + "@types/koa": "npm:*" + "@types/node": "npm:*" + checksum: 10c0/46bc228baf6d768fc24a4d3f8b6d156987c10b387148ca803a5323c93edb9dddc23cf1eb78b72e3a453a2c846885dd2ecb24ee1c2afdf905165251f44e2371ea + languageName: node + linkType: hard + "@types/papaparse@npm:^5.3.16": version: 5.5.2 resolution: "@types/papaparse@npm:5.5.2" @@ -13151,7 +13239,7 @@ __metadata: languageName: node linkType: hard -"accepts@npm:~1.3.8": +"accepts@npm:^1.3.8, accepts@npm:~1.3.8": version: 1.3.8 resolution: "accepts@npm:1.3.8" dependencies: @@ -15491,6 +15579,13 @@ __metadata: languageName: node linkType: hard +"content-disposition@npm:~1.0.1": + version: 1.0.1 + resolution: "content-disposition@npm:1.0.1" + checksum: 10c0/bd7ff1fe8d2542d3a2b9a29428cc3591f6ac27bb5595bba2c69664408a68f9538b14cbd92479796ea835b317a09a527c8c7209c4200381dedb0c34d3b658849e + languageName: node + linkType: hard + "content-type@npm:^1.0.5, content-type@npm:~1.0.4, content-type@npm:~1.0.5": version: 1.0.5 resolution: "content-type@npm:1.0.5" @@ -15498,6 +15593,13 @@ __metadata: languageName: node linkType: hard +"content-type@npm:^2.0.0": + version: 2.1.0 + resolution: "content-type@npm:2.1.0" + checksum: 10c0/f5d420f55fd0c7a7f7cbae9637777ce67a074aa79b489d8d9fee8599089592b5f8bb194e1d6885741fee20271034baca0d68d5419535b52d070c4f7e39f4b448 + languageName: node + linkType: hard + "convert-source-map@npm:^1.6.0, convert-source-map@npm:^1.7.0": version: 1.9.0 resolution: "convert-source-map@npm:1.9.0" @@ -15547,6 +15649,16 @@ __metadata: languageName: node linkType: hard +"cookies@npm:~0.9.1": + version: 0.9.2 + resolution: "cookies@npm:0.9.2" + dependencies: + depd: "npm:~2.0.0" + keygrip: "npm:~1.1.0" + checksum: 10c0/4ca794efd1a916e20b8be89447ee5ad6a65d534a9dc69034ed2445704eed4246cbfc5a089e9429b557ea3f5b1c4f27da0ea2eb517101519ac7d10e8c97370c1e + languageName: node + linkType: hard + "copy-to-clipboard@npm:^3.3.1": version: 3.3.3 resolution: "copy-to-clipboard@npm:3.3.3" @@ -16246,6 +16358,13 @@ __metadata: languageName: node linkType: hard +"deep-equal@npm:~1.0.1": + version: 1.0.1 + resolution: "deep-equal@npm:1.0.1" + checksum: 10c0/bef838ef9824e124d10335deb9c7540bfc9f2f0eab17ad1bb870d0eee83ee4e7e6f6f892e5eebc2bd82759a76676926ad5246180097e28e57752176ff7dae888 + languageName: node + linkType: hard + "deep-extend@npm:^0.6.0": version: 0.6.0 resolution: "deep-extend@npm:0.6.0" @@ -16363,6 +16482,13 @@ __metadata: languageName: node linkType: hard +"delegates@npm:^1.0.0": + version: 1.0.0 + resolution: "delegates@npm:1.0.0" + checksum: 10c0/ba05874b91148e1db4bf254750c042bf2215febd23a6d3cda2e64896aef79745fbd4b9996488bd3cafb39ce19dbce0fd6e3b6665275638befffe1c9b312b91b5 + languageName: node + linkType: hard + "depd@npm:2.0.0, depd@npm:~2.0.0": version: 2.0.0 resolution: "depd@npm:2.0.0" @@ -16370,6 +16496,13 @@ __metadata: languageName: node linkType: hard +"depd@npm:~1.1.2": + version: 1.1.2 + resolution: "depd@npm:1.1.2" + checksum: 10c0/acb24aaf936ef9a227b6be6d495f0d2eb20108a9a6ad40585c5bda1a897031512fef6484e4fdbb80bd249fdaa82841fa1039f416ece03188e677ba11bcfda249 + languageName: node + linkType: hard + "dependency-graph@npm:0.11.0, dependency-graph@npm:~0.11.0": version: 0.11.0 resolution: "dependency-graph@npm:0.11.0" @@ -16394,7 +16527,7 @@ __metadata: languageName: node linkType: hard -"destroy@npm:1.2.0, destroy@npm:~1.2.0": +"destroy@npm:1.2.0, destroy@npm:^1.2.0, destroy@npm:~1.2.0": version: 1.2.0 resolution: "destroy@npm:1.2.0" checksum: 10c0/bd7633942f57418f5a3b80d5cb53898127bcf53e24cdf5d5f4396be471417671f0fee48a4ebe9a1e9defbde2a31280011af58a57e090ff822f589b443ed4e643 @@ -16765,7 +16898,7 @@ __metadata: languageName: node linkType: hard -"encodeurl@npm:~2.0.0": +"encodeurl@npm:^2.0.0, encodeurl@npm:~2.0.0": version: 2.0.0 resolution: "encodeurl@npm:2.0.0" checksum: 10c0/5d317306acb13e6590e28e27924c754163946a2480de11865c991a3a7eed4315cd3fba378b543ca145829569eefe9b899f3d84bb09870f675ae60bc924b01ceb @@ -17452,7 +17585,7 @@ __metadata: languageName: node linkType: hard -"escape-html@npm:~1.0.3": +"escape-html@npm:^1.0.3, escape-html@npm:~1.0.3": version: 1.0.3 resolution: "escape-html@npm:1.0.3" checksum: 10c0/524c739d776b36c3d29fa08a22e03e8824e3b2fd57500e5e44ecf3cc4707c34c60f9ca0781c0e33d191f2991161504c295e98f68c78fe7baa6e57081ec6ac0a3 @@ -19912,6 +20045,16 @@ __metadata: languageName: node linkType: hard +"http-assert@npm:^1.5.0": + version: 1.5.0 + resolution: "http-assert@npm:1.5.0" + dependencies: + deep-equal: "npm:~1.0.1" + http-errors: "npm:~1.8.0" + checksum: 10c0/7b4e631114a1a77654f9ba3feb96da305ddbdeb42112fe384b7b3249c7141e460d7177970155bea6e54e655a04850415b744b452c1fe5052eba6f4186d16b095 + languageName: node + linkType: hard + "http-cache-semantics@npm:^4.1.1": version: 4.1.1 resolution: "http-cache-semantics@npm:4.1.1" @@ -19919,7 +20062,7 @@ __metadata: languageName: node linkType: hard -"http-errors@npm:~2.0.0, http-errors@npm:~2.0.1": +"http-errors@npm:^2.0.0, http-errors@npm:~2.0.0, http-errors@npm:~2.0.1": version: 2.0.1 resolution: "http-errors@npm:2.0.1" dependencies: @@ -19932,6 +20075,19 @@ __metadata: languageName: node linkType: hard +"http-errors@npm:~1.8.0": + version: 1.8.1 + resolution: "http-errors@npm:1.8.1" + dependencies: + depd: "npm:~1.1.2" + inherits: "npm:2.0.4" + setprototypeof: "npm:1.2.0" + statuses: "npm:>= 1.5.0 < 2" + toidentifier: "npm:1.0.1" + checksum: 10c0/f01aeecd76260a6fe7f08e192fcbe9b2f39ed20fc717b852669a69930167053b01790998275c6297d44f435cf0e30edd50c05223d1bec9bc484e6cf35b2d6f43 + languageName: node + linkType: hard + "http-graceful-shutdown@npm:^3.1.13": version: 3.1.13 resolution: "http-graceful-shutdown@npm:3.1.13" @@ -21869,6 +22025,13 @@ __metadata: languageName: node linkType: hard +"jose@npm:^6.2.12": + version: 6.2.13 + resolution: "jose@npm:6.2.13" + checksum: 10c0/a7a175057fd42e129200026320d535deba5c869e764bdb130d4aecb7cc2a22c07eab2bf9fc848188b45b89d95f8e0ba4ce01a8259a4fa45c84bec34f66f2918e + languageName: node + linkType: hard + "jotai@npm:^2.5.1": version: 2.5.1 resolution: "jotai@npm:2.5.1" @@ -22255,6 +22418,15 @@ __metadata: languageName: node linkType: hard +"keygrip@npm:~1.1.0": + version: 1.1.0 + resolution: "keygrip@npm:1.1.0" + dependencies: + tsscmp: "npm:1.0.6" + checksum: 10c0/2aceec1a1e642a0caf938044056ed67b1909cfe67a93a59b32aae2863e0f35a1a53782ecc8f9cd0e3bdb60863fa0f401ccbd257cd7dfae61915f78445139edea + languageName: node + linkType: hard + "keyv@npm:^4.5.4": version: 4.5.4 resolution: "keyv@npm:4.5.4" @@ -22325,6 +22497,39 @@ __metadata: languageName: node linkType: hard +"koa-compose@npm:^4.1.0": + version: 4.1.0 + resolution: "koa-compose@npm:4.1.0" + checksum: 10c0/f1f786f994a691931148e7f38f443865bf2702af4a61610d1eea04dab79c04b1232285b59d82a0cf61c830516dd92f10ab0d009b024fcecd4098e7d296ab771a + languageName: node + linkType: hard + +"koa@npm:^3.2.1": + version: 3.2.1 + resolution: "koa@npm:3.2.1" + dependencies: + accepts: "npm:^1.3.8" + content-disposition: "npm:~1.0.1" + content-type: "npm:^1.0.5" + cookies: "npm:~0.9.1" + delegates: "npm:^1.0.0" + destroy: "npm:^1.2.0" + encodeurl: "npm:^2.0.0" + escape-html: "npm:^1.0.3" + fresh: "npm:~0.5.2" + http-assert: "npm:^1.5.0" + http-errors: "npm:^2.0.0" + koa-compose: "npm:^4.1.0" + mime-types: "npm:^3.0.1" + on-finished: "npm:^2.4.1" + parseurl: "npm:^1.3.3" + statuses: "npm:^2.0.1" + type-is: "npm:^2.0.1" + vary: "npm:^1.1.2" + checksum: 10c0/84352ef0ec0f54898f119ac589c7d96442ac21f494f3e1abca55d19c0cd51177f43b75440092d74730261d4d91270b5ba0396156e04b21132ab2251f8b4d2cde + languageName: node + linkType: hard + "kruptein@npm:^3.0.0": version: 3.0.6 resolution: "kruptein@npm:3.0.6" @@ -23195,6 +23400,13 @@ __metadata: languageName: node linkType: hard +"media-typer@npm:^1.1.0": + version: 1.1.1 + resolution: "media-typer@npm:1.1.1" + checksum: 10c0/924644de220c3107fc53ec0299b7c1488503470265d32f1492535bd798cc369ba7ceaf9c2a4533361590dcf7208d1cc7b7032dbc1a5918773f5f5d912cab5211 + languageName: node + linkType: hard + "memfs@npm:^3.4.1, memfs@npm:^3.4.12": version: 3.6.0 resolution: "memfs@npm:3.6.0" @@ -23649,6 +23861,13 @@ __metadata: languageName: node linkType: hard +"mime-db@npm:^1.54.0": + version: 1.54.0 + resolution: "mime-db@npm:1.54.0" + checksum: 10c0/8d907917bc2a90fa2df842cdf5dfeaf509adc15fe0531e07bb2f6ab15992416479015828d6a74200041c492e42cce3ebf78e5ce714388a0a538ea9c53eece284 + languageName: node + linkType: hard + "mime-db@npm:~1.33.0": version: 1.33.0 resolution: "mime-db@npm:1.33.0" @@ -23674,6 +23893,15 @@ __metadata: languageName: node linkType: hard +"mime-types@npm:^3.0.0, mime-types@npm:^3.0.1": + version: 3.0.2 + resolution: "mime-types@npm:3.0.2" + dependencies: + mime-db: "npm:^1.54.0" + checksum: 10c0/35a0dd1035d14d185664f346efcdb72e93ef7a9b6e9ae808bd1f6358227010267fab52657b37562c80fc888ff76becb2b2938deb5e730818b7983bf8bd359767 + languageName: node + linkType: hard + "mime@npm:1.6.0": version: 1.6.0 resolution: "mime@npm:1.6.0" @@ -24788,6 +25016,13 @@ __metadata: languageName: node linkType: hard +"oauth4webapi@npm:^3.8.8": + version: 3.8.8 + resolution: "oauth4webapi@npm:3.8.8" + checksum: 10c0/1f7d35ba8d7d5aa9ce9ec5959a4611ed2b5dd7830172b1546749b91dda8c53f7934e669c6f81e912c64e3ae4fc681d4d6ce149b42cc9d17db97162bf8765e028 + languageName: node + linkType: hard + "object-assign@npm:^4, object-assign@npm:^4.0.1, object-assign@npm:^4.1.1": version: 4.1.1 resolution: "object-assign@npm:4.1.1" @@ -24901,6 +25136,17 @@ __metadata: languageName: node linkType: hard +"oidc-provider@npm:^9.12.0": + version: 9.13.1 + resolution: "oidc-provider@npm:9.13.1" + dependencies: + debug: "npm:^4.4.3" + jose: "npm:^6.2.12" + koa: "npm:^3.2.1" + checksum: 10c0/5fce3e1ee7a6568692d6edd03c44148a71c458c8d10351142b3ce3d4d446a28cc9d878223dad6b15fa360f3476a4b090f77322cda17dc5ebd7d29caf8c924cb3 + languageName: node + linkType: hard + "on-exit-leak-free@npm:^2.1.0": version: 2.1.2 resolution: "on-exit-leak-free@npm:2.1.2" @@ -24908,6 +25154,15 @@ __metadata: languageName: node linkType: hard +"on-finished@npm:^2.4.1": + version: 2.4.2 + resolution: "on-finished@npm:2.4.2" + dependencies: + ee-first: "npm:1.1.1" + checksum: 10c0/e2cdfcadbdca1421fd62c452b728f62c9dd67f73009b98e58d3340dcfad0367f3c98f18081dc58a54f36b6a13c503aadba72c4ddb6ad13ac0c372f956e9943f4 + languageName: node + linkType: hard + "on-finished@npm:~2.4.1": version: 2.4.1 resolution: "on-finished@npm:2.4.1" @@ -24986,6 +25241,16 @@ __metadata: languageName: node linkType: hard +"openid-client@npm:^6.8.8": + version: 6.8.8 + resolution: "openid-client@npm:6.8.8" + dependencies: + jose: "npm:^6.2.12" + oauth4webapi: "npm:^3.8.8" + checksum: 10c0/b1d60ca45623c77b8869b5a9725e25309cca20d32823861c5f72f0e9126a3ce43da2a93be964bfe771a39560f356c06adaedb2be29fe1762c4d097f91a4b620e + languageName: node + linkType: hard + "optionator@npm:^0.9.3": version: 0.9.3 resolution: "optionator@npm:0.9.3" @@ -25519,7 +25784,7 @@ __metadata: languageName: node linkType: hard -"parseurl@npm:~1.3.3": +"parseurl@npm:^1.3.3, parseurl@npm:~1.3.3": version: 1.3.3 resolution: "parseurl@npm:1.3.3" checksum: 10c0/90dd4760d6f6174adb9f20cf0965ae12e23879b5f5464f38e92fce8073354341e4b3b76fa3d878351efe7d01e617121955284cfd002ab087fba1a0726ec0b4f5 @@ -29102,6 +29367,13 @@ __metadata: languageName: node linkType: hard +"statuses@npm:>= 1.5.0 < 2": + version: 1.5.0 + resolution: "statuses@npm:1.5.0" + checksum: 10c0/e433900956357b3efd79b1c547da4d291799ac836960c016d10a98f6a810b1b5c0dcc13b5a7aa609a58239b5190e1ea176ad9221c2157d2fd1c747393e6b2940 + languageName: node + linkType: hard + "statuses@npm:^2.0.1": version: 2.0.1 resolution: "statuses@npm:2.0.1" @@ -30257,7 +30529,7 @@ __metadata: languageName: node linkType: hard -"toidentifier@npm:~1.0.1": +"toidentifier@npm:1.0.1, toidentifier@npm:~1.0.1": version: 1.0.1 resolution: "toidentifier@npm:1.0.1" checksum: 10c0/93937279934bd66cc3270016dd8d0afec14fb7c94a05c72dc57321f8bd1fa97e5bea6d1f7c89e728d077ca31ea125b78320a616a6c6cd0e6b9cb94cb864381c1 @@ -30577,6 +30849,13 @@ __metadata: languageName: node linkType: hard +"tsscmp@npm:1.0.6": + version: 1.0.6 + resolution: "tsscmp@npm:1.0.6" + checksum: 10c0/2f79a9455e7e3e8071995f98cdf3487ccfc91b760bec21a9abb4d90519557eafaa37246e87c92fa8bf3fef8fd30cfd0cc3c4212bb929baa9fb62494bfa4d24b2 + languageName: node + linkType: hard + "tsup@npm:^8.4.0": version: 8.4.0 resolution: "tsup@npm:8.4.0" @@ -30753,6 +31032,17 @@ __metadata: languageName: node linkType: hard +"type-is@npm:^2.0.1": + version: 2.1.0 + resolution: "type-is@npm:2.1.0" + dependencies: + content-type: "npm:^2.0.0" + media-typer: "npm:^1.1.0" + mime-types: "npm:^3.0.0" + checksum: 10c0/a6018f8f509de48f2c7429305e3a920e73b374fa93127dd0877ae1c2df65a5d33907caac8afb0c37a9b9fc7c49f29e3f55d668963dc845d966930b667c07f50e + languageName: node + linkType: hard + "type-is@npm:~1.6.18": version: 1.6.18 resolution: "type-is@npm:1.6.18" @@ -31407,7 +31697,7 @@ __metadata: languageName: node linkType: hard -"vary@npm:^1, vary@npm:~1.1.2": +"vary@npm:^1, vary@npm:^1.1.2, vary@npm:~1.1.2": version: 1.1.2 resolution: "vary@npm:1.1.2" checksum: 10c0/f15d588d79f3675135ba783c91a4083dcd290a2a5be9fcb6514220a1634e23df116847b1cc51f66bfb0644cf9353b2abb7815ae499bab06e46dd33c1a6bf1f4f