opencode-account-manager 0.6.7 → 0.6.9
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/.github/workflows/ci.yml +27 -0
- package/README.md +75 -25
- package/README_VI.md +75 -25
- package/dist/cli.js +110 -6
- package/dist/cli.js.map +1 -1
- package/dist/core/accounts.d.ts.map +1 -1
- package/dist/core/accounts.js +11 -4
- package/dist/core/accounts.js.map +1 -1
- package/dist/core/config-store.d.ts +23 -0
- package/dist/core/config-store.d.ts.map +1 -1
- package/dist/core/config-store.js +65 -1
- package/dist/core/config-store.js.map +1 -1
- package/dist/core/fingerprint.d.ts +11 -0
- package/dist/core/fingerprint.d.ts.map +1 -0
- package/dist/core/fingerprint.js +47 -0
- package/dist/core/fingerprint.js.map +1 -0
- package/dist/core/health-log.d.ts +5 -0
- package/dist/core/health-log.d.ts.map +1 -1
- package/dist/core/health-log.js +32 -0
- package/dist/core/health-log.js.map +1 -1
- package/dist/core/health-oauth.d.ts +16 -0
- package/dist/core/health-oauth.d.ts.map +1 -1
- package/dist/core/health-oauth.js +80 -1
- package/dist/core/health-oauth.js.map +1 -1
- package/dist/core/health-orchestrator.d.ts.map +1 -1
- package/dist/core/health-orchestrator.js +26 -2
- package/dist/core/health-orchestrator.js.map +1 -1
- package/dist/core/importers/amExport.d.ts.map +1 -1
- package/dist/core/importers/amExport.js +2 -37
- package/dist/core/importers/amExport.js.map +1 -1
- package/dist/core/importers/amJson.d.ts.map +1 -1
- package/dist/core/importers/amJson.js +2 -34
- package/dist/core/importers/amJson.js.map +1 -1
- package/dist/core/opencode-config.d.ts +13 -0
- package/dist/core/opencode-config.d.ts.map +1 -1
- package/dist/core/opencode-config.js +25 -1
- package/dist/core/opencode-config.js.map +1 -1
- package/dist/tui/Dashboard.d.ts.map +1 -1
- package/dist/tui/Dashboard.js +34 -3
- package/dist/tui/Dashboard.js.map +1 -1
- package/docs/ROADMAP.md +32 -5
- package/package.json +10 -9
- package/src/cli.ts +159 -43
- package/src/core/accounts.ts +33 -29
- package/src/core/config-store.ts +97 -21
- package/src/core/fingerprint.ts +49 -0
- package/src/core/health-log.ts +37 -0
- package/src/core/health-oauth.ts +89 -1
- package/src/core/health-orchestrator.ts +33 -6
- package/src/core/importers/amExport.ts +4 -43
- package/src/core/importers/amJson.ts +8 -44
- package/src/core/opencode-config.ts +58 -22
- package/src/tui/Dashboard.tsx +48 -9
- package/tests/accounts.test.js +204 -0
- package/tests/health-log.test.js +87 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config-store.d.ts","sourceRoot":"","sources":["../../src/core/config-store.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,mBAAmB,EACnB,YAAY,EACZ,iBAAiB,EACjB,cAAc,EACf,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"config-store.d.ts","sourceRoot":"","sources":["../../src/core/config-store.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,mBAAmB,EACnB,YAAY,EACZ,iBAAiB,EACjB,cAAc,EACf,MAAM,SAAS,CAAC;AAQjB,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,SAAS;IACxB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,mBAAmB,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC;IAC5C,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,MAAM,CAAC,EAAE,YAAY,CAAC;CACvB;AAQD;;GAEG;AACH,wBAAgB,kBAAkB,IAAI,WAAW,GAAG,IAAI,CAEvD;AAED;;GAEG;AACH,wBAAgB,oBAAoB,IAAI,IAAI,CAE3C;AAsCD;;GAEG;AACH,wBAAgB,aAAa,IAAI,MAAM,CAEtC;AAMD;;GAEG;AACH,wBAAgB,UAAU,IAAI,SAAS,CAetC;AAED;;GAEG;AACH,wBAAgB,WAAW,CAAC,MAAM,EAAE,SAAS,GAAG,IAAI,CAWnD;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAK3D;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAK3D;AAED;;GAEG;AACH,wBAAgB,gBAAgB,IAAI,MAAM,EAAE,CAG3C;AAED;;GAEG;AACH,wBAAgB,mBAAmB,IAAI,MAAM,CAG5C;AAED;;GAEG;AACH,wBAAgB,mBAAmB,IAAI,MAAM,CAG5C;AAMD,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAExD;AAED,wBAAgB,iBAAiB,IAAI,QAAQ,CAAC,cAAc,CAAC,CAQ5D;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,cAAc,GAAG,IAAI,CAQlE;AAED,wBAAgB,oBAAoB,IAAI,iBAAiB,GAAG,SAAS,CAGpE;AAED;;;GAGG;AACH,wBAAgB,8BAA8B,IAAI,MAAM,GAAG,SAAS,CAOnE;AAED;;;GAGG;AACH,wBAAgB,+BAA+B,IAAI,MAAM,GAAG,SAAS,CAiBpE;AAED,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,iBAAiB,GAAG,IAAI,CAQxE;AAED,wBAAgB,cAAc,IAAI,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAGpE;AAED,wBAAgB,eAAe,CAC7B,KAAK,EAAE,MAAM,EACb,KAAK,CAAC,EAAE,MAAM,GACb,mBAAmB,GAAG,SAAS,CAQjC;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,mBAAmB,GAAG,IAAI,CAUpF;AAED,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAY1D;AAED,wBAAgB,gBAAgB,IAAI,IAAI,CAOvC;AA2BD,MAAM,WAAW,aAAa;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,OAAO,CAAC;CACjB;AAED;;GAEG;AACH,wBAAgB,iBAAiB,IAAI,aAAa,EAAE,CAmDnD"}
|
|
@@ -33,6 +33,8 @@ var __importStar = (this && this.__importStar) || (function () {
|
|
|
33
33
|
};
|
|
34
34
|
})();
|
|
35
35
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
|
+
exports.getLastConfigError = getLastConfigError;
|
|
37
|
+
exports.clearLastConfigError = clearLastConfigError;
|
|
36
38
|
exports.getConfigPath = getConfigPath;
|
|
37
39
|
exports.readConfig = readConfig;
|
|
38
40
|
exports.writeConfig = writeConfig;
|
|
@@ -45,6 +47,8 @@ exports.normalizeHealthKey = normalizeHealthKey;
|
|
|
45
47
|
exports.getHealthSettings = getHealthSettings;
|
|
46
48
|
exports.updateHealthSettings = updateHealthSettings;
|
|
47
49
|
exports.getHealthOAuthConfig = getHealthOAuthConfig;
|
|
50
|
+
exports.checkOAuthClientSecretInConfig = checkOAuthClientSecretInConfig;
|
|
51
|
+
exports.checkCustomOAuthEndpointWarning = checkCustomOAuthEndpointWarning;
|
|
48
52
|
exports.updateHealthOAuthConfig = updateHealthOAuthConfig;
|
|
49
53
|
exports.getHealthCache = getHealthCache;
|
|
50
54
|
exports.getCachedHealth = getCachedHealth;
|
|
@@ -56,6 +60,33 @@ const fs = __importStar(require("fs"));
|
|
|
56
60
|
const path = __importStar(require("path"));
|
|
57
61
|
const os = __importStar(require("os"));
|
|
58
62
|
const utils_1 = require("./utils");
|
|
63
|
+
const health_oauth_1 = require("./health-oauth");
|
|
64
|
+
// ============================================================================
|
|
65
|
+
// Error State
|
|
66
|
+
// ============================================================================
|
|
67
|
+
let lastConfigError = null;
|
|
68
|
+
/**
|
|
69
|
+
* Get the last config parse error, if any
|
|
70
|
+
*/
|
|
71
|
+
function getLastConfigError() {
|
|
72
|
+
return lastConfigError;
|
|
73
|
+
}
|
|
74
|
+
/**
|
|
75
|
+
* Clear the last config error
|
|
76
|
+
*/
|
|
77
|
+
function clearLastConfigError() {
|
|
78
|
+
lastConfigError = null;
|
|
79
|
+
}
|
|
80
|
+
/**
|
|
81
|
+
* Set a config parse error
|
|
82
|
+
*/
|
|
83
|
+
function setConfigError(file, message) {
|
|
84
|
+
lastConfigError = {
|
|
85
|
+
file,
|
|
86
|
+
message,
|
|
87
|
+
timestamp: Date.now(),
|
|
88
|
+
};
|
|
89
|
+
}
|
|
59
90
|
// ============================================================================
|
|
60
91
|
// Constants
|
|
61
92
|
// ============================================================================
|
|
@@ -98,7 +129,9 @@ function readConfig() {
|
|
|
98
129
|
const content = fs.readFileSync(configPath, "utf-8");
|
|
99
130
|
return JSON.parse(content);
|
|
100
131
|
}
|
|
101
|
-
catch {
|
|
132
|
+
catch (err) {
|
|
133
|
+
const message = err instanceof Error ? err.message : "Unknown parse error";
|
|
134
|
+
setConfigError(configPath, message);
|
|
102
135
|
return {};
|
|
103
136
|
}
|
|
104
137
|
}
|
|
@@ -182,6 +215,37 @@ function getHealthOAuthConfig() {
|
|
|
182
215
|
const config = readConfig();
|
|
183
216
|
return config.health?.oauth;
|
|
184
217
|
}
|
|
218
|
+
/**
|
|
219
|
+
* Check if clientSecret is stored in config file (security risk)
|
|
220
|
+
* Returns warning message if found, undefined otherwise
|
|
221
|
+
*/
|
|
222
|
+
function checkOAuthClientSecretInConfig() {
|
|
223
|
+
const config = readConfig();
|
|
224
|
+
const oauthConfig = config.health?.oauth;
|
|
225
|
+
if (oauthConfig?.clientSecret) {
|
|
226
|
+
return "Warning: OAuth clientSecret should not be stored in ocam-config.json. Please use OCAM_OAUTH_CLIENT_SECRET environment variable instead.";
|
|
227
|
+
}
|
|
228
|
+
return undefined;
|
|
229
|
+
}
|
|
230
|
+
/**
|
|
231
|
+
* Check if custom OAuth endpoint is configured but not allowed
|
|
232
|
+
* Returns warning message if custom endpoint is blocked, undefined otherwise
|
|
233
|
+
*/
|
|
234
|
+
function checkCustomOAuthEndpointWarning() {
|
|
235
|
+
const config = readConfig();
|
|
236
|
+
const oauthConfig = config.health?.oauth;
|
|
237
|
+
const envEndpoint = process.env.OCAM_OAUTH_TOKEN_ENDPOINT;
|
|
238
|
+
const configEndpoint = oauthConfig?.tokenEndpoint;
|
|
239
|
+
// Check env variable first (takes precedence)
|
|
240
|
+
if (envEndpoint) {
|
|
241
|
+
return (0, health_oauth_1.getCustomEndpointWarning)(envEndpoint);
|
|
242
|
+
}
|
|
243
|
+
// Then check config
|
|
244
|
+
if (configEndpoint) {
|
|
245
|
+
return (0, health_oauth_1.getCustomEndpointWarning)(configEndpoint);
|
|
246
|
+
}
|
|
247
|
+
return undefined;
|
|
248
|
+
}
|
|
185
249
|
function updateHealthOAuthConfig(partial) {
|
|
186
250
|
const config = readConfig();
|
|
187
251
|
const health = config.health || {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config-store.js","sourceRoot":"","sources":["../../src/core/config-store.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"config-store.js","sourceRoot":"","sources":["../../src/core/config-store.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Fingerprint generator for account imports
|
|
3
|
+
* Uses Node.js crypto module for UUID generation
|
|
4
|
+
*/
|
|
5
|
+
import { AccountFingerprint } from "./types";
|
|
6
|
+
/**
|
|
7
|
+
* Generate a new fingerprint for imported accounts
|
|
8
|
+
* Uses Node.js crypto for secure random generation
|
|
9
|
+
*/
|
|
10
|
+
export declare function generateFingerprint(): AccountFingerprint;
|
|
11
|
+
//# sourceMappingURL=fingerprint.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"fingerprint.d.ts","sourceRoot":"","sources":["../../src/core/fingerprint.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAW7C;;;GAGG;AACH,wBAAgB,mBAAmB,IAAI,kBAAkB,CA2BxD"}
|
|
@@ -0,0 +1,47 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/**
|
|
3
|
+
* Fingerprint generator for account imports
|
|
4
|
+
* Uses Node.js crypto module for UUID generation
|
|
5
|
+
*/
|
|
6
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
7
|
+
exports.generateFingerprint = generateFingerprint;
|
|
8
|
+
const crypto_1 = require("crypto");
|
|
9
|
+
/**
|
|
10
|
+
* Generate random hex string of specified length
|
|
11
|
+
*/
|
|
12
|
+
function randomHex(len) {
|
|
13
|
+
return (0, crypto_1.randomBytes)(Math.ceil(len / 2))
|
|
14
|
+
.toString("hex")
|
|
15
|
+
.slice(0, len);
|
|
16
|
+
}
|
|
17
|
+
/**
|
|
18
|
+
* Generate a new fingerprint for imported accounts
|
|
19
|
+
* Uses Node.js crypto for secure random generation
|
|
20
|
+
*/
|
|
21
|
+
function generateFingerprint() {
|
|
22
|
+
const platforms = ["win32/x64", "win32/arm64", "darwin/x64", "darwin/arm64"];
|
|
23
|
+
const ides = ["ANDROID_STUDIO", "INTELLIJ", "IDE_UNSPECIFIED"];
|
|
24
|
+
const clients = [
|
|
25
|
+
"google-cloud-sdk android-studio/2024.1",
|
|
26
|
+
"google-cloud-sdk intellij/2024.1",
|
|
27
|
+
"google-cloud-sdk vscode/1.87.0",
|
|
28
|
+
];
|
|
29
|
+
const platform = platforms[Math.floor(Math.random() * platforms.length)];
|
|
30
|
+
return {
|
|
31
|
+
deviceId: (0, crypto_1.randomUUID)(),
|
|
32
|
+
sessionToken: randomHex(32),
|
|
33
|
+
userAgent: `antigravity/1.15.8 ${platform}`,
|
|
34
|
+
apiClient: clients[Math.floor(Math.random() * clients.length)],
|
|
35
|
+
clientMetadata: {
|
|
36
|
+
ideType: ides[Math.floor(Math.random() * ides.length)],
|
|
37
|
+
platform: platform.startsWith("darwin") ? "MACOS" : "WINDOWS",
|
|
38
|
+
pluginType: "GEMINI",
|
|
39
|
+
osVersion: platform.startsWith("darwin") ? "14.2.1" : "10.0.19042",
|
|
40
|
+
arch: platform.split("/")[1],
|
|
41
|
+
sqmId: `{${(0, crypto_1.randomUUID)().toUpperCase()}}`,
|
|
42
|
+
},
|
|
43
|
+
quotaUser: `device-${randomHex(16)}`,
|
|
44
|
+
createdAt: Date.now(),
|
|
45
|
+
};
|
|
46
|
+
}
|
|
47
|
+
//# sourceMappingURL=fingerprint.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"fingerprint.js","sourceRoot":"","sources":["../../src/core/fingerprint.ts"],"names":[],"mappings":";AAAA;;;GAGG;;AAkBH,kDA2BC;AA3CD,mCAAiD;AAGjD;;GAEG;AACH,SAAS,SAAS,CAAC,GAAW;IAC5B,OAAO,IAAA,oBAAW,EAAC,IAAI,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC;SACnC,QAAQ,CAAC,KAAK,CAAC;SACf,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;AACnB,CAAC;AAED;;;GAGG;AACH,SAAgB,mBAAmB;IACjC,MAAM,SAAS,GAAG,CAAC,WAAW,EAAE,aAAa,EAAE,YAAY,EAAE,cAAc,CAAC,CAAC;IAC7E,MAAM,IAAI,GAAG,CAAC,gBAAgB,EAAE,UAAU,EAAE,iBAAiB,CAAC,CAAC;IAC/D,MAAM,OAAO,GAAG;QACd,wCAAwC;QACxC,kCAAkC;QAClC,gCAAgC;KACjC,CAAC;IAEF,MAAM,QAAQ,GAAG,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC;IAEzE,OAAO;QACL,QAAQ,EAAE,IAAA,mBAAU,GAAE;QACtB,YAAY,EAAE,SAAS,CAAC,EAAE,CAAC;QAC3B,SAAS,EAAE,sBAAsB,QAAQ,EAAE;QAC3C,SAAS,EAAE,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;QAC9D,cAAc,EAAE;YACd,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC;YACtD,QAAQ,EAAE,QAAQ,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS;YAC7D,UAAU,EAAE,QAAQ;YACpB,SAAS,EAAE,QAAQ,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,YAAY;YAClE,IAAI,EAAE,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;YAC5B,KAAK,EAAE,IAAI,IAAA,mBAAU,GAAE,CAAC,WAAW,EAAE,GAAG;SACzC;QACD,SAAS,EAAE,UAAU,SAAS,CAAC,EAAE,CAAC,EAAE;QACpC,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;KACtB,CAAC;AACJ,CAAC"}
|
|
@@ -6,4 +6,9 @@ export interface LogHealthOptions {
|
|
|
6
6
|
}
|
|
7
7
|
export declare function collectLogHealthResults(options?: LogHealthOptions): Record<string, AccountHealthResult>;
|
|
8
8
|
export declare function mergeAccountHealth(primary: AccountHealthResult | undefined, secondary: AccountHealthResult | undefined): AccountHealthResult | undefined;
|
|
9
|
+
/**
|
|
10
|
+
* Redact sensitive information from a message before storing in cache.
|
|
11
|
+
* Hides tokens, refresh_tokens, and long email addresses.
|
|
12
|
+
*/
|
|
13
|
+
export declare function redactMessage(message: string | undefined): string | undefined;
|
|
9
14
|
//# sourceMappingURL=health-log.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"health-log.d.ts","sourceRoot":"","sources":["../../src/core/health-log.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAuB,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"health-log.d.ts","sourceRoot":"","sources":["../../src/core/health-log.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAuB,MAAM,SAAS,CAAC;AA0GnE,MAAM,WAAW,gBAAgB;IAC/B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,wBAAgB,uBAAuB,CACrC,OAAO,GAAE,gBAAqB,GAC7B,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAsDrC;AAED,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,mBAAmB,GAAG,SAAS,EACxC,SAAS,EAAE,mBAAmB,GAAG,SAAS,GACzC,mBAAmB,GAAG,SAAS,CAEjC;AAED;;;GAGG;AACH,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CA0B7E"}
|
package/dist/core/health-log.js
CHANGED
|
@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.collectLogHealthResults = collectLogHealthResults;
|
|
7
7
|
exports.mergeAccountHealth = mergeAccountHealth;
|
|
8
|
+
exports.redactMessage = redactMessage;
|
|
8
9
|
const fs_1 = __importDefault(require("fs"));
|
|
9
10
|
const path_1 = __importDefault(require("path"));
|
|
10
11
|
const paths_1 = require("./paths");
|
|
@@ -12,6 +13,10 @@ const config_store_1 = require("./config-store");
|
|
|
12
13
|
const DEFAULT_MAX_FILES = 10;
|
|
13
14
|
const DEFAULT_MAX_BYTES = 2 * 1024 * 1024;
|
|
14
15
|
const EMAIL_REGEX = /[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,}/gi;
|
|
16
|
+
// Patterns for redacting sensitive data
|
|
17
|
+
const TOKEN_REGEX = /token[=:]\s*["']?[a-zA-Z0-9_\-\.]+["']?/gi;
|
|
18
|
+
const REFRESH_TOKEN_REGEX = /refresh_token[=:]\s*["']?[a-zA-Z0-9_\-\.]+["']?/gi;
|
|
19
|
+
const LONG_EMAIL_REGEX = /[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,}/gi;
|
|
15
20
|
const STATUS_PRIORITY = {
|
|
16
21
|
verification_required: 9,
|
|
17
22
|
disabled: 8,
|
|
@@ -151,4 +156,31 @@ function collectLogHealthResults(options = {}) {
|
|
|
151
156
|
function mergeAccountHealth(primary, secondary) {
|
|
152
157
|
return mergeHealthResults(primary, secondary);
|
|
153
158
|
}
|
|
159
|
+
/**
|
|
160
|
+
* Redact sensitive information from a message before storing in cache.
|
|
161
|
+
* Hides tokens, refresh_tokens, and long email addresses.
|
|
162
|
+
*/
|
|
163
|
+
function redactMessage(message) {
|
|
164
|
+
if (!message)
|
|
165
|
+
return message;
|
|
166
|
+
let redacted = message;
|
|
167
|
+
// Redact token=... or token: ... patterns
|
|
168
|
+
redacted = redacted.replace(TOKEN_REGEX, "token=***");
|
|
169
|
+
// Redact refresh_token=... or refresh_token: ... patterns
|
|
170
|
+
redacted = redacted.replace(REFRESH_TOKEN_REGEX, "refresh_token=***");
|
|
171
|
+
// Redact long email addresses (keep only first 3 chars and domain)
|
|
172
|
+
redacted = redacted.replace(LONG_EMAIL_REGEX, (email) => {
|
|
173
|
+
if (email.length > 20) {
|
|
174
|
+
const atIndex = email.indexOf("@");
|
|
175
|
+
if (atIndex > 0) {
|
|
176
|
+
const local = email.slice(0, Math.min(3, atIndex));
|
|
177
|
+
const domain = email.slice(atIndex);
|
|
178
|
+
return `${local}***${domain}`;
|
|
179
|
+
}
|
|
180
|
+
return email.slice(0, 3) + "***";
|
|
181
|
+
}
|
|
182
|
+
return email;
|
|
183
|
+
});
|
|
184
|
+
return redacted;
|
|
185
|
+
}
|
|
154
186
|
//# sourceMappingURL=health-log.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"health-log.js","sourceRoot":"","sources":["../../src/core/health-log.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"health-log.js","sourceRoot":"","sources":["../../src/core/health-log.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,20 @@
|
|
|
1
1
|
import { AccountHealthResult, HealthOAuthConfig } from "./types";
|
|
2
|
+
/**
|
|
3
|
+
* Check if custom endpoints are allowed via environment variable
|
|
4
|
+
*/
|
|
5
|
+
export declare function isCustomEndpointAllowed(): boolean;
|
|
6
|
+
/**
|
|
7
|
+
* Validate if a token endpoint is in the allowlist
|
|
8
|
+
*/
|
|
9
|
+
export declare function isTokenEndpointAllowed(endpoint: string): boolean;
|
|
10
|
+
/**
|
|
11
|
+
* Get the list of allowed token endpoints for display
|
|
12
|
+
*/
|
|
13
|
+
export declare function getAllowedTokenEndpoints(): string[];
|
|
14
|
+
/**
|
|
15
|
+
* Get warning message if custom endpoint is configured but not allowed
|
|
16
|
+
*/
|
|
17
|
+
export declare function getCustomEndpointWarning(configuredEndpoint?: string): string | undefined;
|
|
2
18
|
export declare function isOAuthHealthCheckConfigured(): boolean;
|
|
3
19
|
export declare function buildOAuthRequestBody(refreshToken: string, config: HealthOAuthConfig): string;
|
|
4
20
|
export declare function checkAccountHealthOAuth(refreshToken: string): Promise<AccountHealthResult>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"health-oauth.d.ts","sourceRoot":"","sources":["../../src/core/health-oauth.ts"],"names":[],"mappings":"AACA,OAAO,EACL,mBAAmB,EAEnB,iBAAiB,EAClB,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"health-oauth.d.ts","sourceRoot":"","sources":["../../src/core/health-oauth.ts"],"names":[],"mappings":"AACA,OAAO,EACL,mBAAmB,EAEnB,iBAAiB,EAClB,MAAM,SAAS,CAAC;AA0BjB;;GAEG;AACH,wBAAgB,uBAAuB,IAAI,OAAO,CAGjD;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAchE;AAED;;GAEG;AACH,wBAAgB,wBAAwB,IAAI,MAAM,EAAE,CAEnD;AAED;;GAEG;AACH,wBAAgB,wBAAwB,CAAC,kBAAkB,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAyBxF;AAgBD,wBAAgB,4BAA4B,IAAI,OAAO,CAEtD;AA4DD,wBAAgB,qBAAqB,CAAC,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,iBAAiB,GAAG,MAAM,CAQ7F;AAED,wBAAsB,uBAAuB,CAC3C,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,mBAAmB,CAAC,CA8F9B"}
|
|
@@ -3,6 +3,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.isCustomEndpointAllowed = isCustomEndpointAllowed;
|
|
7
|
+
exports.isTokenEndpointAllowed = isTokenEndpointAllowed;
|
|
8
|
+
exports.getAllowedTokenEndpoints = getAllowedTokenEndpoints;
|
|
9
|
+
exports.getCustomEndpointWarning = getCustomEndpointWarning;
|
|
6
10
|
exports.isOAuthHealthCheckConfigured = isOAuthHealthCheckConfigured;
|
|
7
11
|
exports.buildOAuthRequestBody = buildOAuthRequestBody;
|
|
8
12
|
exports.checkAccountHealthOAuth = checkAccountHealthOAuth;
|
|
@@ -10,10 +14,72 @@ const https_1 = __importDefault(require("https"));
|
|
|
10
14
|
const config_store_1 = require("./config-store");
|
|
11
15
|
const DEFAULT_TOKEN_ENDPOINT = "https://oauth2.googleapis.com/token";
|
|
12
16
|
const REQUEST_TIMEOUT_MS = 10000;
|
|
17
|
+
// Allowlist for OAuth token endpoints (security)
|
|
18
|
+
const ALLOWED_TOKEN_ENDPOINTS = [
|
|
19
|
+
"https://oauth2.googleapis.com/token",
|
|
20
|
+
];
|
|
21
|
+
// Environment variable to allow custom endpoints
|
|
22
|
+
const ALLOW_CUSTOM_ENDPOINT_ENV = "OCAM_OAUTH_ALLOW_CUSTOM_ENDPOINT";
|
|
23
|
+
/**
|
|
24
|
+
* Check if custom endpoints are allowed via environment variable
|
|
25
|
+
*/
|
|
26
|
+
function isCustomEndpointAllowed() {
|
|
27
|
+
const envValue = process.env[ALLOW_CUSTOM_ENDPOINT_ENV];
|
|
28
|
+
return envValue === "true" || envValue === "1";
|
|
29
|
+
}
|
|
30
|
+
/**
|
|
31
|
+
* Validate if a token endpoint is in the allowlist
|
|
32
|
+
*/
|
|
33
|
+
function isTokenEndpointAllowed(endpoint) {
|
|
34
|
+
// Always allow default endpoint
|
|
35
|
+
if (endpoint === DEFAULT_TOKEN_ENDPOINT) {
|
|
36
|
+
return true;
|
|
37
|
+
}
|
|
38
|
+
// Check allowlist
|
|
39
|
+
if (ALLOWED_TOKEN_ENDPOINTS.includes(endpoint)) {
|
|
40
|
+
return true;
|
|
41
|
+
}
|
|
42
|
+
// Check if custom endpoints are allowed via env
|
|
43
|
+
if (isCustomEndpointAllowed()) {
|
|
44
|
+
return true;
|
|
45
|
+
}
|
|
46
|
+
return false;
|
|
47
|
+
}
|
|
48
|
+
/**
|
|
49
|
+
* Get the list of allowed token endpoints for display
|
|
50
|
+
*/
|
|
51
|
+
function getAllowedTokenEndpoints() {
|
|
52
|
+
return [...ALLOWED_TOKEN_ENDPOINTS];
|
|
53
|
+
}
|
|
54
|
+
/**
|
|
55
|
+
* Get warning message if custom endpoint is configured but not allowed
|
|
56
|
+
*/
|
|
57
|
+
function getCustomEndpointWarning(configuredEndpoint) {
|
|
58
|
+
if (!configuredEndpoint) {
|
|
59
|
+
return undefined;
|
|
60
|
+
}
|
|
61
|
+
const endpoint = configuredEndpoint.trim();
|
|
62
|
+
// Skip if it's the default endpoint
|
|
63
|
+
if (endpoint === DEFAULT_TOKEN_ENDPOINT) {
|
|
64
|
+
return undefined;
|
|
65
|
+
}
|
|
66
|
+
// Skip if it's in the allowlist
|
|
67
|
+
if (ALLOWED_TOKEN_ENDPOINTS.includes(endpoint)) {
|
|
68
|
+
return undefined;
|
|
69
|
+
}
|
|
70
|
+
// Check if custom endpoints are allowed
|
|
71
|
+
if (isCustomEndpointAllowed()) {
|
|
72
|
+
return undefined;
|
|
73
|
+
}
|
|
74
|
+
return `Warning: Custom OAuth token endpoint "${endpoint}" is not in the allowlist. ` +
|
|
75
|
+
`Set ${ALLOW_CUSTOM_ENDPOINT_ENV}=true to allow custom endpoints. ` +
|
|
76
|
+
`Allowed endpoints: ${ALLOWED_TOKEN_ENDPOINTS.join(", ")}`;
|
|
77
|
+
}
|
|
13
78
|
function resolveOAuthConfig() {
|
|
14
79
|
const config = (0, config_store_1.getHealthOAuthConfig)() || {};
|
|
15
80
|
const clientId = process.env.OCAM_OAUTH_CLIENT_ID || config.clientId;
|
|
16
|
-
|
|
81
|
+
// SECURITY: Only read clientSecret from environment variable, never from config file
|
|
82
|
+
const clientSecret = process.env.OCAM_OAUTH_CLIENT_SECRET;
|
|
17
83
|
const tokenEndpoint = process.env.OCAM_OAUTH_TOKEN_ENDPOINT || config.tokenEndpoint;
|
|
18
84
|
if (!clientId || !clientSecret)
|
|
19
85
|
return undefined;
|
|
@@ -95,6 +161,19 @@ async function checkAccountHealthOAuth(refreshToken) {
|
|
|
95
161
|
});
|
|
96
162
|
}
|
|
97
163
|
const tokenEndpoint = config.tokenEndpoint || DEFAULT_TOKEN_ENDPOINT;
|
|
164
|
+
// Enforce HTTPS-only token endpoints for security
|
|
165
|
+
if (!tokenEndpoint.startsWith("https://")) {
|
|
166
|
+
return buildResult("not_configured", "oauth", {
|
|
167
|
+
message: "Token endpoint must use HTTPS protocol",
|
|
168
|
+
});
|
|
169
|
+
}
|
|
170
|
+
// Enforce allowlist for token endpoints
|
|
171
|
+
if (!isTokenEndpointAllowed(tokenEndpoint)) {
|
|
172
|
+
return buildResult("not_configured", "oauth", {
|
|
173
|
+
message: `Token endpoint "${tokenEndpoint}" is not in the allowlist. ` +
|
|
174
|
+
`Set ${ALLOW_CUSTOM_ENDPOINT_ENV}=true to allow custom endpoints.`,
|
|
175
|
+
});
|
|
176
|
+
}
|
|
98
177
|
const body = buildOAuthRequestBody(refreshToken, config);
|
|
99
178
|
return new Promise((resolve) => {
|
|
100
179
|
const request = https_1.default.request(tokenEndpoint, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"health-oauth.js","sourceRoot":"","sources":["../../src/core/health-oauth.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"health-oauth.js","sourceRoot":"","sources":["../../src/core/health-oauth.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"health-orchestrator.d.ts","sourceRoot":"","sources":["../../src/core/health-orchestrator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAU5E,MAAM,MAAM,gBAAgB,GAAG,kBAAkB,GAAG,UAAU,GAAG,UAAU,CAAC;AAE5E,MAAM,WAAW,kBAAkB;IACjC,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,UAAU,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;CACxE;AAED,MAAM,WAAW,eAAe;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,mBAAmB,CAAC;IAC5B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,UAAU,CAAC,EAAE,gBAAgB,CAAC;IAC9B,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,WAAW,iBAAiB;IAChC,KAAK,EAAE,eAAe,EAAE,CAAC;IACzB,MAAM,EAAE;QACN,KAAK,EAAE,MAAM,CAAC;QACd,OAAO,EAAE,MAAM,CAAC;QAChB,OAAO,EAAE,MAAM,CAAC;QAChB,MAAM,EAAE,MAAM,CAAC;QACf,QAAQ,EAAE,MAAM,CAAC,mBAAmB,EAAE,MAAM,CAAC,CAAC;KAC/C,CAAC;IACF,MAAM,EAAE;QACN,SAAS,EAAE,MAAM,CAAC;QAClB,WAAW,EAAE,MAAM,CAAC;QACpB,UAAU,EAAE,MAAM,CAAC;KACpB,CAAC;CACH;AAiDD,wBAAsB,mBAAmB,CACvC,QAAQ,EAAE,OAAO,EAAE,EACnB,OAAO,GAAE,kBAAuB,GAC/B,OAAO,CAAC,iBAAiB,CAAC,
|
|
1
|
+
{"version":3,"file":"health-orchestrator.d.ts","sourceRoot":"","sources":["../../src/core/health-orchestrator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAU5E,MAAM,MAAM,gBAAgB,GAAG,kBAAkB,GAAG,UAAU,GAAG,UAAU,CAAC;AAE5E,MAAM,WAAW,kBAAkB;IACjC,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,UAAU,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;CACxE;AAED,MAAM,WAAW,eAAe;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,mBAAmB,CAAC;IAC5B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,UAAU,CAAC,EAAE,gBAAgB,CAAC;IAC9B,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,WAAW,iBAAiB;IAChC,KAAK,EAAE,eAAe,EAAE,CAAC;IACzB,MAAM,EAAE;QACN,KAAK,EAAE,MAAM,CAAC;QACd,OAAO,EAAE,MAAM,CAAC;QAChB,OAAO,EAAE,MAAM,CAAC;QAChB,MAAM,EAAE,MAAM,CAAC;QACf,QAAQ,EAAE,MAAM,CAAC,mBAAmB,EAAE,MAAM,CAAC,CAAC;KAC/C,CAAC;IACF,MAAM,EAAE;QACN,SAAS,EAAE,MAAM,CAAC;QAClB,WAAW,EAAE,MAAM,CAAC;QACpB,UAAU,EAAE,MAAM,CAAC;KACpB,CAAC;CACH;AAiDD,wBAAsB,mBAAmB,CACvC,QAAQ,EAAE,OAAO,EAAE,EACnB,OAAO,GAAE,kBAAuB,GAC/B,OAAO,CAAC,iBAAiB,CAAC,CA6J5B"}
|
|
@@ -100,10 +100,34 @@ async function checkAccountsHealth(accounts, options = {}) {
|
|
|
100
100
|
if (options.onProgress) {
|
|
101
101
|
options.onProgress(completed, total, `Checking ${item.email}...`);
|
|
102
102
|
}
|
|
103
|
-
|
|
103
|
+
let oauthResult;
|
|
104
|
+
try {
|
|
105
|
+
oauthResult = await (0, health_oauth_1.checkAccountHealthOAuth)(item.refreshToken);
|
|
106
|
+
}
|
|
107
|
+
catch (error) {
|
|
108
|
+
const isNetworkError = error instanceof Error &&
|
|
109
|
+
(error.message.includes("network") ||
|
|
110
|
+
error.message.includes("ECONNREFUSED") ||
|
|
111
|
+
error.message.includes("ETIMEDOUT") ||
|
|
112
|
+
error.message.includes("ENOTFOUND") ||
|
|
113
|
+
error.message.includes("socket") ||
|
|
114
|
+
error.message.includes("timeout"));
|
|
115
|
+
oauthResult = {
|
|
116
|
+
status: isNetworkError ? "network_error" : "unknown_error",
|
|
117
|
+
source: "oauth",
|
|
118
|
+
checkedAt: Date.now(),
|
|
119
|
+
message: error instanceof Error ? error.message : String(error),
|
|
120
|
+
};
|
|
121
|
+
}
|
|
104
122
|
const key = (0, config_store_1.normalizeHealthKey)(item.email);
|
|
105
123
|
const merged = (0, health_log_1.mergeAccountHealth)(oauthResult, logResults[key]) || oauthResult;
|
|
106
|
-
|
|
124
|
+
// Redact sensitive data before caching
|
|
125
|
+
const redactedResult = {
|
|
126
|
+
...merged,
|
|
127
|
+
message: (0, health_log_1.redactMessage)(merged.message),
|
|
128
|
+
errorDescription: (0, health_log_1.redactMessage)(merged.errorDescription),
|
|
129
|
+
};
|
|
130
|
+
(0, config_store_1.setHealthCacheEntry)(item.email, redactedResult);
|
|
107
131
|
completed++;
|
|
108
132
|
if (options.onProgress) {
|
|
109
133
|
options.onProgress(completed, total, `Finished ${item.email}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"health-orchestrator.js","sourceRoot":"","sources":["../../src/core/health-orchestrator.ts"],"names":[],"mappings":";;AA0FA,
|
|
1
|
+
{"version":3,"file":"health-orchestrator.js","sourceRoot":"","sources":["../../src/core/health-orchestrator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"amExport.d.ts","sourceRoot":"","sources":["../../../src/core/importers/amExport.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAGH,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"amExport.d.ts","sourceRoot":"","sources":["../../../src/core/importers/amExport.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAGH,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AAGnC;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,aAAa,EAAE,MAAM,CAAC;CACvB;AAED;;GAEG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,OAAO,GAAG,IAAI,IAAI,aAAa,EAAE,CAYrE;AAED,MAAM,WAAW,wBAAwB;IACvC,QAAQ,EAAE,OAAO,EAAE,CAAC;IACpB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,MAAM,EAAE,WAAW,CAAC;CACrB;AAED;;GAEG;AACH,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,aAAa,EAAE,GAAG,wBAAwB,CAmC5F;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,MAAM,GAAG,wBAAwB,CA+BjF;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAU5D"}
|
|
@@ -19,6 +19,7 @@ exports.importFromAMExportContent = importFromAMExportContent;
|
|
|
19
19
|
exports.importFromAMExportFile = importFromAMExportFile;
|
|
20
20
|
exports.isAMExportFilePath = isAMExportFilePath;
|
|
21
21
|
const fs_1 = __importDefault(require("fs"));
|
|
22
|
+
const fingerprint_1 = require("../fingerprint");
|
|
22
23
|
/**
|
|
23
24
|
* Type guard to check if data is an AM export file (array of entries)
|
|
24
25
|
*/
|
|
@@ -34,42 +35,6 @@ function isAMExportFile(data) {
|
|
|
34
35
|
typeof item.email === "string" &&
|
|
35
36
|
typeof item.refresh_token === "string");
|
|
36
37
|
}
|
|
37
|
-
/**
|
|
38
|
-
* Generate a new fingerprint for imported accounts
|
|
39
|
-
*/
|
|
40
|
-
function generateFingerprint() {
|
|
41
|
-
const randomHex = (len) => {
|
|
42
|
-
let result = "";
|
|
43
|
-
for (let i = 0; i < len; i++) {
|
|
44
|
-
result += Math.floor(Math.random() * 16).toString(16);
|
|
45
|
-
}
|
|
46
|
-
return result;
|
|
47
|
-
};
|
|
48
|
-
const platforms = ["win32/x64", "win32/arm64", "darwin/x64", "darwin/arm64"];
|
|
49
|
-
const ides = ["ANDROID_STUDIO", "INTELLIJ", "IDE_UNSPECIFIED"];
|
|
50
|
-
const clients = [
|
|
51
|
-
"google-cloud-sdk android-studio/2024.1",
|
|
52
|
-
"google-cloud-sdk intellij/2024.1",
|
|
53
|
-
"google-cloud-sdk vscode/1.87.0",
|
|
54
|
-
];
|
|
55
|
-
const platform = platforms[Math.floor(Math.random() * platforms.length)];
|
|
56
|
-
return {
|
|
57
|
-
deviceId: crypto.randomUUID(),
|
|
58
|
-
sessionToken: randomHex(32),
|
|
59
|
-
userAgent: `antigravity/1.15.8 ${platform}`,
|
|
60
|
-
apiClient: clients[Math.floor(Math.random() * clients.length)],
|
|
61
|
-
clientMetadata: {
|
|
62
|
-
ideType: ides[Math.floor(Math.random() * ides.length)],
|
|
63
|
-
platform: platform.startsWith("darwin") ? "MACOS" : "WINDOWS",
|
|
64
|
-
pluginType: "GEMINI",
|
|
65
|
-
osVersion: platform.startsWith("darwin") ? "14.2.1" : "10.0.19042",
|
|
66
|
-
arch: platform.split("/")[1],
|
|
67
|
-
sqmId: `{${crypto.randomUUID().toUpperCase()}}`,
|
|
68
|
-
},
|
|
69
|
-
quotaUser: `device-${randomHex(16)}`,
|
|
70
|
-
createdAt: Date.now(),
|
|
71
|
-
};
|
|
72
|
-
}
|
|
73
38
|
/**
|
|
74
39
|
* Import accounts from AM export file content
|
|
75
40
|
*/
|
|
@@ -97,7 +62,7 @@ function importFromAMExportContent(entries) {
|
|
|
97
62
|
refreshToken: entry.refresh_token,
|
|
98
63
|
addedAt: Date.now(),
|
|
99
64
|
lastUsed: Date.now(),
|
|
100
|
-
fingerprint: generateFingerprint(),
|
|
65
|
+
fingerprint: (0, fingerprint_1.generateFingerprint)(),
|
|
101
66
|
enabled: true,
|
|
102
67
|
};
|
|
103
68
|
result.accounts.push(account);
|