Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Changed
- Added `/api/avatar` to resolve user profile pictures. [#1159](https://github.com/sourcebot-dev/sourcebot/pull/1159)
- Hardened post-auth redirects with an explicit same-origin `redirect` callback in the NextAuth config, and switched the legacy `/~/...` URL rewrite from a 308 to a 301. [#1161](https://github.com/sourcebot-dev/sourcebot/pull/1161)
- Made the Auth.js JWT session lifetime and OAuth token TTLs configurable via `AUTH_SESSION_MAX_AGE_SECONDS`, `AUTH_SESSION_UPDATE_AGE_SECONDS`, `OAUTH_AUTHORIZATION_CODE_TTL_SECONDS`, `OAUTH_ACCESS_TOKEN_TTL_SECONDS`, and `OAUTH_REFRESH_TOKEN_TTL_SECONDS`. Defaults preserve existing behavior. [#1162](https://github.com/sourcebot-dev/sourcebot/pull/1162)

### Fixed
- Bumped `postcss` to `8.5.10`. [#1155](https://github.com/sourcebot-dev/sourcebot/pull/1155)
Expand Down
5 changes: 5 additions & 0 deletions docs/docs/configuration/environment-variables.mdx
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,11 @@ The following environment variables allow you to configure your Sourcebot deploy
| `AUTH_CREDENTIALS_LOGIN_ENABLED` | `true` | <p>Enables/disables authentication with basic credentials. Username and passwords are stored encrypted at rest within the postgres database. Checkout the [auth docs](/docs/configuration/auth/overview) for more info</p> |
| `AUTH_EMAIL_CODE_LOGIN_ENABLED` | `false` | <p>Enables/disables authentication with a login code that's sent to a users email. `SMTP_CONNECTION_URL` and `EMAIL_FROM_ADDRESS` must also be set. Checkout the [auth docs](/docs/configuration/auth/overview) for more info </p> |
| `AUTH_SECRET` | Automatically generated at startup if no value is provided. Generated using `openssl rand -base64 33` | <p>Used to validate login session cookies</p> |
| `AUTH_SESSION_MAX_AGE_SECONDS` | `2592000` (30 days) | <p>Relative time from now in seconds when to expire the session.</p> |
| `AUTH_SESSION_UPDATE_AGE_SECONDS` | `86400` (1 day) | <p>How often the session should be updated in seconds. If set to `0`, session is updated every time.</p> |
| `OAUTH_AUTHORIZATION_CODE_TTL_SECONDS` | `600` (10 minutes) | <p>Lifetime of an OAuth authorization code, in seconds.</p> |
| `OAUTH_ACCESS_TOKEN_TTL_SECONDS` | `3600` (1 hour) | <p>Lifetime of an OAuth access token, in seconds.</p> |
| `OAUTH_REFRESH_TOKEN_TTL_SECONDS` | `7776000` (90 days) | <p>Lifetime of an OAuth refresh token, in seconds.</p> |
| `AUTH_URL` | - | <p>URL of your Sourcebot deployment, e.g., `https://example.com` or `http://localhost:3000`.</p> |
| `CONFIG_PATH` | `-` | <p>The container relative path to the declarative configuration file. See [this doc](/docs/configuration/declarative-config) for more info.</p> |
| `DATA_CACHE_DIR` | `$DATA_DIR/.sourcebot` | <p>The root data directory in which all data written to disk by Sourcebot will be located.</p> |
Expand Down
35 changes: 35 additions & 0 deletions packages/shared/src/env.server.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -139,6 +139,41 @@ const options = {
AUTH_CREDENTIALS_LOGIN_ENABLED: booleanSchema.default('true'),
AUTH_EMAIL_CODE_LOGIN_ENABLED: booleanSchema.default('false'),

/**
* Relative time from now in seconds when to expire the session.
*
* @default 30 days
*/
AUTH_SESSION_MAX_AGE_SECONDS: numberSchema.default(60 * 60 * 24 * 30),

/**
* How often the session should be updated in seconds. If set to 0, session is updated every time.
*
* @default 1 day
*/
AUTH_SESSION_UPDATE_AGE_SECONDS: numberSchema.default(60 * 60 * 24),

/**
* Lifetime of an OAuth authorization code, in seconds.
*
* @default 10 minutes
*/
OAUTH_AUTHORIZATION_CODE_TTL_SECONDS: numberSchema.default(60 * 10),

/**
* Lifetime of an OAuth access token, in seconds.
*
* @default 1 hour
*/
OAUTH_ACCESS_TOKEN_TTL_SECONDS: numberSchema.default(60 * 60),

/**
* Lifetime of an OAuth refresh token, in seconds.
*
* @default 90 days
*/
OAUTH_REFRESH_TOKEN_TTL_SECONDS: numberSchema.default(60 * 60 * 24 * 90),
Comment thread
brendan-kellam marked this conversation as resolved.

// Enterprise Auth
AUTH_EE_ALLOW_EMAIL_ACCOUNT_LINKING:
booleanSchema
Expand Down
8 changes: 4 additions & 4 deletions packages/web/src/app/api/(server)/ee/oauth/token/route.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { verifyAndExchangeCode, verifyAndRotateRefreshToken, ACCESS_TOKEN_TTL_SECONDS } from '@/ee/features/oauth/server';
import { verifyAndExchangeCode, verifyAndRotateRefreshToken } from '@/ee/features/oauth/server';
import { apiHandler } from '@/lib/apiHandler';
import { hasEntitlement } from '@sourcebot/shared';
import { env, hasEntitlement } from '@sourcebot/shared';
import { NextRequest } from 'next/server';
import { OAUTH_NOT_SUPPORTED_ERROR_MESSAGE } from '@/ee/features/oauth/constants';

Expand DownExpand Up@@ -59,7 +59,7 @@ export const POST = apiHandler(async (request: NextRequest) => {
access_token: result.token,
refresh_token: result.refreshToken,
token_type: 'Bearer',
expires_in: ACCESS_TOKEN_TTL_SECONDS,
expires_in: env.OAUTH_ACCESS_TOKEN_TTL_SECONDS,
scope: '',
});
}
Expand DownExpand Up@@ -91,7 +91,7 @@ export const POST = apiHandler(async (request: NextRequest) => {
access_token: result.token,
refresh_token: result.refreshToken,
token_type: 'Bearer',
expires_in: ACCESS_TOKEN_TTL_SECONDS,
expires_in: env.OAUTH_ACCESS_TOKEN_TTL_SECONDS,
scope: '',
});
}
Expand Down
2 changes: 2 additions & 0 deletions packages/web/src/auth.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -148,6 +148,8 @@ export const { handlers, signIn, signOut, auth } = NextAuth({
adapter: EncryptedPrismaAdapter(__unsafePrisma),
session: {
strategy: "jwt",
maxAge: env.AUTH_SESSION_MAX_AGE_SECONDS,
updateAge: env.AUTH_SESSION_UPDATE_AGE_SECONDS,
},
trustHost: true,
events: {
Expand Down
5 changes: 5 additions & 0 deletions packages/web/src/ee/features/oauth/server.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,11 @@ vi.mock('@sourcebot/shared', () => ({
generateOAuthRefreshToken: vi.fn(() => ({ token: 'sbor_newrefresh', hash: 'newrefresh' })),
OAUTH_ACCESS_TOKEN_PREFIX: 'sboa_',
OAUTH_REFRESH_TOKEN_PREFIX: 'sbor_',
env: {
OAUTH_AUTHORIZATION_CODE_TTL_SECONDS: 60 * 10,
OAUTH_ACCESS_TOKEN_TTL_SECONDS: 60 * 60,
OAUTH_REFRESH_TOKEN_TTL_SECONDS: 60 * 60 * 24 * 90,
},
}));

const VALID_CODE_HASH = 'validcode';
Expand Down
21 changes: 8 additions & 13 deletions packages/web/src/ee/features/oauth/server.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ import 'server-only';
import { __unsafePrisma } from '@/prisma';
import { Prisma } from '@prisma/client';
import {
env,
generateOAuthRefreshToken,
generateOAuthToken,
hashSecret,
Expand All@@ -11,12 +12,6 @@ import {
} from '@sourcebot/shared';
import crypto from 'crypto';

const AUTH_CODE_TTL_MS = 10 * 60 * 1000; // 10 minutes
const ACCESS_TOKEN_TTL_MS = 60 * 60 * 1000; // 1 hour
const REFRESH_TOKEN_TTL_MS = 90 * 24 * 60 * 60 * 1000; // 90 days

export const ACCESS_TOKEN_TTL_SECONDS = Math.floor(ACCESS_TOKEN_TTL_MS / 1000);

// Generates a random authorization code, hashes it, and stores it alongside the
// PKCE code challenge. Returns the raw code to be sent to the client.
export async function generateAndStoreAuthCode({
Expand All@@ -43,7 +38,7 @@ export async function generateAndStoreAuthCode({
redirectUri,
codeChallenge,
resource,
expiresAt: new Date(Date.now() + AUTH_CODE_TTL_MS),
expiresAt: new Date(Date.now() + env.OAUTH_AUTHORIZATION_CODE_TTL_SECONDS * 1000),
},
});

Expand DownExpand Up@@ -124,7 +119,7 @@ export async function verifyAndExchangeCode({
clientId,
userId: authCode.userId,
resource: authCode.resource,
expiresAt: new Date(Date.now() + ACCESS_TOKEN_TTL_MS),
expiresAt: new Date(Date.now() + env.OAUTH_ACCESS_TOKEN_TTL_SECONDS * 1000),
},
}),
__unsafePrisma.oAuthRefreshToken.create({
Expand All@@ -133,12 +128,12 @@ export async function verifyAndExchangeCode({
clientId,
userId: authCode.userId,
resource: authCode.resource,
expiresAt: new Date(Date.now() + REFRESH_TOKEN_TTL_MS),
expiresAt: new Date(Date.now() + env.OAUTH_REFRESH_TOKEN_TTL_SECONDS * 1000),
},
}),
]);

return { token, refreshToken, expiresIn: ACCESS_TOKEN_TTL_SECONDS };
return { token, refreshToken, expiresIn: env.OAUTH_ACCESS_TOKEN_TTL_SECONDS };
}

// Verifies a refresh token, rotates it, and issues a new access token + refresh token.
Expand DownExpand Up@@ -189,7 +184,7 @@ export async function verifyAndRotateRefreshToken({
clientId,
userId: existing.userId,
resource: existing.resource,
expiresAt: new Date(Date.now() + ACCESS_TOKEN_TTL_MS),
expiresAt: new Date(Date.now() + env.OAUTH_ACCESS_TOKEN_TTL_SECONDS * 1000),
},
}),
__unsafePrisma.oAuthRefreshToken.create({
Expand All@@ -198,12 +193,12 @@ export async function verifyAndRotateRefreshToken({
clientId,
userId: existing.userId,
resource: existing.resource,
expiresAt: new Date(Date.now() + REFRESH_TOKEN_TTL_MS),
expiresAt: new Date(Date.now() + env.OAUTH_REFRESH_TOKEN_TTL_SECONDS * 1000),
},
}),
]);

return { token, refreshToken, expiresIn: ACCESS_TOKEN_TTL_SECONDS };
return { token, refreshToken, expiresIn: env.OAUTH_ACCESS_TOKEN_TTL_SECONDS };
}

// Revokes an access token or refresh token by hashing it and deleting the DB record.
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all \u003cpre\u003e\u003ccode\u003e blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks"); } } catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); } })(); (function(){ try { var __m = "github.com"; var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Changed
- Added `/api/avatar` to resolve user profile pictures. [#1159](https://github.com/sourcebot-dev/sourcebot/pull/1159)
- Hardened post-auth redirects with an explicit same-origin `redirect` callback in the NextAuth config, and switched the legacy `/~/...` URL rewrite from a 308 to a 301. [#1161](https://github.com/sourcebot-dev/sourcebot/pull/1161)
- Made the Auth.js JWT session lifetime and OAuth token TTLs configurable via `AUTH_SESSION_MAX_AGE_SECONDS`, `AUTH_SESSION_UPDATE_AGE_SECONDS`, `OAUTH_AUTHORIZATION_CODE_TTL_SECONDS`, `OAUTH_ACCESS_TOKEN_TTL_SECONDS`, and `OAUTH_REFRESH_TOKEN_TTL_SECONDS`. Defaults preserve existing behavior. [#1162](https://github.com/sourcebot-dev/sourcebot/pull/1162)

### Fixed
- Bumped `postcss` to `8.5.10`. [#1155](https://github.com/sourcebot-dev/sourcebot/pull/1155)
Expand Down
5 changes: 5 additions & 0 deletions docs/docs/configuration/environment-variables.mdx
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,11 @@ The following environment variables allow you to configure your Sourcebot deploy
| `AUTH_CREDENTIALS_LOGIN_ENABLED` | `true` | <p>Enables/disables authentication with basic credentials. Username and passwords are stored encrypted at rest within the postgres database. Checkout the [auth docs](/docs/configuration/auth/overview) for more info</p> |
| `AUTH_EMAIL_CODE_LOGIN_ENABLED` | `false` | <p>Enables/disables authentication with a login code that's sent to a users email. `SMTP_CONNECTION_URL` and `EMAIL_FROM_ADDRESS` must also be set. Checkout the [auth docs](/docs/configuration/auth/overview) for more info </p> |
| `AUTH_SECRET` | Automatically generated at startup if no value is provided. Generated using `openssl rand -base64 33` | <p>Used to validate login session cookies</p> |
| `AUTH_SESSION_MAX_AGE_SECONDS` | `2592000` (30 days) | <p>Relative time from now in seconds when to expire the session.</p> |
| `AUTH_SESSION_UPDATE_AGE_SECONDS` | `86400` (1 day) | <p>How often the session should be updated in seconds. If set to `0`, session is updated every time.</p> |
| `OAUTH_AUTHORIZATION_CODE_TTL_SECONDS` | `600` (10 minutes) | <p>Lifetime of an OAuth authorization code, in seconds.</p> |
| `OAUTH_ACCESS_TOKEN_TTL_SECONDS` | `3600` (1 hour) | <p>Lifetime of an OAuth access token, in seconds.</p> |
| `OAUTH_REFRESH_TOKEN_TTL_SECONDS` | `7776000` (90 days) | <p>Lifetime of an OAuth refresh token, in seconds.</p> |
| `AUTH_URL` | - | <p>URL of your Sourcebot deployment, e.g., `https://example.com` or `http://localhost:3000`.</p> |
| `CONFIG_PATH` | `-` | <p>The container relative path to the declarative configuration file. See [this doc](/docs/configuration/declarative-config) for more info.</p> |
| `DATA_CACHE_DIR` | `$DATA_DIR/.sourcebot` | <p>The root data directory in which all data written to disk by Sourcebot will be located.</p> |
Expand Down
35 changes: 35 additions & 0 deletions packages/shared/src/env.server.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -139,6 +139,41 @@ const options = {
AUTH_CREDENTIALS_LOGIN_ENABLED: booleanSchema.default('true'),
AUTH_EMAIL_CODE_LOGIN_ENABLED: booleanSchema.default('false'),

/**
* Relative time from now in seconds when to expire the session.
*
* @default 30 days
*/
AUTH_SESSION_MAX_AGE_SECONDS: numberSchema.default(60 * 60 * 24 * 30),

/**
* How often the session should be updated in seconds. If set to 0, session is updated every time.
*
* @default 1 day
*/
AUTH_SESSION_UPDATE_AGE_SECONDS: numberSchema.default(60 * 60 * 24),

/**
* Lifetime of an OAuth authorization code, in seconds.
*
* @default 10 minutes
*/
OAUTH_AUTHORIZATION_CODE_TTL_SECONDS: numberSchema.default(60 * 10),

/**
* Lifetime of an OAuth access token, in seconds.
*
* @default 1 hour
*/
OAUTH_ACCESS_TOKEN_TTL_SECONDS: numberSchema.default(60 * 60),

/**
* Lifetime of an OAuth refresh token, in seconds.
*
* @default 90 days
*/
OAUTH_REFRESH_TOKEN_TTL_SECONDS: numberSchema.default(60 * 60 * 24 * 90),
Comment thread
brendan-kellam marked this conversation as resolved.

// Enterprise Auth
AUTH_EE_ALLOW_EMAIL_ACCOUNT_LINKING:
booleanSchema
Expand Down
8 changes: 4 additions & 4 deletions packages/web/src/app/api/(server)/ee/oauth/token/route.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { verifyAndExchangeCode, verifyAndRotateRefreshToken, ACCESS_TOKEN_TTL_SECONDS } from '@/ee/features/oauth/server';
import { verifyAndExchangeCode, verifyAndRotateRefreshToken } from '@/ee/features/oauth/server';
import { apiHandler } from '@/lib/apiHandler';
import { hasEntitlement } from '@sourcebot/shared';
import { env, hasEntitlement } from '@sourcebot/shared';
import { NextRequest } from 'next/server';
import { OAUTH_NOT_SUPPORTED_ERROR_MESSAGE } from '@/ee/features/oauth/constants';

Expand DownExpand Up@@ -59,7 +59,7 @@ export const POST = apiHandler(async (request: NextRequest) => {
access_token: result.token,
refresh_token: result.refreshToken,
token_type: 'Bearer',
expires_in: ACCESS_TOKEN_TTL_SECONDS,
expires_in: env.OAUTH_ACCESS_TOKEN_TTL_SECONDS,
scope: '',
});
}
Expand DownExpand Up@@ -91,7 +91,7 @@ export const POST = apiHandler(async (request: NextRequest) => {
access_token: result.token,
refresh_token: result.refreshToken,
token_type: 'Bearer',
expires_in: ACCESS_TOKEN_TTL_SECONDS,
expires_in: env.OAUTH_ACCESS_TOKEN_TTL_SECONDS,
scope: '',
});
}
Expand Down
2 changes: 2 additions & 0 deletions packages/web/src/auth.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -148,6 +148,8 @@ export const { handlers, signIn, signOut, auth } = NextAuth({
adapter: EncryptedPrismaAdapter(__unsafePrisma),
session: {
strategy: "jwt",
maxAge: env.AUTH_SESSION_MAX_AGE_SECONDS,
updateAge: env.AUTH_SESSION_UPDATE_AGE_SECONDS,
},
trustHost: true,
events: {
Expand Down
5 changes: 5 additions & 0 deletions packages/web/src/ee/features/oauth/server.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,11 @@ vi.mock('@sourcebot/shared', () => ({
generateOAuthRefreshToken: vi.fn(() => ({ token: 'sbor_newrefresh', hash: 'newrefresh' })),
OAUTH_ACCESS_TOKEN_PREFIX: 'sboa_',
OAUTH_REFRESH_TOKEN_PREFIX: 'sbor_',
env: {
OAUTH_AUTHORIZATION_CODE_TTL_SECONDS: 60 * 10,
OAUTH_ACCESS_TOKEN_TTL_SECONDS: 60 * 60,
OAUTH_REFRESH_TOKEN_TTL_SECONDS: 60 * 60 * 24 * 90,
},
}));

const VALID_CODE_HASH = 'validcode';
Expand Down
21 changes: 8 additions & 13 deletions packages/web/src/ee/features/oauth/server.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ import 'server-only';
import { __unsafePrisma } from '@/prisma';
import { Prisma } from '@prisma/client';
import {
env,
generateOAuthRefreshToken,
generateOAuthToken,
hashSecret,
Expand All@@ -11,12 +12,6 @@ import {
} from '@sourcebot/shared';
import crypto from 'crypto';

const AUTH_CODE_TTL_MS = 10 * 60 * 1000; // 10 minutes
const ACCESS_TOKEN_TTL_MS = 60 * 60 * 1000; // 1 hour
const REFRESH_TOKEN_TTL_MS = 90 * 24 * 60 * 60 * 1000; // 90 days

export const ACCESS_TOKEN_TTL_SECONDS = Math.floor(ACCESS_TOKEN_TTL_MS / 1000);

// Generates a random authorization code, hashes it, and stores it alongside the
// PKCE code challenge. Returns the raw code to be sent to the client.
export async function generateAndStoreAuthCode({
Expand All@@ -43,7 +38,7 @@ export async function generateAndStoreAuthCode({
redirectUri,
codeChallenge,
resource,
expiresAt: new Date(Date.now() + AUTH_CODE_TTL_MS),
expiresAt: new Date(Date.now() + env.OAUTH_AUTHORIZATION_CODE_TTL_SECONDS * 1000),
},
});

Expand DownExpand Up@@ -124,7 +119,7 @@ export async function verifyAndExchangeCode({
clientId,
userId: authCode.userId,
resource: authCode.resource,
expiresAt: new Date(Date.now() + ACCESS_TOKEN_TTL_MS),
expiresAt: new Date(Date.now() + env.OAUTH_ACCESS_TOKEN_TTL_SECONDS * 1000),
},
}),
__unsafePrisma.oAuthRefreshToken.create({
Expand All@@ -133,12 +128,12 @@ export async function verifyAndExchangeCode({
clientId,
userId: authCode.userId,
resource: authCode.resource,
expiresAt: new Date(Date.now() + REFRESH_TOKEN_TTL_MS),
expiresAt: new Date(Date.now() + env.OAUTH_REFRESH_TOKEN_TTL_SECONDS * 1000),
},
}),
]);

return { token, refreshToken, expiresIn: ACCESS_TOKEN_TTL_SECONDS };
return { token, refreshToken, expiresIn: env.OAUTH_ACCESS_TOKEN_TTL_SECONDS };
}

// Verifies a refresh token, rotates it, and issues a new access token + refresh token.
Expand DownExpand Up@@ -189,7 +184,7 @@ export async function verifyAndRotateRefreshToken({
clientId,
userId: existing.userId,
resource: existing.resource,
expiresAt: new Date(Date.now() + ACCESS_TOKEN_TTL_MS),
expiresAt: new Date(Date.now() + env.OAUTH_ACCESS_TOKEN_TTL_SECONDS * 1000),
},
}),
__unsafePrisma.oAuthRefreshToken.create({
Expand All@@ -198,12 +193,12 @@ export async function verifyAndRotateRefreshToken({
clientId,
userId: existing.userId,
resource: existing.resource,
expiresAt: new Date(Date.now() + REFRESH_TOKEN_TTL_MS),
expiresAt: new Date(Date.now() + env.OAUTH_REFRESH_TOKEN_TTL_SECONDS * 1000),
},
}),
]);

return { token, refreshToken, expiresIn: ACCESS_TOKEN_TTL_SECONDS };
return { token, refreshToken, expiresIn: env.OAUTH_ACCESS_TOKEN_TTL_SECONDS };
}

// Revokes an access token or refresh token by hashing it and deleting the DB record.
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Changed
- Added `/api/avatar` to resolve user profile pictures. [#1159](https://github.com/sourcebot-dev/sourcebot/pull/1159)
- Hardened post-auth redirects with an explicit same-origin `redirect` callback in the NextAuth config, and switched the legacy `/~/...` URL rewrite from a 308 to a 301. [#1161](https://github.com/sourcebot-dev/sourcebot/pull/1161)
- Made the Auth.js JWT session lifetime and OAuth token TTLs configurable via `AUTH_SESSION_MAX_AGE_SECONDS`, `AUTH_SESSION_UPDATE_AGE_SECONDS`, `OAUTH_AUTHORIZATION_CODE_TTL_SECONDS`, `OAUTH_ACCESS_TOKEN_TTL_SECONDS`, and `OAUTH_REFRESH_TOKEN_TTL_SECONDS`. Defaults preserve existing behavior. [#1162](https://github.com/sourcebot-dev/sourcebot/pull/1162)

### Fixed
- Bumped `postcss` to `8.5.10`. [#1155](https://github.com/sourcebot-dev/sourcebot/pull/1155)
Expand Down
5 changes: 5 additions & 0 deletions docs/docs/configuration/environment-variables.mdx
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,11 @@ The following environment variables allow you to configure your Sourcebot deploy
| `AUTH_CREDENTIALS_LOGIN_ENABLED` | `true` | <p>Enables/disables authentication with basic credentials. Username and passwords are stored encrypted at rest within the postgres database. Checkout the [auth docs](/docs/configuration/auth/overview) for more info</p> |
| `AUTH_EMAIL_CODE_LOGIN_ENABLED` | `false` | <p>Enables/disables authentication with a login code that's sent to a users email. `SMTP_CONNECTION_URL` and `EMAIL_FROM_ADDRESS` must also be set. Checkout the [auth docs](/docs/configuration/auth/overview) for more info </p> |
| `AUTH_SECRET` | Automatically generated at startup if no value is provided. Generated using `openssl rand -base64 33` | <p>Used to validate login session cookies</p> |
| `AUTH_SESSION_MAX_AGE_SECONDS` | `2592000` (30 days) | <p>Relative time from now in seconds when to expire the session.</p> |
| `AUTH_SESSION_UPDATE_AGE_SECONDS` | `86400` (1 day) | <p>How often the session should be updated in seconds. If set to `0`, session is updated every time.</p> |
| `OAUTH_AUTHORIZATION_CODE_TTL_SECONDS` | `600` (10 minutes) | <p>Lifetime of an OAuth authorization code, in seconds.</p> |
| `OAUTH_ACCESS_TOKEN_TTL_SECONDS` | `3600` (1 hour) | <p>Lifetime of an OAuth access token, in seconds.</p> |
| `OAUTH_REFRESH_TOKEN_TTL_SECONDS` | `7776000` (90 days) | <p>Lifetime of an OAuth refresh token, in seconds.</p> |
| `AUTH_URL` | - | <p>URL of your Sourcebot deployment, e.g., `https://example.com` or `http://localhost:3000`.</p> |
| `CONFIG_PATH` | `-` | <p>The container relative path to the declarative configuration file. See [this doc](/docs/configuration/declarative-config) for more info.</p> |
| `DATA_CACHE_DIR` | `$DATA_DIR/.sourcebot` | <p>The root data directory in which all data written to disk by Sourcebot will be located.</p> |
Expand Down
35 changes: 35 additions & 0 deletions packages/shared/src/env.server.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -139,6 +139,41 @@ const options = {
AUTH_CREDENTIALS_LOGIN_ENABLED: booleanSchema.default('true'),
AUTH_EMAIL_CODE_LOGIN_ENABLED: booleanSchema.default('false'),

/**
* Relative time from now in seconds when to expire the session.
*
* @default 30 days
*/
AUTH_SESSION_MAX_AGE_SECONDS: numberSchema.default(60 * 60 * 24 * 30),

/**
* How often the session should be updated in seconds. If set to 0, session is updated every time.
*
* @default 1 day
*/
AUTH_SESSION_UPDATE_AGE_SECONDS: numberSchema.default(60 * 60 * 24),

/**
* Lifetime of an OAuth authorization code, in seconds.
*
* @default 10 minutes
*/
OAUTH_AUTHORIZATION_CODE_TTL_SECONDS: numberSchema.default(60 * 10),

/**
* Lifetime of an OAuth access token, in seconds.
*
* @default 1 hour
*/
OAUTH_ACCESS_TOKEN_TTL_SECONDS: numberSchema.default(60 * 60),

/**
* Lifetime of an OAuth refresh token, in seconds.
*
* @default 90 days
*/
OAUTH_REFRESH_TOKEN_TTL_SECONDS: numberSchema.default(60 * 60 * 24 * 90),
Comment thread
brendan-kellam marked this conversation as resolved.

// Enterprise Auth
AUTH_EE_ALLOW_EMAIL_ACCOUNT_LINKING:
booleanSchema
Expand Down
8 changes: 4 additions & 4 deletions packages/web/src/app/api/(server)/ee/oauth/token/route.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { verifyAndExchangeCode, verifyAndRotateRefreshToken, ACCESS_TOKEN_TTL_SECONDS } from '@/ee/features/oauth/server';
import { verifyAndExchangeCode, verifyAndRotateRefreshToken } from '@/ee/features/oauth/server';
import { apiHandler } from '@/lib/apiHandler';
import { hasEntitlement } from '@sourcebot/shared';
import { env, hasEntitlement } from '@sourcebot/shared';
import { NextRequest } from 'next/server';
import { OAUTH_NOT_SUPPORTED_ERROR_MESSAGE } from '@/ee/features/oauth/constants';

Expand DownExpand Up@@ -59,7 +59,7 @@ export const POST = apiHandler(async (request: NextRequest) => {
access_token: result.token,
refresh_token: result.refreshToken,
token_type: 'Bearer',
expires_in: ACCESS_TOKEN_TTL_SECONDS,
expires_in: env.OAUTH_ACCESS_TOKEN_TTL_SECONDS,
scope: '',
});
}
Expand DownExpand Up@@ -91,7 +91,7 @@ export const POST = apiHandler(async (request: NextRequest) => {
access_token: result.token,
refresh_token: result.refreshToken,
token_type: 'Bearer',
expires_in: ACCESS_TOKEN_TTL_SECONDS,
expires_in: env.OAUTH_ACCESS_TOKEN_TTL_SECONDS,
scope: '',
});
}
Expand Down
2 changes: 2 additions & 0 deletions packages/web/src/auth.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -148,6 +148,8 @@ export const { handlers, signIn, signOut, auth } = NextAuth({
adapter: EncryptedPrismaAdapter(__unsafePrisma),
session: {
strategy: "jwt",
maxAge: env.AUTH_SESSION_MAX_AGE_SECONDS,
updateAge: env.AUTH_SESSION_UPDATE_AGE_SECONDS,
},
trustHost: true,
events: {
Expand Down
5 changes: 5 additions & 0 deletions packages/web/src/ee/features/oauth/server.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,11 @@ vi.mock('@sourcebot/shared', () => ({
generateOAuthRefreshToken: vi.fn(() => ({ token: 'sbor_newrefresh', hash: 'newrefresh' })),
OAUTH_ACCESS_TOKEN_PREFIX: 'sboa_',
OAUTH_REFRESH_TOKEN_PREFIX: 'sbor_',
env: {
OAUTH_AUTHORIZATION_CODE_TTL_SECONDS: 60 * 10,
OAUTH_ACCESS_TOKEN_TTL_SECONDS: 60 * 60,
OAUTH_REFRESH_TOKEN_TTL_SECONDS: 60 * 60 * 24 * 90,
},
}));

const VALID_CODE_HASH = 'validcode';
Expand Down
21 changes: 8 additions & 13 deletions packages/web/src/ee/features/oauth/server.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ import 'server-only';
import { __unsafePrisma } from '@/prisma';
import { Prisma } from '@prisma/client';
import {
env,
generateOAuthRefreshToken,
generateOAuthToken,
hashSecret,
Expand All@@ -11,12 +12,6 @@ import {
} from '@sourcebot/shared';
import crypto from 'crypto';

const AUTH_CODE_TTL_MS = 10 * 60 * 1000; // 10 minutes
const ACCESS_TOKEN_TTL_MS = 60 * 60 * 1000; // 1 hour
const REFRESH_TOKEN_TTL_MS = 90 * 24 * 60 * 60 * 1000; // 90 days

export const ACCESS_TOKEN_TTL_SECONDS = Math.floor(ACCESS_TOKEN_TTL_MS / 1000);

// Generates a random authorization code, hashes it, and stores it alongside the
// PKCE code challenge. Returns the raw code to be sent to the client.
export async function generateAndStoreAuthCode({
Expand All@@ -43,7 +38,7 @@ export async function generateAndStoreAuthCode({
redirectUri,
codeChallenge,
resource,
expiresAt: new Date(Date.now() + AUTH_CODE_TTL_MS),
expiresAt: new Date(Date.now() + env.OAUTH_AUTHORIZATION_CODE_TTL_SECONDS * 1000),
},
});

Expand DownExpand Up@@ -124,7 +119,7 @@ export async function verifyAndExchangeCode({
clientId,
userId: authCode.userId,
resource: authCode.resource,
expiresAt: new Date(Date.now() + ACCESS_TOKEN_TTL_MS),
expiresAt: new Date(Date.now() + env.OAUTH_ACCESS_TOKEN_TTL_SECONDS * 1000),
},
}),
__unsafePrisma.oAuthRefreshToken.create({
Expand All@@ -133,12 +128,12 @@ export async function verifyAndExchangeCode({
clientId,
userId: authCode.userId,
resource: authCode.resource,
expiresAt: new Date(Date.now() + REFRESH_TOKEN_TTL_MS),
expiresAt: new Date(Date.now() + env.OAUTH_REFRESH_TOKEN_TTL_SECONDS * 1000),
},
}),
]);

return { token, refreshToken, expiresIn: ACCESS_TOKEN_TTL_SECONDS };
return { token, refreshToken, expiresIn: env.OAUTH_ACCESS_TOKEN_TTL_SECONDS };
}

// Verifies a refresh token, rotates it, and issues a new access token + refresh token.
Expand DownExpand Up@@ -189,7 +184,7 @@ export async function verifyAndRotateRefreshToken({
clientId,
userId: existing.userId,
resource: existing.resource,
expiresAt: new Date(Date.now() + ACCESS_TOKEN_TTL_MS),
expiresAt: new Date(Date.now() + env.OAUTH_ACCESS_TOKEN_TTL_SECONDS * 1000),
},
}),
__unsafePrisma.oAuthRefreshToken.create({
Expand All@@ -198,12 +193,12 @@ export async function verifyAndRotateRefreshToken({
clientId,
userId: existing.userId,
resource: existing.resource,
expiresAt: new Date(Date.now() + REFRESH_TOKEN_TTL_MS),
expiresAt: new Date(Date.now() + env.OAUTH_REFRESH_TOKEN_TTL_SECONDS * 1000),
},
}),
]);

return { token, refreshToken, expiresIn: ACCESS_TOKEN_TTL_SECONDS };
return { token, refreshToken, expiresIn: env.OAUTH_ACCESS_TOKEN_TTL_SECONDS };
}

// Revokes an access token or refresh token by hashing it and deleting the DB record.
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length \u003e 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Changed
- Added `/api/avatar` to resolve user profile pictures. [#1159](https://github.com/sourcebot-dev/sourcebot/pull/1159)
- Hardened post-auth redirects with an explicit same-origin `redirect` callback in the NextAuth config, and switched the legacy `/~/...` URL rewrite from a 308 to a 301. [#1161](https://github.com/sourcebot-dev/sourcebot/pull/1161)
- Made the Auth.js JWT session lifetime and OAuth token TTLs configurable via `AUTH_SESSION_MAX_AGE_SECONDS`, `AUTH_SESSION_UPDATE_AGE_SECONDS`, `OAUTH_AUTHORIZATION_CODE_TTL_SECONDS`, `OAUTH_ACCESS_TOKEN_TTL_SECONDS`, and `OAUTH_REFRESH_TOKEN_TTL_SECONDS`. Defaults preserve existing behavior. [#1162](https://github.com/sourcebot-dev/sourcebot/pull/1162)

### Fixed
- Bumped `postcss` to `8.5.10`. [#1155](https://github.com/sourcebot-dev/sourcebot/pull/1155)
Expand Down
5 changes: 5 additions & 0 deletions docs/docs/configuration/environment-variables.mdx
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,11 @@ The following environment variables allow you to configure your Sourcebot deploy
| `AUTH_CREDENTIALS_LOGIN_ENABLED` | `true` | <p>Enables/disables authentication with basic credentials. Username and passwords are stored encrypted at rest within the postgres database. Checkout the [auth docs](/docs/configuration/auth/overview) for more info</p> |
| `AUTH_EMAIL_CODE_LOGIN_ENABLED` | `false` | <p>Enables/disables authentication with a login code that's sent to a users email. `SMTP_CONNECTION_URL` and `EMAIL_FROM_ADDRESS` must also be set. Checkout the [auth docs](/docs/configuration/auth/overview) for more info </p> |
| `AUTH_SECRET` | Automatically generated at startup if no value is provided. Generated using `openssl rand -base64 33` | <p>Used to validate login session cookies</p> |
| `AUTH_SESSION_MAX_AGE_SECONDS` | `2592000` (30 days) | <p>Relative time from now in seconds when to expire the session.</p> |
| `AUTH_SESSION_UPDATE_AGE_SECONDS` | `86400` (1 day) | <p>How often the session should be updated in seconds. If set to `0`, session is updated every time.</p> |
| `OAUTH_AUTHORIZATION_CODE_TTL_SECONDS` | `600` (10 minutes) | <p>Lifetime of an OAuth authorization code, in seconds.</p> |
| `OAUTH_ACCESS_TOKEN_TTL_SECONDS` | `3600` (1 hour) | <p>Lifetime of an OAuth access token, in seconds.</p> |
| `OAUTH_REFRESH_TOKEN_TTL_SECONDS` | `7776000` (90 days) | <p>Lifetime of an OAuth refresh token, in seconds.</p> |
| `AUTH_URL` | - | <p>URL of your Sourcebot deployment, e.g., `https://example.com` or `http://localhost:3000`.</p> |
| `CONFIG_PATH` | `-` | <p>The container relative path to the declarative configuration file. See [this doc](/docs/configuration/declarative-config) for more info.</p> |
| `DATA_CACHE_DIR` | `$DATA_DIR/.sourcebot` | <p>The root data directory in which all data written to disk by Sourcebot will be located.</p> |
Expand Down
35 changes: 35 additions & 0 deletions packages/shared/src/env.server.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -139,6 +139,41 @@ const options = {
AUTH_CREDENTIALS_LOGIN_ENABLED: booleanSchema.default('true'),
AUTH_EMAIL_CODE_LOGIN_ENABLED: booleanSchema.default('false'),

/**
* Relative time from now in seconds when to expire the session.
*
* @default 30 days
*/
AUTH_SESSION_MAX_AGE_SECONDS: numberSchema.default(60 * 60 * 24 * 30),

/**
* How often the session should be updated in seconds. If set to 0, session is updated every time.
*
* @default 1 day
*/
AUTH_SESSION_UPDATE_AGE_SECONDS: numberSchema.default(60 * 60 * 24),

/**
* Lifetime of an OAuth authorization code, in seconds.
*
* @default 10 minutes
*/
OAUTH_AUTHORIZATION_CODE_TTL_SECONDS: numberSchema.default(60 * 10),

/**
* Lifetime of an OAuth access token, in seconds.
*
* @default 1 hour
*/
OAUTH_ACCESS_TOKEN_TTL_SECONDS: numberSchema.default(60 * 60),

/**
* Lifetime of an OAuth refresh token, in seconds.
*
* @default 90 days
*/
OAUTH_REFRESH_TOKEN_TTL_SECONDS: numberSchema.default(60 * 60 * 24 * 90),
Comment thread
brendan-kellam marked this conversation as resolved.

// Enterprise Auth
AUTH_EE_ALLOW_EMAIL_ACCOUNT_LINKING:
booleanSchema
Expand Down
8 changes: 4 additions & 4 deletions packages/web/src/app/api/(server)/ee/oauth/token/route.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { verifyAndExchangeCode, verifyAndRotateRefreshToken, ACCESS_TOKEN_TTL_SECONDS } from '@/ee/features/oauth/server';
import { verifyAndExchangeCode, verifyAndRotateRefreshToken } from '@/ee/features/oauth/server';
import { apiHandler } from '@/lib/apiHandler';
import { hasEntitlement } from '@sourcebot/shared';
import { env, hasEntitlement } from '@sourcebot/shared';
import { NextRequest } from 'next/server';
import { OAUTH_NOT_SUPPORTED_ERROR_MESSAGE } from '@/ee/features/oauth/constants';

Expand DownExpand Up@@ -59,7 +59,7 @@ export const POST = apiHandler(async (request: NextRequest) => {
access_token: result.token,
refresh_token: result.refreshToken,
token_type: 'Bearer',
expires_in: ACCESS_TOKEN_TTL_SECONDS,
expires_in: env.OAUTH_ACCESS_TOKEN_TTL_SECONDS,
scope: '',
});
}
Expand DownExpand Up@@ -91,7 +91,7 @@ export const POST = apiHandler(async (request: NextRequest) => {
access_token: result.token,
refresh_token: result.refreshToken,
token_type: 'Bearer',
expires_in: ACCESS_TOKEN_TTL_SECONDS,
expires_in: env.OAUTH_ACCESS_TOKEN_TTL_SECONDS,
scope: '',
});
}
Expand Down
2 changes: 2 additions & 0 deletions packages/web/src/auth.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -148,6 +148,8 @@ export const { handlers, signIn, signOut, auth } = NextAuth({
adapter: EncryptedPrismaAdapter(__unsafePrisma),
session: {
strategy: "jwt",
maxAge: env.AUTH_SESSION_MAX_AGE_SECONDS,
updateAge: env.AUTH_SESSION_UPDATE_AGE_SECONDS,
},
trustHost: true,
events: {
Expand Down
5 changes: 5 additions & 0 deletions packages/web/src/ee/features/oauth/server.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,11 @@ vi.mock('@sourcebot/shared', () => ({
generateOAuthRefreshToken: vi.fn(() => ({ token: 'sbor_newrefresh', hash: 'newrefresh' })),
OAUTH_ACCESS_TOKEN_PREFIX: 'sboa_',
OAUTH_REFRESH_TOKEN_PREFIX: 'sbor_',
env: {
OAUTH_AUTHORIZATION_CODE_TTL_SECONDS: 60 * 10,
OAUTH_ACCESS_TOKEN_TTL_SECONDS: 60 * 60,
OAUTH_REFRESH_TOKEN_TTL_SECONDS: 60 * 60 * 24 * 90,
},
}));

const VALID_CODE_HASH = 'validcode';
Expand Down
21 changes: 8 additions & 13 deletions packages/web/src/ee/features/oauth/server.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ import 'server-only';
import { __unsafePrisma } from '@/prisma';
import { Prisma } from '@prisma/client';
import {
env,
generateOAuthRefreshToken,
generateOAuthToken,
hashSecret,
Expand All@@ -11,12 +12,6 @@ import {
} from '@sourcebot/shared';
import crypto from 'crypto';

const AUTH_CODE_TTL_MS = 10 * 60 * 1000; // 10 minutes
const ACCESS_TOKEN_TTL_MS = 60 * 60 * 1000; // 1 hour
const REFRESH_TOKEN_TTL_MS = 90 * 24 * 60 * 60 * 1000; // 90 days

export const ACCESS_TOKEN_TTL_SECONDS = Math.floor(ACCESS_TOKEN_TTL_MS / 1000);

// Generates a random authorization code, hashes it, and stores it alongside the
// PKCE code challenge. Returns the raw code to be sent to the client.
export async function generateAndStoreAuthCode({
Expand All@@ -43,7 +38,7 @@ export async function generateAndStoreAuthCode({
redirectUri,
codeChallenge,
resource,
expiresAt: new Date(Date.now() + AUTH_CODE_TTL_MS),
expiresAt: new Date(Date.now() + env.OAUTH_AUTHORIZATION_CODE_TTL_SECONDS * 1000),
},
});

Expand DownExpand Up@@ -124,7 +119,7 @@ export async function verifyAndExchangeCode({
clientId,
userId: authCode.userId,
resource: authCode.resource,
expiresAt: new Date(Date.now() + ACCESS_TOKEN_TTL_MS),
expiresAt: new Date(Date.now() + env.OAUTH_ACCESS_TOKEN_TTL_SECONDS * 1000),
},
}),
__unsafePrisma.oAuthRefreshToken.create({
Expand All@@ -133,12 +128,12 @@ export async function verifyAndExchangeCode({
clientId,
userId: authCode.userId,
resource: authCode.resource,
expiresAt: new Date(Date.now() + REFRESH_TOKEN_TTL_MS),
expiresAt: new Date(Date.now() + env.OAUTH_REFRESH_TOKEN_TTL_SECONDS * 1000),
},
}),
]);

return { token, refreshToken, expiresIn: ACCESS_TOKEN_TTL_SECONDS };
return { token, refreshToken, expiresIn: env.OAUTH_ACCESS_TOKEN_TTL_SECONDS };
}

// Verifies a refresh token, rotates it, and issues a new access token + refresh token.
Expand DownExpand Up@@ -189,7 +184,7 @@ export async function verifyAndRotateRefreshToken({
clientId,
userId: existing.userId,
resource: existing.resource,
expiresAt: new Date(Date.now() + ACCESS_TOKEN_TTL_MS),
expiresAt: new Date(Date.now() + env.OAUTH_ACCESS_TOKEN_TTL_SECONDS * 1000),
},
}),
__unsafePrisma.oAuthRefreshToken.create({
Expand All@@ -198,12 +193,12 @@ export async function verifyAndRotateRefreshToken({
clientId,
userId: existing.userId,
resource: existing.resource,
expiresAt: new Date(Date.now() + REFRESH_TOKEN_TTL_MS),
expiresAt: new Date(Date.now() + env.OAUTH_REFRESH_TOKEN_TTL_SECONDS * 1000),
},
}),
]);

return { token, refreshToken, expiresIn: ACCESS_TOKEN_TTL_SECONDS };
return { token, refreshToken, expiresIn: env.OAUTH_ACCESS_TOKEN_TTL_SECONDS };
}

// Revokes an access token or refresh token by hashing it and deleting the DB record.
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Changed
- Added `/api/avatar` to resolve user profile pictures. [#1159](https://github.com/sourcebot-dev/sourcebot/pull/1159)
- Hardened post-auth redirects with an explicit same-origin `redirect` callback in the NextAuth config, and switched the legacy `/~/...` URL rewrite from a 308 to a 301. [#1161](https://github.com/sourcebot-dev/sourcebot/pull/1161)
- Made the Auth.js JWT session lifetime and OAuth token TTLs configurable via `AUTH_SESSION_MAX_AGE_SECONDS`, `AUTH_SESSION_UPDATE_AGE_SECONDS`, `OAUTH_AUTHORIZATION_CODE_TTL_SECONDS`, `OAUTH_ACCESS_TOKEN_TTL_SECONDS`, and `OAUTH_REFRESH_TOKEN_TTL_SECONDS`. Defaults preserve existing behavior. [#1162](https://github.com/sourcebot-dev/sourcebot/pull/1162)

### Fixed
- Bumped `postcss` to `8.5.10`. [#1155](https://github.com/sourcebot-dev/sourcebot/pull/1155)
Expand Down
5 changes: 5 additions & 0 deletions docs/docs/configuration/environment-variables.mdx
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,11 @@ The following environment variables allow you to configure your Sourcebot deploy
| `AUTH_CREDENTIALS_LOGIN_ENABLED` | `true` | <p>Enables/disables authentication with basic credentials. Username and passwords are stored encrypted at rest within the postgres database. Checkout the [auth docs](/docs/configuration/auth/overview) for more info</p> |
| `AUTH_EMAIL_CODE_LOGIN_ENABLED` | `false` | <p>Enables/disables authentication with a login code that's sent to a users email. `SMTP_CONNECTION_URL` and `EMAIL_FROM_ADDRESS` must also be set. Checkout the [auth docs](/docs/configuration/auth/overview) for more info </p> |
| `AUTH_SECRET` | Automatically generated at startup if no value is provided. Generated using `openssl rand -base64 33` | <p>Used to validate login session cookies</p> |
| `AUTH_SESSION_MAX_AGE_SECONDS` | `2592000` (30 days) | <p>Relative time from now in seconds when to expire the session.</p> |
| `AUTH_SESSION_UPDATE_AGE_SECONDS` | `86400` (1 day) | <p>How often the session should be updated in seconds. If set to `0`, session is updated every time.</p> |
| `OAUTH_AUTHORIZATION_CODE_TTL_SECONDS` | `600` (10 minutes) | <p>Lifetime of an OAuth authorization code, in seconds.</p> |
| `OAUTH_ACCESS_TOKEN_TTL_SECONDS` | `3600` (1 hour) | <p>Lifetime of an OAuth access token, in seconds.</p> |
| `OAUTH_REFRESH_TOKEN_TTL_SECONDS` | `7776000` (90 days) | <p>Lifetime of an OAuth refresh token, in seconds.</p> |
| `AUTH_URL` | - | <p>URL of your Sourcebot deployment, e.g., `https://example.com` or `http://localhost:3000`.</p> |
| `CONFIG_PATH` | `-` | <p>The container relative path to the declarative configuration file. See [this doc](/docs/configuration/declarative-config) for more info.</p> |
| `DATA_CACHE_DIR` | `$DATA_DIR/.sourcebot` | <p>The root data directory in which all data written to disk by Sourcebot will be located.</p> |
Expand Down
35 changes: 35 additions & 0 deletions packages/shared/src/env.server.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -139,6 +139,41 @@ const options = {
AUTH_CREDENTIALS_LOGIN_ENABLED: booleanSchema.default('true'),
AUTH_EMAIL_CODE_LOGIN_ENABLED: booleanSchema.default('false'),

/**
* Relative time from now in seconds when to expire the session.
*
* @default 30 days
*/
AUTH_SESSION_MAX_AGE_SECONDS: numberSchema.default(60 * 60 * 24 * 30),

/**
* How often the session should be updated in seconds. If set to 0, session is updated every time.
*
* @default 1 day
*/
AUTH_SESSION_UPDATE_AGE_SECONDS: numberSchema.default(60 * 60 * 24),

/**
* Lifetime of an OAuth authorization code, in seconds.
*
* @default 10 minutes
*/
OAUTH_AUTHORIZATION_CODE_TTL_SECONDS: numberSchema.default(60 * 10),

/**
* Lifetime of an OAuth access token, in seconds.
*
* @default 1 hour
*/
OAUTH_ACCESS_TOKEN_TTL_SECONDS: numberSchema.default(60 * 60),

/**
* Lifetime of an OAuth refresh token, in seconds.
*
* @default 90 days
*/
OAUTH_REFRESH_TOKEN_TTL_SECONDS: numberSchema.default(60 * 60 * 24 * 90),
Comment thread
brendan-kellam marked this conversation as resolved.

// Enterprise Auth
AUTH_EE_ALLOW_EMAIL_ACCOUNT_LINKING:
booleanSchema
Expand Down
8 changes: 4 additions & 4 deletions packages/web/src/app/api/(server)/ee/oauth/token/route.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { verifyAndExchangeCode, verifyAndRotateRefreshToken, ACCESS_TOKEN_TTL_SECONDS } from '@/ee/features/oauth/server';
import { verifyAndExchangeCode, verifyAndRotateRefreshToken } from '@/ee/features/oauth/server';
import { apiHandler } from '@/lib/apiHandler';
import { hasEntitlement } from '@sourcebot/shared';
import { env, hasEntitlement } from '@sourcebot/shared';
import { NextRequest } from 'next/server';
import { OAUTH_NOT_SUPPORTED_ERROR_MESSAGE } from '@/ee/features/oauth/constants';

Expand DownExpand Up@@ -59,7 +59,7 @@ export const POST = apiHandler(async (request: NextRequest) => {
access_token: result.token,
refresh_token: result.refreshToken,
token_type: 'Bearer',
expires_in: ACCESS_TOKEN_TTL_SECONDS,
expires_in: env.OAUTH_ACCESS_TOKEN_TTL_SECONDS,
scope: '',
});
}
Expand DownExpand Up@@ -91,7 +91,7 @@ export const POST = apiHandler(async (request: NextRequest) => {
access_token: result.token,
refresh_token: result.refreshToken,
token_type: 'Bearer',
expires_in: ACCESS_TOKEN_TTL_SECONDS,
expires_in: env.OAUTH_ACCESS_TOKEN_TTL_SECONDS,
scope: '',
});
}
Expand Down
2 changes: 2 additions & 0 deletions packages/web/src/auth.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -148,6 +148,8 @@ export const { handlers, signIn, signOut, auth } = NextAuth({
adapter: EncryptedPrismaAdapter(__unsafePrisma),
session: {
strategy: "jwt",
maxAge: env.AUTH_SESSION_MAX_AGE_SECONDS,
updateAge: env.AUTH_SESSION_UPDATE_AGE_SECONDS,
},
trustHost: true,
events: {
Expand Down
5 changes: 5 additions & 0 deletions packages/web/src/ee/features/oauth/server.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,11 @@ vi.mock('@sourcebot/shared', () => ({
generateOAuthRefreshToken: vi.fn(() => ({ token: 'sbor_newrefresh', hash: 'newrefresh' })),
OAUTH_ACCESS_TOKEN_PREFIX: 'sboa_',
OAUTH_REFRESH_TOKEN_PREFIX: 'sbor_',
env: {
OAUTH_AUTHORIZATION_CODE_TTL_SECONDS: 60 * 10,
OAUTH_ACCESS_TOKEN_TTL_SECONDS: 60 * 60,
OAUTH_REFRESH_TOKEN_TTL_SECONDS: 60 * 60 * 24 * 90,
},
}));

const VALID_CODE_HASH = 'validcode';
Expand Down
21 changes: 8 additions & 13 deletions packages/web/src/ee/features/oauth/server.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ import 'server-only';
import { __unsafePrisma } from '@/prisma';
import { Prisma } from '@prisma/client';
import {
env,
generateOAuthRefreshToken,
generateOAuthToken,
hashSecret,
Expand All@@ -11,12 +12,6 @@ import {
} from '@sourcebot/shared';
import crypto from 'crypto';

const AUTH_CODE_TTL_MS = 10 * 60 * 1000; // 10 minutes
const ACCESS_TOKEN_TTL_MS = 60 * 60 * 1000; // 1 hour
const REFRESH_TOKEN_TTL_MS = 90 * 24 * 60 * 60 * 1000; // 90 days

export const ACCESS_TOKEN_TTL_SECONDS = Math.floor(ACCESS_TOKEN_TTL_MS / 1000);

// Generates a random authorization code, hashes it, and stores it alongside the
// PKCE code challenge. Returns the raw code to be sent to the client.
export async function generateAndStoreAuthCode({
Expand All@@ -43,7 +38,7 @@ export async function generateAndStoreAuthCode({
redirectUri,
codeChallenge,
resource,
expiresAt: new Date(Date.now() + AUTH_CODE_TTL_MS),
expiresAt: new Date(Date.now() + env.OAUTH_AUTHORIZATION_CODE_TTL_SECONDS * 1000),
},
});

Expand DownExpand Up@@ -124,7 +119,7 @@ export async function verifyAndExchangeCode({
clientId,
userId: authCode.userId,
resource: authCode.resource,
expiresAt: new Date(Date.now() + ACCESS_TOKEN_TTL_MS),
expiresAt: new Date(Date.now() + env.OAUTH_ACCESS_TOKEN_TTL_SECONDS * 1000),
},
}),
__unsafePrisma.oAuthRefreshToken.create({
Expand All@@ -133,12 +128,12 @@ export async function verifyAndExchangeCode({
clientId,
userId: authCode.userId,
resource: authCode.resource,
expiresAt: new Date(Date.now() + REFRESH_TOKEN_TTL_MS),
expiresAt: new Date(Date.now() + env.OAUTH_REFRESH_TOKEN_TTL_SECONDS * 1000),
},
}),
]);

return { token, refreshToken, expiresIn: ACCESS_TOKEN_TTL_SECONDS };
return { token, refreshToken, expiresIn: env.OAUTH_ACCESS_TOKEN_TTL_SECONDS };
}

// Verifies a refresh token, rotates it, and issues a new access token + refresh token.
Expand DownExpand Up@@ -189,7 +184,7 @@ export async function verifyAndRotateRefreshToken({
clientId,
userId: existing.userId,
resource: existing.resource,
expiresAt: new Date(Date.now() + ACCESS_TOKEN_TTL_MS),
expiresAt: new Date(Date.now() + env.OAUTH_ACCESS_TOKEN_TTL_SECONDS * 1000),
},
}),
__unsafePrisma.oAuthRefreshToken.create({
Expand All@@ -198,12 +193,12 @@ export async function verifyAndRotateRefreshToken({
clientId,
userId: existing.userId,
resource: existing.resource,
expiresAt: new Date(Date.now() + REFRESH_TOKEN_TTL_MS),
expiresAt: new Date(Date.now() + env.OAUTH_REFRESH_TOKEN_TTL_SECONDS * 1000),
},
}),
]);

return { token, refreshToken, expiresIn: ACCESS_TOKEN_TTL_SECONDS };
return { token, refreshToken, expiresIn: env.OAUTH_ACCESS_TOKEN_TTL_SECONDS };
}

// Revokes an access token or refresh token by hashing it and deleting the DB record.
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Changed
- Added `/api/avatar` to resolve user profile pictures. [#1159](https://github.com/sourcebot-dev/sourcebot/pull/1159)
- Hardened post-auth redirects with an explicit same-origin `redirect` callback in the NextAuth config, and switched the legacy `/~/...` URL rewrite from a 308 to a 301. [#1161](https://github.com/sourcebot-dev/sourcebot/pull/1161)
- Made the Auth.js JWT session lifetime and OAuth token TTLs configurable via `AUTH_SESSION_MAX_AGE_SECONDS`, `AUTH_SESSION_UPDATE_AGE_SECONDS`, `OAUTH_AUTHORIZATION_CODE_TTL_SECONDS`, `OAUTH_ACCESS_TOKEN_TTL_SECONDS`, and `OAUTH_REFRESH_TOKEN_TTL_SECONDS`. Defaults preserve existing behavior. [#1162](https://github.com/sourcebot-dev/sourcebot/pull/1162)

### Fixed
- Bumped `postcss` to `8.5.10`. [#1155](https://github.com/sourcebot-dev/sourcebot/pull/1155)
Expand Down
5 changes: 5 additions & 0 deletions docs/docs/configuration/environment-variables.mdx
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,11 @@ The following environment variables allow you to configure your Sourcebot deploy
| `AUTH_CREDENTIALS_LOGIN_ENABLED` | `true` | <p>Enables/disables authentication with basic credentials. Username and passwords are stored encrypted at rest within the postgres database. Checkout the [auth docs](/docs/configuration/auth/overview) for more info</p> |
| `AUTH_EMAIL_CODE_LOGIN_ENABLED` | `false` | <p>Enables/disables authentication with a login code that's sent to a users email. `SMTP_CONNECTION_URL` and `EMAIL_FROM_ADDRESS` must also be set. Checkout the [auth docs](/docs/configuration/auth/overview) for more info </p> |
| `AUTH_SECRET` | Automatically generated at startup if no value is provided. Generated using `openssl rand -base64 33` | <p>Used to validate login session cookies</p> |
| `AUTH_SESSION_MAX_AGE_SECONDS` | `2592000` (30 days) | <p>Relative time from now in seconds when to expire the session.</p> |
| `AUTH_SESSION_UPDATE_AGE_SECONDS` | `86400` (1 day) | <p>How often the session should be updated in seconds. If set to `0`, session is updated every time.</p> |
| `OAUTH_AUTHORIZATION_CODE_TTL_SECONDS` | `600` (10 minutes) | <p>Lifetime of an OAuth authorization code, in seconds.</p> |
| `OAUTH_ACCESS_TOKEN_TTL_SECONDS` | `3600` (1 hour) | <p>Lifetime of an OAuth access token, in seconds.</p> |
| `OAUTH_REFRESH_TOKEN_TTL_SECONDS` | `7776000` (90 days) | <p>Lifetime of an OAuth refresh token, in seconds.</p> |
| `AUTH_URL` | - | <p>URL of your Sourcebot deployment, e.g., `https://example.com` or `http://localhost:3000`.</p> |
| `CONFIG_PATH` | `-` | <p>The container relative path to the declarative configuration file. See [this doc](/docs/configuration/declarative-config) for more info.</p> |
| `DATA_CACHE_DIR` | `$DATA_DIR/.sourcebot` | <p>The root data directory in which all data written to disk by Sourcebot will be located.</p> |
Expand Down
35 changes: 35 additions & 0 deletions packages/shared/src/env.server.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -139,6 +139,41 @@ const options = {
AUTH_CREDENTIALS_LOGIN_ENABLED: booleanSchema.default('true'),
AUTH_EMAIL_CODE_LOGIN_ENABLED: booleanSchema.default('false'),

/**
* Relative time from now in seconds when to expire the session.
*
* @default 30 days
*/
AUTH_SESSION_MAX_AGE_SECONDS: numberSchema.default(60 * 60 * 24 * 30),

/**
* How often the session should be updated in seconds. If set to 0, session is updated every time.
*
* @default 1 day
*/
AUTH_SESSION_UPDATE_AGE_SECONDS: numberSchema.default(60 * 60 * 24),

/**
* Lifetime of an OAuth authorization code, in seconds.
*
* @default 10 minutes
*/
OAUTH_AUTHORIZATION_CODE_TTL_SECONDS: numberSchema.default(60 * 10),

/**
* Lifetime of an OAuth access token, in seconds.
*
* @default 1 hour
*/
OAUTH_ACCESS_TOKEN_TTL_SECONDS: numberSchema.default(60 * 60),

/**
* Lifetime of an OAuth refresh token, in seconds.
*
* @default 90 days
*/
OAUTH_REFRESH_TOKEN_TTL_SECONDS: numberSchema.default(60 * 60 * 24 * 90),
Comment thread
brendan-kellam marked this conversation as resolved.

// Enterprise Auth
AUTH_EE_ALLOW_EMAIL_ACCOUNT_LINKING:
booleanSchema
Expand Down
8 changes: 4 additions & 4 deletions packages/web/src/app/api/(server)/ee/oauth/token/route.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { verifyAndExchangeCode, verifyAndRotateRefreshToken, ACCESS_TOKEN_TTL_SECONDS } from '@/ee/features/oauth/server';
import { verifyAndExchangeCode, verifyAndRotateRefreshToken } from '@/ee/features/oauth/server';
import { apiHandler } from '@/lib/apiHandler';
import { hasEntitlement } from '@sourcebot/shared';
import { env, hasEntitlement } from '@sourcebot/shared';
import { NextRequest } from 'next/server';
import { OAUTH_NOT_SUPPORTED_ERROR_MESSAGE } from '@/ee/features/oauth/constants';

Expand DownExpand Up@@ -59,7 +59,7 @@ export const POST = apiHandler(async (request: NextRequest) => {
access_token: result.token,
refresh_token: result.refreshToken,
token_type: 'Bearer',
expires_in: ACCESS_TOKEN_TTL_SECONDS,
expires_in: env.OAUTH_ACCESS_TOKEN_TTL_SECONDS,
scope: '',
});
}
Expand DownExpand Up@@ -91,7 +91,7 @@ export const POST = apiHandler(async (request: NextRequest) => {
access_token: result.token,
refresh_token: result.refreshToken,
token_type: 'Bearer',
expires_in: ACCESS_TOKEN_TTL_SECONDS,
expires_in: env.OAUTH_ACCESS_TOKEN_TTL_SECONDS,
scope: '',
});
}
Expand Down
2 changes: 2 additions & 0 deletions packages/web/src/auth.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -148,6 +148,8 @@ export const { handlers, signIn, signOut, auth } = NextAuth({
adapter: EncryptedPrismaAdapter(__unsafePrisma),
session: {
strategy: "jwt",
maxAge: env.AUTH_SESSION_MAX_AGE_SECONDS,
updateAge: env.AUTH_SESSION_UPDATE_AGE_SECONDS,
},
trustHost: true,
events: {
Expand Down
5 changes: 5 additions & 0 deletions packages/web/src/ee/features/oauth/server.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,11 @@ vi.mock('@sourcebot/shared', () => ({
generateOAuthRefreshToken: vi.fn(() => ({ token: 'sbor_newrefresh', hash: 'newrefresh' })),
OAUTH_ACCESS_TOKEN_PREFIX: 'sboa_',
OAUTH_REFRESH_TOKEN_PREFIX: 'sbor_',
env: {
OAUTH_AUTHORIZATION_CODE_TTL_SECONDS: 60 * 10,
OAUTH_ACCESS_TOKEN_TTL_SECONDS: 60 * 60,
OAUTH_REFRESH_TOKEN_TTL_SECONDS: 60 * 60 * 24 * 90,
},
}));

const VALID_CODE_HASH = 'validcode';
Expand Down
21 changes: 8 additions & 13 deletions packages/web/src/ee/features/oauth/server.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ import 'server-only';
import { __unsafePrisma } from '@/prisma';
import { Prisma } from '@prisma/client';
import {
env,
generateOAuthRefreshToken,
generateOAuthToken,
hashSecret,
Expand All@@ -11,12 +12,6 @@ import {
} from '@sourcebot/shared';
import crypto from 'crypto';

const AUTH_CODE_TTL_MS = 10 * 60 * 1000; // 10 minutes
const ACCESS_TOKEN_TTL_MS = 60 * 60 * 1000; // 1 hour
const REFRESH_TOKEN_TTL_MS = 90 * 24 * 60 * 60 * 1000; // 90 days

export const ACCESS_TOKEN_TTL_SECONDS = Math.floor(ACCESS_TOKEN_TTL_MS / 1000);

// Generates a random authorization code, hashes it, and stores it alongside the
// PKCE code challenge. Returns the raw code to be sent to the client.
export async function generateAndStoreAuthCode({
Expand All@@ -43,7 +38,7 @@ export async function generateAndStoreAuthCode({
redirectUri,
codeChallenge,
resource,
expiresAt: new Date(Date.now() + AUTH_CODE_TTL_MS),
expiresAt: new Date(Date.now() + env.OAUTH_AUTHORIZATION_CODE_TTL_SECONDS * 1000),
},
});

Expand DownExpand Up@@ -124,7 +119,7 @@ export async function verifyAndExchangeCode({
clientId,
userId: authCode.userId,
resource: authCode.resource,
expiresAt: new Date(Date.now() + ACCESS_TOKEN_TTL_MS),
expiresAt: new Date(Date.now() + env.OAUTH_ACCESS_TOKEN_TTL_SECONDS * 1000),
},
}),
__unsafePrisma.oAuthRefreshToken.create({
Expand All@@ -133,12 +128,12 @@ export async function verifyAndExchangeCode({
clientId,
userId: authCode.userId,
resource: authCode.resource,
expiresAt: new Date(Date.now() + REFRESH_TOKEN_TTL_MS),
expiresAt: new Date(Date.now() + env.OAUTH_REFRESH_TOKEN_TTL_SECONDS * 1000),
},
}),
]);

return { token, refreshToken, expiresIn: ACCESS_TOKEN_TTL_SECONDS };
return { token, refreshToken, expiresIn: env.OAUTH_ACCESS_TOKEN_TTL_SECONDS };
}

// Verifies a refresh token, rotates it, and issues a new access token + refresh token.
Expand DownExpand Up@@ -189,7 +184,7 @@ export async function verifyAndRotateRefreshToken({
clientId,
userId: existing.userId,
resource: existing.resource,
expiresAt: new Date(Date.now() + ACCESS_TOKEN_TTL_MS),
expiresAt: new Date(Date.now() + env.OAUTH_ACCESS_TOKEN_TTL_SECONDS * 1000),
},
}),
__unsafePrisma.oAuthRefreshToken.create({
Expand All@@ -198,12 +193,12 @@ export async function verifyAndRotateRefreshToken({
clientId,
userId: existing.userId,
resource: existing.resource,
expiresAt: new Date(Date.now() + REFRESH_TOKEN_TTL_MS),
expiresAt: new Date(Date.now() + env.OAUTH_REFRESH_TOKEN_TTL_SECONDS * 1000),
},
}),
]);

return { token, refreshToken, expiresIn: ACCESS_TOKEN_TTL_SECONDS };
return { token, refreshToken, expiresIn: env.OAUTH_ACCESS_TOKEN_TTL_SECONDS };
}

// Revokes an access token or refresh token by hashing it and deleting the DB record.
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Changed
- Added `/api/avatar` to resolve user profile pictures. [#1159](https://github.com/sourcebot-dev/sourcebot/pull/1159)
- Hardened post-auth redirects with an explicit same-origin `redirect` callback in the NextAuth config, and switched the legacy `/~/...` URL rewrite from a 308 to a 301. [#1161](https://github.com/sourcebot-dev/sourcebot/pull/1161)
- Made the Auth.js JWT session lifetime and OAuth token TTLs configurable via `AUTH_SESSION_MAX_AGE_SECONDS`, `AUTH_SESSION_UPDATE_AGE_SECONDS`, `OAUTH_AUTHORIZATION_CODE_TTL_SECONDS`, `OAUTH_ACCESS_TOKEN_TTL_SECONDS`, and `OAUTH_REFRESH_TOKEN_TTL_SECONDS`. Defaults preserve existing behavior. [#1162](https://github.com/sourcebot-dev/sourcebot/pull/1162)

### Fixed
- Bumped `postcss` to `8.5.10`. [#1155](https://github.com/sourcebot-dev/sourcebot/pull/1155)
Expand Down
5 changes: 5 additions & 0 deletions docs/docs/configuration/environment-variables.mdx
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,11 @@ The following environment variables allow you to configure your Sourcebot deploy
| `AUTH_CREDENTIALS_LOGIN_ENABLED` | `true` | <p>Enables/disables authentication with basic credentials. Username and passwords are stored encrypted at rest within the postgres database. Checkout the [auth docs](/docs/configuration/auth/overview) for more info</p> |
| `AUTH_EMAIL_CODE_LOGIN_ENABLED` | `false` | <p>Enables/disables authentication with a login code that's sent to a users email. `SMTP_CONNECTION_URL` and `EMAIL_FROM_ADDRESS` must also be set. Checkout the [auth docs](/docs/configuration/auth/overview) for more info </p> |
| `AUTH_SECRET` | Automatically generated at startup if no value is provided. Generated using `openssl rand -base64 33` | <p>Used to validate login session cookies</p> |
| `AUTH_SESSION_MAX_AGE_SECONDS` | `2592000` (30 days) | <p>Relative time from now in seconds when to expire the session.</p> |
| `AUTH_SESSION_UPDATE_AGE_SECONDS` | `86400` (1 day) | <p>How often the session should be updated in seconds. If set to `0`, session is updated every time.</p> |
| `OAUTH_AUTHORIZATION_CODE_TTL_SECONDS` | `600` (10 minutes) | <p>Lifetime of an OAuth authorization code, in seconds.</p> |
| `OAUTH_ACCESS_TOKEN_TTL_SECONDS` | `3600` (1 hour) | <p>Lifetime of an OAuth access token, in seconds.</p> |
| `OAUTH_REFRESH_TOKEN_TTL_SECONDS` | `7776000` (90 days) | <p>Lifetime of an OAuth refresh token, in seconds.</p> |
| `AUTH_URL` | - | <p>URL of your Sourcebot deployment, e.g., `https://example.com` or `http://localhost:3000`.</p> |
| `CONFIG_PATH` | `-` | <p>The container relative path to the declarative configuration file. See [this doc](/docs/configuration/declarative-config) for more info.</p> |
| `DATA_CACHE_DIR` | `$DATA_DIR/.sourcebot` | <p>The root data directory in which all data written to disk by Sourcebot will be located.</p> |
Expand Down
35 changes: 35 additions & 0 deletions packages/shared/src/env.server.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -139,6 +139,41 @@ const options = {
AUTH_CREDENTIALS_LOGIN_ENABLED: booleanSchema.default('true'),
AUTH_EMAIL_CODE_LOGIN_ENABLED: booleanSchema.default('false'),

/**
* Relative time from now in seconds when to expire the session.
*
* @default 30 days
*/
AUTH_SESSION_MAX_AGE_SECONDS: numberSchema.default(60 * 60 * 24 * 30),

/**
* How often the session should be updated in seconds. If set to 0, session is updated every time.
*
* @default 1 day
*/
AUTH_SESSION_UPDATE_AGE_SECONDS: numberSchema.default(60 * 60 * 24),

/**
* Lifetime of an OAuth authorization code, in seconds.
*
* @default 10 minutes
*/
OAUTH_AUTHORIZATION_CODE_TTL_SECONDS: numberSchema.default(60 * 10),

/**
* Lifetime of an OAuth access token, in seconds.
*
* @default 1 hour
*/
OAUTH_ACCESS_TOKEN_TTL_SECONDS: numberSchema.default(60 * 60),

/**
* Lifetime of an OAuth refresh token, in seconds.
*
* @default 90 days
*/
OAUTH_REFRESH_TOKEN_TTL_SECONDS: numberSchema.default(60 * 60 * 24 * 90),
Comment thread
brendan-kellam marked this conversation as resolved.

// Enterprise Auth
AUTH_EE_ALLOW_EMAIL_ACCOUNT_LINKING:
booleanSchema
Expand Down
8 changes: 4 additions & 4 deletions packages/web/src/app/api/(server)/ee/oauth/token/route.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { verifyAndExchangeCode, verifyAndRotateRefreshToken, ACCESS_TOKEN_TTL_SECONDS } from '@/ee/features/oauth/server';
import { verifyAndExchangeCode, verifyAndRotateRefreshToken } from '@/ee/features/oauth/server';
import { apiHandler } from '@/lib/apiHandler';
import { hasEntitlement } from '@sourcebot/shared';
import { env, hasEntitlement } from '@sourcebot/shared';
import { NextRequest } from 'next/server';
import { OAUTH_NOT_SUPPORTED_ERROR_MESSAGE } from '@/ee/features/oauth/constants';

Expand DownExpand Up@@ -59,7 +59,7 @@ export const POST = apiHandler(async (request: NextRequest) => {
access_token: result.token,
refresh_token: result.refreshToken,
token_type: 'Bearer',
expires_in: ACCESS_TOKEN_TTL_SECONDS,
expires_in: env.OAUTH_ACCESS_TOKEN_TTL_SECONDS,
scope: '',
});
}
Expand DownExpand Up@@ -91,7 +91,7 @@ export const POST = apiHandler(async (request: NextRequest) => {
access_token: result.token,
refresh_token: result.refreshToken,
token_type: 'Bearer',
expires_in: ACCESS_TOKEN_TTL_SECONDS,
expires_in: env.OAUTH_ACCESS_TOKEN_TTL_SECONDS,
scope: '',
});
}
Expand Down
2 changes: 2 additions & 0 deletions packages/web/src/auth.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -148,6 +148,8 @@ export const { handlers, signIn, signOut, auth } = NextAuth({
adapter: EncryptedPrismaAdapter(__unsafePrisma),
session: {
strategy: "jwt",
maxAge: env.AUTH_SESSION_MAX_AGE_SECONDS,
updateAge: env.AUTH_SESSION_UPDATE_AGE_SECONDS,
},
trustHost: true,
events: {
Expand Down
5 changes: 5 additions & 0 deletions packages/web/src/ee/features/oauth/server.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,11 @@ vi.mock('@sourcebot/shared', () => ({
generateOAuthRefreshToken: vi.fn(() => ({ token: 'sbor_newrefresh', hash: 'newrefresh' })),
OAUTH_ACCESS_TOKEN_PREFIX: 'sboa_',
OAUTH_REFRESH_TOKEN_PREFIX: 'sbor_',
env: {
OAUTH_AUTHORIZATION_CODE_TTL_SECONDS: 60 * 10,
OAUTH_ACCESS_TOKEN_TTL_SECONDS: 60 * 60,
OAUTH_REFRESH_TOKEN_TTL_SECONDS: 60 * 60 * 24 * 90,
},
}));

const VALID_CODE_HASH = 'validcode';
Expand Down
21 changes: 8 additions & 13 deletions packages/web/src/ee/features/oauth/server.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ import 'server-only';
import { __unsafePrisma } from '@/prisma';
import { Prisma } from '@prisma/client';
import {
env,
generateOAuthRefreshToken,
generateOAuthToken,
hashSecret,
Expand All@@ -11,12 +12,6 @@ import {
} from '@sourcebot/shared';
import crypto from 'crypto';

const AUTH_CODE_TTL_MS = 10 * 60 * 1000; // 10 minutes
const ACCESS_TOKEN_TTL_MS = 60 * 60 * 1000; // 1 hour
const REFRESH_TOKEN_TTL_MS = 90 * 24 * 60 * 60 * 1000; // 90 days

export const ACCESS_TOKEN_TTL_SECONDS = Math.floor(ACCESS_TOKEN_TTL_MS / 1000);

// Generates a random authorization code, hashes it, and stores it alongside the
// PKCE code challenge. Returns the raw code to be sent to the client.
export async function generateAndStoreAuthCode({
Expand All@@ -43,7 +38,7 @@ export async function generateAndStoreAuthCode({
redirectUri,
codeChallenge,
resource,
expiresAt: new Date(Date.now() + AUTH_CODE_TTL_MS),
expiresAt: new Date(Date.now() + env.OAUTH_AUTHORIZATION_CODE_TTL_SECONDS * 1000),
},
});

Expand DownExpand Up@@ -124,7 +119,7 @@ export async function verifyAndExchangeCode({
clientId,
userId: authCode.userId,
resource: authCode.resource,
expiresAt: new Date(Date.now() + ACCESS_TOKEN_TTL_MS),
expiresAt: new Date(Date.now() + env.OAUTH_ACCESS_TOKEN_TTL_SECONDS * 1000),
},
}),
__unsafePrisma.oAuthRefreshToken.create({
Expand All@@ -133,12 +128,12 @@ export async function verifyAndExchangeCode({
clientId,
userId: authCode.userId,
resource: authCode.resource,
expiresAt: new Date(Date.now() + REFRESH_TOKEN_TTL_MS),
expiresAt: new Date(Date.now() + env.OAUTH_REFRESH_TOKEN_TTL_SECONDS * 1000),
},
}),
]);

return { token, refreshToken, expiresIn: ACCESS_TOKEN_TTL_SECONDS };
return { token, refreshToken, expiresIn: env.OAUTH_ACCESS_TOKEN_TTL_SECONDS };
}

// Verifies a refresh token, rotates it, and issues a new access token + refresh token.
Expand DownExpand Up@@ -189,7 +184,7 @@ export async function verifyAndRotateRefreshToken({
clientId,
userId: existing.userId,
resource: existing.resource,
expiresAt: new Date(Date.now() + ACCESS_TOKEN_TTL_MS),
expiresAt: new Date(Date.now() + env.OAUTH_ACCESS_TOKEN_TTL_SECONDS * 1000),
},
}),
__unsafePrisma.oAuthRefreshToken.create({
Expand All@@ -198,12 +193,12 @@ export async function verifyAndRotateRefreshToken({
clientId,
userId: existing.userId,
resource: existing.resource,
expiresAt: new Date(Date.now() + REFRESH_TOKEN_TTL_MS),
expiresAt: new Date(Date.now() + env.OAUTH_REFRESH_TOKEN_TTL_SECONDS * 1000),
},
}),
]);

return { token, refreshToken, expiresIn: ACCESS_TOKEN_TTL_SECONDS };
return { token, refreshToken, expiresIn: env.OAUTH_ACCESS_TOKEN_TTL_SECONDS };
}

// Revokes an access token or refresh token by hashing it and deleting the DB record.
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Changed
- Added `/api/avatar` to resolve user profile pictures. [#1159](https://github.com/sourcebot-dev/sourcebot/pull/1159)
- Hardened post-auth redirects with an explicit same-origin `redirect` callback in the NextAuth config, and switched the legacy `/~/...` URL rewrite from a 308 to a 301. [#1161](https://github.com/sourcebot-dev/sourcebot/pull/1161)
- Made the Auth.js JWT session lifetime and OAuth token TTLs configurable via `AUTH_SESSION_MAX_AGE_SECONDS`, `AUTH_SESSION_UPDATE_AGE_SECONDS`, `OAUTH_AUTHORIZATION_CODE_TTL_SECONDS`, `OAUTH_ACCESS_TOKEN_TTL_SECONDS`, and `OAUTH_REFRESH_TOKEN_TTL_SECONDS`. Defaults preserve existing behavior. [#1162](https://github.com/sourcebot-dev/sourcebot/pull/1162)

### Fixed
- Bumped `postcss` to `8.5.10`. [#1155](https://github.com/sourcebot-dev/sourcebot/pull/1155)
Expand Down
5 changes: 5 additions & 0 deletions docs/docs/configuration/environment-variables.mdx
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,11 @@ The following environment variables allow you to configure your Sourcebot deploy
| `AUTH_CREDENTIALS_LOGIN_ENABLED` | `true` | <p>Enables/disables authentication with basic credentials. Username and passwords are stored encrypted at rest within the postgres database. Checkout the [auth docs](/docs/configuration/auth/overview) for more info</p> |
| `AUTH_EMAIL_CODE_LOGIN_ENABLED` | `false` | <p>Enables/disables authentication with a login code that's sent to a users email. `SMTP_CONNECTION_URL` and `EMAIL_FROM_ADDRESS` must also be set. Checkout the [auth docs](/docs/configuration/auth/overview) for more info </p> |
| `AUTH_SECRET` | Automatically generated at startup if no value is provided. Generated using `openssl rand -base64 33` | <p>Used to validate login session cookies</p> |
| `AUTH_SESSION_MAX_AGE_SECONDS` | `2592000` (30 days) | <p>Relative time from now in seconds when to expire the session.</p> |
| `AUTH_SESSION_UPDATE_AGE_SECONDS` | `86400` (1 day) | <p>How often the session should be updated in seconds. If set to `0`, session is updated every time.</p> |
| `OAUTH_AUTHORIZATION_CODE_TTL_SECONDS` | `600` (10 minutes) | <p>Lifetime of an OAuth authorization code, in seconds.</p> |
| `OAUTH_ACCESS_TOKEN_TTL_SECONDS` | `3600` (1 hour) | <p>Lifetime of an OAuth access token, in seconds.</p> |
| `OAUTH_REFRESH_TOKEN_TTL_SECONDS` | `7776000` (90 days) | <p>Lifetime of an OAuth refresh token, in seconds.</p> |
| `AUTH_URL` | - | <p>URL of your Sourcebot deployment, e.g., `https://example.com` or `http://localhost:3000`.</p> |
| `CONFIG_PATH` | `-` | <p>The container relative path to the declarative configuration file. See [this doc](/docs/configuration/declarative-config) for more info.</p> |
| `DATA_CACHE_DIR` | `$DATA_DIR/.sourcebot` | <p>The root data directory in which all data written to disk by Sourcebot will be located.</p> |
Expand Down
35 changes: 35 additions & 0 deletions packages/shared/src/env.server.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -139,6 +139,41 @@ const options = {
AUTH_CREDENTIALS_LOGIN_ENABLED: booleanSchema.default('true'),
AUTH_EMAIL_CODE_LOGIN_ENABLED: booleanSchema.default('false'),

/**
* Relative time from now in seconds when to expire the session.
*
* @default 30 days
*/
AUTH_SESSION_MAX_AGE_SECONDS: numberSchema.default(60 * 60 * 24 * 30),

/**
* How often the session should be updated in seconds. If set to 0, session is updated every time.
*
* @default 1 day
*/
AUTH_SESSION_UPDATE_AGE_SECONDS: numberSchema.default(60 * 60 * 24),

/**
* Lifetime of an OAuth authorization code, in seconds.
*
* @default 10 minutes
*/
OAUTH_AUTHORIZATION_CODE_TTL_SECONDS: numberSchema.default(60 * 10),

/**
* Lifetime of an OAuth access token, in seconds.
*
* @default 1 hour
*/
OAUTH_ACCESS_TOKEN_TTL_SECONDS: numberSchema.default(60 * 60),

/**
* Lifetime of an OAuth refresh token, in seconds.
*
* @default 90 days
*/
OAUTH_REFRESH_TOKEN_TTL_SECONDS: numberSchema.default(60 * 60 * 24 * 90),
Comment thread
brendan-kellam marked this conversation as resolved.

// Enterprise Auth
AUTH_EE_ALLOW_EMAIL_ACCOUNT_LINKING:
booleanSchema
Expand Down
8 changes: 4 additions & 4 deletions packages/web/src/app/api/(server)/ee/oauth/token/route.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { verifyAndExchangeCode, verifyAndRotateRefreshToken, ACCESS_TOKEN_TTL_SECONDS } from '@/ee/features/oauth/server';
import { verifyAndExchangeCode, verifyAndRotateRefreshToken } from '@/ee/features/oauth/server';
import { apiHandler } from '@/lib/apiHandler';
import { hasEntitlement } from '@sourcebot/shared';
import { env, hasEntitlement } from '@sourcebot/shared';
import { NextRequest } from 'next/server';
import { OAUTH_NOT_SUPPORTED_ERROR_MESSAGE } from '@/ee/features/oauth/constants';

Expand DownExpand Up@@ -59,7 +59,7 @@ export const POST = apiHandler(async (request: NextRequest) => {
access_token: result.token,
refresh_token: result.refreshToken,
token_type: 'Bearer',
expires_in: ACCESS_TOKEN_TTL_SECONDS,
expires_in: env.OAUTH_ACCESS_TOKEN_TTL_SECONDS,
scope: '',
});
}
Expand DownExpand Up@@ -91,7 +91,7 @@ export const POST = apiHandler(async (request: NextRequest) => {
access_token: result.token,
refresh_token: result.refreshToken,
token_type: 'Bearer',
expires_in: ACCESS_TOKEN_TTL_SECONDS,
expires_in: env.OAUTH_ACCESS_TOKEN_TTL_SECONDS,
scope: '',
});
}
Expand Down
2 changes: 2 additions & 0 deletions packages/web/src/auth.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -148,6 +148,8 @@ export const { handlers, signIn, signOut, auth } = NextAuth({
adapter: EncryptedPrismaAdapter(__unsafePrisma),
session: {
strategy: "jwt",
maxAge: env.AUTH_SESSION_MAX_AGE_SECONDS,
updateAge: env.AUTH_SESSION_UPDATE_AGE_SECONDS,
},
trustHost: true,
events: {
Expand Down
5 changes: 5 additions & 0 deletions packages/web/src/ee/features/oauth/server.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,11 @@ vi.mock('@sourcebot/shared', () => ({
generateOAuthRefreshToken: vi.fn(() => ({ token: 'sbor_newrefresh', hash: 'newrefresh' })),
OAUTH_ACCESS_TOKEN_PREFIX: 'sboa_',
OAUTH_REFRESH_TOKEN_PREFIX: 'sbor_',
env: {
OAUTH_AUTHORIZATION_CODE_TTL_SECONDS: 60 * 10,
OAUTH_ACCESS_TOKEN_TTL_SECONDS: 60 * 60,
OAUTH_REFRESH_TOKEN_TTL_SECONDS: 60 * 60 * 24 * 90,
},
}));

const VALID_CODE_HASH = 'validcode';
Expand Down
21 changes: 8 additions & 13 deletions packages/web/src/ee/features/oauth/server.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ import 'server-only';
import { __unsafePrisma } from '@/prisma';
import { Prisma } from '@prisma/client';
import {
env,
generateOAuthRefreshToken,
generateOAuthToken,
hashSecret,
Expand All@@ -11,12 +12,6 @@ import {
} from '@sourcebot/shared';
import crypto from 'crypto';

const AUTH_CODE_TTL_MS = 10 * 60 * 1000; // 10 minutes
const ACCESS_TOKEN_TTL_MS = 60 * 60 * 1000; // 1 hour
const REFRESH_TOKEN_TTL_MS = 90 * 24 * 60 * 60 * 1000; // 90 days

export const ACCESS_TOKEN_TTL_SECONDS = Math.floor(ACCESS_TOKEN_TTL_MS / 1000);

// Generates a random authorization code, hashes it, and stores it alongside the
// PKCE code challenge. Returns the raw code to be sent to the client.
export async function generateAndStoreAuthCode({
Expand All@@ -43,7 +38,7 @@ export async function generateAndStoreAuthCode({
redirectUri,
codeChallenge,
resource,
expiresAt: new Date(Date.now() + AUTH_CODE_TTL_MS),
expiresAt: new Date(Date.now() + env.OAUTH_AUTHORIZATION_CODE_TTL_SECONDS * 1000),
},
});

Expand DownExpand Up@@ -124,7 +119,7 @@ export async function verifyAndExchangeCode({
clientId,
userId: authCode.userId,
resource: authCode.resource,
expiresAt: new Date(Date.now() + ACCESS_TOKEN_TTL_MS),
expiresAt: new Date(Date.now() + env.OAUTH_ACCESS_TOKEN_TTL_SECONDS * 1000),
},
}),
__unsafePrisma.oAuthRefreshToken.create({
Expand All@@ -133,12 +128,12 @@ export async function verifyAndExchangeCode({
clientId,
userId: authCode.userId,
resource: authCode.resource,
expiresAt: new Date(Date.now() + REFRESH_TOKEN_TTL_MS),
expiresAt: new Date(Date.now() + env.OAUTH_REFRESH_TOKEN_TTL_SECONDS * 1000),
},
}),
]);

return { token, refreshToken, expiresIn: ACCESS_TOKEN_TTL_SECONDS };
return { token, refreshToken, expiresIn: env.OAUTH_ACCESS_TOKEN_TTL_SECONDS };
}

// Verifies a refresh token, rotates it, and issues a new access token + refresh token.
Expand DownExpand Up@@ -189,7 +184,7 @@ export async function verifyAndRotateRefreshToken({
clientId,
userId: existing.userId,
resource: existing.resource,
expiresAt: new Date(Date.now() + ACCESS_TOKEN_TTL_MS),
expiresAt: new Date(Date.now() + env.OAUTH_ACCESS_TOKEN_TTL_SECONDS * 1000),
},
}),
__unsafePrisma.oAuthRefreshToken.create({
Expand All@@ -198,12 +193,12 @@ export async function verifyAndRotateRefreshToken({
clientId,
userId: existing.userId,
resource: existing.resource,
expiresAt: new Date(Date.now() + REFRESH_TOKEN_TTL_MS),
expiresAt: new Date(Date.now() + env.OAUTH_REFRESH_TOKEN_TTL_SECONDS * 1000),
},
}),
]);

return { token, refreshToken, expiresIn: ACCESS_TOKEN_TTL_SECONDS };
return { token, refreshToken, expiresIn: env.OAUTH_ACCESS_TOKEN_TTL_SECONDS };
}

// Revokes an access token or refresh token by hashing it and deleting the DB record.
Expand Down
Loading