@kaitranntt/ccs 7.79.1-dev.2 → 7.79.1-dev.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/cliproxy/ai-providers/model-id-normalizer.d.ts +8 -0
- package/dist/cliproxy/ai-providers/model-id-normalizer.d.ts.map +1 -1
- package/dist/cliproxy/ai-providers/model-id-normalizer.js +18 -1
- package/dist/cliproxy/ai-providers/model-id-normalizer.js.map +1 -1
- package/dist/targets/codex-cliproxy-provider-config.d.ts.map +1 -1
- package/dist/targets/codex-cliproxy-provider-config.js +41 -13
- package/dist/targets/codex-cliproxy-provider-config.js.map +1 -1
- package/dist/web-server/middleware/auth-middleware.d.ts.map +1 -1
- package/dist/web-server/middleware/auth-middleware.js +25 -1
- package/dist/web-server/middleware/auth-middleware.js.map +1 -1
- package/package.json +1 -1
|
@@ -10,6 +10,14 @@ import type { CLIProxyProvider } from '../types';
|
|
|
10
10
|
/** Env vars that carry model identifiers. */
|
|
11
11
|
export declare const MODEL_ENV_VAR_KEYS: readonly ["ANTHROPIC_MODEL", "ANTHROPIC_DEFAULT_OPUS_MODEL", "ANTHROPIC_DEFAULT_SONNET_MODEL", "ANTHROPIC_DEFAULT_HAIKU_MODEL"];
|
|
12
12
|
type ProviderLike = CLIProxyProvider | string | null | undefined;
|
|
13
|
+
export type CodexModelTuningEffort = 'medium' | 'high' | 'xhigh';
|
|
14
|
+
export type CodexModelServiceTier = 'fast';
|
|
15
|
+
export interface CodexModelTuningAlias {
|
|
16
|
+
baseModel: string;
|
|
17
|
+
effort: CodexModelTuningEffort | null;
|
|
18
|
+
serviceTier: CodexModelServiceTier | null;
|
|
19
|
+
}
|
|
20
|
+
export declare function parseCodexModelTuningAlias(model: string): CodexModelTuningAlias | null;
|
|
13
21
|
/**
|
|
14
22
|
* Extract provider segment from `/api/provider/{provider}` request paths.
|
|
15
23
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model-id-normalizer.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/ai-providers/model-id-normalizer.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;;;AAEH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAGjD,6CAA6C;AAC7C,eAAO,MAAM,kBAAkB,iIAA2B,CAAC;AAE3D,KAAK,YAAY,GAAG,gBAAgB,GAAG,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"model-id-normalizer.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/ai-providers/model-id-normalizer.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;;;AAEH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAGjD,6CAA6C;AAC7C,eAAO,MAAM,kBAAkB,iIAA2B,CAAC;AAE3D,KAAK,YAAY,GAAG,gBAAgB,GAAG,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;AAkCjE,MAAM,MAAM,sBAAsB,GAAG,QAAQ,GAAG,MAAM,GAAG,OAAO,CAAC;AACjE,MAAM,MAAM,qBAAqB,GAAG,MAAM,CAAC;AAE3C,MAAM,WAAW,qBAAqB;IACpC,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,sBAAsB,GAAG,IAAI,CAAC;IACtC,WAAW,EAAE,qBAAqB,GAAG,IAAI,CAAC;CAC3C;AAkDD,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,MAAM,GAAG,qBAAqB,GAAG,IAAI,CAetF;AAED;;;;;;GAMG;AACH,wBAAgB,2BAA2B,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAI3E;AAED,uEAAuE;AACvE,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,YAAY,GAAG,OAAO,CAIrE;AAED,mEAAmE;AACnE,wBAAgB,eAAe,CAAC,QAAQ,EAAE,YAAY,GAAG,OAAO,CAG/D;AAED,yEAAyE;AACzE,wBAAgB,eAAe,CAAC,QAAQ,EAAE,YAAY,GAAG,OAAO,CAG/D;AAED,0FAA0F;AAC1F,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAK5D;AAED,4EAA4E;AAC5E,wBAAgB,gCAAgC,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAStE;AAED;;;GAGG;AACH,wBAAgB,gCAAgC,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAQtE;AAED,oEAAoE;AACpE,wBAAgB,+BAA+B,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAMrE;AAED;;;GAGG;AACH,wBAAgB,uCAAuC,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAM7E;AAED;;;GAGG;AACH,wBAAgB,0CAA0C,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAKhF;AAED;;;GAGG;AACH,wBAAgB,oCAAoC,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAK1E;AAED;;GAEG;AACH,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAEjE;AAED;;GAEG;AACH,wBAAgB,iCAAiC,CAC/C,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,YAAY,GACrB,MAAM,GAAG,IAAI,CAKf;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,2BAA2B,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,YAAY,GAAG,MAAM,CAWzF;AAED;;;;GAIG;AACH,wBAAgB,8BAA8B,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,YAAY,GAAG,MAAM,CAG5F;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,YAAY,GAAG,MAAM,CAWxF;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,gCAAgC,CAC9C,OAAO,EAAE,MAAM,CAAC,UAAU,EAC1B,QAAQ,EAAE,YAAY,EACtB,IAAI,GAAE,SAAS,MAAM,EAAuB,GAC3C,MAAM,CAAC,UAAU,CAenB"}
|
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
* model version formats (e.g., 4.6 vs 4-6).
|
|
7
7
|
*/
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
|
-
exports.normalizeModelEnvVarsForProvider = exports.normalizeModelIdForRouting = exports.canonicalizeModelIdForProvider = exports.normalizeModelIdForProvider = exports.getDeniedModelIdReasonForProvider = exports.isDeniedAntigravityModelId = exports.migrateDeniedAntigravityModelAliases = exports.normalizeDeprecatedAntigravityModelAliases = exports.normalizeClaudeDottedThinkingMajorMinor = exports.normalizeClaudeDottedMajorMinor = exports.normalizeIFlowLegacyModelAliases = exports.normalizeCodexLegacyModelAliases = exports.stripCodexEffortSuffix = exports.isIFlowProvider = exports.isCodexProvider = exports.isAntigravityProvider = exports.extractProviderFromPathname = exports.MODEL_ENV_VAR_KEYS = void 0;
|
|
9
|
+
exports.normalizeModelEnvVarsForProvider = exports.normalizeModelIdForRouting = exports.canonicalizeModelIdForProvider = exports.normalizeModelIdForProvider = exports.getDeniedModelIdReasonForProvider = exports.isDeniedAntigravityModelId = exports.migrateDeniedAntigravityModelAliases = exports.normalizeDeprecatedAntigravityModelAliases = exports.normalizeClaudeDottedThinkingMajorMinor = exports.normalizeClaudeDottedMajorMinor = exports.normalizeIFlowLegacyModelAliases = exports.normalizeCodexLegacyModelAliases = exports.stripCodexEffortSuffix = exports.isIFlowProvider = exports.isCodexProvider = exports.isAntigravityProvider = exports.extractProviderFromPathname = exports.parseCodexModelTuningAlias = exports.MODEL_ENV_VAR_KEYS = void 0;
|
|
10
10
|
const extended_context_utils_1 = require("../../shared/extended-context-utils");
|
|
11
11
|
/** Env vars that carry model identifiers. */
|
|
12
12
|
exports.MODEL_ENV_VAR_KEYS = extended_context_utils_1.ANTHROPIC_MODEL_ENV_KEYS;
|
|
@@ -79,6 +79,23 @@ function splitCodexTuningSuffix(model) {
|
|
|
79
79
|
suffix: suffix ? `-${suffix}` : '',
|
|
80
80
|
};
|
|
81
81
|
}
|
|
82
|
+
function parseCodexModelTuningAlias(model) {
|
|
83
|
+
const trimmed = trimModelId(model);
|
|
84
|
+
const { baseModel, suffix } = splitBaseModelAndSuffix(trimmed);
|
|
85
|
+
if (suffix)
|
|
86
|
+
return null;
|
|
87
|
+
const parsed = splitCodexTuningSuffix(baseModel);
|
|
88
|
+
if (!parsed.suffix)
|
|
89
|
+
return null;
|
|
90
|
+
const tokens = parsed.suffix.slice(1).split('-');
|
|
91
|
+
const effort = tokens.find((token) => token !== 'fast');
|
|
92
|
+
return {
|
|
93
|
+
baseModel: parsed.baseModel.trim(),
|
|
94
|
+
effort: effort ?? null,
|
|
95
|
+
serviceTier: tokens.includes('fast') ? 'fast' : null,
|
|
96
|
+
};
|
|
97
|
+
}
|
|
98
|
+
exports.parseCodexModelTuningAlias = parseCodexModelTuningAlias;
|
|
82
99
|
/**
|
|
83
100
|
* Extract provider segment from `/api/provider/{provider}` request paths.
|
|
84
101
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model-id-normalizer.js","sourceRoot":"","sources":["../../../src/cliproxy/ai-providers/model-id-normalizer.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAGH,gFAA+E;AAE/E,6CAA6C;AAChC,QAAA,kBAAkB,GAAG,iDAAwB,CAAC;AAI3D,MAAM,2BAA2B,GAAG,+DAA+D,CAAC;AACpG,MAAM,4BAA4B,GAChC,wEAAwE,CAAC;AAC3E,MAAM,+CAA+C,GACnD,yDAAyD,CAAC;AAC5D,MAAM,qCAAqC,GAAG,mBAAmB,CAAC;AAClE,MAAM,8BAA8B,GAClC,qEAAqE,CAAC;AACxE,MAAM,gCAAgC,GACpC,2DAA2D,CAAC;AAC9D,MAAM,kCAAkC,GACtC,6DAA6D,CAAC;AAChE,MAAM,mCAAmC,GAAG,0BAA0B,CAAC;AACvE,MAAM,+BAA+B,GAAG,6BAA6B,CAAC;AACtE,MAAM,0BAA0B,GAAqC,MAAM,CAAC,MAAM,CAAC;IACjF,aAAa,EAAE,SAAS;IACxB,kBAAkB,EAAE,cAAc;IAClC,YAAY,EAAE,cAAc;IAC5B,eAAe,EAAE,SAAS;IAC1B,oBAAoB,EAAE,cAAc;IACpC,mBAAmB,EAAE,SAAS;IAC9B,eAAe,EAAE,SAAS;IAC1B,oBAAoB,EAAE,cAAc;CACrC,CAAC,CAAC;AACH,MAAM,0BAA0B,GAAqC,MAAM,CAAC,MAAM,CAAC;IACjF,eAAe,EAAE,kBAAkB;IACnC,WAAW,EAAE,SAAS;IACtB,oBAAoB,EAAE,eAAe;IACrC,SAAS,EAAE,SAAS;IACpB,cAAc,EAAE,kBAAkB;CACnC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"model-id-normalizer.js","sourceRoot":"","sources":["../../../src/cliproxy/ai-providers/model-id-normalizer.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codex-cliproxy-provider-config.d.ts","sourceRoot":"","sources":["../../src/targets/codex-cliproxy-provider-config.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"codex-cliproxy-provider-config.d.ts","sourceRoot":"","sources":["../../src/targets/codex-cliproxy-provider-config.ts"],"names":[],"mappings":";;AAWA,eAAO,MAAM,2BAA2B,4BAA4B,CAAC;AACrE,eAAO,MAAM,0BAA0B,aAAa,CAAC;AACrD,eAAO,MAAM,+BAA+B,qBAAqB,CAAC;AAClE,eAAO,MAAM,4BAA4B,mBAAmB,CAAC;AAG7D,MAAM,WAAW,iCAAiC;IAChD,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;CAChB;AAgBD,wBAAgB,iCAAiC,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEtE;AAED,wBAAgB,uBAAuB,CAAC,GAAG,GAAE,MAAM,CAAC,UAAwB,GAAG,OAAO,CAErF;AAoFD,wBAAsB,iCAAiC,CACrD,IAAI,EAAE,MAAM,EACZ,GAAG,GAAE,MAAM,CAAC,UAAwB,GACnC,OAAO,CAAC,iCAAiC,CAAC,CAsE5C"}
|
|
@@ -28,10 +28,13 @@ const os = __importStar(require("os"));
|
|
|
28
28
|
const path = __importStar(require("path"));
|
|
29
29
|
const helpers_1 = require("../utils/helpers");
|
|
30
30
|
const compatible_cli_toml_file_service_1 = require("../web-server/services/compatible-cli-toml-file-service");
|
|
31
|
+
const model_catalog_1 = require("../cliproxy/model-catalog");
|
|
32
|
+
const model_id_normalizer_1 = require("../cliproxy/ai-providers/model-id-normalizer");
|
|
31
33
|
exports.CCSXP_CLIPROXY_SHORTCUT_ENV = 'CCSXP_CLIPROXY_SHORTCUT';
|
|
32
34
|
exports.CODEX_CLIPROXY_PROVIDER_ID = 'cliproxy';
|
|
33
35
|
exports.CODEX_CLIPROXY_PROVIDER_ENV_KEY = 'CLIPROXY_API_KEY';
|
|
34
36
|
exports.CODEX_CLIPROXY_PROVIDER_NAME = 'CLIProxy Codex';
|
|
37
|
+
const CODEX_FAST_SERVICE_TIER = 'priority';
|
|
35
38
|
function resolveCodexConfigPath(env = process.env) {
|
|
36
39
|
const baseDir = path.resolve(env.CODEX_HOME ? (0, helpers_1.expandPath)(env.CODEX_HOME) : path.join(os.homedir(), '.codex'));
|
|
37
40
|
const displayBase = env.CODEX_HOME ? '$CODEX_HOME' : '~/.codex';
|
|
@@ -95,18 +98,31 @@ function buildProviderConfig(baseUrl, envKey) {
|
|
|
95
98
|
supports_websockets: false,
|
|
96
99
|
};
|
|
97
100
|
}
|
|
98
|
-
function
|
|
99
|
-
|
|
101
|
+
function appendProviderBlock(rawText, baseUrl) {
|
|
102
|
+
const prefix = rawText.trimEnd();
|
|
103
|
+
const providerBlock = (0, compatible_cli_toml_file_service_1.stringifyTomlObject)({
|
|
100
104
|
model_providers: {
|
|
101
105
|
[exports.CODEX_CLIPROXY_PROVIDER_ID]: buildProviderConfig(baseUrl, exports.CODEX_CLIPROXY_PROVIDER_ENV_KEY),
|
|
102
106
|
},
|
|
103
|
-
});
|
|
104
|
-
}
|
|
105
|
-
function appendProviderBlock(rawText, baseUrl) {
|
|
106
|
-
const prefix = rawText.trimEnd();
|
|
107
|
-
const providerBlock = buildProviderBlock(baseUrl).trimEnd();
|
|
107
|
+
}).trimEnd();
|
|
108
108
|
return prefix ? `${prefix}\n\n${providerBlock}\n` : `${providerBlock}\n`;
|
|
109
109
|
}
|
|
110
|
+
function normalizeTopLevelCodexModelAlias(config) {
|
|
111
|
+
const model = config.model;
|
|
112
|
+
if (typeof model !== 'string')
|
|
113
|
+
return false;
|
|
114
|
+
const parsed = (0, model_id_normalizer_1.parseCodexModelTuningAlias)(model);
|
|
115
|
+
if (!parsed || (!parsed.effort && !parsed.serviceTier))
|
|
116
|
+
return false;
|
|
117
|
+
if (!parsed.baseModel || (0, model_catalog_1.getModelMaxLevel)('codex', parsed.baseModel) === undefined)
|
|
118
|
+
return false;
|
|
119
|
+
config.model = parsed.baseModel;
|
|
120
|
+
if (parsed.effort)
|
|
121
|
+
config.model_reasoning_effort = parsed.effort;
|
|
122
|
+
if (parsed.serviceTier)
|
|
123
|
+
config.service_tier = CODEX_FAST_SERVICE_TIER;
|
|
124
|
+
return true;
|
|
125
|
+
}
|
|
110
126
|
async function ensureCodexCliproxyProviderConfig(port, env = process.env) {
|
|
111
127
|
const { configPath, displayPath } = resolveCodexConfigPath(env);
|
|
112
128
|
const fileProbe = await (0, compatible_cli_toml_file_service_1.probeTomlObjectFile)(configPath, 'Codex user config', displayPath);
|
|
@@ -120,13 +136,22 @@ async function ensureCodexCliproxyProviderConfig(port, env = process.env) {
|
|
|
120
136
|
const modelProvidersValue = config.model_providers;
|
|
121
137
|
const providers = asObject(modelProvidersValue);
|
|
122
138
|
const expectedBaseUrl = buildCodexCliproxyProviderBaseUrl(port);
|
|
139
|
+
const normalizedModelAlias = normalizeTopLevelCodexModelAlias(config);
|
|
123
140
|
if (modelProvidersValue !== undefined && !providers) {
|
|
124
141
|
throw new Error(`Cannot repair ${displayPath}: [model_providers] must be a table.`);
|
|
125
142
|
}
|
|
126
143
|
if (!providers || !Object.prototype.hasOwnProperty.call(providers, exports.CODEX_CLIPROXY_PROVIDER_ID)) {
|
|
127
144
|
await (0, compatible_cli_toml_file_service_1.writeTomlFileAtomic)({
|
|
128
145
|
filePath: configPath,
|
|
129
|
-
rawText:
|
|
146
|
+
rawText: normalizedModelAlias
|
|
147
|
+
? (0, compatible_cli_toml_file_service_1.stringifyTomlObject)({
|
|
148
|
+
...config,
|
|
149
|
+
model_providers: {
|
|
150
|
+
...(providers ?? {}),
|
|
151
|
+
[exports.CODEX_CLIPROXY_PROVIDER_ID]: buildProviderConfig(expectedBaseUrl, exports.CODEX_CLIPROXY_PROVIDER_ENV_KEY),
|
|
152
|
+
},
|
|
153
|
+
})
|
|
154
|
+
: appendProviderBlock(fileProbe.rawText, expectedBaseUrl),
|
|
130
155
|
expectedMtime: fileProbe.diagnostics.mtimeMs ?? undefined,
|
|
131
156
|
fileLabel: 'config.toml',
|
|
132
157
|
});
|
|
@@ -137,13 +162,16 @@ async function ensureCodexCliproxyProviderConfig(port, env = process.env) {
|
|
|
137
162
|
throw new Error(`Cannot repair ${displayPath}: [model_providers.${exports.CODEX_CLIPROXY_PROVIDER_ID}] must be a table.`);
|
|
138
163
|
}
|
|
139
164
|
const envKey = resolveProviderEnvKey(currentProvider);
|
|
140
|
-
|
|
165
|
+
const providerReady = isProviderReady(currentProvider, expectedBaseUrl, envKey);
|
|
166
|
+
if (!providerReady) {
|
|
167
|
+
providers[exports.CODEX_CLIPROXY_PROVIDER_ID] = {
|
|
168
|
+
...currentProvider,
|
|
169
|
+
...buildProviderConfig(expectedBaseUrl, envKey),
|
|
170
|
+
};
|
|
171
|
+
}
|
|
172
|
+
if (providerReady && !normalizedModelAlias) {
|
|
141
173
|
return { changed: false, configPath, displayPath, envKey };
|
|
142
174
|
}
|
|
143
|
-
providers[exports.CODEX_CLIPROXY_PROVIDER_ID] = {
|
|
144
|
-
...currentProvider,
|
|
145
|
-
...buildProviderConfig(expectedBaseUrl, envKey),
|
|
146
|
-
};
|
|
147
175
|
await (0, compatible_cli_toml_file_service_1.writeTomlFileAtomic)({
|
|
148
176
|
filePath: configPath,
|
|
149
177
|
rawText: (0, compatible_cli_toml_file_service_1.stringifyTomlObject)(config),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codex-cliproxy-provider-config.js","sourceRoot":"","sources":["../../src/targets/codex-cliproxy-provider-config.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAAyB;AACzB,2CAA6B;AAC7B,8CAA8C;AAC9C,8GAIiE;
|
|
1
|
+
{"version":3,"file":"codex-cliproxy-provider-config.js","sourceRoot":"","sources":["../../src/targets/codex-cliproxy-provider-config.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth-middleware.d.ts","sourceRoot":"","sources":["../../../src/web-server/middleware/auth-middleware.ts"],"names":[],"mappings":"AAAA;;;GAGG;;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,MAAM,CAAC;AAC5C,OAAO,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"auth-middleware.d.ts","sourceRoot":"","sources":["../../../src/web-server/middleware/auth-middleware.ts"],"names":[],"mappings":"AAAA;;;GAGG;;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,MAAM,CAAC;AAC5C,OAAO,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAe/D,OAAO,QAAQ,iBAAiB,CAAC;IAC/B,UAAU,WAAW;QACnB,aAAa,EAAE,OAAO,CAAC;QACvB,QAAQ,EAAE,MAAM,CAAC;KAClB;CACF;AAkDD;;;GAGG;AACH,eAAO,MAAM,gBAAgB,sDAO3B,CAAC;AAEH;;GAEG;AACH,wBAAgB,uBAAuB,IAAI,CACzC,GAAG,EAAE,OAAO,EACZ,GAAG,EAAE,QAAQ,EACb,IAAI,EAAE,YAAY,KACf,IAAI,CAeR;AAED;;;GAGG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY,GAAG,IAAI,CAwBpF;AAED,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAU1E;AAiCD,wBAAgB,iCAAiC,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO,CA6B/E;AAED,wBAAgB,kCAAkC,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO,CAUhF;AAED,wBAAgB,oCAAoC,CAAC,GAAG,CAAC,EAAE,eAAe,GAAG,GAAG,GAAG,GAAG,CAQrF;AAED,wBAAgB,kCAAkC,CAChD,GAAG,EAAE,OAAO,EACZ,GAAG,EAAE,QAAQ,EACb,KAAK,SAA6E,GACjF,OAAO,CAWT"}
|
|
@@ -3,6 +3,29 @@
|
|
|
3
3
|
* Dashboard Authentication Middleware
|
|
4
4
|
* Session-based auth with httpOnly cookies for CCS dashboard.
|
|
5
5
|
*/
|
|
6
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
7
|
+
if (k2 === undefined) k2 = k;
|
|
8
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
9
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
10
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
11
|
+
}
|
|
12
|
+
Object.defineProperty(o, k2, desc);
|
|
13
|
+
}) : (function(o, m, k, k2) {
|
|
14
|
+
if (k2 === undefined) k2 = k;
|
|
15
|
+
o[k2] = m[k];
|
|
16
|
+
}));
|
|
17
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
18
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
19
|
+
}) : function(o, v) {
|
|
20
|
+
o["default"] = v;
|
|
21
|
+
});
|
|
22
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
23
|
+
if (mod && mod.__esModule) return mod;
|
|
24
|
+
var result = {};
|
|
25
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
26
|
+
__setModuleDefault(result, mod);
|
|
27
|
+
return result;
|
|
28
|
+
};
|
|
6
29
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
7
30
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
8
31
|
};
|
|
@@ -11,6 +34,7 @@ exports.requireLocalAccessWhenAuthDisabled = exports.getDashboardWebSocketReject
|
|
|
11
34
|
const express_session_1 = __importDefault(require("express-session"));
|
|
12
35
|
const express_rate_limit_1 = __importDefault(require("express-rate-limit"));
|
|
13
36
|
const crypto_1 = __importDefault(require("crypto"));
|
|
37
|
+
const net = __importStar(require("net"));
|
|
14
38
|
const fs_1 = __importDefault(require("fs"));
|
|
15
39
|
const path_1 = __importDefault(require("path"));
|
|
16
40
|
const config_loader_facade_1 = require("../../config/config-loader-facade");
|
|
@@ -134,7 +158,7 @@ function isLoopbackHostname(value) {
|
|
|
134
158
|
.replace(/^\[|\]$/g, '');
|
|
135
159
|
return (normalized === 'localhost' ||
|
|
136
160
|
normalized.endsWith('.localhost') ||
|
|
137
|
-
isLoopbackRemoteAddress(normalized));
|
|
161
|
+
(net.isIP(normalized) !== 0 && isLoopbackRemoteAddress(normalized)));
|
|
138
162
|
}
|
|
139
163
|
function getSingleHeader(value) {
|
|
140
164
|
return Array.isArray(value) ? value[0] : value;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth-middleware.js","sourceRoot":"","sources":["../../../src/web-server/middleware/auth-middleware.ts"],"names":[],"mappings":";AAAA;;;GAGG
|
|
1
|
+
{"version":3,"file":"auth-middleware.js","sourceRoot":"","sources":["../../../src/web-server/middleware/auth-middleware.ts"],"names":[],"mappings":"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"}
|