Skip to content

fix(github): enforce the redirect allowlist on the client's redirect_uri #545

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
viktormarinho merged 1 commit into from
Aug 20, 2026
Merged

fix(github): enforce the redirect allowlist on the client's redirect_uri #545

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 8 additions & 4 deletions bun.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions github/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
},
"dependencies": {
"@decocms/bindings": "^1.4.0",
"@decocms/runtime": "^1.6.0",
"@decocms/runtime": "^3.0.0",
"@modelcontextprotocol/sdk": "^1.27.1",
"zod": "^4.0.0"
"zod": "4.3.6"
},
"devDependencies": {
"@cloudflare/workers-types": "^4.20251014.0",
Expand Down
68 changes: 0 additions & 68 deletions github/server/lib/redirect-allowlist.test.ts
View file
Open in desktop

This file was deleted.

57 changes: 0 additions & 57 deletions github/server/lib/redirect-allowlist.ts
View file
Open in desktop

This file was deleted.

13 changes: 6 additions & 7 deletions github/server/main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,11 @@ import {
handleRepoGrantTokenRequest,
} from "./lib/repo-grant.ts";
import { setRepoGrantKV } from "./lib/repo-grant-store.ts";
import { assertAllowedRedirectUri } from "./lib/redirect-allowlist.ts";
import { REPO_GRANT_REVOKE_PATH, REPO_GRANT_TOKEN_PATH } from "./constants.ts";
import {
ALLOWED_REDIRECT_HOST_SUFFIXES,
REPO_GRANT_REVOKE_PATH,
REPO_GRANT_TOKEN_PATH,
} from "./constants.ts";
import { setTriggerKV } from "./lib/trigger-store.ts";
import { getTools } from "./tools/index.ts";
import { type Env, StateSchema } from "./types/env.ts";
Expand Down Expand Up @@ -65,6 +68,7 @@ async function getRuntime(): Promise<Runtime> {
oauth: {
mode: "PKCE",
authorizationServer: "https://github.com",
allowedRedirectHosts: [...ALLOWED_REDIRECT_HOST_SUFFIXES],

authorizationUrl: (callbackUrl) => {
const clientId = process.env.GITHUB_CLIENT_ID || "";
Expand All @@ -75,11 +79,6 @@ async function getRuntime(): Promise<Runtime> {
callbackUrlObj.searchParams.delete("state");
const redirectUri = callbackUrlObj.toString();

// Defense-in-depth: never forward a redirect_uri off the decocms.com
// origin to GitHub. GitHub returns the authorization `code` here, so
// an attacker-influenced host would hijack the code/token.
assertAllowedRedirectUri(redirectUri);

const url = new URL("https://github.com/login/oauth/authorize");
url.searchParams.set("client_id", clientId);
url.searchParams.set("redirect_uri", redirectUri);
Expand Down
Loading