Skip to content

fix(admin): narrow oauth path captures #142

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
INONONO66 merged 1 commit into from
Jun 5, 2026
Merged

fix(admin): narrow oauth path captures #142

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
18 changes: 9 additions & 9 deletions src/admin/oauth.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ export namespace OAuthAdmin {
return json({ accounts: await readAccounts(config.authDir) });
}

const startMatch = path.match(/^\/admin\/oauth\/([^/]+)\/start$/);
if (startMatch && req.method === "POST") {
const provider = decodeURIComponent(startMatch[1]);
const startProvider = path.match(/^\/admin\/oauth\/([^/]+)\/start$/)?.[1];
if (startProvider !== undefined && req.method === "POST") {
const provider = decodeURIComponent(startProvider);
try {
const removed = await removeProviderAuthFiles(config.authDir, provider);
if (removed > 0) {
Expand All @@ -40,9 +40,9 @@ export namespace OAuthAdmin {
}
}

const eventsMatch = path.match(/^\/admin\/oauth\/jobs\/([^/]+)\/events$/);
if (eventsMatch && req.method === "GET") {
const jobId = decodeURIComponent(eventsMatch[1]);
const eventsJobId = path.match(/^\/admin\/oauth\/jobs\/([^/]+)\/events$/)?.[1];
if (eventsJobId !== undefined && req.method === "GET") {
const jobId = decodeURIComponent(eventsJobId);
try {
return sse(CLIProxyLogin.subscribe(jobId));
} catch (err) {
Expand All @@ -51,9 +51,9 @@ export namespace OAuthAdmin {
}
}

const cancelMatch = path.match(/^\/admin\/oauth\/jobs\/([^/]+)\/cancel$/);
if (cancelMatch && req.method === "POST") {
const jobId = decodeURIComponent(cancelMatch[1]);
const cancelJobId = path.match(/^\/admin\/oauth\/jobs\/([^/]+)\/cancel$/)?.[1];
if (cancelJobId !== undefined && req.method === "POST") {
const jobId = decodeURIComponent(cancelJobId);
const ok = CLIProxyLogin.cancelJob(jobId);
if (!ok) return json({ error: "job not found" }, 404);
return json({ ok: true });
Expand Down