@iam-brain/opencode-codex-auth 1.2.2 → 1.2.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/lib/cache-io.d.ts.map +1 -1
- package/dist/lib/cache-io.js +2 -1
- package/dist/lib/cache-io.js.map +1 -1
- package/dist/lib/cache-lock.d.ts +1 -0
- package/dist/lib/cache-lock.d.ts.map +1 -1
- package/dist/lib/cache-lock.js +12 -2
- package/dist/lib/cache-lock.js.map +1 -1
- package/dist/lib/codex-native/browser.d.ts +3 -0
- package/dist/lib/codex-native/browser.d.ts.map +1 -1
- package/dist/lib/codex-native/browser.js +40 -1
- package/dist/lib/codex-native/browser.js.map +1 -1
- package/dist/lib/codex-native/client-identity.d.ts.map +1 -1
- package/dist/lib/codex-native/client-identity.js +22 -6
- package/dist/lib/codex-native/client-identity.js.map +1 -1
- package/dist/lib/codex-native/oauth-auth-methods.d.ts +1 -0
- package/dist/lib/codex-native/oauth-auth-methods.d.ts.map +1 -1
- package/dist/lib/codex-native/oauth-auth-methods.js +14 -0
- package/dist/lib/codex-native/oauth-auth-methods.js.map +1 -1
- package/dist/lib/codex-native/oauth-persistence.d.ts.map +1 -1
- package/dist/lib/codex-native/oauth-persistence.js +6 -0
- package/dist/lib/codex-native/oauth-persistence.js.map +1 -1
- package/dist/lib/codex-native/oauth-server.d.ts.map +1 -1
- package/dist/lib/codex-native/oauth-server.js +22 -15
- package/dist/lib/codex-native/oauth-server.js.map +1 -1
- package/dist/lib/codex-native/openai-loader-fetch.d.ts.map +1 -1
- package/dist/lib/codex-native/openai-loader-fetch.js +31 -1
- package/dist/lib/codex-native/openai-loader-fetch.js.map +1 -1
- package/dist/lib/codex-native/request-routing.d.ts.map +1 -1
- package/dist/lib/codex-native/request-routing.js +9 -0
- package/dist/lib/codex-native/request-routing.js.map +1 -1
- package/dist/lib/codex-native/request-transform.d.ts.map +1 -1
- package/dist/lib/codex-native/request-transform.js +6 -17
- package/dist/lib/codex-native/request-transform.js.map +1 -1
- package/dist/lib/codex-native.d.ts.map +1 -1
- package/dist/lib/codex-native.js +2 -1
- package/dist/lib/codex-native.js.map +1 -1
- package/dist/lib/codex-prompts-cache.d.ts.map +1 -1
- package/dist/lib/codex-prompts-cache.js +3 -1
- package/dist/lib/codex-prompts-cache.js.map +1 -1
- package/dist/lib/model-catalog.d.ts.map +1 -1
- package/dist/lib/model-catalog.js +2 -1
- package/dist/lib/model-catalog.js.map +1 -1
- package/dist/lib/paths.d.ts.map +1 -1
- package/dist/lib/paths.js +16 -1
- package/dist/lib/paths.js.map +1 -1
- package/dist/lib/remote-cache-fetch.d.ts +4 -2
- package/dist/lib/remote-cache-fetch.d.ts.map +1 -1
- package/dist/lib/remote-cache-fetch.js +98 -9
- package/dist/lib/remote-cache-fetch.js.map +1 -1
- package/package.json +2 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cache-io.d.ts","sourceRoot":"","sources":["../../lib/cache-io.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"cache-io.d.ts","sourceRoot":"","sources":["../../lib/cache-io.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAEzC,KAAK,WAAW,GAAG,CAAC,KAAK,EAAE;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,OAAO,CAAA;CAAE,KAAK,IAAI,CAAA;AAI3F,wBAAgB,yBAAyB,CAAC,QAAQ,EAAE,WAAW,GAAG,SAAS,GAAG,IAAI,CAEjF;AAYD,wBAAgB,aAAa,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAEnE;AAKD,eAAO,MAAM,UAAU;mCACU,MAAM,MAAM,CAAC,QAAQ,GAAG,IAAI;CAG5D,CAAA;AA+CD,wBAAsB,2BAA2B,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAQjF;AAED,wBAAsB,sBAAsB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC,CAa3F;AAED,wBAAsB,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAInF;AAED,wBAAsB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAsBzF;AAED,wBAAsB,uBAAuB,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAS7F;AAED,wBAAsB,6BAA6B,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CASnG;AAED,wBAAsB,6BAA6B,CACjD,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,OAAO,EACd,OAAO,EAAE;IAAE,GAAG,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GACzC,OAAO,CAAC,IAAI,CAAC,CAOf;AAED,wBAAsB,mCAAmC,CACvD,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,OAAO,EACd,OAAO,EAAE;IAAE,GAAG,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GACzC,OAAO,CAAC,IAAI,CAAC,CAOf"}
|
package/dist/lib/cache-io.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import fs from "node:fs/promises";
|
|
2
2
|
import path from "node:path";
|
|
3
|
+
import { randomUUID } from "node:crypto";
|
|
3
4
|
let cacheIoFailureObserver;
|
|
4
5
|
export function setCacheIoFailureObserver(observer) {
|
|
5
6
|
cacheIoFailureObserver = observer;
|
|
@@ -100,7 +101,7 @@ export async function writeJsonFile(filePath, value) {
|
|
|
100
101
|
}
|
|
101
102
|
export async function writeJsonFileAtomic(filePath, value) {
|
|
102
103
|
await fs.mkdir(path.dirname(filePath), { recursive: true });
|
|
103
|
-
const tempPath = `${filePath}.tmp.${Date.now().toString(36)}.${
|
|
104
|
+
const tempPath = `${filePath}.tmp.${Date.now().toString(36)}.${randomUUID()}`;
|
|
104
105
|
try {
|
|
105
106
|
await fs.writeFile(tempPath, `${JSON.stringify(value, null, 2)}\n`, { mode: 0o600 });
|
|
106
107
|
const tempHandle = await fs.open(tempPath, "r+");
|
package/dist/lib/cache-io.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cache-io.js","sourceRoot":"","sources":["../../lib/cache-io.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,kBAAkB,CAAA;AACjC,OAAO,IAAI,MAAM,WAAW,CAAA;
|
|
1
|
+
{"version":3,"file":"cache-io.js","sourceRoot":"","sources":["../../lib/cache-io.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/cache-lock.d.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
type LockTargetOptions = {
|
|
2
2
|
staleMs?: number;
|
|
3
3
|
};
|
|
4
|
+
export declare function lockTargetPathForFile(filePath: string): string;
|
|
4
5
|
export declare function withLockedDirectory<T>(directoryPath: string, fn: () => Promise<T>, options?: LockTargetOptions): Promise<T>;
|
|
5
6
|
export declare function withLockedFile<T>(filePath: string, fn: () => Promise<T>, options?: LockTargetOptions): Promise<T>;
|
|
6
7
|
export {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cache-lock.d.ts","sourceRoot":"","sources":["../../lib/cache-lock.ts"],"names":[],"mappings":"AAUA,KAAK,iBAAiB,GAAG;IACvB,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB,CAAA;
|
|
1
|
+
{"version":3,"file":"cache-lock.d.ts","sourceRoot":"","sources":["../../lib/cache-lock.ts"],"names":[],"mappings":"AAUA,KAAK,iBAAiB,GAAG;IACvB,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB,CAAA;AAgBD,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAE9D;AAOD,wBAAsB,mBAAmB,CAAC,CAAC,EACzC,aAAa,EAAE,MAAM,EACrB,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EACpB,OAAO,GAAE,iBAAsB,GAC9B,OAAO,CAAC,CAAC,CAAC,CAQZ;AAED,wBAAsB,cAAc,CAAC,CAAC,EACpC,QAAQ,EAAE,MAAM,EAChB,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EACpB,OAAO,GAAE,iBAAsB,GAC9B,OAAO,CAAC,CAAC,CAAC,CAUZ"}
|
package/dist/lib/cache-lock.js
CHANGED
|
@@ -6,14 +6,22 @@ const LOCK_RETRIES = {
|
|
|
6
6
|
minTimeout: 10,
|
|
7
7
|
maxTimeout: 100
|
|
8
8
|
};
|
|
9
|
+
const FILE_LOCK_SUFFIX = ".lock";
|
|
9
10
|
function resolveLockOptions(options = {}) {
|
|
10
11
|
const staleMs = typeof options.staleMs === "number" && Number.isFinite(options.staleMs) ? options.staleMs : undefined;
|
|
11
12
|
return {
|
|
12
|
-
realpath:
|
|
13
|
+
realpath: true,
|
|
13
14
|
retries: LOCK_RETRIES,
|
|
14
15
|
...(staleMs !== undefined ? { stale: Math.max(1, Math.floor(staleMs)) } : {})
|
|
15
16
|
};
|
|
16
17
|
}
|
|
18
|
+
export function lockTargetPathForFile(filePath) {
|
|
19
|
+
return `${filePath}${FILE_LOCK_SUFFIX}`;
|
|
20
|
+
}
|
|
21
|
+
async function ensureLockTargetFile(lockTargetPath) {
|
|
22
|
+
const handle = await fs.open(lockTargetPath, "a", 0o600);
|
|
23
|
+
await handle.close();
|
|
24
|
+
}
|
|
17
25
|
export async function withLockedDirectory(directoryPath, fn, options = {}) {
|
|
18
26
|
await fs.mkdir(directoryPath, { recursive: true });
|
|
19
27
|
const release = await lockfile.lock(directoryPath, resolveLockOptions(options));
|
|
@@ -26,7 +34,9 @@ export async function withLockedDirectory(directoryPath, fn, options = {}) {
|
|
|
26
34
|
}
|
|
27
35
|
export async function withLockedFile(filePath, fn, options = {}) {
|
|
28
36
|
await fs.mkdir(path.dirname(filePath), { recursive: true });
|
|
29
|
-
const
|
|
37
|
+
const lockTargetPath = lockTargetPathForFile(filePath);
|
|
38
|
+
await ensureLockTargetFile(lockTargetPath);
|
|
39
|
+
const release = await lockfile.lock(lockTargetPath, resolveLockOptions(options));
|
|
30
40
|
try {
|
|
31
41
|
return await fn();
|
|
32
42
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cache-lock.js","sourceRoot":"","sources":["../../lib/cache-lock.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,kBAAkB,CAAA;AACjC,OAAO,IAAI,MAAM,WAAW,CAAA;AAC5B,OAAO,QAAQ,MAAM,iBAAiB,CAAA;AAEtC,MAAM,YAAY,GAAG;IACnB,OAAO,EAAE,EAAE;IACX,UAAU,EAAE,EAAE;IACd,UAAU,EAAE,GAAG;CAChB,CAAA;
|
|
1
|
+
{"version":3,"file":"cache-lock.js","sourceRoot":"","sources":["../../lib/cache-lock.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,kBAAkB,CAAA;AACjC,OAAO,IAAI,MAAM,WAAW,CAAA;AAC5B,OAAO,QAAQ,MAAM,iBAAiB,CAAA;AAEtC,MAAM,YAAY,GAAG;IACnB,OAAO,EAAE,EAAE;IACX,UAAU,EAAE,EAAE;IACd,UAAU,EAAE,GAAG;CAChB,CAAA;AAKD,MAAM,gBAAgB,GAAG,OAAO,CAAA;AAEhC,SAAS,kBAAkB,CAAC,UAA6B,EAAE;IAKzD,MAAM,OAAO,GAAG,OAAO,OAAO,CAAC,OAAO,KAAK,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAA;IACrH,OAAO;QACL,QAAQ,EAAE,IAAI;QACd,OAAO,EAAE,YAAY;QACrB,GAAG,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KAC9E,CAAA;AACH,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,QAAgB;IACpD,OAAO,GAAG,QAAQ,GAAG,gBAAgB,EAAE,CAAA;AACzC,CAAC;AAED,KAAK,UAAU,oBAAoB,CAAC,cAAsB;IACxD,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,IAAI,CAAC,cAAc,EAAE,GAAG,EAAE,KAAK,CAAC,CAAA;IACxD,MAAM,MAAM,CAAC,KAAK,EAAE,CAAA;AACtB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACvC,aAAqB,EACrB,EAAoB,EACpB,UAA6B,EAAE;IAE/B,MAAM,EAAE,CAAC,KAAK,CAAC,aAAa,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;IAClD,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,aAAa,EAAE,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAA;IAC/E,IAAI,CAAC;QACH,OAAO,MAAM,EAAE,EAAE,CAAA;IACnB,CAAC;YAAS,CAAC;QACT,MAAM,OAAO,EAAE,CAAA;IACjB,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,QAAgB,EAChB,EAAoB,EACpB,UAA6B,EAAE;IAE/B,MAAM,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;IAC3D,MAAM,cAAc,GAAG,qBAAqB,CAAC,QAAQ,CAAC,CAAA;IACtD,MAAM,oBAAoB,CAAC,cAAc,CAAC,CAAA;IAC1C,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,cAAc,EAAE,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAA;IAChF,IAAI,CAAC;QACH,OAAO,MAAM,EAAE,EAAE,CAAA;IACnB,CAAC;YAAS,CAAC;QACT,MAAM,OAAO,EAAE,CAAA;IACjB,CAAC;AACH,CAAC"}
|
|
@@ -3,9 +3,12 @@ export type BrowserOpenInvocation = {
|
|
|
3
3
|
command: string;
|
|
4
4
|
args: string[];
|
|
5
5
|
};
|
|
6
|
+
export declare function normalizeAllowedOrigins(input: string[] | undefined): Set<string>;
|
|
7
|
+
export declare function isAllowedBrowserUrl(url: string, allowedOrigins: Set<string>): boolean;
|
|
6
8
|
export declare function browserOpenInvocationFor(url: string, platform?: NodeJS.Platform): BrowserOpenInvocation;
|
|
7
9
|
export declare function tryOpenUrlInBrowser(input: {
|
|
8
10
|
url: string;
|
|
11
|
+
allowedOrigins?: string[];
|
|
9
12
|
log?: Logger;
|
|
10
13
|
onEvent?: (event: string, meta?: Record<string, unknown>) => void;
|
|
11
14
|
}): Promise<boolean>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"browser.d.ts","sourceRoot":"","sources":["../../../lib/codex-native/browser.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AAI1C,MAAM,MAAM,qBAAqB,GAAG;IAClC,OAAO,EAAE,MAAM,CAAA;IACf,IAAI,EAAE,MAAM,EAAE,CAAA;CACf,CAAA;AAED,wBAAgB,wBAAwB,CACtC,GAAG,EAAE,MAAM,EACX,QAAQ,GAAE,MAAM,CAAC,QAA2B,GAC3C,qBAAqB,CAQvB;AAED,wBAAsB,mBAAmB,CAAC,KAAK,EAAE;IAC/C,GAAG,EAAE,MAAM,CAAA;IACX,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,IAAI,CAAA;CAClE,GAAG,OAAO,CAAC,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"browser.d.ts","sourceRoot":"","sources":["../../../lib/codex-native/browser.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AAI1C,MAAM,MAAM,qBAAqB,GAAG;IAClC,OAAO,EAAE,MAAM,CAAA;IACf,IAAI,EAAE,MAAM,EAAE,CAAA;CACf,CAAA;AAED,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,SAAS,GAAG,GAAG,CAAC,MAAM,CAAC,CAYhF;AAED,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,MAAM,EAAE,cAAc,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,OAAO,CAUrF;AAED,wBAAgB,wBAAwB,CACtC,GAAG,EAAE,MAAM,EACX,QAAQ,GAAE,MAAM,CAAC,QAA2B,GAC3C,qBAAqB,CAQvB;AAED,wBAAsB,mBAAmB,CAAC,KAAK,EAAE;IAC/C,GAAG,EAAE,MAAM,CAAA;IACX,cAAc,CAAC,EAAE,MAAM,EAAE,CAAA;IACzB,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,IAAI,CAAA;CAClE,GAAG,OAAO,CAAC,OAAO,CAAC,CAgCnB"}
|
|
@@ -1,12 +1,43 @@
|
|
|
1
1
|
import { execFile } from "node:child_process";
|
|
2
2
|
import { promisify } from "node:util";
|
|
3
3
|
const execFileAsync = promisify(execFile);
|
|
4
|
+
export function normalizeAllowedOrigins(input) {
|
|
5
|
+
const out = new Set();
|
|
6
|
+
if (!input)
|
|
7
|
+
return out;
|
|
8
|
+
for (const candidate of input) {
|
|
9
|
+
try {
|
|
10
|
+
const origin = new URL(candidate).origin;
|
|
11
|
+
if (origin)
|
|
12
|
+
out.add(origin);
|
|
13
|
+
}
|
|
14
|
+
catch {
|
|
15
|
+
// ignore invalid configured origin
|
|
16
|
+
}
|
|
17
|
+
}
|
|
18
|
+
return out;
|
|
19
|
+
}
|
|
20
|
+
export function isAllowedBrowserUrl(url, allowedOrigins) {
|
|
21
|
+
try {
|
|
22
|
+
const parsed = new URL(url);
|
|
23
|
+
if (parsed.protocol !== "https:" && parsed.protocol !== "http:")
|
|
24
|
+
return false;
|
|
25
|
+
if (parsed.username || parsed.password)
|
|
26
|
+
return false;
|
|
27
|
+
if (allowedOrigins.size > 0 && !allowedOrigins.has(parsed.origin))
|
|
28
|
+
return false;
|
|
29
|
+
return true;
|
|
30
|
+
}
|
|
31
|
+
catch {
|
|
32
|
+
return false;
|
|
33
|
+
}
|
|
34
|
+
}
|
|
4
35
|
export function browserOpenInvocationFor(url, platform = process.platform) {
|
|
5
36
|
if (platform === "darwin") {
|
|
6
37
|
return { command: "open", args: [url] };
|
|
7
38
|
}
|
|
8
39
|
if (platform === "win32") {
|
|
9
|
-
return { command: "
|
|
40
|
+
return { command: "rundll32.exe", args: ["url.dll,FileProtocolHandler", url] };
|
|
10
41
|
}
|
|
11
42
|
return { command: "xdg-open", args: [url] };
|
|
12
43
|
}
|
|
@@ -15,6 +46,14 @@ export async function tryOpenUrlInBrowser(input) {
|
|
|
15
46
|
return false;
|
|
16
47
|
if (process.env.VITEST || process.env.NODE_ENV === "test")
|
|
17
48
|
return false;
|
|
49
|
+
const allowedOrigins = normalizeAllowedOrigins(input.allowedOrigins);
|
|
50
|
+
if (!isAllowedBrowserUrl(input.url, allowedOrigins)) {
|
|
51
|
+
input.onEvent?.("browser_open_blocked", {
|
|
52
|
+
reason: "invalid_or_disallowed_url"
|
|
53
|
+
});
|
|
54
|
+
input.log?.warn("blocked auto-open oauth URL", { reason: "invalid_or_disallowed_url" });
|
|
55
|
+
return false;
|
|
56
|
+
}
|
|
18
57
|
const invocation = browserOpenInvocationFor(input.url);
|
|
19
58
|
input.onEvent?.("browser_open_attempt", { command: invocation.command });
|
|
20
59
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"browser.js","sourceRoot":"","sources":["../../../lib/codex-native/browser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAA;AAC7C,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAA;AAIrC,MAAM,aAAa,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAA;AAOzC,MAAM,UAAU,wBAAwB,CACtC,GAAW,EACX,WAA4B,OAAO,CAAC,QAAQ;IAE5C,IAAI,QAAQ,KAAK,QAAQ,EAAE,CAAC;QAC1B,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,GAAG,CAAC,EAAE,CAAA;IACzC,CAAC;IACD,IAAI,QAAQ,KAAK,OAAO,EAAE,CAAC;QACzB,OAAO,EAAE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"browser.js","sourceRoot":"","sources":["../../../lib/codex-native/browser.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client-identity.d.ts","sourceRoot":"","sources":["../../../lib/codex-native/client-identity.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"client-identity.d.ts","sourceRoot":"","sources":["../../../lib/codex-native/client-identity.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA;AAClD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AAI1C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AA4StD,wBAAsB,mCAAmC,CACvD,GAAG,CAAC,EAAE,MAAM,EACZ,OAAO,GAAE;IACP,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,SAAS,CAAC,EAAE,OAAO,KAAK,CAAA;IACxB,GAAG,CAAC,EAAE,MAAM,MAAM,CAAA;IAClB,WAAW,CAAC,EAAE,OAAO,CAAA;CACjB,GACL,OAAO,CAAC,MAAM,CAAC,CA8CjB;AAED,wBAAgB,yBAAyB,CAAC,aAAa,GAAE,MAAwC,GAAG,MAAM,CAYzG;AAoCD,wBAAgB,mBAAmB,CAAC,UAAU,EAAE,eAAe,GAAG,MAAM,CAMvE;AAED,wBAAgB,uBAAuB,CAAC,SAAS,EAAE,cAAc,EAAE,UAAU,EAAE,eAAe,GAAG,MAAM,CAGtG"}
|
|
@@ -1,16 +1,19 @@
|
|
|
1
1
|
import os from "node:os";
|
|
2
2
|
import path from "node:path";
|
|
3
3
|
import { execFileSync } from "node:child_process";
|
|
4
|
+
import { randomUUID } from "node:crypto";
|
|
4
5
|
import { chmodSync, mkdirSync, readFileSync, renameSync, writeFileSync } from "node:fs";
|
|
5
6
|
import { defaultOpencodeCachePath } from "../paths.js";
|
|
6
7
|
import { fetchRemoteText } from "../remote-cache-fetch.js";
|
|
7
8
|
import { isFsErrorCode } from "../cache-io.js";
|
|
9
|
+
import { URL } from "node:url";
|
|
8
10
|
const DEFAULT_PLUGIN_VERSION = "0.1.0";
|
|
9
11
|
const DEFAULT_CODEX_CLIENT_VERSION = "0.97.0";
|
|
10
12
|
const CODEX_CLIENT_VERSION_CACHE_FILE = path.join(defaultOpencodeCachePath(), "codex-client-version.json");
|
|
11
13
|
const CODEX_CLIENT_VERSION_TTL_MS = 60 * 60 * 1000;
|
|
12
14
|
const CODEX_GITHUB_RELEASES_API = "https://api.github.com/repos/openai/codex/releases/latest";
|
|
13
15
|
const CODEX_GITHUB_RELEASES_HTML = "https://github.com/openai/codex/releases/latest";
|
|
16
|
+
const REMOTE_RELEASE_ALLOWED_HOSTS = ["api.github.com", "github.com", "raw.githubusercontent.com"];
|
|
14
17
|
let cachedPluginVersion;
|
|
15
18
|
let cachedMacProductVersion;
|
|
16
19
|
let cachedTerminalUserAgentToken;
|
|
@@ -61,7 +64,7 @@ function splitProgramAndVersion(value) {
|
|
|
61
64
|
}
|
|
62
65
|
function tmuxDisplayMessage(format) {
|
|
63
66
|
try {
|
|
64
|
-
const value = execFileSync("tmux", ["display-message", "-p", format], { encoding: "utf8" }).trim();
|
|
67
|
+
const value = execFileSync("tmux", ["display-message", "-p", format], { encoding: "utf8", timeout: 1500 }).trim();
|
|
65
68
|
return value || undefined;
|
|
66
69
|
}
|
|
67
70
|
catch (error) {
|
|
@@ -71,6 +74,17 @@ function tmuxDisplayMessage(format) {
|
|
|
71
74
|
return undefined;
|
|
72
75
|
}
|
|
73
76
|
}
|
|
77
|
+
function ensureAllowedReleaseUrl(input) {
|
|
78
|
+
const parsed = new URL(input);
|
|
79
|
+
if (parsed.protocol !== "https:") {
|
|
80
|
+
throw new Error("invalid_release_url_scheme");
|
|
81
|
+
}
|
|
82
|
+
const host = parsed.hostname.toLowerCase();
|
|
83
|
+
if (!REMOTE_RELEASE_ALLOWED_HOSTS.includes(host)) {
|
|
84
|
+
throw new Error(`invalid_release_url_host:${host}`);
|
|
85
|
+
}
|
|
86
|
+
return parsed.toString();
|
|
87
|
+
}
|
|
74
88
|
function resolveTerminalUserAgentToken(env = process.env) {
|
|
75
89
|
if (cachedTerminalUserAgentToken)
|
|
76
90
|
return cachedTerminalUserAgentToken;
|
|
@@ -195,7 +209,7 @@ function readCodexClientVersionCache(cacheFilePath) {
|
|
|
195
209
|
function writeCodexClientVersionCache(entry, cacheFilePath = CODEX_CLIENT_VERSION_CACHE_FILE) {
|
|
196
210
|
try {
|
|
197
211
|
mkdirSync(path.dirname(cacheFilePath), { recursive: true });
|
|
198
|
-
const tempFilePath = `${cacheFilePath}.tmp.${Date.now().toString(36)}.${
|
|
212
|
+
const tempFilePath = `${cacheFilePath}.tmp.${Date.now().toString(36)}.${randomUUID()}`;
|
|
199
213
|
writeFileSync(tempFilePath, `${JSON.stringify(entry, null, 2)}\n`, { mode: 0o600 });
|
|
200
214
|
renameSync(tempFilePath, cacheFilePath);
|
|
201
215
|
chmodSync(cacheFilePath, 0o600);
|
|
@@ -217,7 +231,8 @@ async function fetchLatestCodexReleaseTag(fetchImpl = fetch) {
|
|
|
217
231
|
url: CODEX_GITHUB_RELEASES_API
|
|
218
232
|
}, {
|
|
219
233
|
fetchImpl,
|
|
220
|
-
timeoutMs: 5000
|
|
234
|
+
timeoutMs: 5000,
|
|
235
|
+
allowedHosts: REMOTE_RELEASE_ALLOWED_HOSTS
|
|
221
236
|
});
|
|
222
237
|
if (apiResult.status === "ok") {
|
|
223
238
|
const payload = JSON.parse(apiResult.text);
|
|
@@ -230,12 +245,13 @@ async function fetchLatestCodexReleaseTag(fetchImpl = fetch) {
|
|
|
230
245
|
url: CODEX_GITHUB_RELEASES_HTML
|
|
231
246
|
}, {
|
|
232
247
|
fetchImpl,
|
|
233
|
-
timeoutMs: 5000
|
|
248
|
+
timeoutMs: 5000,
|
|
249
|
+
allowedHosts: REMOTE_RELEASE_ALLOWED_HOSTS
|
|
234
250
|
});
|
|
235
251
|
if (htmlResult.status !== "ok") {
|
|
236
252
|
throw new Error("failed to fetch codex release tag");
|
|
237
253
|
}
|
|
238
|
-
const finalUrl = htmlResult.finalUrl ?? CODEX_GITHUB_RELEASES_HTML;
|
|
254
|
+
const finalUrl = ensureAllowedReleaseUrl(htmlResult.finalUrl ?? CODEX_GITHUB_RELEASES_HTML);
|
|
239
255
|
if (finalUrl.includes("/tag/")) {
|
|
240
256
|
const tag = finalUrl.split("/tag/").pop();
|
|
241
257
|
if (tag && !tag.includes("/"))
|
|
@@ -310,7 +326,7 @@ function resolveMacProductVersion() {
|
|
|
310
326
|
if (cachedMacProductVersion)
|
|
311
327
|
return cachedMacProductVersion;
|
|
312
328
|
try {
|
|
313
|
-
const value = execFileSync("sw_vers", ["-productVersion"], { encoding: "utf8" }).trim();
|
|
329
|
+
const value = execFileSync("sw_vers", ["-productVersion"], { encoding: "utf8", timeout: 1500 }).trim();
|
|
314
330
|
cachedMacProductVersion = value || os.release();
|
|
315
331
|
}
|
|
316
332
|
catch (error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client-identity.js","sourceRoot":"","sources":["../../../lib/codex-native/client-identity.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"client-identity.js","sourceRoot":"","sources":["../../../lib/codex-native/client-identity.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth-auth-methods.d.ts","sourceRoot":"","sources":["../../../lib/codex-native/oauth-auth-methods.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA;AAClD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAA;AAGjD,OAAO,EAYL,KAAK,SAAS,EACd,KAAK,aAAa,EACnB,MAAM,kBAAkB,CAAA;AAEzB,KAAK,YAAY,GAAG;IAClB,IAAI,EAAE,SAAS,CAAA;IACf,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,MAAM,CAAA;IACd,OAAO,EAAE,MAAM,CAAA;IACf,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB,CAAA;AAED,KAAK,YAAY,GAAG;IAClB,IAAI,EAAE,QAAQ,CAAA;CACf,CAAA;AAED,KAAK,mBAAmB,GAAG,YAAY,GAAG,YAAY,CAAA;AAEtD,KAAK,qBAAqB,GAAG;IAC3B,GAAG,EAAE,MAAM,CAAA;IACX,YAAY,EAAE,MAAM,CAAA;IACpB,MAAM,EAAE,MAAM,CAAA;IACd,QAAQ,EAAE,MAAM,OAAO,CAAC,mBAAmB,CAAC,CAAA;CAC7C,CAAA;
|
|
1
|
+
{"version":3,"file":"oauth-auth-methods.d.ts","sourceRoot":"","sources":["../../../lib/codex-native/oauth-auth-methods.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA;AAClD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAA;AAGjD,OAAO,EAYL,KAAK,SAAS,EACd,KAAK,aAAa,EACnB,MAAM,kBAAkB,CAAA;AAEzB,KAAK,YAAY,GAAG;IAClB,IAAI,EAAE,SAAS,CAAA;IACf,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,MAAM,CAAA;IACd,OAAO,EAAE,MAAM,CAAA;IACf,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB,CAAA;AAED,KAAK,YAAY,GAAG;IAClB,IAAI,EAAE,QAAQ,CAAA;CACf,CAAA;AAED,KAAK,mBAAmB,GAAG,YAAY,GAAG,YAAY,CAAA;AAEtD,KAAK,qBAAqB,GAAG;IAC3B,GAAG,EAAE,MAAM,CAAA;IACX,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,YAAY,EAAE,MAAM,CAAA;IACpB,MAAM,EAAE,MAAM,CAAA;IACd,QAAQ,EAAE,MAAM,OAAO,CAAC,mBAAmB,CAAC,CAAA;CAC7C,CAAA;AAcD,KAAK,cAAc,GAAG,KAAK,GAAG,MAAM,CAAA;AAEpC,KAAK,oBAAoB,GAAG;IAC1B,QAAQ,EAAE,cAAc,CAAA;IACxB,SAAS,EAAE,cAAc,CAAA;IACzB,sBAAsB,EAAE,CAAC,OAAO,EAAE;QAAE,SAAS,EAAE,OAAO,CAAA;KAAE,KAAK,OAAO,CAAC,cAAc,CAAC,CAAA;IACpF,gBAAgB,EAAE,MAAM,OAAO,CAAC;QAAE,WAAW,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;IACxD,oBAAoB,EAAE,CAAC,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,cAAc,KAAK,OAAO,CAAC,aAAa,CAAC,CAAA;IAC1G,uBAAuB,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,GAAG,OAAO,GAAG,OAAO,KAAK,IAAI,CAAA;IACzF,kBAAkB,EAAE,CAAC,MAAM,EAAE,aAAa,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;IAC5D,WAAW,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAA;IAClC,eAAe,EAAE,MAAM,CAAA;IACvB,oBAAoB,EAAE,MAAM,CAAA;CAC7B,CAAA;AAED,KAAK,qBAAqB,GAAG;IAC3B,SAAS,EAAE,cAAc,CAAA;IACzB,kBAAkB,EAAE,CAAC,MAAM,EAAE,aAAa,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;CAC7D,CAAA;AAoBD,wBAAgB,2BAA2B,CAAC,IAAI,EAAE,oBAAoB,IACtD,SAAS,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,KAAG,OAAO,CAAC,qBAAqB,CAAC,CAwH/E;AAED,wBAAgB,4BAA4B,CAAC,IAAI,EAAE,qBAAqB,SACrD,OAAO,CAAC,qBAAqB,CAAC,CA6FhD"}
|
|
@@ -1,6 +1,18 @@
|
|
|
1
1
|
import { resolveRequestUserAgent } from "./client-identity.js";
|
|
2
2
|
import { resolveCodexOriginator } from "./originator.js";
|
|
3
3
|
import { buildAuthorizeUrl, CLIENT_ID, extractAccountId, fetchWithTimeout, generatePKCE, generateState, ISSUER, OAUTH_DEVICE_AUTH_TIMEOUT_MS, OAUTH_HTTP_TIMEOUT_MS, OAUTH_POLLING_SAFETY_MARGIN_MS, sleep } from "./oauth-utils.js";
|
|
4
|
+
function redactOAuthDisplayUrl(url) {
|
|
5
|
+
try {
|
|
6
|
+
const parsed = new URL(url);
|
|
7
|
+
if (parsed.searchParams.has("state")) {
|
|
8
|
+
parsed.searchParams.set("state", "[redacted]");
|
|
9
|
+
}
|
|
10
|
+
return parsed.toString();
|
|
11
|
+
}
|
|
12
|
+
catch {
|
|
13
|
+
return url;
|
|
14
|
+
}
|
|
15
|
+
}
|
|
4
16
|
function resolveDeviceAuthUserAgent(spoofMode) {
|
|
5
17
|
const originator = resolveCodexOriginator(spoofMode);
|
|
6
18
|
const userAgent = resolveRequestUserAgent(spoofMode, originator);
|
|
@@ -93,8 +105,10 @@ export function createBrowserOAuthAuthorize(deps) {
|
|
|
93
105
|
const authUrl = buildAuthorizeUrl(redirectUri, pkce, state, deps.spoofMode === "codex" ? "codex_cli_rs" : "opencode");
|
|
94
106
|
const callbackPromise = deps.waitForOAuthCallback(pkce, state, deps.authMode);
|
|
95
107
|
deps.openAuthUrl(authUrl);
|
|
108
|
+
const displayUrl = redactOAuthDisplayUrl(authUrl);
|
|
96
109
|
return {
|
|
97
110
|
url: authUrl,
|
|
111
|
+
displayUrl,
|
|
98
112
|
instructions: "Complete authorization in your browser. If you close the tab early, cancel (Ctrl+C) and retry.",
|
|
99
113
|
method: "auto",
|
|
100
114
|
callback: async () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth-auth-methods.js","sourceRoot":"","sources":["../../../lib/codex-native/oauth-auth-methods.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAA;AAC9D,OAAO,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAA;AACxD,OAAO,EACL,iBAAiB,EACjB,SAAS,EACT,gBAAgB,EAChB,gBAAgB,EAChB,YAAY,EACZ,aAAa,EACb,MAAM,EACN,4BAA4B,EAC5B,qBAAqB,EACrB,8BAA8B,EAC9B,KAAK,EAGN,MAAM,kBAAkB,CAAA;
|
|
1
|
+
{"version":3,"file":"oauth-auth-methods.js","sourceRoot":"","sources":["../../../lib/codex-native/oauth-auth-methods.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAA;AAC9D,OAAO,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAA;AACxD,OAAO,EACL,iBAAiB,EACjB,SAAS,EACT,gBAAgB,EAChB,gBAAgB,EAChB,YAAY,EACZ,aAAa,EACb,MAAM,EACN,4BAA4B,EAC5B,qBAAqB,EACrB,8BAA8B,EAC9B,KAAK,EAGN,MAAM,kBAAkB,CAAA;AAwBzB,SAAS,qBAAqB,CAAC,GAAW;IACxC,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAA;QAC3B,IAAI,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC;YACrC,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,EAAE,YAAY,CAAC,CAAA;QAChD,CAAC;QACD,OAAO,MAAM,CAAC,QAAQ,EAAE,CAAA;IAC1B,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,GAAG,CAAA;IACZ,CAAC;AACH,CAAC;AAsBD,SAAS,0BAA0B,CAAC,SAAyB;IAC3D,MAAM,UAAU,GAAG,sBAAsB,CAAC,SAAS,CAAC,CAAA;IACpD,MAAM,SAAS,GAAG,uBAAuB,CAAC,SAAS,EAAE,UAAU,CAAC,CAAA;IAChE,IAAI,SAAS,KAAK,QAAQ;QAAE,OAAO,SAAS,CAAA;IAC5C,MAAM,MAAM,GAAG,SAAS,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;IACzC,OAAO,MAAM,IAAI,SAAS,CAAA;AAC5B,CAAC;AAED,SAAS,cAAc,CAAC,MAAqB;IAC3C,OAAO;QACL,IAAI,EAAE,SAAS;QACf,OAAO,EAAE,MAAM,CAAC,aAAa;QAC7B,MAAM,EAAE,MAAM,CAAC,YAAY;QAC3B,OAAO,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,MAAM,CAAC,UAAU,IAAI,IAAI,CAAC,GAAG,IAAI;QACxD,SAAS,EAAE,gBAAgB,CAAC,MAAM,CAAC;KACpC,CAAA;AACH,CAAC;AAED,MAAM,UAAU,2BAA2B,CAAC,IAA0B;IACpE,OAAO,KAAK,EAAE,MAA+B,EAAkC,EAAE;QAC/E,MAAM,2BAA2B,GAAG,KAAK,IAAmC,EAAE;YAC5E,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAA;YACrD,MAAM,IAAI,GAAG,MAAM,YAAY,EAAE,CAAA;YACjC,MAAM,KAAK,GAAG,aAAa,EAAE,CAAA;YAC7B,MAAM,OAAO,GAAG,iBAAiB,CAC/B,WAAW,EACX,IAAI,EACJ,KAAK,EACL,IAAI,CAAC,SAAS,KAAK,OAAO,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,UAAU,CACzD,CAAA;YACD,MAAM,eAAe,GAAG,IAAI,CAAC,oBAAoB,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAA;YAC7E,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAA;YACzB,MAAM,eAAe,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,CAAA;YACxC,IAAI,eAAe,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC;gBAC9C,eAAe,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,EAAE,YAAY,CAAC,CAAA;YACzD,CAAC;YACD,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,YAAY,eAAe,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAA;YAChE,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,iFAAiF,CAAC,CAAA;YAEvG,IAAI,UAAU,GAAG,KAAK,CAAA;YACtB,IAAI,CAAC;gBACH,MAAM,MAAM,GAAG,MAAM,eAAe,CAAA;gBACpC,MAAM,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAA;gBACrC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAA;gBAC5C,OAAO,MAAM,CAAA;YACf,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,UAAU,GAAG,IAAI,CAAA;gBACjB,MAAM,MAAM,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,sBAAsB,CAAA;gBAC9E,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,2BAA2B,MAAM,MAAM,CAAC,CAAA;gBAC7D,OAAO,IAAI,CAAA;YACb,CAAC;oBAAS,CAAC;gBACT,IAAI,CAAC,uBAAuB,CAC1B,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC,CAAC,IAAI,CAAC,eAAe,EAC7D,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CACjC,CAAA;YACH,CAAC;QACH,CAAC,CAAA;QAED,MAAM,6BAA6B,GAAG,KAAK,IAAoC,EAAE;YAC/E,IAAI,eAA0C,CAAA;YAC9C,OAAO,IAAI,EAAE,CAAC;gBACZ,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;gBACzE,IAAI,UAAU,KAAK,MAAM,EAAE,CAAC;oBAC1B,IAAI,CAAC,eAAe,EAAE,CAAC;wBACrB,OAAO;4BACL,GAAG,EAAE,EAAE;4BACP,MAAM,EAAE,MAAM;4BACd,YAAY,EAAE,kBAAkB;4BAChC,QAAQ,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;yBAC3C,CAAA;oBACH,CAAC;oBAED,MAAM,MAAM,GAAG,eAAe,CAAA;oBAC9B,OAAO;wBACL,GAAG,EAAE,EAAE;wBACP,MAAM,EAAE,MAAM;wBACd,YAAY,EAAE,EAAE;wBAChB,QAAQ,EAAE,KAAK,IAAI,EAAE,CAAC,cAAc,CAAC,MAAM,CAAC;qBAC7C,CAAA;gBACH,CAAC;gBAED,MAAM,MAAM,GAAG,MAAM,2BAA2B,EAAE,CAAA;gBAClD,IAAI,MAAM,EAAE,CAAC;oBACX,eAAe,GAAG,MAAM,CAAA;oBACxB,SAAQ;gBACV,CAAC;gBAED,OAAO;oBACL,GAAG,EAAE,EAAE;oBACP,MAAM,EAAE,MAAM;oBACd,YAAY,EAAE,uBAAuB;oBACrC,QAAQ,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;iBAC3C,CAAA;YACH,CAAC;QACH,CAAC,CAAA;QAED,IAAI,MAAM,IAAI,OAAO,CAAC,GAAG,CAAC,mBAAmB,KAAK,GAAG,IAAI,OAAO,CAAC,KAAK,CAAC,KAAK,IAAI,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;YACrG,OAAO,6BAA6B,EAAE,CAAA;QACxC,CAAC;QAED,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAA;QACrD,MAAM,IAAI,GAAG,MAAM,YAAY,EAAE,CAAA;QACjC,MAAM,KAAK,GAAG,aAAa,EAAE,CAAA;QAC7B,MAAM,OAAO,GAAG,iBAAiB,CAC/B,WAAW,EACX,IAAI,EACJ,KAAK,EACL,IAAI,CAAC,SAAS,KAAK,OAAO,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,UAAU,CACzD,CAAA;QACD,MAAM,eAAe,GAAG,IAAI,CAAC,oBAAoB,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAA;QAC7E,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAA;QACzB,MAAM,UAAU,GAAG,qBAAqB,CAAC,OAAO,CAAC,CAAA;QAEjD,OAAO;YACL,GAAG,EAAE,OAAO;YACZ,UAAU;YACV,YAAY,EAAE,gGAAgG;YAC9G,MAAM,EAAE,MAAM;YACd,QAAQ,EAAE,KAAK,IAAI,EAAE;gBACnB,IAAI,UAAU,GAAG,KAAK,CAAA;gBACtB,IAAI,CAAC;oBACH,MAAM,MAAM,GAAG,MAAM,eAAe,CAAA;oBACpC,MAAM,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAA;oBACrC,OAAO,cAAc,CAAC,MAAM,CAAC,CAAA;gBAC/B,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,IAAI,KAAK,YAAY,KAAK,EAAE,CAAC;wBAC3B,mDAAmD;oBACrD,CAAC;oBACD,UAAU,GAAG,IAAI,CAAA;oBACjB,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAA;gBAC3B,CAAC;wBAAS,CAAC;oBACT,IAAI,CAAC,uBAAuB,CAC1B,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC,CAAC,IAAI,CAAC,eAAe,EAC7D,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CACjC,CAAA;gBACH,CAAC;YACH,CAAC;SACF,CAAA;IACH,CAAC,CAAA;AACH,CAAC;AAED,MAAM,UAAU,4BAA4B,CAAC,IAA2B;IACtE,OAAO,KAAK,IAAoC,EAAE;QAChD,MAAM,cAAc,GAAG,MAAM,gBAAgB,CAC3C,GAAG,MAAM,mCAAmC,EAC5C;YACE,MAAM,EAAE,MAAM;YACd,OAAO,EAAE;gBACP,cAAc,EAAE,kBAAkB;gBAClC,YAAY,EAAE,0BAA0B,CAAC,IAAI,CAAC,SAAS,CAAC;aACzD;YACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,SAAS,EAAE,SAAS,EAAE,CAAC;SAC/C,EACD,qBAAqB,CACtB,CAAA;QAED,IAAI,CAAC,cAAc,CAAC,EAAE,EAAE,CAAC;YACvB,MAAM,IAAI,KAAK,CAAC,yCAAyC,CAAC,CAAA;QAC5D,CAAC;QAED,MAAM,UAAU,GAAG,CAAC,MAAM,cAAc,CAAC,IAAI,EAAE,CAI9C,CAAA;QAED,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,GAAG,IAAI,CAAA;QAEvE,OAAO;YACL,GAAG,EAAE,GAAG,MAAM,eAAe;YAC7B,YAAY,EAAE,eAAe,UAAU,CAAC,SAAS,EAAE;YACnD,MAAM,EAAE,MAAM;YACd,KAAK,CAAC,QAAQ;gBACZ,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;gBAC5B,OAAO,IAAI,EAAE,CAAC;oBACZ,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,GAAG,4BAA4B,EAAE,CAAC;wBAC1D,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAA;oBAC3B,CAAC;oBAED,MAAM,QAAQ,GAAG,MAAM,gBAAgB,CACrC,GAAG,MAAM,gCAAgC,EACzC;wBACE,MAAM,EAAE,MAAM;wBACd,OAAO,EAAE;4BACP,cAAc,EAAE,kBAAkB;4BAClC,YAAY,EAAE,0BAA0B,CAAC,IAAI,CAAC,SAAS,CAAC;yBACzD;wBACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;4BACnB,cAAc,EAAE,UAAU,CAAC,cAAc;4BACzC,SAAS,EAAE,UAAU,CAAC,SAAS;yBAChC,CAAC;qBACH,EACD,qBAAqB,CACtB,CAAA;oBAED,IAAI,QAAQ,CAAC,EAAE,EAAE,CAAC;wBAChB,MAAM,IAAI,GAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAGlC,CAAA;wBAED,MAAM,aAAa,GAAG,MAAM,gBAAgB,CAC1C,GAAG,MAAM,cAAc,EACvB;4BACE,MAAM,EAAE,MAAM;4BACd,OAAO,EAAE,EAAE,cAAc,EAAE,mCAAmC,EAAE;4BAChE,IAAI,EAAE,IAAI,eAAe,CAAC;gCACxB,UAAU,EAAE,oBAAoB;gCAChC,IAAI,EAAE,IAAI,CAAC,kBAAkB;gCAC7B,YAAY,EAAE,GAAG,MAAM,sBAAsB;gCAC7C,SAAS,EAAE,SAAS;gCACpB,aAAa,EAAE,IAAI,CAAC,aAAa;6BAClC,CAAC,CAAC,QAAQ,EAAE;yBACd,EACD,qBAAqB,CACtB,CAAA;wBAED,IAAI,CAAC,aAAa,CAAC,EAAE,EAAE,CAAC;4BACtB,MAAM,IAAI,KAAK,CAAC,0BAA0B,aAAa,CAAC,MAAM,EAAE,CAAC,CAAA;wBACnE,CAAC;wBAED,MAAM,MAAM,GAAG,CAAC,MAAM,aAAa,CAAC,IAAI,EAAE,CAAkB,CAAA;wBAC5D,MAAM,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAA;wBACrC,OAAO,cAAc,CAAC,MAAM,CAAC,CAAA;oBAC/B,CAAC;oBAED,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;wBACvD,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAA;oBAC3B,CAAC;oBAED,MAAM,KAAK,CAAC,QAAQ,GAAG,8BAA8B,CAAC,CAAA;gBACxD,CAAC;YACH,CAAC;SACF,CAAA;IACH,CAAC,CAAA;AACH,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth-persistence.d.ts","sourceRoot":"","sources":["../../../lib/codex-native/oauth-persistence.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAiB,cAAc,EAAE,MAAM,aAAa,CAAA;AAEhE,OAAO,EAAoB,KAAK,aAAa,EAAE,MAAM,kBAAkB,CAAA;AAEvE,wBAAsB,yBAAyB,CAAC,MAAM,EAAE,aAAa,EAAE,QAAQ,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"oauth-persistence.d.ts","sourceRoot":"","sources":["../../../lib/codex-native/oauth-persistence.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAiB,cAAc,EAAE,MAAM,aAAa,CAAA;AAEhE,OAAO,EAAoB,KAAK,aAAa,EAAE,MAAM,kBAAkB,CAAA;AAEvE,wBAAsB,yBAAyB,CAAC,MAAM,EAAE,aAAa,EAAE,QAAQ,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CA8B9G"}
|
|
@@ -17,6 +17,12 @@ export async function persistOAuthTokensForMode(tokens, authMode) {
|
|
|
17
17
|
lastUsed: now
|
|
18
18
|
};
|
|
19
19
|
await saveAuthStorage(undefined, async (authFile) => {
|
|
20
|
+
if (!authFile.openai || authFile.openai.type !== "oauth") {
|
|
21
|
+
authFile.openai = {
|
|
22
|
+
type: "oauth",
|
|
23
|
+
accounts: []
|
|
24
|
+
};
|
|
25
|
+
}
|
|
20
26
|
const domain = ensureOpenAIOAuthDomain(authFile, authMode);
|
|
21
27
|
const stored = upsertAccount(domain, { ...account, authTypes: [authMode] });
|
|
22
28
|
if (stored.identityKey) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth-persistence.js","sourceRoot":"","sources":["../../../lib/codex-native/oauth-persistence.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,qBAAqB,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA;AAC5F,OAAO,EAAE,uBAAuB,EAAE,eAAe,EAAE,MAAM,eAAe,CAAA;AAExE,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAA;AAC7C,OAAO,EAAE,gBAAgB,EAAsB,MAAM,kBAAkB,CAAA;AAEvE,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAAC,MAAqB,EAAE,QAAwB;IAC7F,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;IACtB,MAAM,OAAO,GAAG,GAAG,GAAG,CAAC,MAAM,CAAC,UAAU,IAAI,IAAI,CAAC,GAAG,IAAI,CAAA;IACxD,MAAM,MAAM,GAAG,cAAc,CAAC,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,YAAY,CAAC,CAAA;IAErE,MAAM,OAAO,GAAkB;QAC7B,OAAO,EAAE,IAAI;QACb,OAAO,EAAE,MAAM,CAAC,aAAa;QAC7B,MAAM,EAAE,MAAM,CAAC,YAAY;QAC3B,OAAO;QACP,SAAS,EAAE,gBAAgB,CAAC,MAAM,CAAC;QACnC,KAAK,EAAE,sBAAsB,CAAC,MAAM,CAAC;QACrC,IAAI,EAAE,qBAAqB,CAAC,MAAM,CAAC;QACnC,QAAQ,EAAE,GAAG;KACd,CAAA;IAED,MAAM,eAAe,CAAC,SAAS,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE;QAClD,MAAM,MAAM,GAAG,uBAAuB,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAA;QAC1D,MAAM,MAAM,GAAG,aAAa,CAAC,MAAM,EAAE,EAAE,GAAG,OAAO,EAAE,SAAS,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAA;QAC3E,IAAI,MAAM,CAAC,WAAW,EAAE,CAAC;YACvB,MAAM,CAAC,iBAAiB,GAAG,MAAM,CAAC,WAAW,CAAA;QAC/C,CAAC;QACD,OAAO,QAAQ,CAAA;IACjB,CAAC,CAAC,CAAA;AACJ,CAAC"}
|
|
1
|
+
{"version":3,"file":"oauth-persistence.js","sourceRoot":"","sources":["../../../lib/codex-native/oauth-persistence.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,qBAAqB,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA;AAC5F,OAAO,EAAE,uBAAuB,EAAE,eAAe,EAAE,MAAM,eAAe,CAAA;AAExE,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAA;AAC7C,OAAO,EAAE,gBAAgB,EAAsB,MAAM,kBAAkB,CAAA;AAEvE,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAAC,MAAqB,EAAE,QAAwB;IAC7F,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;IACtB,MAAM,OAAO,GAAG,GAAG,GAAG,CAAC,MAAM,CAAC,UAAU,IAAI,IAAI,CAAC,GAAG,IAAI,CAAA;IACxD,MAAM,MAAM,GAAG,cAAc,CAAC,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,YAAY,CAAC,CAAA;IAErE,MAAM,OAAO,GAAkB;QAC7B,OAAO,EAAE,IAAI;QACb,OAAO,EAAE,MAAM,CAAC,aAAa;QAC7B,MAAM,EAAE,MAAM,CAAC,YAAY;QAC3B,OAAO;QACP,SAAS,EAAE,gBAAgB,CAAC,MAAM,CAAC;QACnC,KAAK,EAAE,sBAAsB,CAAC,MAAM,CAAC;QACrC,IAAI,EAAE,qBAAqB,CAAC,MAAM,CAAC;QACnC,QAAQ,EAAE,GAAG;KACd,CAAA;IAED,MAAM,eAAe,CAAC,SAAS,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE;QAClD,IAAI,CAAC,QAAQ,CAAC,MAAM,IAAI,QAAQ,CAAC,MAAM,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;YACzD,QAAQ,CAAC,MAAM,GAAG;gBAChB,IAAI,EAAE,OAAO;gBACb,QAAQ,EAAE,EAAE;aACb,CAAA;QACH,CAAC;QACD,MAAM,MAAM,GAAG,uBAAuB,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAA;QAC1D,MAAM,MAAM,GAAG,aAAa,CAAC,MAAM,EAAE,EAAE,GAAG,OAAO,EAAE,SAAS,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAA;QAC3E,IAAI,MAAM,CAAC,WAAW,EAAE,CAAC;YACvB,MAAM,CAAC,iBAAiB,GAAG,MAAM,CAAC,WAAW,CAAA;QAC/C,CAAC;QACD,OAAO,QAAQ,CAAA;IACjB,CAAC,CAAC,CAAA;AACJ,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth-server.d.ts","sourceRoot":"","sources":["../../../lib/codex-native/oauth-server.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAA;AAIjD,KAAK,qBAAqB,GAAG,SAAS,GAAG,OAAO,GAAG,OAAO,CAAA;AAE1D,KAAK,0BAA0B,CAAC,KAAK,EAAE,OAAO,IAAI;IAChD,IAAI,EAAE,MAAM,CAAA;IACZ,YAAY,EAAE,MAAM,CAAA;IACpB,cAAc,EAAE,MAAM,CAAA;IACtB,WAAW,EAAE,MAAM,CAAA;IACnB,YAAY,EAAE,MAAM,CAAA;IACpB,iBAAiB,EAAE,MAAM,CAAA;IACzB,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,mBAAmB,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,CAAA;IAC9C,qBAAqB,EAAE,CAAC,IAAI,EAAE,QAAQ,GAAG,OAAO,KAAK,MAAM,CAAA;IAC3D,8BAA8B,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,MAAM,CAAA;IAC3D,qBAAqB,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,KAAK,OAAO,CAAC,OAAO,CAAC,CAAA;CAC5F,CAAA;AA4FD,wBAAgB,2BAA2B,CAAC,KAAK,EAAE,OAAO,EACxD,KAAK,EAAE,0BAA0B,CAAC,KAAK,EAAE,OAAO,CAAC,GAChD;IACD,cAAc,EAAE,MAAM,OAAO,CAAA;IAC7B,SAAS,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,IAAI,CAAA;IAClE,KAAK,EAAE,MAAM,OAAO,CAAC;QAAE,WAAW,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;IAC7C,IAAI,EAAE,MAAM,IAAI,CAAA;IAChB,YAAY,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,qBAAqB,KAAK,IAAI,CAAA;IACtE,eAAe,EAAE,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,cAAc,KAAK,OAAO,CAAC,OAAO,CAAC,CAAA;CAC5F,
|
|
1
|
+
{"version":3,"file":"oauth-server.d.ts","sourceRoot":"","sources":["../../../lib/codex-native/oauth-server.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAA;AAIjD,KAAK,qBAAqB,GAAG,SAAS,GAAG,OAAO,GAAG,OAAO,CAAA;AAE1D,KAAK,0BAA0B,CAAC,KAAK,EAAE,OAAO,IAAI;IAChD,IAAI,EAAE,MAAM,CAAA;IACZ,YAAY,EAAE,MAAM,CAAA;IACpB,cAAc,EAAE,MAAM,CAAA;IACtB,WAAW,EAAE,MAAM,CAAA;IACnB,YAAY,EAAE,MAAM,CAAA;IACpB,iBAAiB,EAAE,MAAM,CAAA;IACzB,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,mBAAmB,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,CAAA;IAC9C,qBAAqB,EAAE,CAAC,IAAI,EAAE,QAAQ,GAAG,OAAO,KAAK,MAAM,CAAA;IAC3D,8BAA8B,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,MAAM,CAAA;IAC3D,qBAAqB,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,KAAK,OAAO,CAAC,OAAO,CAAC,CAAA;CAC5F,CAAA;AA4FD,wBAAgB,2BAA2B,CAAC,KAAK,EAAE,OAAO,EACxD,KAAK,EAAE,0BAA0B,CAAC,KAAK,EAAE,OAAO,CAAC,GAChD;IACD,cAAc,EAAE,MAAM,OAAO,CAAA;IAC7B,SAAS,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,IAAI,CAAA;IAClE,KAAK,EAAE,MAAM,OAAO,CAAC;QAAE,WAAW,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;IAC7C,IAAI,EAAE,MAAM,IAAI,CAAA;IAChB,YAAY,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,qBAAqB,KAAK,IAAI,CAAA;IACtE,eAAe,EAAE,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,cAAc,KAAK,OAAO,CAAC,OAAO,CAAC,CAAA;CAC5F,CA6TA"}
|
|
@@ -84,6 +84,7 @@ export function createOAuthServerController(input) {
|
|
|
84
84
|
const debugLogMaxBytes = resolveDebugLogMaxBytes();
|
|
85
85
|
let oauthServer;
|
|
86
86
|
let pendingOAuth;
|
|
87
|
+
let lastErrorState;
|
|
87
88
|
let oauthServerCloseTimer;
|
|
88
89
|
function isDebugEnabled() {
|
|
89
90
|
const raw = process.env.CODEX_AUTH_DEBUG?.trim().toLowerCase();
|
|
@@ -194,34 +195,38 @@ export function createOAuthServerController(input) {
|
|
|
194
195
|
hasState: Boolean(state),
|
|
195
196
|
hasError: Boolean(error)
|
|
196
197
|
});
|
|
198
|
+
if (!pendingOAuth || state !== pendingOAuth.state) {
|
|
199
|
+
if (error && state && state === lastErrorState) {
|
|
200
|
+
const errorMsg = errorDescription || error;
|
|
201
|
+
emitDebug("callback_error", { reason: errorMsg });
|
|
202
|
+
sendHtml(200, input.buildOAuthErrorHtml(errorMsg));
|
|
203
|
+
return;
|
|
204
|
+
}
|
|
205
|
+
const errorMsg = "Invalid state - potential CSRF attack";
|
|
206
|
+
emitDebug("callback_error", { reason: errorMsg });
|
|
207
|
+
sendHtml(400, input.buildOAuthErrorHtml(errorMsg));
|
|
208
|
+
return;
|
|
209
|
+
}
|
|
210
|
+
const current = pendingOAuth;
|
|
197
211
|
if (error) {
|
|
198
212
|
const errorMsg = errorDescription || error;
|
|
199
213
|
emitDebug("callback_error", { reason: errorMsg });
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
}
|
|
214
|
+
current.reject(new Error(errorMsg));
|
|
215
|
+
lastErrorState = state ?? undefined;
|
|
216
|
+
pendingOAuth = undefined;
|
|
204
217
|
sendHtml(200, input.buildOAuthErrorHtml(errorMsg));
|
|
205
218
|
return;
|
|
206
219
|
}
|
|
207
220
|
if (!code) {
|
|
208
221
|
const errorMsg = "Missing authorization code";
|
|
209
222
|
emitDebug("callback_error", { reason: errorMsg });
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
pendingOAuth = undefined;
|
|
213
|
-
}
|
|
223
|
+
current.reject(new Error(errorMsg));
|
|
224
|
+
pendingOAuth = undefined;
|
|
214
225
|
sendHtml(400, input.buildOAuthErrorHtml(errorMsg));
|
|
215
226
|
return;
|
|
216
227
|
}
|
|
217
|
-
if (!pendingOAuth || state !== pendingOAuth.state) {
|
|
218
|
-
const errorMsg = "Invalid state - potential CSRF attack";
|
|
219
|
-
emitDebug("callback_error", { reason: errorMsg });
|
|
220
|
-
sendHtml(400, input.buildOAuthErrorHtml(errorMsg));
|
|
221
|
-
return;
|
|
222
|
-
}
|
|
223
|
-
const current = pendingOAuth;
|
|
224
228
|
pendingOAuth = undefined;
|
|
229
|
+
lastErrorState = undefined;
|
|
225
230
|
emitDebug("token_exchange_start", { authMode: current.authMode });
|
|
226
231
|
input
|
|
227
232
|
.exchangeCodeForTokens(code, input.callbackUri, current.pkce)
|
|
@@ -313,6 +318,7 @@ export function createOAuthServerController(input) {
|
|
|
313
318
|
emitDebug("server_stopping", { hadPendingOAuth: Boolean(pendingOAuth) });
|
|
314
319
|
oauthServer?.close();
|
|
315
320
|
oauthServer = undefined;
|
|
321
|
+
lastErrorState = undefined;
|
|
316
322
|
emitDebug("server_stopped");
|
|
317
323
|
}
|
|
318
324
|
function scheduleStop(delayMs, reason) {
|
|
@@ -332,6 +338,7 @@ export function createOAuthServerController(input) {
|
|
|
332
338
|
if (pendingOAuth) {
|
|
333
339
|
return Promise.reject(new Error("Authorization already in progress"));
|
|
334
340
|
}
|
|
341
|
+
lastErrorState = undefined;
|
|
335
342
|
emitDebug("callback_wait_start", {
|
|
336
343
|
authMode,
|
|
337
344
|
stateTail: state.slice(-6)
|