pi-antigravity-rotator 2.1.6 → 2.2.2

package/src/dashboard.ts

@@ -10,19 +10,19 @@ export function serveDashboard(res: ServerResponse): void {
 }
 
 export function serveStatusApi(res: ServerResponse, rotator: AccountRotator): void {
-  res.writeHead(200, {
-    "Content-Type": "application/json",
-    "Access-Control-Allow-Origin": "*",
-  });
-  res.end(JSON.stringify(rotator.getStatus()));
+	res.writeHead(200, {
+		"Content-Type": "application/json",
+		"Cache-Control": "no-store",
+	});
+	res.end(JSON.stringify(rotator.getStatus()));
 }
 
 export function serveConfigApi(res: ServerResponse, rotator: AccountRotator): void {
-  res.writeHead(200, {
-    "Content-Type": "application/json",
-    "Access-Control-Allow-Origin": "*",
-  });
-  res.end(JSON.stringify(rotator.getConfig()));
+	res.writeHead(200, {
+		"Content-Type": "application/json",
+		"Cache-Control": "no-store",
+	});
+	res.end(JSON.stringify(rotator.getConfig()));
 }
 
 export function serveConfigExportApi(res: ServerResponse, rotator: AccountRotator): void {
@@ -2843,7 +2843,7 @@ function escapeHtml(text) {
     .replace(/&/g, '&')
     .replace(/</g, '&lt;')
     .replace(/>/g, '&gt;')
-    .replace(/\"/g, '&quot;')
+    .replace(/"/g, '&quot;')
     .replace(/'/g, '&#39;');
 }
 

package/src/index.ts

@@ -8,7 +8,11 @@ import { startProxy } from "./proxy.js";
 import { getConfigDir } from "./paths.js";
 import { TelemetryReporter, setActiveReporter } from "./telemetry.js";
 import { loadConfigFromDisk } from "./account-store.js";
-import { getConfiguredAdminToken } from "./admin-auth.js";
+import { ensureAdminToken, getConfiguredAdminToken, setPersistedAdminToken } from "./admin-auth.js";
+import { warnIfUsingFallbackOAuthCreds } from "./oauth.js";
+import { warnIfInsecureTelemetryEndpoint } from "./telemetry.js";
+import { setModelSpecsOverride, loadResponsesStore, flushResponsesStoreSync } from "./compat.js";
+import { setModelAliasesOverride } from "./types.js";
 import { writeTextFileAtomic } from "./storage.js";
 
 function loadConfig(): Config {
@@ -74,6 +78,33 @@ function maybeShowStarNudge(): void {
 	try { writeTextFileAtomic(promptedPath, String(Date.now())); } catch { /* best effort */ }
 }
 
+/**
+ * Resolve the effective admin token at startup. If no PI_ROTATOR_ADMIN_TOKEN
+ * env var is set and no .admin-token file exists, a new token is generated,
+ * persisted to .admin-token, and printed to the operator once. This ensures
+ * admin routes are protected by default on first run.
+ */
+function bootstrapAdminToken(configDir: string): void {
+	const resolved = ensureAdminToken(configDir);
+	setPersistedAdminToken(resolved.token);
+	if (resolved.source === "generated") {
+		console.log();
+		console.log("  ╭──────────────────────────────────────────────────────────╮");
+		console.log("  │  Generated admin token (persisted to .admin-token):      │");
+		const tokenPreview = resolved.token.length > 12
+			? `${resolved.token.slice(0, 8)}…${resolved.token.slice(-4)}`
+			: resolved.token;
+		console.log(`  │  ${tokenPreview}  │`);
+		console.log("  │  (full token in .admin-token; cat to view)               │");
+		console.log("  │                                                          │");
+		console.log("  │  Header: x-rotator-admin-token: <token>                  │");
+		console.log("  │  Bearer: Authorization: Bearer <token>                   │");
+		console.log("  │  URL:    <url>?token=<token>                             │");
+		console.log("  ╰──────────────────────────────────────────────────────────╯");
+		console.log();
+	}
+}
+
 function maybeWarnAboutAdminExposure(config: Config): void {
 	if (getConfiguredAdminToken()) return;
 	console.warn("WARNING: PI_ROTATOR_ADMIN_TOKEN is not configured.");
@@ -103,7 +134,13 @@ export function main(): void {
 	console.log();
 
 	maybeShowStarNudge();
+	bootstrapAdminToken(getConfigDir());
 	maybeWarnAboutAdminExposure(config);
+	warnIfUsingFallbackOAuthCreds();
+	warnIfInsecureTelemetryEndpoint();
+	setModelSpecsOverride(config.modelSpecs ?? null);
+	setModelAliasesOverride(config.modelAliases ?? null);
+	void loadResponsesStore();
 
 	const rotator = new AccountRotator(config);
 
@@ -134,6 +171,9 @@ export function main(): void {
 	// ── Graceful shutdown ──
 	const shutdown = async (): Promise<void> => {
 		console.log("\nShutting down...");
+		flushResponsesStoreSync();
+		rotator.flushPendingStateSaveSync();
+		rotator.flushPendingTokenUsageSaveSync();
 		await telemetry.shutdown();
 		rotator.stopQuotaPolling();
 		process.exit(0);

package/src/logger.ts

@@ -33,7 +33,12 @@ export function redactSensitive(input: unknown): string {
 		.replace(/(authorization["'\s:=]+)(Bearer\s+)?[A-Za-z0-9._~+/=-]+/gi, "$1[REDACTED]")
 		.replace(/("?(?:refresh_token|refreshToken|access_token|accessToken|client_secret|clientSecret)"?\s*[:=]\s*")[^"]+(")/gi, "$1[REDACTED]$2")
 		.replace(/("?(?:refresh_token|refreshToken|access_token|accessToken|client_secret|clientSecret)"?\s*[:=]\s*)[^\s,&}]+/gi, "$1[REDACTED]")
-		.replace(/1\/\/[A-Za-z0-9._~+/=-]+/g, "1//[REDACTED]");
+		.replace(/1\/\/[A-Za-z0-9._~+/=-]+/g, "1//[REDACTED]")
+		// Redact sensitive keys when they appear as querystring parameters (?key=val&...)
+		// or as path segments. Matches both with and without surrounding quotes/encoding.
+		.replace(/([?&](?:access_token|accessToken|refresh_token|refreshToken|token|api_key|apikey|key)=)[^&\s#]+/gi, "$1[REDACTED]")
+		// Redact when the key is followed by = and a value in a query-like context
+		.replace(/(\?|&)(token|access_token|accessToken|refresh_token|refreshToken|api_key|apikey|key)=([^&\s#]+)/gi, "$1$2=[REDACTED]");
 }
 
 export class Logger {

package/src/notification-poller.ts

@@ -13,7 +13,10 @@ import { isTelemetryEnabled } from "./telemetry.js";
 const notifLogger = logger.child("notifications");
 
 // Same base URL as telemetry endpoint (just different path)
-const TELEMETRY_BASE = "http://telemetry.dragont.ec:3800";
+const DEFAULT_TELEMETRY_BASE = "http://telemetry.dragont.ec:3800";
+const TELEMETRY_BASE = process.env.PI_ROTATOR_TELEMETRY_URL?.trim()
+	? new URL(process.env.PI_ROTATOR_TELEMETRY_URL).origin
+	: DEFAULT_TELEMETRY_BASE;
 const NOTIFICATIONS_URL = `${TELEMETRY_BASE}/v1/notifications`;
 
 const POLL_INTERVAL_MS = 30 * 60 * 1000; // 30 minutes

package/src/oauth.ts

@@ -1,6 +1,9 @@
 import { createHash, randomBytes } from "node:crypto";
 import { CLIENT_ID, CLIENT_SECRET, TOKEN_URL } from "./types.js";
 import { fetchWithRetry } from "./fetch-with-retry.js";
+import { logger } from "./logger.js";
+
+const oauthLogger = logger.child("oauth");
 
 export const DEFAULT_REDIRECT_URI = "http://localhost:51121/oauth-callback";
 export const SCOPES = [
@@ -32,6 +35,34 @@ export function getOAuthClientConfig(): OAuthClientConfig {
 	};
 }
 
+let warnedAboutFallback = false;
+
+/**
+ * Check whether the rotator is running on the hardcoded fallback OAuth
+ * credentials (the public Antigravity IDE client shipped in types.ts). When
+ * the operator has not provided ANTIGRAVITY_CLIENT_ID / ANTIGRAVITY_CLIENT_SECRET,
+ * every Google OAuth call uses the bundled client, which may violate Google's
+ * ToS for third-party usage of the official client.
+ *
+ * The warning is printed at most once per process to avoid log spam.
+ */
+export function warnIfUsingFallbackOAuthCreds(env: NodeJS.ProcessEnv = process.env): boolean {
+	const usingFallbackId = !env.ANTIGRAVITY_CLIENT_ID?.trim();
+	const usingFallbackSecret = !env.ANTIGRAVITY_CLIENT_SECRET?.trim();
+	if (!usingFallbackId && !usingFallbackSecret) return false;
+	if (warnedAboutFallback) return true;
+	warnedAboutFallback = true;
+	const missing: string[] = [];
+	if (usingFallbackId) missing.push("ANTIGRAVITY_CLIENT_ID");
+	if (usingFallbackSecret) missing.push("ANTIGRAVITY_CLIENT_SECRET");
+	oauthLogger.log("warn",
+		`Using the bundled fallback OAuth client credentials (missing env: ${missing.join(", ")}). ` +
+		`This identifies the rotator as the official Antigravity IDE client. ` +
+		`For self-hosted deployments, set ${missing.join(" and ")} to your own registered OAuth client.`,
+	);
+	return true;
+}
+
 export function isHostedOAuthConfigured(): boolean {
 	try {
 		const { redirectUri } = getOAuthClientConfig();

package/src/onboarding.ts

@@ -19,6 +19,7 @@ interface PendingSession {
 
 const pendingSessions = new Map<string, PendingSession>();
 const SESSION_TTL_MS = 15 * 60 * 1000;
+const SESSION_PRUNE_INTERVAL_MS = 5 * 60 * 1000;
 
 function prunePendingSessions(): void {
 	const cutoff = Date.now() - SESSION_TTL_MS;
@@ -29,6 +30,24 @@ function prunePendingSessions(): void {
 	}
 }
 
+// Background reaper. Without this, a long-lived proxy that never sees
+// /auth/antigravity/start or /callback would accumulate stale sessions
+// (each is a 96-byte PKCE verifier + timestamp). The interval is unref'd
+// so it does not block process exit.
+let pruneTimer: ReturnType<typeof setInterval> | null = null;
+function startPendingSessionReaper(): void {
+	if (pruneTimer) return;
+	pruneTimer = setInterval(() => prunePendingSessions(), SESSION_PRUNE_INTERVAL_MS);
+	if (pruneTimer.unref) pruneTimer.unref();
+}
+function stopPendingSessionReaper(): void {
+	if (pruneTimer) {
+		clearInterval(pruneTimer);
+		pruneTimer = null;
+	}
+}
+startPendingSessionReaper();
+
 function renderPage(title: string, body: string): string {
 	return `<!DOCTYPE html>
 <html lang="en">

package/src/paths.ts

@@ -2,7 +2,7 @@
 // Default: ~/.pi-antigravity-rotator/
 // Override: --config-dir <path> or PI_ROTATOR_DIR env var
 
-import { join } from "node:path";
+import { join, resolve, sep } from "node:path";
 import { homedir } from "node:os";
 import { mkdirSync } from "node:fs";
 
@@ -10,15 +10,35 @@ const DEFAULT_DIR = join(homedir(), ".pi-antigravity-rotator");
 
 let configDir: string | null = null;
 
+/**
+ * Validate that a user-supplied config dir doesn't contain obvious path
+ * traversal. Refuses to mkdir and returns the default if the input contains
+ * `..` segments that escape the intended root. Throws otherwise.
+ */
+export function resolveSafeConfigDir(input: string, source: "argv" | "env" = "argv"): string {
+	// Check the ORIGINAL input (before resolve() collapses ".."), since
+	// resolve("/a/../../b") silently becomes "/b" and would mask the attack.
+	const segments = input.split(/[\\/]+/);
+	for (const seg of segments) {
+		if (seg === "..") {
+			throw new Error(
+				`Refusing --config-dir="${input}" from ${source}: contains '..' segment which could escape the config root. ` +
+				`Use an absolute path or PI_ROTATOR_DIR env var set by the container orchestrator.`,
+			);
+		}
+	}
+	return resolve(input);
+}
+
 export function getConfigDir(): string {
 	if (configDir) return configDir;
 
 	// Check CLI arg
 	const idx = process.argv.indexOf("--config-dir");
 	if (idx !== -1 && process.argv[idx + 1]) {
-		configDir = process.argv[idx + 1];
+		configDir = resolveSafeConfigDir(process.argv[idx + 1], "argv");
 	} else if (process.env.PI_ROTATOR_DIR) {
-		configDir = process.env.PI_ROTATOR_DIR;
+		configDir = resolveSafeConfigDir(process.env.PI_ROTATOR_DIR, "env");
 	} else {
 		configDir = DEFAULT_DIR;
 	}