Skip to content

Sign-in can return to the page check: safeNext allows /scan #234

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

Open
MeharPro wants to merge 1 commit into
base: main
Choose a base branch
from
+12 −4
Open

Sign-in can return to the page check: safeNext allows /scan #234

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
7 changes: 6 additions & 1 deletion telemetry-worker/src/auth.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,9 +265,14 @@ export function cleanEmail(v: unknown): string | null {
}

/** Only same-site paths under /account (a team invite link, /account/join/<code>, is one) or /login/device may be a `next` target. */
/**
* Where a sign-in may send the browser afterwards (?next=): our own account pages, the device page the genclass command
* opens, and the page check (/scan, or /scan?url=<an encoded address>, so "Sign in to see it all" on a report comes
* back to that report). Anything else is null (the caller goes to /account).
*/
export function safeNext(v: string | null | undefined): string | null {
if (!v || v.length > 300 || !v.startsWith("/") || v.startsWith("//") || /[\\\u0000-\u001f]/.test(v)) return null;
return /^\/(account(\/[A-Za-z0-9/]*)?([?#].*)?|login\/device(\?code=[A-Za-z-]{0,12})?)$/.test(v) ? v : null;
return /^\/(account(\/[A-Za-z0-9/]*)?([?#].*)?|login\/device(\?code=[A-Za-z-]{0,12})?|scan(\?url=[A-Za-z0-9%._~!*'()\/:+-]{1,280})?)$/.test(v) ? v : null;
}

export function fail(status: number, error: string, headers: Record<string, string> = {}): Response {
Expand Down
9 changes: 6 additions & 3 deletions telemetry-worker/test/auth.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1379,9 +1379,12 @@ describe("accounts: CBOR, signatures, links (unit)", () => {
expect(() => derToRaw(Uint8Array.from([0x31, 0x00]))).toThrow();
});

it("next targets stay on our own account pages; dashboard links parse", () => {
for (const ok of ["/account", "/account/apps/0123456789abcdef", "/login/device?code=BCDF-GHJK", "/account?welcome=1"]) expect(safeNext(ok)).toBe(ok);
for (const bad of ["//evil.example", "/\\evil.example", "https://evil.example", "/start", "/account/../x", "/login/device?code=<x>", null]) expect(safeNext(bad as string)).toBeNull();
it("next targets stay on our own account pages and the page check; dashboard links parse", () => {
for (const ok of ["/account", "/account/apps/0123456789abcdef", "/login/device?code=BCDF-GHJK", "/account?welcome=1",
"/scan", "/scan?url=https%3A%2F%2Fshop.example.com%2Fpricing%3Fa%3D1", "/scan?url=stripe.com/pricing"]) expect(safeNext(ok)).toBe(ok);
for (const bad of ["//evil.example", "/\\evil.example", "https://evil.example", "/start", "/account/../x", "/login/device?code=<x>", null,
"/scanner", "/scan/../account", "/scan?url=", "/scan?url=<x>", '/scan?url=a"b', "/scan?url=a&next=//evil.example", "/scan?url=a#x", "/scan?other=1",
"/scan?url=" + "a".repeat(281)]) expect(safeNext(bad as string)).toBeNull();
const s = "A".repeat(32);
expect(secretFromLink(`https://genclass.dev/dashboard/${s}`)).toBe(s);
expect(secretFromLink(` /dashboard/${s} `)).toBe(s);
Expand Down
Loading