Skip to content

Harden mainnet origin and alternative-origin validation #762

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
zeropath-ai wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Harden mainnet origin and alternative-origin validation #762

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
63c3d65
Harden mainnet origin and alternative-origin validation
Sep 16, 2026
8f2ee94
Merge branch 'master' into zvuln_fix_5fd8f327
adamspofford Sep 16, 2026
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: 10 additions & 8 deletions tools/ui/src/auth/auth.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ function is_valid_url(url: string): boolean {
return obj.protocol === "http:" || obj.protocol === "https:";
}

async function check_alternative_origin(): Promise<boolean> {
async function check_alternative_origin(canisterOrigin: string): Promise<boolean> {
try {
const url = window.location.origin;
const response = await fetch(`${url}/.well-known/ii-alternative-origins`);
const currentOrigin = window.location.origin;
const response = await fetch(`${canisterOrigin}/.well-known/ii-alternative-origins`);
const data = await response.json();
if (data.hasProperty("alternativeOrigins") && Array.isArray(data["alternativeOrigins"])) {
return data["alternativeOrigins"].some((origin: string) => origin === url);
if (Array.isArray(data?.alternativeOrigins)) {
return data.alternativeOrigins.some((origin: string) => origin === currentOrigin);
}
return false;
} catch (_) {
Expand All @@ -42,7 +42,8 @@ async function insertLoginForm() {
try {
const params = new URLSearchParams(window.location.search);
const mainnet_domains = ["icp0.io", "ic0.app", "icp.net"];
const mainnet_domain = mainnet_domains.find((domain) => window.location.hostname.endsWith(domain));
const hostname = window.location.hostname;
const mainnet_domain = mainnet_domains.find((domain) => hostname === domain || hostname.endsWith(`.${domain}`));
const is_mainnet = mainnet_domain !== undefined;
let provider = params.get("ii");
if (is_mainnet && !provider) {
Expand All @@ -57,8 +58,9 @@ async function insertLoginForm() {
}
const cid = Principal.fromText(params.get("id")!);
let origin = params.get("origin");
if (!origin && is_mainnet && await check_alternative_origin()) {
origin = `https://${cid.toText()}.${mainnet_domain}`;
const canisterOrigin = is_mainnet ? `https://${cid.toText()}.${mainnet_domain}` : undefined;
if (!origin && canisterOrigin && await check_alternative_origin(canisterOrigin)) {
origin = canisterOrigin;
}
if (origin) {
if (!is_valid_url(origin)) {
Expand Down
Loading