diff --git a/.github/workflows/update-bundle.yml b/.github/workflows/update-bundle.yml index fb4c4ea481..acc8fc27eb 100644 --- a/.github/workflows/update-bundle.yml +++ b/.github/workflows/update-bundle.yml @@ -57,6 +57,20 @@ jobs: - name: Update bundle uses: ./.github/actions/update-bundle + - name: Set up CodeQL CLI from new bundle + id: setup-codeql + uses: ./setup-codeql + with: + tools: https://github.com/github/codeql-action/releases/download/${{ github.event.release.tag_name }}/codeql-bundle-linux64.tar.gz + + - name: Update language aliases + env: + CODEQL_PATH: ${{ steps.setup-codeql.outputs.codeql-path }} + run: | + "$CODEQL_PATH" resolve languages --format=betterjson --extractor-include-aliases \ + | jq -S '.aliases // {}' \ + > src/known-language-aliases.json + - name: Bump Action minor version if new CodeQL minor version series id: bump-action-version run: | diff --git a/CHANGELOG.md b/CHANGELOG.md index df8bb124da..002fb3f2b1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ See the [releases page](https://github.com/github/codeql-action/releases) for th - The undocumented TRAP cache cleanup feature that could be enabled using the `CODEQL_ACTION_CLEANUP_TRAP_CACHES` environment variable is deprecated and will be removed in May 2026. If you are affected by this, we recommend disabling TRAP caching by passing the `trap-caching: false` input to the `init` Action. [#3795](https://github.com/github/codeql-action/pull/3795) - The Git version 2.36.0 requirement for improved incremental analysis now only applies to repositories that contain submodules. [#3789](https://github.com/github/codeql-action/pull/3789) - Python analysis on GHES no longer extracts the standard library, relying instead on models of the standard library. This should result in significantly faster extraction and analysis times, while the effect on alerts should be minimal. [#3794](https://github.com/github/codeql-action/pull/3794) +- Fixed a bug in the validation of OIDC configurations for private registries that was added in CodeQL Action 4.33.0 / 3.33.0. [#3807](https://github.com/github/codeql-action/pull/3807) ## 4.35.1 - 27 Mar 2026 diff --git a/lib/start-proxy-action.js b/lib/start-proxy-action.js index 3c91b950ef..072deb113a 100644 --- a/lib/start-proxy-action.js +++ b/lib/start-proxy-action.js @@ -1586,8 +1586,8 @@ var require_util = __commonJS({ function isUSVString(val) { return hasIsWellFormed ? `${val}`.isWellFormed() : toUSVString(val) === `${val}`; } - function isTokenCharCode(c) { - switch (c) { + function isTokenCharCode(c2) { + switch (c2) { case 34: case 40: case 41: @@ -1607,7 +1607,7 @@ var require_util = __commonJS({ case 125: return false; default: - return c >= 33 && c <= 126; + return c2 >= 33 && c2 <= 126; } } function isValidHTTPToken(characters) { @@ -3179,7 +3179,7 @@ var require_constants2 = __commonJS({ exports2.HEADER_CHARS.push(i); } } - exports2.CONNECTION_TOKEN_CHARS = exports2.HEADER_CHARS.filter((c) => c !== 44); + exports2.CONNECTION_TOKEN_CHARS = exports2.HEADER_CHARS.filter((c2) => c2 !== 44); exports2.MAJOR = exports2.NUM_MAP; exports2.MINOR = exports2.MAJOR; var HEADER_STATE; @@ -4318,10 +4318,10 @@ var require_util2 = __commonJS({ } function isValidReasonPhrase(statusText) { for (let i = 0; i < statusText.length; ++i) { - const c = statusText.charCodeAt(i); - if (!(c === 9 || // HTAB - c >= 32 && c <= 126 || // SP / VCHAR - c >= 128 && c <= 255)) { + const c2 = statusText.charCodeAt(i); + if (!(c2 === 9 || // HTAB + c2 >= 32 && c2 <= 126 || // SP / VCHAR + c2 >= 128 && c2 <= 255)) { return false; } } @@ -8281,7 +8281,7 @@ var require_pool_base = __commonJS({ pool.emit("drain", origin, [pool, ...targets]); } if (pool[kClosedResolve] && queue.isEmpty()) { - Promise.all(pool[kClients].map((c) => c.close())).then(pool[kClosedResolve]); + Promise.all(pool[kClients].map((c2) => c2.close())).then(pool[kClosedResolve]); } }; this[kOnConnect] = (origin, targets) => { @@ -8330,7 +8330,7 @@ var require_pool_base = __commonJS({ } async [kClose]() { if (this[kQueue].isEmpty()) { - await Promise.all(this[kClients].map((c) => c.close())); + await Promise.all(this[kClients].map((c2) => c2.close())); } else { await new Promise((resolve2) => { this[kClosedResolve] = resolve2; @@ -8345,7 +8345,7 @@ var require_pool_base = __commonJS({ } item.handler.onError(err); } - await Promise.all(this[kClients].map((c) => c.destroy(err))); + await Promise.all(this[kClients].map((c2) => c2.destroy(err))); } [kDispatch](opts, handler2) { const dispatcher = this[kGetDispatcher](); @@ -15073,8 +15073,8 @@ var require_util4 = __commonJS({ return new TextDecoder(encoding).decode(sliced); } function BOMSniffing(ioQueue) { - const [a, b, c] = ioQueue; - if (a === 239 && b === 187 && c === 191) { + const [a, b, c2] = ioQueue; + if (a === 239 && b === 187 && c2 === 191) { return "UTF-8"; } else if (a === 254 && b === 255) { return "UTF-16BE"; @@ -19488,7 +19488,7 @@ var require_lib = __commonJS({ } }; exports2.HttpClient = HttpClient; - var lowercaseKeys2 = (obj) => Object.keys(obj).reduce((c, k) => (c[k.toLowerCase()] = obj[k], c), {}); + var lowercaseKeys2 = (obj) => Object.keys(obj).reduce((c2, k) => (c2[k.toLowerCase()] = obj[k], c2), {}); } }); @@ -20898,39 +20898,39 @@ var require_toolrunner = __commonJS({ let inQuotes = false; let escaped = false; let arg = ""; - function append(c) { - if (escaped && c !== '"') { + function append(c2) { + if (escaped && c2 !== '"') { arg += "\\"; } - arg += c; + arg += c2; escaped = false; } for (let i = 0; i < argString.length; i++) { - const c = argString.charAt(i); - if (c === '"') { + const c2 = argString.charAt(i); + if (c2 === '"') { if (!escaped) { inQuotes = !inQuotes; } else { - append(c); + append(c2); } continue; } - if (c === "\\" && escaped) { - append(c); + if (c2 === "\\" && escaped) { + append(c2); continue; } - if (c === "\\" && inQuotes) { + if (c2 === "\\" && inQuotes) { escaped = true; continue; } - if (c === " " && !inQuotes) { + if (c2 === " " && !inQuotes) { if (arg.length > 0) { args.push(arg); arg = ""; } continue; } - append(c); + append(c2); } if (arg.length > 0) { args.push(arg.trim()); @@ -22584,8 +22584,8 @@ var require_util9 = __commonJS({ function isUSVString(val) { return hasIsWellFormed ? `${val}`.isWellFormed() : toUSVString(val) === `${val}`; } - function isTokenCharCode(c) { - switch (c) { + function isTokenCharCode(c2) { + switch (c2) { case 34: case 40: case 41: @@ -22605,7 +22605,7 @@ var require_util9 = __commonJS({ case 125: return false; default: - return c >= 33 && c <= 126; + return c2 >= 33 && c2 <= 126; } } function isValidHTTPToken(characters) { @@ -24177,7 +24177,7 @@ var require_constants7 = __commonJS({ exports2.HEADER_CHARS.push(i); } } - exports2.CONNECTION_TOKEN_CHARS = exports2.HEADER_CHARS.filter((c) => c !== 44); + exports2.CONNECTION_TOKEN_CHARS = exports2.HEADER_CHARS.filter((c2) => c2 !== 44); exports2.MAJOR = exports2.NUM_MAP; exports2.MINOR = exports2.MAJOR; var HEADER_STATE; @@ -25316,10 +25316,10 @@ var require_util10 = __commonJS({ } function isValidReasonPhrase(statusText) { for (let i = 0; i < statusText.length; ++i) { - const c = statusText.charCodeAt(i); - if (!(c === 9 || // HTAB - c >= 32 && c <= 126 || // SP / VCHAR - c >= 128 && c <= 255)) { + const c2 = statusText.charCodeAt(i); + if (!(c2 === 9 || // HTAB + c2 >= 32 && c2 <= 126 || // SP / VCHAR + c2 >= 128 && c2 <= 255)) { return false; } } @@ -29279,7 +29279,7 @@ var require_pool_base2 = __commonJS({ pool.emit("drain", origin, [pool, ...targets]); } if (pool[kClosedResolve] && queue.isEmpty()) { - Promise.all(pool[kClients].map((c) => c.close())).then(pool[kClosedResolve]); + Promise.all(pool[kClients].map((c2) => c2.close())).then(pool[kClosedResolve]); } }; this[kOnConnect] = (origin, targets) => { @@ -29328,7 +29328,7 @@ var require_pool_base2 = __commonJS({ } async [kClose]() { if (this[kQueue].isEmpty()) { - await Promise.all(this[kClients].map((c) => c.close())); + await Promise.all(this[kClients].map((c2) => c2.close())); } else { await new Promise((resolve2) => { this[kClosedResolve] = resolve2; @@ -29343,7 +29343,7 @@ var require_pool_base2 = __commonJS({ } item.handler.onError(err); } - await Promise.all(this[kClients].map((c) => c.destroy(err))); + await Promise.all(this[kClients].map((c2) => c2.destroy(err))); } [kDispatch](opts, handler2) { const dispatcher = this[kGetDispatcher](); @@ -36071,8 +36071,8 @@ var require_util12 = __commonJS({ return new TextDecoder(encoding).decode(sliced); } function BOMSniffing(ioQueue) { - const [a, b, c] = ioQueue; - if (a === 239 && b === 187 && c === 191) { + const [a, b, c2] = ioQueue; + if (a === 239 && b === 187 && c2 === 191) { return "UTF-8"; } else if (a === 254 && b === 255) { return "UTF-16BE"; @@ -40160,8 +40160,8 @@ function encodeReserved(str2) { }).join(""); } function encodeUnreserved(str2) { - return encodeURIComponent(str2).replace(/[!'()*]/g, function(c) { - return "%" + c.charCodeAt(0).toString(16).toUpperCase(); + return encodeURIComponent(str2).replace(/[!'()*]/g, function(c2) { + return "%" + c2.charCodeAt(0).toString(16).toUpperCase(); }); } function encodeValue(operator, value, key) { @@ -44946,19 +44946,19 @@ var require_range = __commonJS({ this.loose = !!options.loose; this.includePrerelease = !!options.includePrerelease; this.raw = range.trim().replace(SPACE_CHARACTERS, " "); - this.set = this.raw.split("||").map((r) => this.parseRange(r.trim())).filter((c) => c.length); + this.set = this.raw.split("||").map((r) => this.parseRange(r.trim())).filter((c2) => c2.length); if (!this.set.length) { throw new TypeError(`Invalid SemVer Range: ${this.raw}`); } if (this.set.length > 1) { const first = this.set[0]; - this.set = this.set.filter((c) => !isNullSet(c[0])); + this.set = this.set.filter((c2) => !isNullSet(c2[0])); if (this.set.length === 0) { this.set = [first]; } else if (this.set.length > 1) { - for (const c of this.set) { - if (c.length === 1 && isAny(c[0])) { - this.set = [c]; + for (const c2 of this.set) { + if (c2.length === 1 && isAny(c2[0])) { + this.set = [c2]; break; } } @@ -45079,8 +45079,8 @@ var require_range = __commonJS({ caretTrimReplace } = require_re(); var { FLAG_INCLUDE_PRERELEASE, FLAG_LOOSE } = require_constants11(); - var isNullSet = (c) => c.value === "<0.0.0-0"; - var isAny = (c) => c.value === ""; + var isNullSet = (c2) => c2.value === "<0.0.0-0"; + var isAny = (c2) => c2.value === ""; var isSatisfiable = (comparators, options) => { let result = true; const remainingComparators = comparators.slice(); @@ -45108,7 +45108,7 @@ var require_range = __commonJS({ }; var isX = (id) => !id || id.toLowerCase() === "x" || id === "*"; var replaceTildes = (comp, options) => { - return comp.trim().split(/\s+/).map((c) => replaceTilde(c, options)).join(" "); + return comp.trim().split(/\s+/).map((c2) => replaceTilde(c2, options)).join(" "); }; var replaceTilde = (comp, options) => { const r = options.loose ? re[t.TILDELOOSE] : re[t.TILDE]; @@ -45132,7 +45132,7 @@ var require_range = __commonJS({ }); }; var replaceCarets = (comp, options) => { - return comp.trim().split(/\s+/).map((c) => replaceCaret(c, options)).join(" "); + return comp.trim().split(/\s+/).map((c2) => replaceCaret(c2, options)).join(" "); }; var replaceCaret = (comp, options) => { debug5("caret", comp, options); @@ -45180,7 +45180,7 @@ var require_range = __commonJS({ }; var replaceXRanges = (comp, options) => { debug5("replaceXRanges", comp, options); - return comp.split(/\s+/).map((c) => replaceXRange(c, options)).join(" "); + return comp.split(/\s+/).map((c2) => replaceXRange(c2, options)).join(" "); }; var replaceXRange = (comp, options) => { comp = comp.trim(); @@ -45433,7 +45433,7 @@ var require_to_comparators = __commonJS({ "node_modules/semver/ranges/to-comparators.js"(exports2, module2) { "use strict"; var Range2 = require_range(); - var toComparators = (range, options) => new Range2(range, options).set.map((comp) => comp.map((c) => c.value).join(" ").trim().split(" ")); + var toComparators = (range, options) => new Range2(range, options).set.map((comp) => comp.map((c2) => c2.value).join(" ").trim().split(" ")); module2.exports = toComparators; } }); @@ -45778,13 +45778,13 @@ var require_subset = __commonJS({ } const eqSet = /* @__PURE__ */ new Set(); let gt, lt; - for (const c of sub) { - if (c.operator === ">" || c.operator === ">=") { - gt = higherGT(gt, c, options); - } else if (c.operator === "<" || c.operator === "<=") { - lt = lowerLT(lt, c, options); + for (const c2 of sub) { + if (c2.operator === ">" || c2.operator === ">=") { + gt = higherGT(gt, c2, options); + } else if (c2.operator === "<" || c2.operator === "<=") { + lt = lowerLT(lt, c2, options); } else { - eqSet.add(c.semver); + eqSet.add(c2.semver); } } if (eqSet.size > 1) { @@ -45806,8 +45806,8 @@ var require_subset = __commonJS({ if (lt && !satisfies2(eq, String(lt), options)) { return null; } - for (const c of dom) { - if (!satisfies2(eq, String(c), options)) { + for (const c2 of dom) { + if (!satisfies2(eq, String(c2), options)) { return false; } } @@ -45820,40 +45820,40 @@ var require_subset = __commonJS({ if (needDomLTPre && needDomLTPre.prerelease.length === 1 && lt.operator === "<" && needDomLTPre.prerelease[0] === 0) { needDomLTPre = false; } - for (const c of dom) { - hasDomGT = hasDomGT || c.operator === ">" || c.operator === ">="; - hasDomLT = hasDomLT || c.operator === "<" || c.operator === "<="; + for (const c2 of dom) { + hasDomGT = hasDomGT || c2.operator === ">" || c2.operator === ">="; + hasDomLT = hasDomLT || c2.operator === "<" || c2.operator === "<="; if (gt) { if (needDomGTPre) { - if (c.semver.prerelease && c.semver.prerelease.length && c.semver.major === needDomGTPre.major && c.semver.minor === needDomGTPre.minor && c.semver.patch === needDomGTPre.patch) { + if (c2.semver.prerelease && c2.semver.prerelease.length && c2.semver.major === needDomGTPre.major && c2.semver.minor === needDomGTPre.minor && c2.semver.patch === needDomGTPre.patch) { needDomGTPre = false; } } - if (c.operator === ">" || c.operator === ">=") { - higher = higherGT(gt, c, options); - if (higher === c && higher !== gt) { + if (c2.operator === ">" || c2.operator === ">=") { + higher = higherGT(gt, c2, options); + if (higher === c2 && higher !== gt) { return false; } - } else if (gt.operator === ">=" && !satisfies2(gt.semver, String(c), options)) { + } else if (gt.operator === ">=" && !satisfies2(gt.semver, String(c2), options)) { return false; } } if (lt) { if (needDomLTPre) { - if (c.semver.prerelease && c.semver.prerelease.length && c.semver.major === needDomLTPre.major && c.semver.minor === needDomLTPre.minor && c.semver.patch === needDomLTPre.patch) { + if (c2.semver.prerelease && c2.semver.prerelease.length && c2.semver.major === needDomLTPre.major && c2.semver.minor === needDomLTPre.minor && c2.semver.patch === needDomLTPre.patch) { needDomLTPre = false; } } - if (c.operator === "<" || c.operator === "<=") { - lower = lowerLT(lt, c, options); - if (lower === c && lower !== lt) { + if (c2.operator === "<" || c2.operator === "<=") { + lower = lowerLT(lt, c2, options); + if (lower === c2 && lower !== lt) { return false; } - } else if (lt.operator === "<=" && !satisfies2(lt.semver, String(c), options)) { + } else if (lt.operator === "<=" && !satisfies2(lt.semver, String(c2), options)) { return false; } } - if (!c.operator && (lt || gt) && gtltComp !== 0) { + if (!c2.operator && (lt || gt) && gtltComp !== 0) { return false; } } @@ -47815,25 +47815,25 @@ var require_brace_expansion = __commonJS({ var pad = n.some(isPadded); N = []; for (var i = x; test(i, y); i += incr) { - var c; + var c2; if (isAlphaSequence) { - c = String.fromCharCode(i); - if (c === "\\") - c = ""; + c2 = String.fromCharCode(i); + if (c2 === "\\") + c2 = ""; } else { - c = String(i); + c2 = String(i); if (pad) { - var need = width - c.length; + var need = width - c2.length; if (need > 0) { var z = new Array(need + 1).join("0"); if (i < 0) - c = "-" + z + c.slice(1); + c2 = "-" + z + c2.slice(1); else - c = z + c; + c2 = z + c2; } } } - N.push(c); + N.push(c2); } } else { N = concatMap(n, function(el) { @@ -47881,8 +47881,8 @@ var require_minimatch = __commonJS({ var twoStarNoDot = "(?:(?!(?:\\/|^)\\.).)*?"; var reSpecials = charSet("().*{}+?[]^$\\!"); function charSet(s) { - return s.split("").reduce(function(set2, c) { - set2[c] = true; + return s.split("").reduce(function(set2, c2) { + set2[c2] = true; return set2; }, {}); } @@ -48086,14 +48086,14 @@ var require_minimatch = __commonJS({ stateChar = false; } } - for (var i = 0, len = pattern.length, c; i < len && (c = pattern.charAt(i)); i++) { - this.debug("%s %s %s %j", pattern, i, re, c); - if (escaping && reSpecials[c]) { - re += "\\" + c; + for (var i = 0, len = pattern.length, c2; i < len && (c2 = pattern.charAt(i)); i++) { + this.debug("%s %s %s %j", pattern, i, re, c2); + if (escaping && reSpecials[c2]) { + re += "\\" + c2; escaping = false; continue; } - switch (c) { + switch (c2) { /* istanbul ignore next */ case "/": { return false; @@ -48109,17 +48109,17 @@ var require_minimatch = __commonJS({ case "+": case "@": case "!": - this.debug("%s %s %s %j <-- stateChar", pattern, i, re, c); + this.debug("%s %s %s %j <-- stateChar", pattern, i, re, c2); if (inClass) { this.debug(" in class"); - if (c === "!" && i === classStart + 1) c = "^"; - re += c; + if (c2 === "!" && i === classStart + 1) c2 = "^"; + re += c2; continue; } - if (c === "*" && stateChar === "*") continue; + if (c2 === "*" && stateChar === "*") continue; self2.debug("call clearStateChar %j", stateChar); clearStateChar(); - stateChar = c; + stateChar = c2; if (options.noext) clearStateChar(); continue; case "(": @@ -48169,17 +48169,17 @@ var require_minimatch = __commonJS({ case "[": clearStateChar(); if (inClass) { - re += "\\" + c; + re += "\\" + c2; continue; } inClass = true; classStart = i; reClassStart = re.length; - re += c; + re += c2; continue; case "]": if (i === classStart + 1 || !inClass) { - re += "\\" + c; + re += "\\" + c2; escaping = false; continue; } @@ -48195,16 +48195,16 @@ var require_minimatch = __commonJS({ } hasMagic = true; inClass = false; - re += c; + re += c2; continue; default: clearStateChar(); if (escaping) { escaping = false; - } else if (reSpecials[c] && !(c === "^" && inClass)) { + } else if (reSpecials[c2] && !(c2 === "^" && inClass)) { re += "\\"; } - re += c; + re += c2; } } if (inClass) { @@ -48802,25 +48802,25 @@ var require_internal_pattern = __commonJS({ static getLiteral(segment) { let literal = ""; for (let i = 0; i < segment.length; i++) { - const c = segment[i]; - if (c === "\\" && !IS_WINDOWS && i + 1 < segment.length) { + const c2 = segment[i]; + if (c2 === "\\" && !IS_WINDOWS && i + 1 < segment.length) { literal += segment[++i]; continue; - } else if (c === "*" || c === "?") { + } else if (c2 === "*" || c2 === "?") { return ""; - } else if (c === "[" && i + 1 < segment.length) { + } else if (c2 === "[" && i + 1 < segment.length) { let set2 = ""; let closed = -1; for (let i2 = i + 1; i2 < segment.length; i2++) { - const c2 = segment[i2]; - if (c2 === "\\" && !IS_WINDOWS && i2 + 1 < segment.length) { + const c22 = segment[i2]; + if (c22 === "\\" && !IS_WINDOWS && i2 + 1 < segment.length) { set2 += segment[++i2]; continue; - } else if (c2 === "]") { + } else if (c22 === "]") { closed = i2; break; } else { - set2 += c2; + set2 += c22; } } if (closed >= 0) { @@ -48834,7 +48834,7 @@ var require_internal_pattern = __commonJS({ } } } - literal += c; + literal += c2; } return literal; } @@ -50020,8 +50020,8 @@ var require_semver3 = __commonJS({ this.raw = range.trim().split(/\s+/).join(" "); this.set = this.raw.split("||").map(function(range2) { return this.parseRange(range2.trim()); - }, this).filter(function(c) { - return c.length; + }, this).filter(function(c2) { + return c2.length; }); if (!this.set.length) { throw new TypeError("Invalid SemVer Range: " + this.raw); @@ -50090,8 +50090,8 @@ var require_semver3 = __commonJS({ exports2.toComparators = toComparators; function toComparators(range, options) { return new Range2(range, options).set.map(function(comp) { - return comp.map(function(c) { - return c.value; + return comp.map(function(c2) { + return c2.value; }).join(" ").trim().split(" "); }); } @@ -50852,10 +50852,10 @@ function __rest(s, e) { return t; } function __decorate(decorators, target, key, desc) { - var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d; + var c2 = arguments.length, r = c2 < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d; if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc); - else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r; - return c > 3 && r && Object.defineProperty(target, key, r), r; + else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c2 < 3 ? d(r) : c2 > 3 ? d(target, key, r) : d(target, key)) || r; + return c2 > 3 && r && Object.defineProperty(target, key, r), r; } function __param(paramIndex, decorator) { return function(target, key) { @@ -53603,8 +53603,8 @@ var require_browser = __commonJS({ if (!this.useColors) { return; } - const c = "color: " + this.color; - args.splice(1, 0, c, "color: inherit"); + const c2 = "color: " + this.color; + args.splice(1, 0, c2, "color: inherit"); let index = 0; let lastC = 0; args[0].replace(/%[a-zA-Z%]/g, (match) => { @@ -53616,7 +53616,7 @@ var require_browser = __commonJS({ lastC = index; } }); - args.splice(lastC, 0, c); + args.splice(lastC, 0, c2); } exports2.log = console.debug || console.log || (() => { }); @@ -53900,8 +53900,8 @@ var require_node = __commonJS({ function formatArgs(args) { const { namespace: name, useColors: useColors2 } = this; if (useColors2) { - const c = this.color; - const colorCode = "\x1B[3" + (c < 8 ? c : "8;5;" + c); + const c2 = this.color; + const colorCode = "\x1B[3" + (c2 < 8 ? c2 : "8;5;" + c2); const prefix = ` ${colorCode};1m${name} \x1B[0m`; args[0] = prefix + args[0].split("\n").join("\n" + prefix); args.push(colorCode + "m+" + module2.exports.humanize(this.diff) + "\x1B[0m"); @@ -60567,7 +60567,7 @@ var require_fxp = __commonJS({ { let o2 = r2; if (r2++, "!" === t2[r2]) { - r2 = c(t2, r2); + r2 = c2(t2, r2); continue; } { @@ -60608,7 +60608,7 @@ var require_fxp = __commonJS({ } for (r2++; r2 < t2.length; r2++) if ("<" === t2[r2]) { if ("!" === t2[r2 + 1]) { - r2++, r2 = c(t2, r2); + r2++, r2 = c2(t2, r2); continue; } if ("?" !== t2[r2 + 1]) break; @@ -60640,7 +60640,7 @@ var require_fxp = __commonJS({ } return e2; } - function c(t2, e2) { + function c2(t2, e2) { if (t2.length > e2 + 5 && "-" === t2[e2 + 1] && "-" === t2[e2 + 2]) { for (e2 += 3; e2 < t2.length; e2++) if ("-" === t2[e2] && "-" === t2[e2 + 1] && ">" === t2[e2 + 2]) { e2 += 2; @@ -61215,14 +61215,14 @@ var require_fxp = __commonJS({ i2 && n2 && "!xml" !== i2.tagname && (n2 = this.saveTextToParentTag(n2, i2, this.matcher, false)); const u2 = i2; u2 && -1 !== this.options.unpairedTags.indexOf(u2.tagname) && (i2 = this.tagsNodeStack.pop(), this.matcher.pop()); - let c2 = false; - h2.length > 0 && h2.lastIndexOf("/") === h2.length - 1 && (c2 = true, "/" === o2[o2.length - 1] ? (o2 = o2.substr(0, o2.length - 1), h2 = o2) : h2 = h2.substr(0, h2.length - 1), l2 = o2 !== h2); + let c3 = false; + h2.length > 0 && h2.lastIndexOf("/") === h2.length - 1 && (c3 = true, "/" === o2[o2.length - 1] ? (o2 = o2.substr(0, o2.length - 1), h2 = o2) : h2 = h2.substr(0, h2.length - 1), l2 = o2 !== h2); let d2, f2 = null, g2 = {}; d2 = U(a2), o2 !== e2.tagname && this.matcher.push(o2, {}, d2), o2 !== h2 && l2 && (f2 = this.buildAttributesMap(h2, this.matcher, o2), f2 && (g2 = R(f2, this.options))), o2 !== e2.tagname && (this.isCurrentNodeStopNode = this.isItStopNode(this.stopNodeExpressions, this.matcher)); const m2 = r2; if (this.isCurrentNodeStopNode) { let e3 = ""; - if (c2) r2 = s3.closeIndex; + if (c3) r2 = s3.closeIndex; else if (-1 !== this.options.unpairedTags.indexOf(o2)) r2 = s3.closeIndex; else { const i3 = this.readStopNodeData(t2, a2, p2 + 1); @@ -61232,7 +61232,7 @@ var require_fxp = __commonJS({ const n3 = new $(o2); f2 && (n3[":@"] = f2), n3.add(this.options.textNodeName, e3), this.matcher.pop(), this.isCurrentNodeStopNode = false, this.addChild(i2, n3, this.matcher, m2); } else { - if (c2) { + if (c3) { ({ tagName: o2, tagExp: h2 } = rt(this.options.transformTagName, o2, h2, this.options)); const t3 = new $(o2); f2 && (t3[":@"] = f2), this.addChild(i2, t3, this.matcher, m2), this.matcher.pop(), this.isCurrentNodeStopNode = false; @@ -61551,11 +61551,11 @@ var require_fxp = __commonJS({ a3 = 0 !== a3.length ? " " + a3 : "", r2 += s3 + `<${l2}${a3}${t3}?>`, o2 = true, n2.pop(); continue; } - let c2 = i2; - "" !== c2 && (c2 += e2.indentBy); + let c3 = i2; + "" !== c3 && (c3 += e2.indentBy); const d2 = i2 + `<${l2}${yt(h2[":@"], e2, u2)}`; let f2; - f2 = u2 ? Nt(h2[l2], e2) : mt(h2[l2], e2, c2, n2, s2), -1 !== e2.unpairedTags.indexOf(l2) ? e2.suppressUnpairedNode ? r2 += d2 + ">" : r2 += d2 + "/>" : f2 && 0 !== f2.length || !e2.suppressEmptyNode ? f2 && f2.endsWith(">") ? r2 += d2 + `>${f2}${i2}` : (r2 += d2 + ">", f2 && "" !== i2 && (f2.includes("/>") || f2.includes("`) : r2 += d2 + "/>", o2 = true, n2.pop(); + f2 = u2 ? Nt(h2[l2], e2) : mt(h2[l2], e2, c3, n2, s2), -1 !== e2.unpairedTags.indexOf(l2) ? e2.suppressUnpairedNode ? r2 += d2 + ">" : r2 += d2 + "/>" : f2 && 0 !== f2.length || !e2.suppressEmptyNode ? f2 && f2.endsWith(">") ? r2 += d2 + `>${f2}${i2}` : (r2 += d2 + ">", f2 && "" !== i2 && (f2.includes("/>") || f2.includes("`) : r2 += d2 + "/>", o2 = true, n2.pop(); } return r2; } @@ -84329,7 +84329,7 @@ var require_poller3 = __commonJS({ onProgress(callback) { this.pollProgressCallbacks.push(callback); return () => { - this.pollProgressCallbacks = this.pollProgressCallbacks.filter((c) => c !== callback); + this.pollProgressCallbacks = this.pollProgressCallbacks.filter((c2) => c2 !== callback); }; } /** @@ -89430,8 +89430,8 @@ var require_AccountSASPermissions = __commonJS({ */ static parse(permissions) { const accountSASPermissions = new _AccountSASPermissions(); - for (const c of permissions) { - switch (c) { + for (const c2 of permissions) { + switch (c2) { case "r": accountSASPermissions.read = true; break; @@ -89472,7 +89472,7 @@ var require_AccountSASPermissions = __commonJS({ accountSASPermissions.permanentDelete = true; break; default: - throw new RangeError(`Invalid permission character: ${c}`); + throw new RangeError(`Invalid permission character: ${c2}`); } } return accountSASPermissions; @@ -89651,8 +89651,8 @@ var require_AccountSASResourceTypes = __commonJS({ */ static parse(resourceTypes) { const accountSASResourceTypes = new _AccountSASResourceTypes(); - for (const c of resourceTypes) { - switch (c) { + for (const c2 of resourceTypes) { + switch (c2) { case "s": accountSASResourceTypes.service = true; break; @@ -89663,7 +89663,7 @@ var require_AccountSASResourceTypes = __commonJS({ accountSASResourceTypes.object = true; break; default: - throw new RangeError(`Invalid resource type: ${c}`); + throw new RangeError(`Invalid resource type: ${c2}`); } } return accountSASResourceTypes; @@ -89719,8 +89719,8 @@ var require_AccountSASServices = __commonJS({ */ static parse(services) { const accountSASServices = new _AccountSASServices(); - for (const c of services) { - switch (c) { + for (const c2 of services) { + switch (c2) { case "b": accountSASServices.blob = true; break; @@ -89734,7 +89734,7 @@ var require_AccountSASServices = __commonJS({ accountSASServices.table = true; break; default: - throw new RangeError(`Invalid service character: ${c}`); + throw new RangeError(`Invalid service character: ${c2}`); } } return accountSASServices; @@ -93195,9 +93195,9 @@ var require_json_format_contract = __commonJS({ exports2.jsonWriteOptions = jsonWriteOptions; function mergeJsonOptions(a, b) { var _a, _b; - let c = Object.assign(Object.assign({}, a), b); - c.typeRegistry = [...(_a = a === null || a === void 0 ? void 0 : a.typeRegistry) !== null && _a !== void 0 ? _a : [], ...(_b = b === null || b === void 0 ? void 0 : b.typeRegistry) !== null && _b !== void 0 ? _b : []]; - return c; + let c2 = Object.assign(Object.assign({}, a), b); + c2.typeRegistry = [...(_a = a === null || a === void 0 ? void 0 : a.typeRegistry) !== null && _a !== void 0 ? _a : [], ...(_b = b === null || b === void 0 ? void 0 : b.typeRegistry) !== null && _b !== void 0 ? _b : []]; + return c2; } exports2.mergeJsonOptions = mergeJsonOptions; } @@ -95334,14 +95334,14 @@ var require_rpc_options = __commonJS({ function copy(a, into) { if (!a) return; - let c = into; + let c2 = into; for (let [k, v] of Object.entries(a)) { if (v instanceof Date) - c[k] = new Date(v.getTime()); + c2[k] = new Date(v.getTime()); else if (Array.isArray(v)) - c[k] = v.concat(); + c2[k] = v.concat(); else - c[k] = v; + c2[k] = v; } } } @@ -98729,9 +98729,9 @@ var require_tool_cache = __commonJS({ core13.debug("finished caching tool"); } function isExplicitVersion(versionSpec) { - const c = semver6.clean(versionSpec) || ""; - core13.debug(`isExplicit: ${c}`); - const valid2 = semver6.valid(c) != null; + const c2 = semver6.clean(versionSpec) || ""; + core13.debug(`isExplicit: ${c2}`); + const valid2 = semver6.valid(c2) != null; core13.debug(`explicit? ${valid2}`); return valid2; } @@ -100493,9 +100493,9 @@ var require_util19 = __commonJS({ return this.data.charCodeAt(this.data.length - 1); }; util.ByteStringBuffer.prototype.copy = function() { - var c = util.createBuffer(this.data); - c.read = this.read; - return c; + var c2 = util.createBuffer(this.data); + c2.read = this.read; + return c2; }; util.ByteStringBuffer.prototype.compact = function() { if (this.read > 0) { @@ -100854,15 +100854,15 @@ var require_util19 = __commonJS({ } return new util.ByteBuffer(input); }; - util.fillString = function(c, n) { + util.fillString = function(c2, n) { var s = ""; while (n > 0) { if (n & 1) { - s += c; + s += c2; } n >>>= 1; if (n > 0) { - c += c; + c2 += c2; } } return s; @@ -100872,16 +100872,16 @@ var require_util19 = __commonJS({ var b = ""; var t = ""; var i = 0; - var c = 0; + var c2 = 0; for (; n > 0; --n, ++i) { b = s1.charCodeAt(i) ^ s2.charCodeAt(i); - if (c >= 10) { + if (c2 >= 10) { s3 += t; t = ""; - c = 0; + c2 = 0; } t += String.fromCharCode(b); - ++c; + ++c2; } s3 += t; return s3; @@ -101368,12 +101368,12 @@ var require_util19 = __commonJS({ return parts.join(""); }; util.formatNumber = function(number, decimals, dec_point, thousands_sep) { - var n = number, c = isNaN(decimals = Math.abs(decimals)) ? 2 : decimals; + var n = number, c2 = isNaN(decimals = Math.abs(decimals)) ? 2 : decimals; var d = dec_point === void 0 ? "," : dec_point; var t = thousands_sep === void 0 ? "." : thousands_sep, s = n < 0 ? "-" : ""; - var i = parseInt(n = Math.abs(+n || 0).toFixed(c), 10) + ""; + var i = parseInt(n = Math.abs(+n || 0).toFixed(c2), 10) + ""; var j = i.length > 3 ? i.length % 3 : 0; - return s + (j ? i.substr(0, j) + t : "") + i.substr(j).replace(/(\d{3})(?=\d)/g, "$1" + t) + (c ? d + Math.abs(n - i).toFixed(c).slice(2) : ""); + return s + (j ? i.substr(0, j) + t : "") + i.substr(j).replace(/(\d{3})(?=\d)/g, "$1" + t) + (c2 ? d + Math.abs(n - i).toFixed(c2).slice(2) : ""); }; util.formatSize = function(size) { if (size >= 1073741824) { @@ -102310,8 +102310,8 @@ var require_cipherModes = __commonJS({ } m[0] = [0, 0, 0, 0]; for (i = half + 1; i < size; ++i) { - var c = m[i ^ half]; - m[i] = [mid[0] ^ c[0], mid[1] ^ c[1], mid[2] ^ c[2], mid[3] ^ c[3]]; + var c2 = m[i ^ half]; + m[i] = [mid[0] ^ c2[0], mid[1] ^ c2[1], mid[2] ^ c2[2], mid[3] ^ c2[3]]; } return m; }; @@ -102578,25 +102578,25 @@ var require_aes = __commonJS({ m3 = mix[3]; sub = sbox; } - var a, b, c, d, a2, b2, c2; + var a, b, c2, d, a2, b2, c22; a = input[0] ^ w[0]; b = input[decrypt ? 3 : 1] ^ w[1]; - c = input[2] ^ w[2]; + c2 = input[2] ^ w[2]; d = input[decrypt ? 1 : 3] ^ w[3]; var i = 3; for (var round = 1; round < Nr; ++round) { - a2 = m0[a >>> 24] ^ m1[b >>> 16 & 255] ^ m2[c >>> 8 & 255] ^ m3[d & 255] ^ w[++i]; - b2 = m0[b >>> 24] ^ m1[c >>> 16 & 255] ^ m2[d >>> 8 & 255] ^ m3[a & 255] ^ w[++i]; - c2 = m0[c >>> 24] ^ m1[d >>> 16 & 255] ^ m2[a >>> 8 & 255] ^ m3[b & 255] ^ w[++i]; - d = m0[d >>> 24] ^ m1[a >>> 16 & 255] ^ m2[b >>> 8 & 255] ^ m3[c & 255] ^ w[++i]; + a2 = m0[a >>> 24] ^ m1[b >>> 16 & 255] ^ m2[c2 >>> 8 & 255] ^ m3[d & 255] ^ w[++i]; + b2 = m0[b >>> 24] ^ m1[c2 >>> 16 & 255] ^ m2[d >>> 8 & 255] ^ m3[a & 255] ^ w[++i]; + c22 = m0[c2 >>> 24] ^ m1[d >>> 16 & 255] ^ m2[a >>> 8 & 255] ^ m3[b & 255] ^ w[++i]; + d = m0[d >>> 24] ^ m1[a >>> 16 & 255] ^ m2[b >>> 8 & 255] ^ m3[c2 & 255] ^ w[++i]; a = a2; b = b2; - c = c2; + c2 = c22; } - output[0] = sub[a >>> 24] << 24 ^ sub[b >>> 16 & 255] << 16 ^ sub[c >>> 8 & 255] << 8 ^ sub[d & 255] ^ w[++i]; - output[decrypt ? 3 : 1] = sub[b >>> 24] << 24 ^ sub[c >>> 16 & 255] << 16 ^ sub[d >>> 8 & 255] << 8 ^ sub[a & 255] ^ w[++i]; - output[2] = sub[c >>> 24] << 24 ^ sub[d >>> 16 & 255] << 16 ^ sub[a >>> 8 & 255] << 8 ^ sub[b & 255] ^ w[++i]; - output[decrypt ? 1 : 3] = sub[d >>> 24] << 24 ^ sub[a >>> 16 & 255] << 16 ^ sub[b >>> 8 & 255] << 8 ^ sub[c & 255] ^ w[++i]; + output[0] = sub[a >>> 24] << 24 ^ sub[b >>> 16 & 255] << 16 ^ sub[c2 >>> 8 & 255] << 8 ^ sub[d & 255] ^ w[++i]; + output[decrypt ? 3 : 1] = sub[b >>> 24] << 24 ^ sub[c2 >>> 16 & 255] << 16 ^ sub[d >>> 8 & 255] << 8 ^ sub[a & 255] ^ w[++i]; + output[2] = sub[c2 >>> 24] << 24 ^ sub[d >>> 16 & 255] << 16 ^ sub[a >>> 8 & 255] << 8 ^ sub[b & 255] ^ w[++i]; + output[decrypt ? 1 : 3] = sub[d >>> 24] << 24 ^ sub[a >>> 16 & 255] << 16 ^ sub[b >>> 8 & 255] << 8 ^ sub[c2 & 255] ^ w[++i]; } function _createCipher(options) { options = options || {}; @@ -103194,9 +103194,9 @@ var require_asn1 = __commonJS({ var mm = parseInt(utc.substr(8, 2), 10); var ss = 0; if (utc.length > 11) { - var c = utc.charAt(10); + var c2 = utc.charAt(10); var end = 10; - if (c !== "+" && c !== "-") { + if (c2 !== "+" && c2 !== "-") { ss = parseInt(utc.substr(10, 2), 10); end += 2; } @@ -103204,13 +103204,13 @@ var require_asn1 = __commonJS({ date.setUTCFullYear(year, MM, DD); date.setUTCHours(hh, mm, ss, 0); if (end) { - c = utc.charAt(end); - if (c === "+" || c === "-") { + c2 = utc.charAt(end); + if (c2 === "+" || c2 === "-") { var hhoffset = parseInt(utc.substr(end + 1, 2), 10); var mmoffset = parseInt(utc.substr(end + 4, 2), 10); var offset = hhoffset * 60 + mmoffset; offset *= 6e4; - if (c === "+") { + if (c2 === "+") { date.setTime(+date - offset); } else { date.setTime(+date + offset); @@ -103233,13 +103233,13 @@ var require_asn1 = __commonJS({ if (gentime.charAt(gentime.length - 1) === "Z") { isUTC = true; } - var end = gentime.length - 5, c = gentime.charAt(end); - if (c === "+" || c === "-") { + var end = gentime.length - 5, c2 = gentime.charAt(end); + if (c2 === "+" || c2 === "-") { var hhoffset = parseInt(gentime.substr(end + 1, 2), 10); var mmoffset = parseInt(gentime.substr(end + 4, 2), 10); offset = hhoffset * 60 + mmoffset; offset *= 6e4; - if (c === "+") { + if (c2 === "+") { offset *= -1; } isUTC = true; @@ -103918,53 +103918,53 @@ var require_md5 = __commonJS({ _initialized = true; } function _update(s, w, bytes) { - var t, a, b, c, d, f, r, i; + var t, a, b, c2, d, f, r, i; var len = bytes.length(); while (len >= 64) { a = s.h0; b = s.h1; - c = s.h2; + c2 = s.h2; d = s.h3; for (i = 0; i < 16; ++i) { w[i] = bytes.getInt32Le(); - f = d ^ b & (c ^ d); + f = d ^ b & (c2 ^ d); t = a + f + _k[i] + w[i]; r = _r[i]; a = d; - d = c; - c = b; + d = c2; + c2 = b; b += t << r | t >>> 32 - r; } for (; i < 32; ++i) { - f = c ^ d & (b ^ c); + f = c2 ^ d & (b ^ c2); t = a + f + _k[i] + w[_g[i]]; r = _r[i]; a = d; - d = c; - c = b; + d = c2; + c2 = b; b += t << r | t >>> 32 - r; } for (; i < 48; ++i) { - f = b ^ c ^ d; + f = b ^ c2 ^ d; t = a + f + _k[i] + w[_g[i]]; r = _r[i]; a = d; - d = c; - c = b; + d = c2; + c2 = b; b += t << r | t >>> 32 - r; } for (; i < 64; ++i) { - f = c ^ (b | ~d); + f = c2 ^ (b | ~d); t = a + f + _k[i] + w[_g[i]]; r = _r[i]; a = d; - d = c; - c = b; + d = c2; + c2 = b; b += t << r | t >>> 32 - r; } s.h0 = s.h0 + a | 0; s.h1 = s.h1 + b | 0; - s.h2 = s.h2 + c | 0; + s.h2 = s.h2 + c2 | 0; s.h3 = s.h3 + d | 0; len -= 64; } @@ -104373,7 +104373,7 @@ var require_pbkdf2 = __commonJS({ if (forge.util.isNodejs && !forge.options.usePureJavaScript) { crypto2 = require("crypto"); } - module2.exports = forge.pbkdf2 = pkcs5.pbkdf2 = function(p, s, c, dkLen, md2, callback) { + module2.exports = forge.pbkdf2 = pkcs5.pbkdf2 = function(p, s, c2, dkLen, md2, callback) { if (typeof md2 === "function") { callback = md2; md2 = null; @@ -104386,19 +104386,19 @@ var require_pbkdf2 = __commonJS({ s = Buffer.from(s, "binary"); if (!callback) { if (crypto2.pbkdf2Sync.length === 4) { - return crypto2.pbkdf2Sync(p, s, c, dkLen).toString("binary"); + return crypto2.pbkdf2Sync(p, s, c2, dkLen).toString("binary"); } - return crypto2.pbkdf2Sync(p, s, c, dkLen, md2).toString("binary"); + return crypto2.pbkdf2Sync(p, s, c2, dkLen, md2).toString("binary"); } if (crypto2.pbkdf2Sync.length === 4) { - return crypto2.pbkdf2(p, s, c, dkLen, function(err2, key) { + return crypto2.pbkdf2(p, s, c2, dkLen, function(err2, key) { if (err2) { return callback(err2); } callback(null, key.toString("binary")); }); } - return crypto2.pbkdf2(p, s, c, dkLen, md2, function(err2, key) { + return crypto2.pbkdf2(p, s, c2, dkLen, md2, function(err2, key) { if (err2) { return callback(err2); } @@ -104434,7 +104434,7 @@ var require_pbkdf2 = __commonJS({ prf.update(s); prf.update(forge.util.int32ToBytes(i)); xor = u_c1 = prf.digest().getBytes(); - for (var j = 2; j <= c; ++j) { + for (var j = 2; j <= c2; ++j) { prf.start(null, null); prf.update(u_c1); u_c = prf.digest().getBytes(); @@ -104458,7 +104458,7 @@ var require_pbkdf2 = __commonJS({ inner(); } function inner() { - if (j <= c) { + if (j <= c2) { prf.start(null, null); prf.update(u_c1); u_c = prf.digest().getBytes(); @@ -104658,7 +104658,7 @@ var require_sha2562 = __commonJS({ _initialized = true; } function _update(s, w, bytes) { - var t1, t2, s0, s1, ch, maj, i, a, b, c, d, e, f, g, h; + var t1, t2, s0, s1, ch, maj, i, a, b, c2, d, e, f, g, h; var len = bytes.length(); while (len >= 64) { for (i = 0; i < 16; ++i) { @@ -104673,7 +104673,7 @@ var require_sha2562 = __commonJS({ } a = s.h0; b = s.h1; - c = s.h2; + c2 = s.h2; d = s.h3; e = s.h4; f = s.h5; @@ -104683,21 +104683,21 @@ var require_sha2562 = __commonJS({ s1 = (e >>> 6 | e << 26) ^ (e >>> 11 | e << 21) ^ (e >>> 25 | e << 7); ch = g ^ e & (f ^ g); s0 = (a >>> 2 | a << 30) ^ (a >>> 13 | a << 19) ^ (a >>> 22 | a << 10); - maj = a & b | c & (a ^ b); + maj = a & b | c2 & (a ^ b); t1 = h + s1 + ch + _k[i] + w[i]; t2 = s0 + maj; h = g; g = f; f = e; e = d + t1 >>> 0; - d = c; - c = b; + d = c2; + c2 = b; b = a; a = t1 + t2 >>> 0; } s.h0 = s.h0 + a | 0; s.h1 = s.h1 + b | 0; - s.h2 = s.h2 + c | 0; + s.h2 = s.h2 + c2 | 0; s.h3 = s.h3 + d | 0; s.h4 = s.h4 + e | 0; s.h5 = s.h5 + f | 0; @@ -105526,10 +105526,10 @@ var require_jsbn = __commonJS({ var dbits; var canary = 244837814094590; var j_lm = (canary & 16777215) == 15715070; - function BigInteger(a, b, c) { + function BigInteger(a, b, c2) { this.data = []; if (a != null) - if ("number" == typeof a) this.fromNumber(a, b, c); + if ("number" == typeof a) this.fromNumber(a, b, c2); else if (b == null && "string" != typeof a) this.fromString(a, 256); else this.fromString(a, b); } @@ -105537,37 +105537,37 @@ var require_jsbn = __commonJS({ function nbi() { return new BigInteger(null); } - function am1(i, x, w, j, c, n) { + function am1(i, x, w, j, c2, n) { while (--n >= 0) { - var v = x * this.data[i++] + w.data[j] + c; - c = Math.floor(v / 67108864); + var v = x * this.data[i++] + w.data[j] + c2; + c2 = Math.floor(v / 67108864); w.data[j++] = v & 67108863; } - return c; + return c2; } - function am2(i, x, w, j, c, n) { + function am2(i, x, w, j, c2, n) { var xl = x & 32767, xh = x >> 15; while (--n >= 0) { var l = this.data[i] & 32767; var h = this.data[i++] >> 15; var m = xh * l + h * xl; - l = xl * l + ((m & 32767) << 15) + w.data[j] + (c & 1073741823); - c = (l >>> 30) + (m >>> 15) + xh * h + (c >>> 30); + l = xl * l + ((m & 32767) << 15) + w.data[j] + (c2 & 1073741823); + c2 = (l >>> 30) + (m >>> 15) + xh * h + (c2 >>> 30); w.data[j++] = l & 1073741823; } - return c; + return c2; } - function am3(i, x, w, j, c, n) { + function am3(i, x, w, j, c2, n) { var xl = x & 16383, xh = x >> 14; while (--n >= 0) { var l = this.data[i] & 16383; var h = this.data[i++] >> 14; var m = xh * l + h * xl; - l = xl * l + ((m & 16383) << 14) + w.data[j] + c; - c = (l >> 28) + (m >> 14) + xh * h; + l = xl * l + ((m & 16383) << 14) + w.data[j] + c2; + c2 = (l >> 28) + (m >> 14) + xh * h; w.data[j++] = l & 268435455; } - return c; + return c2; } if (typeof navigator === "undefined") { BigInteger.prototype.am = am3; @@ -105603,8 +105603,8 @@ var require_jsbn = __commonJS({ return BI_RM.charAt(n); } function intAt(s, i) { - var c = BI_RC[s.charCodeAt(i)]; - return c == null ? -1 : c; + var c2 = BI_RC[s.charCodeAt(i)]; + return c2 == null ? -1 : c2; } function bnpCopyTo(r) { for (var i = this.t - 1; i >= 0; --i) r.data[i] = this.data[i]; @@ -105663,8 +105663,8 @@ var require_jsbn = __commonJS({ if (mi) BigInteger.ZERO.subTo(this, this); } function bnpClamp() { - var c = this.s & this.DM; - while (this.t > 0 && this.data[this.t - 1] == c) --this.t; + var c2 = this.s & this.DM; + while (this.t > 0 && this.data[this.t - 1] == c2) --this.t; } function bnToString(b) { if (this.s < 0) return "-" + this.negate().toString(b); @@ -105760,13 +105760,13 @@ var require_jsbn = __commonJS({ var bs = n % this.DB; var cbs = this.DB - bs; var bm = (1 << cbs) - 1; - var ds = Math.floor(n / this.DB), c = this.s << bs & this.DM, i; + var ds = Math.floor(n / this.DB), c2 = this.s << bs & this.DM, i; for (i = this.t - 1; i >= 0; --i) { - r.data[i + ds + 1] = this.data[i] >> cbs | c; - c = (this.data[i] & bm) << bs; + r.data[i + ds + 1] = this.data[i] >> cbs | c2; + c2 = (this.data[i] & bm) << bs; } for (i = ds - 1; i >= 0; --i) r.data[i] = 0; - r.data[ds] = c; + r.data[ds] = c2; r.t = this.t + ds + 1; r.s = this.s; r.clamp(); @@ -105791,32 +105791,32 @@ var require_jsbn = __commonJS({ r.clamp(); } function bnpSubTo(a, r) { - var i = 0, c = 0, m = Math.min(a.t, this.t); + var i = 0, c2 = 0, m = Math.min(a.t, this.t); while (i < m) { - c += this.data[i] - a.data[i]; - r.data[i++] = c & this.DM; - c >>= this.DB; + c2 += this.data[i] - a.data[i]; + r.data[i++] = c2 & this.DM; + c2 >>= this.DB; } if (a.t < this.t) { - c -= a.s; + c2 -= a.s; while (i < this.t) { - c += this.data[i]; - r.data[i++] = c & this.DM; - c >>= this.DB; + c2 += this.data[i]; + r.data[i++] = c2 & this.DM; + c2 >>= this.DB; } - c += this.s; + c2 += this.s; } else { - c += this.s; + c2 += this.s; while (i < a.t) { - c -= a.data[i]; - r.data[i++] = c & this.DM; - c >>= this.DB; + c2 -= a.data[i]; + r.data[i++] = c2 & this.DM; + c2 >>= this.DB; } - c -= a.s; + c2 -= a.s; } - r.s = c < 0 ? -1 : 0; - if (c < -1) r.data[i++] = this.DV + c; - else if (c > 0) r.data[i++] = c; + r.s = c2 < 0 ? -1 : 0; + if (c2 < -1) r.data[i++] = this.DV + c2; + else if (c2 > 0) r.data[i++] = c2; r.t = i; r.clamp(); } @@ -105835,8 +105835,8 @@ var require_jsbn = __commonJS({ var i = r.t = 2 * x.t; while (--i >= 0) r.data[i] = 0; for (i = 0; i < x.t - 1; ++i) { - var c = x.am(i, x.data[i], r, 2 * i, 0, 1); - if ((r.data[i + x.t] += x.am(i + 1, 2 * x.data[i], r, 2 * i + 1, c, x.t - i - 1)) >= x.DV) { + var c2 = x.am(i, x.data[i], r, 2 * i, 0, 1); + if ((r.data[i + x.t] += x.am(i + 1, 2 * x.data[i], r, 2 * i + 1, c2, x.t - i - 1)) >= x.DV) { r.data[i + x.t] -= x.DV; r.data[i + x.t + 1] = 1; } @@ -106102,11 +106102,11 @@ var require_jsbn = __commonJS({ } if (mi) BigInteger.ZERO.subTo(this, this); } - function bnpFromNumber(a, b, c) { + function bnpFromNumber(a, b, c2) { if ("number" == typeof b) { if (a < 2) this.fromInt(1); else { - this.fromNumber(a, c); + this.fromNumber(a, c2); if (!this.testBit(a - 1)) this.bitwiseTo(BigInteger.ONE.shiftLeft(a - 1), op_or, this); if (this.isEven()) this.dAddOffset(1, 0); @@ -106285,32 +106285,32 @@ var require_jsbn = __commonJS({ return this.changeBit(n, op_xor); } function bnpAddTo(a, r) { - var i = 0, c = 0, m = Math.min(a.t, this.t); + var i = 0, c2 = 0, m = Math.min(a.t, this.t); while (i < m) { - c += this.data[i] + a.data[i]; - r.data[i++] = c & this.DM; - c >>= this.DB; + c2 += this.data[i] + a.data[i]; + r.data[i++] = c2 & this.DM; + c2 >>= this.DB; } if (a.t < this.t) { - c += a.s; + c2 += a.s; while (i < this.t) { - c += this.data[i]; - r.data[i++] = c & this.DM; - c >>= this.DB; + c2 += this.data[i]; + r.data[i++] = c2 & this.DM; + c2 >>= this.DB; } - c += this.s; + c2 += this.s; } else { - c += this.s; + c2 += this.s; while (i < a.t) { - c += a.data[i]; - r.data[i++] = c & this.DM; - c >>= this.DB; + c2 += a.data[i]; + r.data[i++] = c2 & this.DM; + c2 >>= this.DB; } - c += a.s; + c2 += a.s; } - r.s = c < 0 ? -1 : 0; - if (c > 0) r.data[i++] = c; - else if (c < -1) r.data[i++] = this.DV + c; + r.s = c2 < 0 ? -1 : 0; + if (c2 > 0) r.data[i++] = c2; + else if (c2 < -1) r.data[i++] = this.DV + c2; r.t = i; r.clamp(); } @@ -106563,7 +106563,7 @@ var require_jsbn = __commonJS({ var ac = m.isEven(); if (this.isEven() && ac || m.signum() == 0) return BigInteger.ZERO; var u = m.clone(), v = this.clone(); - var a = nbv(1), b = nbv(0), c = nbv(0), d = nbv(1); + var a = nbv(1), b = nbv(0), c2 = nbv(0), d = nbv(1); while (u.signum() != 0) { while (u.isEven()) { u.rShiftTo(1, u); @@ -106579,21 +106579,21 @@ var require_jsbn = __commonJS({ while (v.isEven()) { v.rShiftTo(1, v); if (ac) { - if (!c.isEven() || !d.isEven()) { - c.addTo(this, c); + if (!c2.isEven() || !d.isEven()) { + c2.addTo(this, c2); d.subTo(m, d); } - c.rShiftTo(1, c); + c2.rShiftTo(1, c2); } else if (!d.isEven()) d.subTo(m, d); d.rShiftTo(1, d); } if (u.compareTo(v) >= 0) { u.subTo(v, u); - if (ac) a.subTo(c, a); + if (ac) a.subTo(c2, a); b.subTo(d, b); } else { v.subTo(u, v); - if (ac) c.subTo(a, c); + if (ac) c2.subTo(a, c2); d.subTo(b, d); } } @@ -106812,22 +106812,22 @@ var require_sha1 = __commonJS({ _initialized = true; } function _update(s, w, bytes) { - var t, a, b, c, d, e, f, i; + var t, a, b, c2, d, e, f, i; var len = bytes.length(); while (len >= 64) { a = s.h0; b = s.h1; - c = s.h2; + c2 = s.h2; d = s.h3; e = s.h4; for (i = 0; i < 16; ++i) { t = bytes.getInt32(); w[i] = t; - f = d ^ b & (c ^ d); + f = d ^ b & (c2 ^ d); t = (a << 5 | a >>> 27) + f + e + 1518500249 + t; e = d; - d = c; - c = (b << 30 | b >>> 2) >>> 0; + d = c2; + c2 = (b << 30 | b >>> 2) >>> 0; b = a; a = t; } @@ -106835,11 +106835,11 @@ var require_sha1 = __commonJS({ t = w[i - 3] ^ w[i - 8] ^ w[i - 14] ^ w[i - 16]; t = t << 1 | t >>> 31; w[i] = t; - f = d ^ b & (c ^ d); + f = d ^ b & (c2 ^ d); t = (a << 5 | a >>> 27) + f + e + 1518500249 + t; e = d; - d = c; - c = (b << 30 | b >>> 2) >>> 0; + d = c2; + c2 = (b << 30 | b >>> 2) >>> 0; b = a; a = t; } @@ -106847,11 +106847,11 @@ var require_sha1 = __commonJS({ t = w[i - 3] ^ w[i - 8] ^ w[i - 14] ^ w[i - 16]; t = t << 1 | t >>> 31; w[i] = t; - f = b ^ c ^ d; + f = b ^ c2 ^ d; t = (a << 5 | a >>> 27) + f + e + 1859775393 + t; e = d; - d = c; - c = (b << 30 | b >>> 2) >>> 0; + d = c2; + c2 = (b << 30 | b >>> 2) >>> 0; b = a; a = t; } @@ -106859,11 +106859,11 @@ var require_sha1 = __commonJS({ t = w[i - 6] ^ w[i - 16] ^ w[i - 28] ^ w[i - 32]; t = t << 2 | t >>> 30; w[i] = t; - f = b ^ c ^ d; + f = b ^ c2 ^ d; t = (a << 5 | a >>> 27) + f + e + 1859775393 + t; e = d; - d = c; - c = (b << 30 | b >>> 2) >>> 0; + d = c2; + c2 = (b << 30 | b >>> 2) >>> 0; b = a; a = t; } @@ -106871,11 +106871,11 @@ var require_sha1 = __commonJS({ t = w[i - 6] ^ w[i - 16] ^ w[i - 28] ^ w[i - 32]; t = t << 2 | t >>> 30; w[i] = t; - f = b & c | d & (b ^ c); + f = b & c2 | d & (b ^ c2); t = (a << 5 | a >>> 27) + f + e + 2400959708 + t; e = d; - d = c; - c = (b << 30 | b >>> 2) >>> 0; + d = c2; + c2 = (b << 30 | b >>> 2) >>> 0; b = a; a = t; } @@ -106883,17 +106883,17 @@ var require_sha1 = __commonJS({ t = w[i - 6] ^ w[i - 16] ^ w[i - 28] ^ w[i - 32]; t = t << 2 | t >>> 30; w[i] = t; - f = b ^ c ^ d; + f = b ^ c2 ^ d; t = (a << 5 | a >>> 27) + f + e + 3395469782 + t; e = d; - d = c; - c = (b << 30 | b >>> 2) >>> 0; + d = c2; + c2 = (b << 30 | b >>> 2) >>> 0; b = a; a = t; } s.h0 = s.h0 + a | 0; s.h1 = s.h1 + b | 0; - s.h2 = s.h2 + c | 0; + s.h2 = s.h2 + c2 | 0; s.h3 = s.h3 + d | 0; s.h4 = s.h4 + e | 0; len -= 64; @@ -107039,14 +107039,14 @@ var require_pkcs1 = __commonJS({ var t = ""; var count = Math.ceil(maskLength / hash.digestLength); for (var i = 0; i < count; ++i) { - var c = String.fromCharCode( + var c2 = String.fromCharCode( i >> 24 & 255, i >> 16 & 255, i >> 8 & 255, i & 255 ); hash.start(); - hash.update(seed + c); + hash.update(seed + c2); t += hash.digest().getBytes(); } return t.substring(0, maskLength); @@ -108931,8 +108931,8 @@ var require_pbe = __commonJS({ } var I = S; I.putBuffer(P); - var c = Math.ceil(n / u); - for (var i = 1; i <= c; i++) { + var c2 = Math.ceil(n / u); + for (var i = 1; i <= c2; i++) { var buf = new forge.util.ByteBuffer(); buf.putBytes(D.bytes()); buf.putBytes(I.bytes()); @@ -109515,10 +109515,10 @@ var require_mgf1 = __commonJS({ var t = new forge.util.ByteBuffer(); var len = Math.ceil(maskLen / md2.digestLength); for (var i = 0; i < len; i++) { - var c = new forge.util.ByteBuffer(); - c.putInt32(i); + var c2 = new forge.util.ByteBuffer(); + c2.putInt32(i); md2.start(); - md2.update(seed + c.getBytes()); + md2.update(seed + c2.getBytes()); t.putBuffer(md2.digest()); } t.truncate(t.length() - maskLen); @@ -112772,10 +112772,10 @@ var require_tls = __commonJS({ hmac.update(b.getBytes()); return hmac.digest().getBytes(); }; - var deflate = function(c, record, s) { + var deflate = function(c2, record, s) { var rval = false; try { - var bytes = c.deflate(record.fragment.getBytes()); + var bytes = c2.deflate(record.fragment.getBytes()); record.fragment = forge.util.createBuffer(bytes); record.length = bytes.length; rval = true; @@ -112783,10 +112783,10 @@ var require_tls = __commonJS({ } return rval; }; - var inflate = function(c, record, s) { + var inflate = function(c2, record, s) { var rval = false; try { - var bytes = c.inflate(record.fragment.getBytes()); + var bytes = c2.inflate(record.fragment.getBytes()); record.fragment = forge.util.createBuffer(bytes); record.length = bytes.length; rval = true; @@ -112923,10 +112923,10 @@ var require_tls = __commonJS({ } return rval; }; - tls.handleUnexpected = function(c, record) { - var ignore = !c.open && c.entity === tls.ConnectionEnd.client; + tls.handleUnexpected = function(c2, record) { + var ignore = !c2.open && c2.entity === tls.ConnectionEnd.client; if (!ignore) { - c.error(c, { + c2.error(c2, { message: "Unexpected message. Received TLS record out of order.", send: true, alert: { @@ -112936,21 +112936,21 @@ var require_tls = __commonJS({ }); } }; - tls.handleHelloRequest = function(c, record, length) { - if (!c.handshaking && c.handshakes > 0) { - tls.queue(c, tls.createAlert(c, { + tls.handleHelloRequest = function(c2, record, length) { + if (!c2.handshaking && c2.handshakes > 0) { + tls.queue(c2, tls.createAlert(c2, { level: tls.Alert.Level.warning, description: tls.Alert.Description.no_renegotiation })); - tls.flush(c); + tls.flush(c2); } - c.process(); + c2.process(); }; - tls.parseHelloMessage = function(c, record, length) { + tls.parseHelloMessage = function(c2, record, length) { var msg = null; - var client = c.entity === tls.ConnectionEnd.client; + var client = c2.entity === tls.ConnectionEnd.client; if (length < 38) { - c.error(c, { + c2.error(c2, { message: client ? "Invalid ServerHello message. Message too short." : "Invalid ClientHello message. Message too short.", send: true, alert: { @@ -112996,7 +112996,7 @@ var require_tls = __commonJS({ if (snType !== 0) { break; } - c.session.extensions.server_name.serverNameList.push( + c2.session.extensions.server_name.serverNameList.push( readVector(snl, 2).getBytes() ); } @@ -113004,9 +113004,9 @@ var require_tls = __commonJS({ } } } - if (c.session.version) { - if (msg.version.major !== c.session.version.major || msg.version.minor !== c.session.version.minor) { - return c.error(c, { + if (c2.session.version) { + if (msg.version.major !== c2.session.version.major || msg.version.minor !== c2.session.version.minor) { + return c2.error(c2, { message: "TLS version change is disallowed during renegotiation.", send: true, alert: { @@ -113017,18 +113017,18 @@ var require_tls = __commonJS({ } } if (client) { - c.session.cipherSuite = tls.getCipherSuite(msg.cipher_suite); + c2.session.cipherSuite = tls.getCipherSuite(msg.cipher_suite); } else { var tmp = forge.util.createBuffer(msg.cipher_suites.bytes()); while (tmp.length() > 0) { - c.session.cipherSuite = tls.getCipherSuite(tmp.getBytes(2)); - if (c.session.cipherSuite !== null) { + c2.session.cipherSuite = tls.getCipherSuite(tmp.getBytes(2)); + if (c2.session.cipherSuite !== null) { break; } } } - if (c.session.cipherSuite === null) { - return c.error(c, { + if (c2.session.cipherSuite === null) { + return c2.error(c2, { message: "No cipher suites in common.", send: true, alert: { @@ -113039,20 +113039,20 @@ var require_tls = __commonJS({ }); } if (client) { - c.session.compressionMethod = msg.compression_method; + c2.session.compressionMethod = msg.compression_method; } else { - c.session.compressionMethod = tls.CompressionMethod.none; + c2.session.compressionMethod = tls.CompressionMethod.none; } } return msg; }; - tls.createSecurityParameters = function(c, msg) { - var client = c.entity === tls.ConnectionEnd.client; + tls.createSecurityParameters = function(c2, msg) { + var client = c2.entity === tls.ConnectionEnd.client; var msgRandom = msg.random.bytes(); - var cRandom = client ? c.session.sp.client_random : msgRandom; + var cRandom = client ? c2.session.sp.client_random : msgRandom; var sRandom = client ? msgRandom : tls.createRandom().getBytes(); - c.session.sp = { - entity: c.entity, + c2.session.sp = { + entity: c2.entity, prf_algorithm: tls.PRFAlgorithm.tls_prf_sha256, bulk_cipher_algorithm: null, cipher_type: null, @@ -113063,22 +113063,22 @@ var require_tls = __commonJS({ mac_algorithm: null, mac_length: null, mac_key_length: null, - compression_algorithm: c.session.compressionMethod, + compression_algorithm: c2.session.compressionMethod, pre_master_secret: null, master_secret: null, client_random: cRandom, server_random: sRandom }; }; - tls.handleServerHello = function(c, record, length) { - var msg = tls.parseHelloMessage(c, record, length); - if (c.fail) { + tls.handleServerHello = function(c2, record, length) { + var msg = tls.parseHelloMessage(c2, record, length); + if (c2.fail) { return; } - if (msg.version.minor <= c.version.minor) { - c.version.minor = msg.version.minor; + if (msg.version.minor <= c2.version.minor) { + c2.version.minor = msg.version.minor; } else { - return c.error(c, { + return c2.error(c2, { message: "Incompatible TLS version.", send: true, alert: { @@ -113087,29 +113087,29 @@ var require_tls = __commonJS({ } }); } - c.session.version = c.version; + c2.session.version = c2.version; var sessionId = msg.session_id.bytes(); - if (sessionId.length > 0 && sessionId === c.session.id) { - c.expect = SCC; - c.session.resuming = true; - c.session.sp.server_random = msg.random.bytes(); + if (sessionId.length > 0 && sessionId === c2.session.id) { + c2.expect = SCC; + c2.session.resuming = true; + c2.session.sp.server_random = msg.random.bytes(); } else { - c.expect = SCE; - c.session.resuming = false; - tls.createSecurityParameters(c, msg); + c2.expect = SCE; + c2.session.resuming = false; + tls.createSecurityParameters(c2, msg); } - c.session.id = sessionId; - c.process(); + c2.session.id = sessionId; + c2.process(); }; - tls.handleClientHello = function(c, record, length) { - var msg = tls.parseHelloMessage(c, record, length); - if (c.fail) { + tls.handleClientHello = function(c2, record, length) { + var msg = tls.parseHelloMessage(c2, record, length); + if (c2.fail) { return; } var sessionId = msg.session_id.bytes(); var session = null; - if (c.sessionCache) { - session = c.sessionCache.getSession(sessionId); + if (c2.sessionCache) { + session = c2.sessionCache.getSession(sessionId); if (session === null) { sessionId = ""; } else if (session.version.major !== msg.version.major || session.version.minor > msg.version.minor) { @@ -113120,12 +113120,12 @@ var require_tls = __commonJS({ if (sessionId.length === 0) { sessionId = forge.random.getBytes(32); } - c.session.id = sessionId; - c.session.clientHelloVersion = msg.version; - c.session.sp = {}; + c2.session.id = sessionId; + c2.session.clientHelloVersion = msg.version; + c2.session.sp = {}; if (session) { - c.version = c.session.version = session.version; - c.session.sp = session.sp; + c2.version = c2.session.version = session.version; + c2.session.sp = session.sp; } else { var version; for (var i = 1; i < tls.SupportedVersions.length; ++i) { @@ -113134,62 +113134,62 @@ var require_tls = __commonJS({ break; } } - c.version = { major: version.major, minor: version.minor }; - c.session.version = c.version; + c2.version = { major: version.major, minor: version.minor }; + c2.session.version = c2.version; } if (session !== null) { - c.expect = CCC; - c.session.resuming = true; - c.session.sp.client_random = msg.random.bytes(); + c2.expect = CCC; + c2.session.resuming = true; + c2.session.sp.client_random = msg.random.bytes(); } else { - c.expect = c.verifyClient !== false ? CCE : CKE; - c.session.resuming = false; - tls.createSecurityParameters(c, msg); + c2.expect = c2.verifyClient !== false ? CCE : CKE; + c2.session.resuming = false; + tls.createSecurityParameters(c2, msg); } - c.open = true; - tls.queue(c, tls.createRecord(c, { + c2.open = true; + tls.queue(c2, tls.createRecord(c2, { type: tls.ContentType.handshake, - data: tls.createServerHello(c) + data: tls.createServerHello(c2) })); - if (c.session.resuming) { - tls.queue(c, tls.createRecord(c, { + if (c2.session.resuming) { + tls.queue(c2, tls.createRecord(c2, { type: tls.ContentType.change_cipher_spec, data: tls.createChangeCipherSpec() })); - c.state.pending = tls.createConnectionState(c); - c.state.current.write = c.state.pending.write; - tls.queue(c, tls.createRecord(c, { + c2.state.pending = tls.createConnectionState(c2); + c2.state.current.write = c2.state.pending.write; + tls.queue(c2, tls.createRecord(c2, { type: tls.ContentType.handshake, - data: tls.createFinished(c) + data: tls.createFinished(c2) })); } else { - tls.queue(c, tls.createRecord(c, { + tls.queue(c2, tls.createRecord(c2, { type: tls.ContentType.handshake, - data: tls.createCertificate(c) + data: tls.createCertificate(c2) })); - if (!c.fail) { - tls.queue(c, tls.createRecord(c, { + if (!c2.fail) { + tls.queue(c2, tls.createRecord(c2, { type: tls.ContentType.handshake, - data: tls.createServerKeyExchange(c) + data: tls.createServerKeyExchange(c2) })); - if (c.verifyClient !== false) { - tls.queue(c, tls.createRecord(c, { + if (c2.verifyClient !== false) { + tls.queue(c2, tls.createRecord(c2, { type: tls.ContentType.handshake, - data: tls.createCertificateRequest(c) + data: tls.createCertificateRequest(c2) })); } - tls.queue(c, tls.createRecord(c, { + tls.queue(c2, tls.createRecord(c2, { type: tls.ContentType.handshake, - data: tls.createServerHelloDone(c) + data: tls.createServerHelloDone(c2) })); } } - tls.flush(c); - c.process(); + tls.flush(c2); + c2.process(); }; - tls.handleCertificate = function(c, record, length) { + tls.handleCertificate = function(c2, record, length) { if (length < 3) { - return c.error(c, { + return c2.error(c2, { message: "Invalid Certificate message. Message too short.", send: true, alert: { @@ -113212,7 +113212,7 @@ var require_tls = __commonJS({ certs.push(cert); } } catch (ex) { - return c.error(c, { + return c2.error(c2, { message: "Could not parse certificate list.", cause: ex, send: true, @@ -113222,9 +113222,9 @@ var require_tls = __commonJS({ } }); } - var client = c.entity === tls.ConnectionEnd.client; - if ((client || c.verifyClient === true) && certs.length === 0) { - c.error(c, { + var client = c2.entity === tls.ConnectionEnd.client; + if ((client || c2.verifyClient === true) && certs.length === 0) { + c2.error(c2, { message: client ? "No server certificate provided." : "No client certificate provided.", send: true, alert: { @@ -113233,22 +113233,22 @@ var require_tls = __commonJS({ } }); } else if (certs.length === 0) { - c.expect = client ? SKE : CKE; + c2.expect = client ? SKE : CKE; } else { if (client) { - c.session.serverCertificate = certs[0]; + c2.session.serverCertificate = certs[0]; } else { - c.session.clientCertificate = certs[0]; + c2.session.clientCertificate = certs[0]; } - if (tls.verifyCertificateChain(c, certs)) { - c.expect = client ? SKE : CKE; + if (tls.verifyCertificateChain(c2, certs)) { + c2.expect = client ? SKE : CKE; } } - c.process(); + c2.process(); }; - tls.handleServerKeyExchange = function(c, record, length) { + tls.handleServerKeyExchange = function(c2, record, length) { if (length > 0) { - return c.error(c, { + return c2.error(c2, { message: "Invalid key parameters. Only RSA is supported.", send: true, alert: { @@ -113257,12 +113257,12 @@ var require_tls = __commonJS({ } }); } - c.expect = SCR; - c.process(); + c2.expect = SCR; + c2.process(); }; - tls.handleClientKeyExchange = function(c, record, length) { + tls.handleClientKeyExchange = function(c2, record, length) { if (length < 48) { - return c.error(c, { + return c2.error(c2, { message: "Invalid key parameters. Only RSA is supported.", send: true, alert: { @@ -113276,12 +113276,12 @@ var require_tls = __commonJS({ enc_pre_master_secret: readVector(b, 2).getBytes() }; var privateKey = null; - if (c.getPrivateKey) { + if (c2.getPrivateKey) { try { - privateKey = c.getPrivateKey(c, c.session.serverCertificate); + privateKey = c2.getPrivateKey(c2, c2.session.serverCertificate); privateKey = forge.pki.privateKeyFromPem(privateKey); } catch (ex) { - c.error(c, { + c2.error(c2, { message: "Could not get private key.", cause: ex, send: true, @@ -113293,7 +113293,7 @@ var require_tls = __commonJS({ } } if (privateKey === null) { - return c.error(c, { + return c2.error(c2, { message: "No private key set.", send: true, alert: { @@ -113303,24 +113303,24 @@ var require_tls = __commonJS({ }); } try { - var sp = c.session.sp; + var sp = c2.session.sp; sp.pre_master_secret = privateKey.decrypt(msg.enc_pre_master_secret); - var version = c.session.clientHelloVersion; + var version = c2.session.clientHelloVersion; if (version.major !== sp.pre_master_secret.charCodeAt(0) || version.minor !== sp.pre_master_secret.charCodeAt(1)) { throw new Error("TLS version rollback attack detected."); } } catch (ex) { sp.pre_master_secret = forge.random.getBytes(48); } - c.expect = CCC; - if (c.session.clientCertificate !== null) { - c.expect = CCV; + c2.expect = CCC; + if (c2.session.clientCertificate !== null) { + c2.expect = CCV; } - c.process(); + c2.process(); }; - tls.handleCertificateRequest = function(c, record, length) { + tls.handleCertificateRequest = function(c2, record, length) { if (length < 3) { - return c.error(c, { + return c2.error(c2, { message: "Invalid CertificateRequest. Message too short.", send: true, alert: { @@ -113334,13 +113334,13 @@ var require_tls = __commonJS({ certificate_types: readVector(b, 1), certificate_authorities: readVector(b, 2) }; - c.session.certificateRequest = msg; - c.expect = SHD; - c.process(); + c2.session.certificateRequest = msg; + c2.expect = SHD; + c2.process(); }; - tls.handleCertificateVerify = function(c, record, length) { + tls.handleCertificateVerify = function(c2, record, length) { if (length < 2) { - return c.error(c, { + return c2.error(c2, { message: "Invalid CertificateVerify. Message too short.", send: true, alert: { @@ -113357,18 +113357,18 @@ var require_tls = __commonJS({ signature: readVector(b, 2).getBytes() }; var verify = forge.util.createBuffer(); - verify.putBuffer(c.session.md5.digest()); - verify.putBuffer(c.session.sha1.digest()); + verify.putBuffer(c2.session.md5.digest()); + verify.putBuffer(c2.session.sha1.digest()); verify = verify.getBytes(); try { - var cert = c.session.clientCertificate; + var cert = c2.session.clientCertificate; if (!cert.publicKey.verify(verify, msg.signature, "NONE")) { throw new Error("CertificateVerify signature does not match."); } - c.session.md5.update(msgBytes); - c.session.sha1.update(msgBytes); + c2.session.md5.update(msgBytes); + c2.session.sha1.update(msgBytes); } catch (ex) { - return c.error(c, { + return c2.error(c2, { message: "Bad signature in CertificateVerify.", send: true, alert: { @@ -113377,12 +113377,12 @@ var require_tls = __commonJS({ } }); } - c.expect = CCC; - c.process(); + c2.expect = CCC; + c2.process(); }; - tls.handleServerHelloDone = function(c, record, length) { + tls.handleServerHelloDone = function(c2, record, length) { if (length > 0) { - return c.error(c, { + return c2.error(c2, { message: "Invalid ServerHelloDone message. Invalid length.", send: true, alert: { @@ -113391,7 +113391,7 @@ var require_tls = __commonJS({ } }); } - if (c.serverCertificate === null) { + if (c2.serverCertificate === null) { var error3 = { message: "No server certificate provided. Not enough security.", send: true, @@ -113401,7 +113401,7 @@ var require_tls = __commonJS({ } }; var depth = 0; - var ret = c.verify(c, error3.alert.description, depth, []); + var ret = c2.verify(c2, error3.alert.description, depth, []); if (ret !== true) { if (ret || ret === 0) { if (typeof ret === "object" && !forge.util.isArray(ret)) { @@ -113415,51 +113415,51 @@ var require_tls = __commonJS({ error3.alert.description = ret; } } - return c.error(c, error3); + return c2.error(c2, error3); } } - if (c.session.certificateRequest !== null) { - record = tls.createRecord(c, { + if (c2.session.certificateRequest !== null) { + record = tls.createRecord(c2, { type: tls.ContentType.handshake, - data: tls.createCertificate(c) + data: tls.createCertificate(c2) }); - tls.queue(c, record); + tls.queue(c2, record); } - record = tls.createRecord(c, { + record = tls.createRecord(c2, { type: tls.ContentType.handshake, - data: tls.createClientKeyExchange(c) + data: tls.createClientKeyExchange(c2) }); - tls.queue(c, record); - c.expect = SER; - var callback = function(c2, signature) { - if (c2.session.certificateRequest !== null && c2.session.clientCertificate !== null) { - tls.queue(c2, tls.createRecord(c2, { + tls.queue(c2, record); + c2.expect = SER; + var callback = function(c3, signature) { + if (c3.session.certificateRequest !== null && c3.session.clientCertificate !== null) { + tls.queue(c3, tls.createRecord(c3, { type: tls.ContentType.handshake, - data: tls.createCertificateVerify(c2, signature) + data: tls.createCertificateVerify(c3, signature) })); } - tls.queue(c2, tls.createRecord(c2, { + tls.queue(c3, tls.createRecord(c3, { type: tls.ContentType.change_cipher_spec, data: tls.createChangeCipherSpec() })); - c2.state.pending = tls.createConnectionState(c2); - c2.state.current.write = c2.state.pending.write; - tls.queue(c2, tls.createRecord(c2, { + c3.state.pending = tls.createConnectionState(c3); + c3.state.current.write = c3.state.pending.write; + tls.queue(c3, tls.createRecord(c3, { type: tls.ContentType.handshake, - data: tls.createFinished(c2) + data: tls.createFinished(c3) })); - c2.expect = SCC; - tls.flush(c2); - c2.process(); + c3.expect = SCC; + tls.flush(c3); + c3.process(); }; - if (c.session.certificateRequest === null || c.session.clientCertificate === null) { - return callback(c, null); + if (c2.session.certificateRequest === null || c2.session.clientCertificate === null) { + return callback(c2, null); } - tls.getClientSignature(c, callback); + tls.getClientSignature(c2, callback); }; - tls.handleChangeCipherSpec = function(c, record) { + tls.handleChangeCipherSpec = function(c2, record) { if (record.fragment.getByte() !== 1) { - return c.error(c, { + return c2.error(c2, { message: "Invalid ChangeCipherSpec message received.", send: true, alert: { @@ -113468,34 +113468,34 @@ var require_tls = __commonJS({ } }); } - var client = c.entity === tls.ConnectionEnd.client; - if (c.session.resuming && client || !c.session.resuming && !client) { - c.state.pending = tls.createConnectionState(c); + var client = c2.entity === tls.ConnectionEnd.client; + if (c2.session.resuming && client || !c2.session.resuming && !client) { + c2.state.pending = tls.createConnectionState(c2); } - c.state.current.read = c.state.pending.read; - if (!c.session.resuming && client || c.session.resuming && !client) { - c.state.pending = null; + c2.state.current.read = c2.state.pending.read; + if (!c2.session.resuming && client || c2.session.resuming && !client) { + c2.state.pending = null; } - c.expect = client ? SFI : CFI; - c.process(); + c2.expect = client ? SFI : CFI; + c2.process(); }; - tls.handleFinished = function(c, record, length) { + tls.handleFinished = function(c2, record, length) { var b = record.fragment; b.read -= 4; var msgBytes = b.bytes(); b.read += 4; var vd = record.fragment.getBytes(); b = forge.util.createBuffer(); - b.putBuffer(c.session.md5.digest()); - b.putBuffer(c.session.sha1.digest()); - var client = c.entity === tls.ConnectionEnd.client; + b.putBuffer(c2.session.md5.digest()); + b.putBuffer(c2.session.sha1.digest()); + var client = c2.entity === tls.ConnectionEnd.client; var label = client ? "server finished" : "client finished"; - var sp = c.session.sp; + var sp = c2.session.sp; var vdl = 12; var prf = prf_TLS1; b = prf(sp.master_secret, label, b.getBytes(), vdl); if (b.getBytes() !== vd) { - return c.error(c, { + return c2.error(c2, { message: "Invalid verify_data in Finished message.", send: true, alert: { @@ -113504,30 +113504,30 @@ var require_tls = __commonJS({ } }); } - c.session.md5.update(msgBytes); - c.session.sha1.update(msgBytes); - if (c.session.resuming && client || !c.session.resuming && !client) { - tls.queue(c, tls.createRecord(c, { + c2.session.md5.update(msgBytes); + c2.session.sha1.update(msgBytes); + if (c2.session.resuming && client || !c2.session.resuming && !client) { + tls.queue(c2, tls.createRecord(c2, { type: tls.ContentType.change_cipher_spec, data: tls.createChangeCipherSpec() })); - c.state.current.write = c.state.pending.write; - c.state.pending = null; - tls.queue(c, tls.createRecord(c, { + c2.state.current.write = c2.state.pending.write; + c2.state.pending = null; + tls.queue(c2, tls.createRecord(c2, { type: tls.ContentType.handshake, - data: tls.createFinished(c) + data: tls.createFinished(c2) })); } - c.expect = client ? SAD : CAD; - c.handshaking = false; - ++c.handshakes; - c.peerCertificate = client ? c.session.serverCertificate : c.session.clientCertificate; - tls.flush(c); - c.isConnected = true; - c.connected(c); - c.process(); + c2.expect = client ? SAD : CAD; + c2.handshaking = false; + ++c2.handshakes; + c2.peerCertificate = client ? c2.session.serverCertificate : c2.session.clientCertificate; + tls.flush(c2); + c2.isConnected = true; + c2.connected(c2); + c2.process(); }; - tls.handleAlert = function(c, record) { + tls.handleAlert = function(c2, record) { var b = record.fragment; var alert = { level: b.getByte(), @@ -113609,35 +113609,35 @@ var require_tls = __commonJS({ break; } if (alert.description === tls.Alert.Description.close_notify) { - return c.close(); + return c2.close(); } - c.error(c, { + c2.error(c2, { message: msg, send: false, // origin is the opposite end - origin: c.entity === tls.ConnectionEnd.client ? "server" : "client", + origin: c2.entity === tls.ConnectionEnd.client ? "server" : "client", alert }); - c.process(); + c2.process(); }; - tls.handleHandshake = function(c, record) { + tls.handleHandshake = function(c2, record) { var b = record.fragment; var type2 = b.getByte(); var length = b.getInt24(); if (length > b.length()) { - c.fragmented = record; + c2.fragmented = record; record.fragment = forge.util.createBuffer(); b.read -= 4; - return c.process(); + return c2.process(); } - c.fragmented = null; + c2.fragmented = null; b.read -= 4; var bytes = b.bytes(length + 4); b.read += 4; - if (type2 in hsTable[c.entity][c.expect]) { - if (c.entity === tls.ConnectionEnd.server && !c.open && !c.fail) { - c.handshaking = true; - c.session = { + if (type2 in hsTable[c2.entity][c2.expect]) { + if (c2.entity === tls.ConnectionEnd.server && !c2.open && !c2.fail) { + c2.handshaking = true; + c2.session = { version: null, extensions: { server_name: { @@ -113653,45 +113653,45 @@ var require_tls = __commonJS({ }; } if (type2 !== tls.HandshakeType.hello_request && type2 !== tls.HandshakeType.certificate_verify && type2 !== tls.HandshakeType.finished) { - c.session.md5.update(bytes); - c.session.sha1.update(bytes); + c2.session.md5.update(bytes); + c2.session.sha1.update(bytes); } - hsTable[c.entity][c.expect][type2](c, record, length); + hsTable[c2.entity][c2.expect][type2](c2, record, length); } else { - tls.handleUnexpected(c, record); + tls.handleUnexpected(c2, record); } }; - tls.handleApplicationData = function(c, record) { - c.data.putBuffer(record.fragment); - c.dataReady(c); - c.process(); + tls.handleApplicationData = function(c2, record) { + c2.data.putBuffer(record.fragment); + c2.dataReady(c2); + c2.process(); }; - tls.handleHeartbeat = function(c, record) { + tls.handleHeartbeat = function(c2, record) { var b = record.fragment; var type2 = b.getByte(); var length = b.getInt16(); var payload = b.getBytes(length); if (type2 === tls.HeartbeatMessageType.heartbeat_request) { - if (c.handshaking || length > payload.length) { - return c.process(); + if (c2.handshaking || length > payload.length) { + return c2.process(); } - tls.queue(c, tls.createRecord(c, { + tls.queue(c2, tls.createRecord(c2, { type: tls.ContentType.heartbeat, data: tls.createHeartbeat( tls.HeartbeatMessageType.heartbeat_response, payload ) })); - tls.flush(c); + tls.flush(c2); } else if (type2 === tls.HeartbeatMessageType.heartbeat_response) { - if (payload !== c.expectedHeartbeatPayload) { - return c.process(); + if (payload !== c2.expectedHeartbeatPayload) { + return c2.process(); } - if (c.heartbeatReceived) { - c.heartbeatReceived(c, forge.util.createBuffer(payload)); + if (c2.heartbeatReceived) { + c2.heartbeatReceived(c2, forge.util.createBuffer(payload)); } } - c.process(); + c2.process(); }; var SHE = 0; var SCE = 1; @@ -113807,10 +113807,10 @@ var require_tls = __commonJS({ /*CER*/ [__, __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, __] ]; - tls.generateKeys = function(c, sp) { + tls.generateKeys = function(c2, sp) { var prf = prf_TLS1; var random = sp.client_random + sp.server_random; - if (!c.session.resuming) { + if (!c2.session.resuming) { sp.master_secret = prf( sp.pre_master_secret, "master secret", @@ -113821,7 +113821,7 @@ var require_tls = __commonJS({ } random = sp.server_random + sp.client_random; var length = 2 * sp.mac_key_length + 2 * sp.enc_key_length; - var tls10 = c.version.major === tls.Versions.TLS_1_0.major && c.version.minor === tls.Versions.TLS_1_0.minor; + var tls10 = c2.version.major === tls.Versions.TLS_1_0.major && c2.version.minor === tls.Versions.TLS_1_0.minor; if (tls10) { length += 2 * sp.fixed_iv_length; } @@ -113838,8 +113838,8 @@ var require_tls = __commonJS({ } return rval; }; - tls.createConnectionState = function(c) { - var client = c.entity === tls.ConnectionEnd.client; + tls.createConnectionState = function(c2) { + var client = c2.entity === tls.ConnectionEnd.client; var createMode = function() { var mode = { // two 32-bit numbers, first is most significant @@ -113870,9 +113870,9 @@ var require_tls = __commonJS({ read: createMode(), write: createMode() }; - state.read.update = function(c2, record) { + state.read.update = function(c3, record) { if (!state.read.cipherFunction(record, state.read)) { - c2.error(c2, { + c3.error(c3, { message: "Could not decrypt record or bad MAC.", send: true, alert: { @@ -113883,8 +113883,8 @@ var require_tls = __commonJS({ description: tls.Alert.Description.bad_record_mac } }); - } else if (!state.read.compressFunction(c2, record, state.read)) { - c2.error(c2, { + } else if (!state.read.compressFunction(c3, record, state.read)) { + c3.error(c3, { message: "Could not decompress record.", send: true, alert: { @@ -113893,11 +113893,11 @@ var require_tls = __commonJS({ } }); } - return !c2.fail; + return !c3.fail; }; - state.write.update = function(c2, record) { - if (!state.write.compressFunction(c2, record, state.write)) { - c2.error(c2, { + state.write.update = function(c3, record) { + if (!state.write.compressFunction(c3, record, state.write)) { + c3.error(c3, { message: "Could not compress record.", send: false, alert: { @@ -113906,7 +113906,7 @@ var require_tls = __commonJS({ } }); } else if (!state.write.cipherFunction(record, state.write)) { - c2.error(c2, { + c3.error(c3, { message: "Could not encrypt record.", send: false, alert: { @@ -113915,15 +113915,15 @@ var require_tls = __commonJS({ } }); } - return !c2.fail; + return !c3.fail; }; - if (c.session) { - var sp = c.session.sp; - c.session.cipherSuite.initSecurityParameters(sp); - sp.keys = tls.generateKeys(c, sp); + if (c2.session) { + var sp = c2.session.sp; + c2.session.cipherSuite.initSecurityParameters(sp); + sp.keys = tls.generateKeys(c2, sp); state.read.macKey = client ? sp.keys.server_write_MAC_key : sp.keys.client_write_MAC_key; state.write.macKey = client ? sp.keys.client_write_MAC_key : sp.keys.server_write_MAC_key; - c.session.cipherSuite.initConnectionState(state, c, sp); + c2.session.cipherSuite.initConnectionState(state, c2, sp); switch (sp.compression_algorithm) { case tls.CompressionMethod.none: break; @@ -113945,38 +113945,38 @@ var require_tls = __commonJS({ rval.putBytes(forge.random.getBytes(28)); return rval; }; - tls.createRecord = function(c, options) { + tls.createRecord = function(c2, options) { if (!options.data) { return null; } var record = { type: options.type, version: { - major: c.version.major, - minor: c.version.minor + major: c2.version.major, + minor: c2.version.minor }, length: options.data.length(), fragment: options.data }; return record; }; - tls.createAlert = function(c, alert) { + tls.createAlert = function(c2, alert) { var b = forge.util.createBuffer(); b.putByte(alert.level); b.putByte(alert.description); - return tls.createRecord(c, { + return tls.createRecord(c2, { type: tls.ContentType.alert, data: b }); }; - tls.createClientHello = function(c) { - c.session.clientHelloVersion = { - major: c.version.major, - minor: c.version.minor + tls.createClientHello = function(c2) { + c2.session.clientHelloVersion = { + major: c2.version.major, + minor: c2.version.minor }; var cipherSuites = forge.util.createBuffer(); - for (var i = 0; i < c.cipherSuites.length; ++i) { - var cs = c.cipherSuites[i]; + for (var i = 0; i < c2.cipherSuites.length; ++i) { + var cs = c2.cipherSuites[i]; cipherSuites.putByte(cs.id[0]); cipherSuites.putByte(cs.id[1]); } @@ -113985,13 +113985,13 @@ var require_tls = __commonJS({ compressionMethods.putByte(tls.CompressionMethod.none); var cMethods = compressionMethods.length(); var extensions = forge.util.createBuffer(); - if (c.virtualHost) { + if (c2.virtualHost) { var ext = forge.util.createBuffer(); ext.putByte(0); ext.putByte(0); var serverName = forge.util.createBuffer(); serverName.putByte(0); - writeVector(serverName, 2, forge.util.createBuffer(c.virtualHost)); + writeVector(serverName, 2, forge.util.createBuffer(c2.virtualHost)); var snList = forge.util.createBuffer(); writeVector(snList, 2, serverName); writeVector(ext, 2, snList); @@ -114001,7 +114001,7 @@ var require_tls = __commonJS({ if (extLength > 0) { extLength += 2; } - var sessionId = c.session.id; + var sessionId = c2.session.id; var length = sessionId.length + 1 + // session ID vector 2 + // version (major + minor) 4 + 28 + // random time and random bytes @@ -114011,9 +114011,9 @@ var require_tls = __commonJS({ var rval = forge.util.createBuffer(); rval.putByte(tls.HandshakeType.client_hello); rval.putInt24(length); - rval.putByte(c.version.major); - rval.putByte(c.version.minor); - rval.putBytes(c.session.sp.client_random); + rval.putByte(c2.version.major); + rval.putByte(c2.version.minor); + rval.putBytes(c2.session.sp.client_random); writeVector(rval, 1, forge.util.createBuffer(sessionId)); writeVector(rval, 2, cipherSuites); writeVector(rval, 1, compressionMethods); @@ -114022,8 +114022,8 @@ var require_tls = __commonJS({ } return rval; }; - tls.createServerHello = function(c) { - var sessionId = c.session.id; + tls.createServerHello = function(c2) { + var sessionId = c2.session.id; var length = sessionId.length + 1 + // session ID vector 2 + // version (major + minor) 4 + 28 + // random time and random bytes @@ -114032,26 +114032,26 @@ var require_tls = __commonJS({ var rval = forge.util.createBuffer(); rval.putByte(tls.HandshakeType.server_hello); rval.putInt24(length); - rval.putByte(c.version.major); - rval.putByte(c.version.minor); - rval.putBytes(c.session.sp.server_random); + rval.putByte(c2.version.major); + rval.putByte(c2.version.minor); + rval.putBytes(c2.session.sp.server_random); writeVector(rval, 1, forge.util.createBuffer(sessionId)); - rval.putByte(c.session.cipherSuite.id[0]); - rval.putByte(c.session.cipherSuite.id[1]); - rval.putByte(c.session.compressionMethod); + rval.putByte(c2.session.cipherSuite.id[0]); + rval.putByte(c2.session.cipherSuite.id[1]); + rval.putByte(c2.session.compressionMethod); return rval; }; - tls.createCertificate = function(c) { - var client = c.entity === tls.ConnectionEnd.client; + tls.createCertificate = function(c2) { + var client = c2.entity === tls.ConnectionEnd.client; var cert = null; - if (c.getCertificate) { + if (c2.getCertificate) { var hint; if (client) { - hint = c.session.certificateRequest; + hint = c2.session.certificateRequest; } else { - hint = c.session.extensions.server_name.serverNameList; + hint = c2.session.extensions.server_name.serverNameList; } - cert = c.getCertificate(c, hint); + cert = c2.getCertificate(c2, hint); } var certList = forge.util.createBuffer(); if (cert !== null) { @@ -114080,12 +114080,12 @@ var require_tls = __commonJS({ } cert = forge.pki.certificateFromAsn1(asn1); if (client) { - c.session.clientCertificate = cert; + c2.session.clientCertificate = cert; } else { - c.session.serverCertificate = cert; + c2.session.serverCertificate = cert; } } catch (ex) { - return c.error(c, { + return c2.error(c2, { message: "Could not send certificate list.", cause: ex, send: true, @@ -114103,14 +114103,14 @@ var require_tls = __commonJS({ writeVector(rval, 3, certList); return rval; }; - tls.createClientKeyExchange = function(c) { + tls.createClientKeyExchange = function(c2) { var b = forge.util.createBuffer(); - b.putByte(c.session.clientHelloVersion.major); - b.putByte(c.session.clientHelloVersion.minor); + b.putByte(c2.session.clientHelloVersion.major); + b.putByte(c2.session.clientHelloVersion.minor); b.putBytes(forge.random.getBytes(46)); - var sp = c.session.sp; + var sp = c2.session.sp; sp.pre_master_secret = b.getBytes(); - var key2 = c.session.serverCertificate.publicKey; + var key2 = c2.session.serverCertificate.publicKey; b = key2.encrypt(sp.pre_master_secret); var length = b.length + 2; var rval = forge.util.createBuffer(); @@ -114120,7 +114120,7 @@ var require_tls = __commonJS({ rval.putBytes(b); return rval; }; - tls.createServerKeyExchange = function(c) { + tls.createServerKeyExchange = function(c2) { var length = 0; var rval = forge.util.createBuffer(); if (length > 0) { @@ -114129,19 +114129,19 @@ var require_tls = __commonJS({ } return rval; }; - tls.getClientSignature = function(c, callback) { + tls.getClientSignature = function(c2, callback) { var b = forge.util.createBuffer(); - b.putBuffer(c.session.md5.digest()); - b.putBuffer(c.session.sha1.digest()); + b.putBuffer(c2.session.md5.digest()); + b.putBuffer(c2.session.sha1.digest()); b = b.getBytes(); - c.getSignature = c.getSignature || function(c2, b2, callback2) { + c2.getSignature = c2.getSignature || function(c3, b2, callback2) { var privateKey = null; - if (c2.getPrivateKey) { + if (c3.getPrivateKey) { try { - privateKey = c2.getPrivateKey(c2, c2.session.clientCertificate); + privateKey = c3.getPrivateKey(c3, c3.session.clientCertificate); privateKey = forge.pki.privateKeyFromPem(privateKey); } catch (ex) { - c2.error(c2, { + c3.error(c3, { message: "Could not get private key.", cause: ex, send: true, @@ -114153,7 +114153,7 @@ var require_tls = __commonJS({ } } if (privateKey === null) { - c2.error(c2, { + c3.error(c3, { message: "No private key set.", send: true, alert: { @@ -114164,11 +114164,11 @@ var require_tls = __commonJS({ } else { b2 = privateKey.sign(b2, null); } - callback2(c2, b2); + callback2(c3, b2); }; - c.getSignature(c, b, callback); + c2.getSignature(c2, b, callback); }; - tls.createCertificateVerify = function(c, signature) { + tls.createCertificateVerify = function(c2, signature) { var length = signature.length + 2; var rval = forge.util.createBuffer(); rval.putByte(tls.HandshakeType.certificate_verify); @@ -114177,12 +114177,12 @@ var require_tls = __commonJS({ rval.putBytes(signature); return rval; }; - tls.createCertificateRequest = function(c) { + tls.createCertificateRequest = function(c2) { var certTypes = forge.util.createBuffer(); certTypes.putByte(1); var cAs = forge.util.createBuffer(); - for (var key2 in c.caStore.certs) { - var cert = c.caStore.certs[key2]; + for (var key2 in c2.caStore.certs) { + var cert = c2.caStore.certs[key2]; var dn = forge.pki.distinguishedNameToAsn1(cert.subject); var byteBuffer = forge.asn1.toDer(dn); cAs.putInt16(byteBuffer.length()); @@ -114196,7 +114196,7 @@ var require_tls = __commonJS({ writeVector(rval, 2, cAs); return rval; }; - tls.createServerHelloDone = function(c) { + tls.createServerHelloDone = function(c2) { var rval = forge.util.createBuffer(); rval.putByte(tls.HandshakeType.server_hello_done); rval.putInt24(0); @@ -114207,12 +114207,12 @@ var require_tls = __commonJS({ rval.putByte(1); return rval; }; - tls.createFinished = function(c) { + tls.createFinished = function(c2) { var b = forge.util.createBuffer(); - b.putBuffer(c.session.md5.digest()); - b.putBuffer(c.session.sha1.digest()); - var client = c.entity === tls.ConnectionEnd.client; - var sp = c.session.sp; + b.putBuffer(c2.session.md5.digest()); + b.putBuffer(c2.session.sha1.digest()); + var client = c2.entity === tls.ConnectionEnd.client; + var sp = c2.session.sp; var vdl = 12; var prf = prf_TLS1; var label = client ? "client finished" : "server finished"; @@ -114236,7 +114236,7 @@ var require_tls = __commonJS({ rval.putBytes(forge.random.getBytes(paddingLength)); return rval; }; - tls.queue = function(c, record) { + tls.queue = function(c2, record) { if (!record) { return; } @@ -114247,8 +114247,8 @@ var require_tls = __commonJS({ } if (record.type === tls.ContentType.handshake) { var bytes = record.fragment.bytes(); - c.session.md5.update(bytes); - c.session.sha1.update(bytes); + c2.session.md5.update(bytes); + c2.session.sha1.update(bytes); bytes = null; } var records; @@ -114258,38 +114258,38 @@ var require_tls = __commonJS({ records = []; var data = record.fragment.bytes(); while (data.length > tls.MaxFragment) { - records.push(tls.createRecord(c, { + records.push(tls.createRecord(c2, { type: record.type, data: forge.util.createBuffer(data.slice(0, tls.MaxFragment)) })); data = data.slice(tls.MaxFragment); } if (data.length > 0) { - records.push(tls.createRecord(c, { + records.push(tls.createRecord(c2, { type: record.type, data: forge.util.createBuffer(data) })); } } - for (var i = 0; i < records.length && !c.fail; ++i) { + for (var i = 0; i < records.length && !c2.fail; ++i) { var rec = records[i]; - var s = c.state.current.write; - if (s.update(c, rec)) { - c.records.push(rec); + var s = c2.state.current.write; + if (s.update(c2, rec)) { + c2.records.push(rec); } } }; - tls.flush = function(c) { - for (var i = 0; i < c.records.length; ++i) { - var record = c.records[i]; - c.tlsData.putByte(record.type); - c.tlsData.putByte(record.version.major); - c.tlsData.putByte(record.version.minor); - c.tlsData.putInt16(record.fragment.length()); - c.tlsData.putBuffer(c.records[i].fragment); + tls.flush = function(c2) { + for (var i = 0; i < c2.records.length; ++i) { + var record = c2.records[i]; + c2.tlsData.putByte(record.type); + c2.tlsData.putByte(record.version.major); + c2.tlsData.putByte(record.version.minor); + c2.tlsData.putInt16(record.fragment.length()); + c2.tlsData.putBuffer(c2.records[i].fragment); } - c.records = []; - return c.tlsDataReady(c); + c2.records = []; + return c2.tlsDataReady(c2); }; var _certErrorToAlertDesc = function(error3) { switch (error3) { @@ -114331,15 +114331,15 @@ var require_tls = __commonJS({ return forge.pki.certificateError.bad_certificate; } }; - tls.verifyCertificateChain = function(c, chain) { + tls.verifyCertificateChain = function(c2, chain) { try { var options = {}; - for (var key2 in c.verifyOptions) { - options[key2] = c.verifyOptions[key2]; + for (var key2 in c2.verifyOptions) { + options[key2] = c2.verifyOptions[key2]; } options.verify = function(vfd, depth, chain2) { var desc = _certErrorToAlertDesc(vfd); - var ret = c.verify(c, vfd, depth, chain2); + var ret = c2.verify(c2, vfd, depth, chain2); if (ret !== true) { if (typeof ret === "object" && !forge.util.isArray(ret)) { var error3 = new Error("The application rejected the certificate."); @@ -114362,7 +114362,7 @@ var require_tls = __commonJS({ } return ret; }; - forge.pki.verifyCertificateChain(c.caStore, chain, options); + forge.pki.verifyCertificateChain(c2.caStore, chain, options); } catch (ex) { var err = ex; if (typeof err !== "object" || forge.util.isArray(err)) { @@ -114383,9 +114383,9 @@ var require_tls = __commonJS({ description: _certErrorToAlertDesc(err.error) }; } - c.error(c, err); + c2.error(c2, err); } - return !c.fail; + return !c2.fail; }; tls.createSessionCache = function(cache, capacity) { var rval = null; @@ -114455,7 +114455,7 @@ var require_tls = __commonJS({ } var entity = options.server || false ? tls.ConnectionEnd.server : tls.ConnectionEnd.client; var sessionCache = options.sessionCache ? tls.createSessionCache(options.sessionCache) : null; - var c = { + var c2 = { version: { major: tls.Version.major, minor: tls.Version.minor }, entity, sessionId: options.sessionId, @@ -114479,64 +114479,64 @@ var require_tls = __commonJS({ dataReady: options.dataReady, heartbeatReceived: options.heartbeatReceived, closed: options.closed, - error: function(c2, ex) { - ex.origin = ex.origin || (c2.entity === tls.ConnectionEnd.client ? "client" : "server"); + error: function(c3, ex) { + ex.origin = ex.origin || (c3.entity === tls.ConnectionEnd.client ? "client" : "server"); if (ex.send) { - tls.queue(c2, tls.createAlert(c2, ex.alert)); - tls.flush(c2); + tls.queue(c3, tls.createAlert(c3, ex.alert)); + tls.flush(c3); } var fatal = ex.fatal !== false; if (fatal) { - c2.fail = true; + c3.fail = true; } - options.error(c2, ex); + options.error(c3, ex); if (fatal) { - c2.close(false); + c3.close(false); } }, deflate: options.deflate || null, inflate: options.inflate || null }; - c.reset = function(clearFail) { - c.version = { major: tls.Version.major, minor: tls.Version.minor }; - c.record = null; - c.session = null; - c.peerCertificate = null; - c.state = { + c2.reset = function(clearFail) { + c2.version = { major: tls.Version.major, minor: tls.Version.minor }; + c2.record = null; + c2.session = null; + c2.peerCertificate = null; + c2.state = { pending: null, current: null }; - c.expect = c.entity === tls.ConnectionEnd.client ? SHE : CHE; - c.fragmented = null; - c.records = []; - c.open = false; - c.handshakes = 0; - c.handshaking = false; - c.isConnected = false; - c.fail = !(clearFail || typeof clearFail === "undefined"); - c.input.clear(); - c.tlsData.clear(); - c.data.clear(); - c.state.current = tls.createConnectionState(c); + c2.expect = c2.entity === tls.ConnectionEnd.client ? SHE : CHE; + c2.fragmented = null; + c2.records = []; + c2.open = false; + c2.handshakes = 0; + c2.handshaking = false; + c2.isConnected = false; + c2.fail = !(clearFail || typeof clearFail === "undefined"); + c2.input.clear(); + c2.tlsData.clear(); + c2.data.clear(); + c2.state.current = tls.createConnectionState(c2); }; - c.reset(); - var _update = function(c2, record) { + c2.reset(); + var _update = function(c3, record) { var aligned = record.type - tls.ContentType.change_cipher_spec; - var handlers = ctTable[c2.entity][c2.expect]; + var handlers = ctTable[c3.entity][c3.expect]; if (aligned in handlers) { - handlers[aligned](c2, record); + handlers[aligned](c3, record); } else { - tls.handleUnexpected(c2, record); + tls.handleUnexpected(c3, record); } }; - var _readRecordHeader = function(c2) { + var _readRecordHeader = function(c3) { var rval = 0; - var b = c2.input; + var b = c3.input; var len = b.length(); if (len < 5) { rval = 5 - len; } else { - c2.record = { + c3.record = { type: b.getByte(), version: { major: b.getByte(), @@ -114546,12 +114546,12 @@ var require_tls = __commonJS({ fragment: forge.util.createBuffer(), ready: false }; - var compatibleVersion = c2.record.version.major === c2.version.major; - if (compatibleVersion && c2.session && c2.session.version) { - compatibleVersion = c2.record.version.minor === c2.version.minor; + var compatibleVersion = c3.record.version.major === c3.version.major; + if (compatibleVersion && c3.session && c3.session.version) { + compatibleVersion = c3.record.version.minor === c3.version.minor; } if (!compatibleVersion) { - c2.error(c2, { + c3.error(c3, { message: "Incompatible TLS version.", send: true, alert: { @@ -114563,23 +114563,23 @@ var require_tls = __commonJS({ } return rval; }; - var _readRecord = function(c2) { + var _readRecord = function(c3) { var rval = 0; - var b = c2.input; + var b = c3.input; var len = b.length(); - if (len < c2.record.length) { - rval = c2.record.length - len; + if (len < c3.record.length) { + rval = c3.record.length - len; } else { - c2.record.fragment.putBytes(b.getBytes(c2.record.length)); + c3.record.fragment.putBytes(b.getBytes(c3.record.length)); b.compact(); - var s = c2.state.current.read; - if (s.update(c2, c2.record)) { - if (c2.fragmented !== null) { - if (c2.fragmented.type === c2.record.type) { - c2.fragmented.fragment.putBuffer(c2.record.fragment); - c2.record = c2.fragmented; + var s = c3.state.current.read; + if (s.update(c3, c3.record)) { + if (c3.fragmented !== null) { + if (c3.fragmented.type === c3.record.type) { + c3.fragmented.fragment.putBuffer(c3.record.fragment); + c3.record = c3.fragmented; } else { - c2.error(c2, { + c3.error(c3, { message: "Invalid fragmented record.", send: true, alert: { @@ -114589,44 +114589,44 @@ var require_tls = __commonJS({ }); } } - c2.record.ready = true; + c3.record.ready = true; } } return rval; }; - c.handshake = function(sessionId) { - if (c.entity !== tls.ConnectionEnd.client) { - c.error(c, { + c2.handshake = function(sessionId) { + if (c2.entity !== tls.ConnectionEnd.client) { + c2.error(c2, { message: "Cannot initiate handshake as a server.", fatal: false }); - } else if (c.handshaking) { - c.error(c, { + } else if (c2.handshaking) { + c2.error(c2, { message: "Handshake already in progress.", fatal: false }); } else { - if (c.fail && !c.open && c.handshakes === 0) { - c.fail = false; + if (c2.fail && !c2.open && c2.handshakes === 0) { + c2.fail = false; } - c.handshaking = true; + c2.handshaking = true; sessionId = sessionId || ""; var session = null; if (sessionId.length > 0) { - if (c.sessionCache) { - session = c.sessionCache.getSession(sessionId); + if (c2.sessionCache) { + session = c2.sessionCache.getSession(sessionId); } if (session === null) { sessionId = ""; } } - if (sessionId.length === 0 && c.sessionCache) { - session = c.sessionCache.getSession(); + if (sessionId.length === 0 && c2.sessionCache) { + session = c2.sessionCache.getSession(); if (session !== null) { sessionId = session.id; } } - c.session = { + c2.session = { id: sessionId, version: null, cipherSuite: null, @@ -114639,55 +114639,55 @@ var require_tls = __commonJS({ sha1: forge.md.sha1.create() }; if (session) { - c.version = session.version; - c.session.sp = session.sp; + c2.version = session.version; + c2.session.sp = session.sp; } - c.session.sp.client_random = tls.createRandom().getBytes(); - c.open = true; - tls.queue(c, tls.createRecord(c, { + c2.session.sp.client_random = tls.createRandom().getBytes(); + c2.open = true; + tls.queue(c2, tls.createRecord(c2, { type: tls.ContentType.handshake, - data: tls.createClientHello(c) + data: tls.createClientHello(c2) })); - tls.flush(c); + tls.flush(c2); } }; - c.process = function(data) { + c2.process = function(data) { var rval = 0; if (data) { - c.input.putBytes(data); + c2.input.putBytes(data); } - if (!c.fail) { - if (c.record !== null && c.record.ready && c.record.fragment.isEmpty()) { - c.record = null; + if (!c2.fail) { + if (c2.record !== null && c2.record.ready && c2.record.fragment.isEmpty()) { + c2.record = null; } - if (c.record === null) { - rval = _readRecordHeader(c); + if (c2.record === null) { + rval = _readRecordHeader(c2); } - if (!c.fail && c.record !== null && !c.record.ready) { - rval = _readRecord(c); + if (!c2.fail && c2.record !== null && !c2.record.ready) { + rval = _readRecord(c2); } - if (!c.fail && c.record !== null && c.record.ready) { - _update(c, c.record); + if (!c2.fail && c2.record !== null && c2.record.ready) { + _update(c2, c2.record); } } return rval; }; - c.prepare = function(data) { - tls.queue(c, tls.createRecord(c, { + c2.prepare = function(data) { + tls.queue(c2, tls.createRecord(c2, { type: tls.ContentType.application_data, data: forge.util.createBuffer(data) })); - return tls.flush(c); + return tls.flush(c2); }; - c.prepareHeartbeatRequest = function(payload, payloadLength) { + c2.prepareHeartbeatRequest = function(payload, payloadLength) { if (payload instanceof forge.util.ByteBuffer) { payload = payload.bytes(); } if (typeof payloadLength === "undefined") { payloadLength = payload.length; } - c.expectedHeartbeatPayload = payload; - tls.queue(c, tls.createRecord(c, { + c2.expectedHeartbeatPayload = payload; + tls.queue(c2, tls.createRecord(c2, { type: tls.ContentType.heartbeat, data: tls.createHeartbeat( tls.HeartbeatMessageType.heartbeat_request, @@ -114695,34 +114695,34 @@ var require_tls = __commonJS({ payloadLength ) })); - return tls.flush(c); + return tls.flush(c2); }; - c.close = function(clearFail) { - if (!c.fail && c.sessionCache && c.session) { + c2.close = function(clearFail) { + if (!c2.fail && c2.sessionCache && c2.session) { var session = { - id: c.session.id, - version: c.session.version, - sp: c.session.sp + id: c2.session.id, + version: c2.session.version, + sp: c2.session.sp }; session.sp.keys = null; - c.sessionCache.setSession(session.id, session); - } - if (c.open) { - c.open = false; - c.input.clear(); - if (c.isConnected || c.handshaking) { - c.isConnected = c.handshaking = false; - tls.queue(c, tls.createAlert(c, { + c2.sessionCache.setSession(session.id, session); + } + if (c2.open) { + c2.open = false; + c2.input.clear(); + if (c2.isConnected || c2.handshaking) { + c2.isConnected = c2.handshaking = false; + tls.queue(c2, tls.createAlert(c2, { level: tls.Alert.Level.warning, description: tls.Alert.Description.close_notify })); - tls.flush(c); + tls.flush(c2); } - c.closed(c); + c2.closed(c2); } - c.reset(clearFail); + c2.reset(clearFail); }; - return c; + return c2; }; module2.exports = forge.tls = forge.tls || {}; for (key in tls) { @@ -114777,8 +114777,8 @@ var require_aesCipherSuites = __commonJS({ }, initConnectionState }; - function initConnectionState(state, c, sp) { - var client = c.entity === forge.tls.ConnectionEnd.client; + function initConnectionState(state, c2, sp) { + var client = c2.entity === forge.tls.ConnectionEnd.client; state.read.cipherState = { init: false, cipher: forge.cipher.createDecipher("AES-CBC", client ? sp.keys.server_write_key : sp.keys.client_write_key), @@ -115866,20 +115866,20 @@ var require_ed25519 = __commonJS({ modL(r, x); } function add(p, q) { - var a = gf(), b = gf(), c = gf(), d = gf(), e = gf(), f = gf(), g = gf(), h = gf(), t = gf(); + var a = gf(), b = gf(), c2 = gf(), d = gf(), e = gf(), f = gf(), g = gf(), h = gf(), t = gf(); Z(a, p[1], p[0]); Z(t, q[1], q[0]); M(a, a, t); A(b, p[0], p[1]); A(t, q[0], q[1]); M(b, b, t); - M(c, p[3], q[3]); - M(c, c, D2); + M(c2, p[3], q[3]); + M(c2, c2, D2); M(d, p[2], q[2]); A(d, d, d); Z(e, b, a); - Z(f, d, c); - A(g, d, c); + Z(f, d, c2); + A(g, d, c2); A(h, b, a); M(p[0], e, f); M(p[1], h, g); @@ -115966,27 +115966,27 @@ var require_ed25519 = __commonJS({ o[15] &= 32767; } function pow2523(o, i) { - var c = gf(); + var c2 = gf(); var a; for (a = 0; a < 16; ++a) { - c[a] = i[a]; + c2[a] = i[a]; } for (a = 250; a >= 0; --a) { - S(c, c); + S(c2, c2); if (a !== 1) { - M(c, c, i); + M(c2, c2, i); } } for (a = 0; a < 16; ++a) { - o[a] = c[a]; + o[a] = c2[a]; } } function neq25519(a, b) { - var c = new NativeBuffer(32); + var c2 = new NativeBuffer(32); var d = new NativeBuffer(32); - pack25519(c, a); + pack25519(c2, a); pack25519(d, b); - return crypto_verify_32(c, 0, d, 0); + return crypto_verify_32(c2, 0, d, 0); } function crypto_verify_32(x, xi, y, yi) { return vn(x, xi, y, yi, 32); @@ -116032,34 +116032,34 @@ var require_ed25519 = __commonJS({ } } function inv25519(o, i) { - var c = gf(); + var c2 = gf(); var a; for (a = 0; a < 16; ++a) { - c[a] = i[a]; + c2[a] = i[a]; } for (a = 253; a >= 0; --a) { - S(c, c); + S(c2, c2); if (a !== 2 && a !== 4) { - M(c, c, i); + M(c2, c2, i); } } for (a = 0; a < 16; ++a) { - o[a] = c[a]; + o[a] = c2[a]; } } function car25519(o) { - var i, v, c = 1; + var i, v, c2 = 1; for (i = 0; i < 16; ++i) { - v = o[i] + c + 65535; - c = Math.floor(v / 65536); - o[i] = v - c * 65536; + v = o[i] + c2 + 65535; + c2 = Math.floor(v / 65536); + o[i] = v - c2 * 65536; } - o[0] += c - 1 + 37 * (c - 1); + o[0] += c2 - 1 + 37 * (c2 - 1); } function sel25519(p, q, b) { - var t, c = ~(b - 1); + var t, c2 = ~(b - 1); for (var i = 0; i < 16; ++i) { - t = c & (p[i] ^ q[i]); + t = c2 & (p[i] ^ q[i]); p[i] ^= t; q[i] ^= t; } @@ -116087,7 +116087,7 @@ var require_ed25519 = __commonJS({ M(o, a, a); } function M(o, a, b) { - var v, c, t0 = 0, t1 = 0, t2 = 0, t3 = 0, t4 = 0, t5 = 0, t6 = 0, t7 = 0, t8 = 0, t9 = 0, t10 = 0, t11 = 0, t12 = 0, t13 = 0, t14 = 0, t15 = 0, t16 = 0, t17 = 0, t18 = 0, t19 = 0, t20 = 0, t21 = 0, t22 = 0, t23 = 0, t24 = 0, t25 = 0, t26 = 0, t27 = 0, t28 = 0, t29 = 0, t30 = 0, b0 = b[0], b1 = b[1], b2 = b[2], b3 = b[3], b4 = b[4], b5 = b[5], b6 = b[6], b7 = b[7], b8 = b[8], b9 = b[9], b10 = b[10], b11 = b[11], b12 = b[12], b13 = b[13], b14 = b[14], b15 = b[15]; + var v, c2, t0 = 0, t1 = 0, t2 = 0, t3 = 0, t4 = 0, t5 = 0, t6 = 0, t7 = 0, t8 = 0, t9 = 0, t10 = 0, t11 = 0, t12 = 0, t13 = 0, t14 = 0, t15 = 0, t16 = 0, t17 = 0, t18 = 0, t19 = 0, t20 = 0, t21 = 0, t22 = 0, t23 = 0, t24 = 0, t25 = 0, t26 = 0, t27 = 0, t28 = 0, t29 = 0, t30 = 0, b0 = b[0], b1 = b[1], b2 = b[2], b3 = b[3], b4 = b[4], b5 = b[5], b6 = b[6], b7 = b[7], b8 = b[8], b9 = b[9], b10 = b[10], b11 = b[11], b12 = b[12], b13 = b[13], b14 = b[14], b15 = b[15]; v = a[0]; t0 += v * b0; t1 += v * b1; @@ -116375,106 +116375,106 @@ var require_ed25519 = __commonJS({ t12 += 38 * t28; t13 += 38 * t29; t14 += 38 * t30; - c = 1; - v = t0 + c + 65535; - c = Math.floor(v / 65536); - t0 = v - c * 65536; - v = t1 + c + 65535; - c = Math.floor(v / 65536); - t1 = v - c * 65536; - v = t2 + c + 65535; - c = Math.floor(v / 65536); - t2 = v - c * 65536; - v = t3 + c + 65535; - c = Math.floor(v / 65536); - t3 = v - c * 65536; - v = t4 + c + 65535; - c = Math.floor(v / 65536); - t4 = v - c * 65536; - v = t5 + c + 65535; - c = Math.floor(v / 65536); - t5 = v - c * 65536; - v = t6 + c + 65535; - c = Math.floor(v / 65536); - t6 = v - c * 65536; - v = t7 + c + 65535; - c = Math.floor(v / 65536); - t7 = v - c * 65536; - v = t8 + c + 65535; - c = Math.floor(v / 65536); - t8 = v - c * 65536; - v = t9 + c + 65535; - c = Math.floor(v / 65536); - t9 = v - c * 65536; - v = t10 + c + 65535; - c = Math.floor(v / 65536); - t10 = v - c * 65536; - v = t11 + c + 65535; - c = Math.floor(v / 65536); - t11 = v - c * 65536; - v = t12 + c + 65535; - c = Math.floor(v / 65536); - t12 = v - c * 65536; - v = t13 + c + 65535; - c = Math.floor(v / 65536); - t13 = v - c * 65536; - v = t14 + c + 65535; - c = Math.floor(v / 65536); - t14 = v - c * 65536; - v = t15 + c + 65535; - c = Math.floor(v / 65536); - t15 = v - c * 65536; - t0 += c - 1 + 37 * (c - 1); - c = 1; - v = t0 + c + 65535; - c = Math.floor(v / 65536); - t0 = v - c * 65536; - v = t1 + c + 65535; - c = Math.floor(v / 65536); - t1 = v - c * 65536; - v = t2 + c + 65535; - c = Math.floor(v / 65536); - t2 = v - c * 65536; - v = t3 + c + 65535; - c = Math.floor(v / 65536); - t3 = v - c * 65536; - v = t4 + c + 65535; - c = Math.floor(v / 65536); - t4 = v - c * 65536; - v = t5 + c + 65535; - c = Math.floor(v / 65536); - t5 = v - c * 65536; - v = t6 + c + 65535; - c = Math.floor(v / 65536); - t6 = v - c * 65536; - v = t7 + c + 65535; - c = Math.floor(v / 65536); - t7 = v - c * 65536; - v = t8 + c + 65535; - c = Math.floor(v / 65536); - t8 = v - c * 65536; - v = t9 + c + 65535; - c = Math.floor(v / 65536); - t9 = v - c * 65536; - v = t10 + c + 65535; - c = Math.floor(v / 65536); - t10 = v - c * 65536; - v = t11 + c + 65535; - c = Math.floor(v / 65536); - t11 = v - c * 65536; - v = t12 + c + 65535; - c = Math.floor(v / 65536); - t12 = v - c * 65536; - v = t13 + c + 65535; - c = Math.floor(v / 65536); - t13 = v - c * 65536; - v = t14 + c + 65535; - c = Math.floor(v / 65536); - t14 = v - c * 65536; - v = t15 + c + 65535; - c = Math.floor(v / 65536); - t15 = v - c * 65536; - t0 += c - 1 + 37 * (c - 1); + c2 = 1; + v = t0 + c2 + 65535; + c2 = Math.floor(v / 65536); + t0 = v - c2 * 65536; + v = t1 + c2 + 65535; + c2 = Math.floor(v / 65536); + t1 = v - c2 * 65536; + v = t2 + c2 + 65535; + c2 = Math.floor(v / 65536); + t2 = v - c2 * 65536; + v = t3 + c2 + 65535; + c2 = Math.floor(v / 65536); + t3 = v - c2 * 65536; + v = t4 + c2 + 65535; + c2 = Math.floor(v / 65536); + t4 = v - c2 * 65536; + v = t5 + c2 + 65535; + c2 = Math.floor(v / 65536); + t5 = v - c2 * 65536; + v = t6 + c2 + 65535; + c2 = Math.floor(v / 65536); + t6 = v - c2 * 65536; + v = t7 + c2 + 65535; + c2 = Math.floor(v / 65536); + t7 = v - c2 * 65536; + v = t8 + c2 + 65535; + c2 = Math.floor(v / 65536); + t8 = v - c2 * 65536; + v = t9 + c2 + 65535; + c2 = Math.floor(v / 65536); + t9 = v - c2 * 65536; + v = t10 + c2 + 65535; + c2 = Math.floor(v / 65536); + t10 = v - c2 * 65536; + v = t11 + c2 + 65535; + c2 = Math.floor(v / 65536); + t11 = v - c2 * 65536; + v = t12 + c2 + 65535; + c2 = Math.floor(v / 65536); + t12 = v - c2 * 65536; + v = t13 + c2 + 65535; + c2 = Math.floor(v / 65536); + t13 = v - c2 * 65536; + v = t14 + c2 + 65535; + c2 = Math.floor(v / 65536); + t14 = v - c2 * 65536; + v = t15 + c2 + 65535; + c2 = Math.floor(v / 65536); + t15 = v - c2 * 65536; + t0 += c2 - 1 + 37 * (c2 - 1); + c2 = 1; + v = t0 + c2 + 65535; + c2 = Math.floor(v / 65536); + t0 = v - c2 * 65536; + v = t1 + c2 + 65535; + c2 = Math.floor(v / 65536); + t1 = v - c2 * 65536; + v = t2 + c2 + 65535; + c2 = Math.floor(v / 65536); + t2 = v - c2 * 65536; + v = t3 + c2 + 65535; + c2 = Math.floor(v / 65536); + t3 = v - c2 * 65536; + v = t4 + c2 + 65535; + c2 = Math.floor(v / 65536); + t4 = v - c2 * 65536; + v = t5 + c2 + 65535; + c2 = Math.floor(v / 65536); + t5 = v - c2 * 65536; + v = t6 + c2 + 65535; + c2 = Math.floor(v / 65536); + t6 = v - c2 * 65536; + v = t7 + c2 + 65535; + c2 = Math.floor(v / 65536); + t7 = v - c2 * 65536; + v = t8 + c2 + 65535; + c2 = Math.floor(v / 65536); + t8 = v - c2 * 65536; + v = t9 + c2 + 65535; + c2 = Math.floor(v / 65536); + t9 = v - c2 * 65536; + v = t10 + c2 + 65535; + c2 = Math.floor(v / 65536); + t10 = v - c2 * 65536; + v = t11 + c2 + 65535; + c2 = Math.floor(v / 65536); + t11 = v - c2 * 65536; + v = t12 + c2 + 65535; + c2 = Math.floor(v / 65536); + t12 = v - c2 * 65536; + v = t13 + c2 + 65535; + c2 = Math.floor(v / 65536); + t13 = v - c2 * 65536; + v = t14 + c2 + 65535; + c2 = Math.floor(v / 65536); + t14 = v - c2 * 65536; + v = t15 + c2 + 65535; + c2 = Math.floor(v / 65536); + t15 = v - c2 * 65536; + t0 += c2 - 1 + 37 * (c2 - 1); o[0] = t0; o[1] = t1; o[2] = t2; @@ -116543,11 +116543,11 @@ var require_kem = __commonJS({ kdf.generate = function(x, length) { var key = new forge.util.ByteBuffer(); var k = Math.ceil(length / digestLength) + counterStart; - var c = new forge.util.ByteBuffer(); + var c2 = new forge.util.ByteBuffer(); for (var i = counterStart; i < k; ++i) { - c.putInt32(i); + c2.putInt32(i); md2.start(); - md2.update(x + c.getBytes()); + md2.update(x + c2.getBytes()); var hash = md2.digest(); key.putBytes(hash.getBytes(digestLength)); } @@ -118346,14 +118346,14 @@ var bool = new type("tag:yaml.org,2002:bool", { }, defaultStyle: "lowercase" }); -function isHexCode(c) { - return 48 <= c && c <= 57 || 65 <= c && c <= 70 || 97 <= c && c <= 102; +function isHexCode(c2) { + return 48 <= c2 && c2 <= 57 || 65 <= c2 && c2 <= 70 || 97 <= c2 && c2 <= 102; } -function isOctCode(c) { - return 48 <= c && c <= 55; +function isOctCode(c2) { + return 48 <= c2 && c2 <= 55; } -function isDecCode(c) { - return 48 <= c && c <= 57; +function isDecCode(c2) { + return 48 <= c2 && c2 <= 57; } function resolveYamlInteger(data) { if (data === null) return false; @@ -118783,57 +118783,57 @@ var PATTERN_TAG_URI = /^(?:!|[^,\[\]\{\}])(?:%[0-9a-f]{2}|[0-9a-z\-#;\/\?:@&=\+\ function _class(obj) { return Object.prototype.toString.call(obj); } -function is_EOL(c) { - return c === 10 || c === 13; +function is_EOL(c2) { + return c2 === 10 || c2 === 13; } -function is_WHITE_SPACE(c) { - return c === 9 || c === 32; +function is_WHITE_SPACE(c2) { + return c2 === 9 || c2 === 32; } -function is_WS_OR_EOL(c) { - return c === 9 || c === 32 || c === 10 || c === 13; +function is_WS_OR_EOL(c2) { + return c2 === 9 || c2 === 32 || c2 === 10 || c2 === 13; } -function is_FLOW_INDICATOR(c) { - return c === 44 || c === 91 || c === 93 || c === 123 || c === 125; +function is_FLOW_INDICATOR(c2) { + return c2 === 44 || c2 === 91 || c2 === 93 || c2 === 123 || c2 === 125; } -function fromHexCode(c) { +function fromHexCode(c2) { var lc; - if (48 <= c && c <= 57) { - return c - 48; + if (48 <= c2 && c2 <= 57) { + return c2 - 48; } - lc = c | 32; + lc = c2 | 32; if (97 <= lc && lc <= 102) { return lc - 97 + 10; } return -1; } -function escapedHexLen(c) { - if (c === 120) { +function escapedHexLen(c2) { + if (c2 === 120) { return 2; } - if (c === 117) { + if (c2 === 117) { return 4; } - if (c === 85) { + if (c2 === 85) { return 8; } return 0; } -function fromDecimalCode(c) { - if (48 <= c && c <= 57) { - return c - 48; +function fromDecimalCode(c2) { + if (48 <= c2 && c2 <= 57) { + return c2 - 48; } return -1; } -function simpleEscapeSequence(c) { - return c === 48 ? "\0" : c === 97 ? "\x07" : c === 98 ? "\b" : c === 116 ? " " : c === 9 ? " " : c === 110 ? "\n" : c === 118 ? "\v" : c === 102 ? "\f" : c === 114 ? "\r" : c === 101 ? "\x1B" : c === 32 ? " " : c === 34 ? '"' : c === 47 ? "/" : c === 92 ? "\\" : c === 78 ? "\x85" : c === 95 ? "\xA0" : c === 76 ? "\u2028" : c === 80 ? "\u2029" : ""; +function simpleEscapeSequence(c2) { + return c2 === 48 ? "\0" : c2 === 97 ? "\x07" : c2 === 98 ? "\b" : c2 === 116 ? " " : c2 === 9 ? " " : c2 === 110 ? "\n" : c2 === 118 ? "\v" : c2 === 102 ? "\f" : c2 === 114 ? "\r" : c2 === 101 ? "\x1B" : c2 === 32 ? " " : c2 === 34 ? '"' : c2 === 47 ? "/" : c2 === 92 ? "\\" : c2 === 78 ? "\x85" : c2 === 95 ? "\xA0" : c2 === 76 ? "\u2028" : c2 === 80 ? "\u2029" : ""; } -function charFromCodepoint(c) { - if (c <= 65535) { - return String.fromCharCode(c); +function charFromCodepoint(c2) { + if (c2 <= 65535) { + return String.fromCharCode(c2); } return String.fromCharCode( - (c - 65536 >> 10) + 55296, - (c - 65536 & 1023) + 56320 + (c2 - 65536 >> 10) + 55296, + (c2 - 65536 & 1023) + 56320 ); } function setProperty(object, key, value) { @@ -120075,31 +120075,31 @@ function testImplicitResolving(state, str2) { } return false; } -function isWhitespace(c) { - return c === CHAR_SPACE || c === CHAR_TAB; +function isWhitespace(c2) { + return c2 === CHAR_SPACE || c2 === CHAR_TAB; } -function isPrintable(c) { - return 32 <= c && c <= 126 || 161 <= c && c <= 55295 && c !== 8232 && c !== 8233 || 57344 <= c && c <= 65533 && c !== CHAR_BOM || 65536 <= c && c <= 1114111; +function isPrintable(c2) { + return 32 <= c2 && c2 <= 126 || 161 <= c2 && c2 <= 55295 && c2 !== 8232 && c2 !== 8233 || 57344 <= c2 && c2 <= 65533 && c2 !== CHAR_BOM || 65536 <= c2 && c2 <= 1114111; } -function isNsCharOrWhitespace(c) { - return isPrintable(c) && c !== CHAR_BOM && c !== CHAR_CARRIAGE_RETURN && c !== CHAR_LINE_FEED; +function isNsCharOrWhitespace(c2) { + return isPrintable(c2) && c2 !== CHAR_BOM && c2 !== CHAR_CARRIAGE_RETURN && c2 !== CHAR_LINE_FEED; } -function isPlainSafe(c, prev, inblock) { - var cIsNsCharOrWhitespace = isNsCharOrWhitespace(c); - var cIsNsChar = cIsNsCharOrWhitespace && !isWhitespace(c); +function isPlainSafe(c2, prev, inblock) { + var cIsNsCharOrWhitespace = isNsCharOrWhitespace(c2); + var cIsNsChar = cIsNsCharOrWhitespace && !isWhitespace(c2); return ( // ns-plain-safe (inblock ? ( // c = flow-in cIsNsCharOrWhitespace - ) : cIsNsCharOrWhitespace && c !== CHAR_COMMA && c !== CHAR_LEFT_SQUARE_BRACKET && c !== CHAR_RIGHT_SQUARE_BRACKET && c !== CHAR_LEFT_CURLY_BRACKET && c !== CHAR_RIGHT_CURLY_BRACKET) && c !== CHAR_SHARP && !(prev === CHAR_COLON && !cIsNsChar) || isNsCharOrWhitespace(prev) && !isWhitespace(prev) && c === CHAR_SHARP || prev === CHAR_COLON && cIsNsChar + ) : cIsNsCharOrWhitespace && c2 !== CHAR_COMMA && c2 !== CHAR_LEFT_SQUARE_BRACKET && c2 !== CHAR_RIGHT_SQUARE_BRACKET && c2 !== CHAR_LEFT_CURLY_BRACKET && c2 !== CHAR_RIGHT_CURLY_BRACKET) && c2 !== CHAR_SHARP && !(prev === CHAR_COLON && !cIsNsChar) || isNsCharOrWhitespace(prev) && !isWhitespace(prev) && c2 === CHAR_SHARP || prev === CHAR_COLON && cIsNsChar ); } -function isPlainSafeFirst(c) { - return isPrintable(c) && c !== CHAR_BOM && !isWhitespace(c) && c !== CHAR_MINUS && c !== CHAR_QUESTION && c !== CHAR_COLON && c !== CHAR_COMMA && c !== CHAR_LEFT_SQUARE_BRACKET && c !== CHAR_RIGHT_SQUARE_BRACKET && c !== CHAR_LEFT_CURLY_BRACKET && c !== CHAR_RIGHT_CURLY_BRACKET && c !== CHAR_SHARP && c !== CHAR_AMPERSAND && c !== CHAR_ASTERISK && c !== CHAR_EXCLAMATION && c !== CHAR_VERTICAL_LINE && c !== CHAR_EQUALS && c !== CHAR_GREATER_THAN && c !== CHAR_SINGLE_QUOTE && c !== CHAR_DOUBLE_QUOTE && c !== CHAR_PERCENT && c !== CHAR_COMMERCIAL_AT && c !== CHAR_GRAVE_ACCENT; +function isPlainSafeFirst(c2) { + return isPrintable(c2) && c2 !== CHAR_BOM && !isWhitespace(c2) && c2 !== CHAR_MINUS && c2 !== CHAR_QUESTION && c2 !== CHAR_COLON && c2 !== CHAR_COMMA && c2 !== CHAR_LEFT_SQUARE_BRACKET && c2 !== CHAR_RIGHT_SQUARE_BRACKET && c2 !== CHAR_LEFT_CURLY_BRACKET && c2 !== CHAR_RIGHT_CURLY_BRACKET && c2 !== CHAR_SHARP && c2 !== CHAR_AMPERSAND && c2 !== CHAR_ASTERISK && c2 !== CHAR_EXCLAMATION && c2 !== CHAR_VERTICAL_LINE && c2 !== CHAR_EQUALS && c2 !== CHAR_GREATER_THAN && c2 !== CHAR_SINGLE_QUOTE && c2 !== CHAR_DOUBLE_QUOTE && c2 !== CHAR_PERCENT && c2 !== CHAR_COMMERCIAL_AT && c2 !== CHAR_GRAVE_ACCENT; } -function isPlainSafeLast(c) { - return !isWhitespace(c) && c !== CHAR_COLON; +function isPlainSafeLast(c2) { + return !isWhitespace(c2) && c2 !== CHAR_COLON; } function codePointAt(string, pos) { var first = string.charCodeAt(pos), second; @@ -121680,6 +121680,41 @@ function isAuthToken(value, patterns = GITHUB_TOKEN_PATTERNS) { return void 0; } +// src/known-language-aliases.json +var known_language_aliases_exports = {}; +__export(known_language_aliases_exports, { + c: () => c, + "c#": () => c_, + "c++": () => c__, + "c-c++": () => c_c__, + "c-cpp": () => c_cpp, + default: () => known_language_aliases_default, + "java-kotlin": () => java_kotlin, + "javascript-typescript": () => javascript_typescript, + kotlin: () => kotlin, + typescript: () => typescript +}); +var c = "cpp"; +var c_c__ = "cpp"; +var c_cpp = "cpp"; +var c_ = "csharp"; +var c__ = "cpp"; +var java_kotlin = "java"; +var javascript_typescript = "javascript"; +var kotlin = "java"; +var typescript = "javascript"; +var known_language_aliases_default = { + c, + "c-c++": c_c__, + "c-cpp": c_cpp, + "c#": c_, + "c++": c__, + "java-kotlin": java_kotlin, + "javascript-typescript": javascript_typescript, + kotlin, + typescript +}; + // src/languages.ts var KnownLanguage = /* @__PURE__ */ ((KnownLanguage2) => { KnownLanguage2["actions"] = "actions"; @@ -121709,15 +121744,15 @@ function isToken(config) { return "token" in config && isStringOrUndefined(config.token); } function isAzureConfig(config) { - return "tenant_id" in config && "client_id" in config && isDefined2(config.tenant_id) && isDefined2(config.client_id) && isString(config.tenant_id) && isString(config.client_id); + return "tenant-id" in config && "client-id" in config && isDefined2(config["tenant-id"]) && isDefined2(config["client-id"]) && isString(config["tenant-id"]) && isString(config["client-id"]); } function isAWSConfig(config) { const requiredProperties = [ - "aws_region", - "account_id", - "role_name", + "aws-region", + "account-id", + "role-name", "domain", - "domain_owner" + "domain-owner" ]; for (const property of requiredProperties) { if (!(property in config) || !isDefined2(config[property]) || !isString(config[property])) { @@ -121733,10 +121768,10 @@ function isJFrogConfig(config) { if ("audience" in config && !isStringOrUndefined(config.audience)) { return false; } - if ("identity_mapping_name" in config && !isStringOrUndefined(config.identity_mapping_name)) { + if ("identity-mapping-name" in config && !isStringOrUndefined(config["identity-mapping-name"])) { return false; } - return "jfrog_oidc_provider_name" in config && isDefined2(config.jfrog_oidc_provider_name) && isString(config.jfrog_oidc_provider_name); + return "jfrog-oidc-provider-name" in config && isDefined2(config["jfrog-oidc-provider-name"]) && isString(config["jfrog-oidc-provider-name"]); } function credentialToStr(credential) { let result = `Type: ${credential.type};`; @@ -121760,18 +121795,21 @@ function credentialToStr(credential) { appendIfDefined("Token", isDefined2(credential.token) ? "***" : void 0); } if (isAzureConfig(credential)) { - appendIfDefined("Tenant", credential.tenant_id); - appendIfDefined("Client", credential.client_id); + appendIfDefined("Tenant", credential["tenant-id"]); + appendIfDefined("Client", credential["client-id"]); } else if (isAWSConfig(credential)) { - appendIfDefined("AWS Region", credential.aws_region); - appendIfDefined("AWS Account", credential.account_id); - appendIfDefined("AWS Role", credential.role_name); + appendIfDefined("AWS Region", credential["aws-region"]); + appendIfDefined("AWS Account", credential["account-id"]); + appendIfDefined("AWS Role", credential["role-name"]); appendIfDefined("AWS Domain", credential.domain); - appendIfDefined("AWS Domain Owner", credential.domain_owner); + appendIfDefined("AWS Domain Owner", credential["domain-owner"]); appendIfDefined("AWS Audience", credential.audience); } else if (isJFrogConfig(credential)) { - appendIfDefined("JFrog Provider", credential.jfrog_oidc_provider_name); - appendIfDefined("JFrog Identity Mapping", credential.identity_mapping_name); + appendIfDefined("JFrog Provider", credential["jfrog-oidc-provider-name"]); + appendIfDefined( + "JFrog Identity Mapping", + credential["identity-mapping-name"] + ); appendIfDefined("JFrog Audience", credential.audience); } return result; @@ -122122,22 +122160,16 @@ async function sendFailedStatusReport(logger, startedAt, language, unwrappedErro var UPDATEJOB_PROXY = "update-job-proxy"; var UPDATEJOB_PROXY_VERSION = "v2.0.20250624110901"; var UPDATEJOB_PROXY_URL_PREFIX = "https://github.com/github/codeql-action/releases/download/codeql-bundle-v2.22.0/"; -var LANGUAGE_ALIASES = { - c: "cpp" /* cpp */, - "c++": "cpp" /* cpp */, - "c#": "csharp" /* csharp */, - kotlin: "java" /* java */, - typescript: "javascript" /* javascript */, - "javascript-typescript": "javascript" /* javascript */, - "java-kotlin": "java" /* java */ -}; function parseLanguage(language) { language = language.trim().toLowerCase(); - if (language in KnownLanguage) { + if (Object.hasOwn(KnownLanguage, language)) { return language; } - if (language in LANGUAGE_ALIASES) { - return LANGUAGE_ALIASES[language]; + if (Object.hasOwn(known_language_aliases_exports, language)) { + language = known_language_aliases_exports[language]; + if (Object.hasOwn(KnownLanguage, language)) { + return language; + } } return void 0; } @@ -122188,22 +122220,22 @@ function getRegistryAddress(registry) { function getAuthConfig(config) { if (isAzureConfig(config)) { return { - tenant_id: config.tenant_id, - client_id: config.client_id + "tenant-id": config["tenant-id"], + "client-id": config["client-id"] }; } else if (isAWSConfig(config)) { return { - aws_region: config.aws_region, - account_id: config.account_id, - role_name: config.role_name, + "aws-region": config["aws-region"], + "account-id": config["account-id"], + "role-name": config["role-name"], domain: config.domain, - domain_owner: config.domain_owner, + "domain-owner": config["domain-owner"], audience: config.audience }; } else if (isJFrogConfig(config)) { return { - jfrog_oidc_provider_name: config.jfrog_oidc_provider_name, - identity_mapping_name: config.identity_mapping_name, + "jfrog-oidc-provider-name": config["jfrog-oidc-provider-name"], + "identity-mapping-name": config["identity-mapping-name"], audience: config.audience }; } else if (isToken(config)) { @@ -122738,7 +122770,7 @@ async function run(startedAt) { } logger.info( `Credentials loaded for the following registries: - ${credentials.map((c) => credentialToStr(c)).join("\n")}` + ${credentials.map((c2) => credentialToStr(c2)).join("\n")}` ); if (core12.isDebug() || isInTestMode()) { try { @@ -122767,7 +122799,7 @@ async function run(startedAt) { { languages: language && [language] }, - proxyConfig.all_credentials.map((c) => c.type), + proxyConfig.all_credentials.map((c2) => c2.type), logger ); } catch (unwrappedError) { diff --git a/src/known-language-aliases.json b/src/known-language-aliases.json new file mode 100644 index 0000000000..50726256fe --- /dev/null +++ b/src/known-language-aliases.json @@ -0,0 +1,11 @@ +{ + "c": "cpp", + "c-c++": "cpp", + "c-cpp": "cpp", + "c#": "csharp", + "c++": "cpp", + "java-kotlin": "java", + "javascript-typescript": "javascript", + "kotlin": "java", + "typescript": "javascript" +} diff --git a/src/start-proxy.test.ts b/src/start-proxy.test.ts index 5e5bce6c93..e1d465abc9 100644 --- a/src/start-proxy.test.ts +++ b/src/start-proxy.test.ts @@ -351,23 +351,23 @@ test("getCredentials throws an error when non-printable characters are used", as }); const validAzureCredential: startProxyExports.AzureConfig = { - tenant_id: "12345678-1234-1234-1234-123456789012", - client_id: "abcdef01-2345-6789-abcd-ef0123456789", + "tenant-id": "12345678-1234-1234-1234-123456789012", + "client-id": "abcdef01-2345-6789-abcd-ef0123456789", }; const validAwsCredential: startProxyExports.AWSConfig = { - aws_region: "us-east-1", - account_id: "123456789012", - role_name: "MY_ROLE", + "aws-region": "us-east-1", + "account-id": "123456789012", + "role-name": "MY_ROLE", domain: "MY_DOMAIN", - domain_owner: "987654321098", + "domain-owner": "987654321098", audience: "custom-audience", }; const validJFrogCredential: startProxyExports.JFrogConfig = { - jfrog_oidc_provider_name: "MY_PROVIDER", + "jfrog-oidc-provider-name": "MY_PROVIDER", audience: "jfrog-audience", - identity_mapping_name: "my-mapping", + "identity-mapping-name": "my-mapping", }; test("getCredentials throws an error when non-printable characters are used for Azure OIDC", (t) => { diff --git a/src/start-proxy.ts b/src/start-proxy.ts index 1a68d99cf3..270681240b 100644 --- a/src/start-proxy.ts +++ b/src/start-proxy.ts @@ -18,6 +18,7 @@ import { FeatureEnablement, } from "./feature-flags"; import * as json from "./json"; +import * as knownLanguageAliases from "./known-language-aliases.json"; import { KnownLanguage } from "./languages"; import { Logger } from "./logging"; import { @@ -188,43 +189,30 @@ export const UPDATEJOB_PROXY_VERSION = "v2.0.20250624110901"; const UPDATEJOB_PROXY_URL_PREFIX = "https://github.com/github/codeql-action/releases/download/codeql-bundle-v2.22.0/"; -/* - * Language aliases supported by the start-proxy Action. - * - * In general, the CodeQL CLI is the source of truth for language aliases, and to - * allow us to more easily support new languages, we want to avoid hardcoding these - * aliases in the Action itself. However this is difficult to do in the start-proxy - * Action since this Action does not use CodeQL, so we're accepting some hardcoding - * for this Action. - */ -const LANGUAGE_ALIASES: { [lang: string]: KnownLanguage } = { - c: KnownLanguage.cpp, - "c++": KnownLanguage.cpp, - "c#": KnownLanguage.csharp, - kotlin: KnownLanguage.java, - typescript: KnownLanguage.javascript, - "javascript-typescript": KnownLanguage.javascript, - "java-kotlin": KnownLanguage.java, -}; - /** * Parse the start-proxy language input into its canonical CodeQL language name. * - * Exported for testing. Do not use this outside of the start-proxy Action - * to avoid complicating the process of adding new CodeQL languages. + * This uses the language aliases shipped with the Action and will not be able to resolve aliases + * added by versions of the CodeQL CLI newer than the one mentioned in `defaults.json`. However, + * this is sufficient for the start-proxy Action since we are already specifying proxy + * configurations on a per-language basis. */ export function parseLanguage(language: string): KnownLanguage | undefined { // Normalize to lower case language = language.trim().toLowerCase(); // See if it's an exact match - if (language in KnownLanguage) { + if (Object.hasOwn(KnownLanguage, language)) { return language as KnownLanguage; } // Check language aliases - if (language in LANGUAGE_ALIASES) { - return LANGUAGE_ALIASES[language]; + if (Object.hasOwn(knownLanguageAliases, language)) { + language = + knownLanguageAliases[language as keyof typeof knownLanguageAliases]; + if (Object.hasOwn(KnownLanguage, language)) { + return language as KnownLanguage; + } } return undefined; @@ -301,22 +289,22 @@ export function getAuthConfig( // which we can use to identify them. if (isAzureConfig(config)) { return { - tenant_id: config.tenant_id, - client_id: config.client_id, + "tenant-id": config["tenant-id"], + "client-id": config["client-id"], } satisfies AzureConfig; } else if (isAWSConfig(config)) { return { - aws_region: config.aws_region, - account_id: config.account_id, - role_name: config.role_name, + "aws-region": config["aws-region"], + "account-id": config["account-id"], + "role-name": config["role-name"], domain: config.domain, - domain_owner: config.domain_owner, + "domain-owner": config["domain-owner"], audience: config.audience, } satisfies AWSConfig; } else if (isJFrogConfig(config)) { return { - jfrog_oidc_provider_name: config.jfrog_oidc_provider_name, - identity_mapping_name: config.identity_mapping_name, + "jfrog-oidc-provider-name": config["jfrog-oidc-provider-name"], + "identity-mapping-name": config["identity-mapping-name"], audience: config.audience, } satisfies JFrogConfig; } else if (isToken(config)) { diff --git a/src/start-proxy/types.test.ts b/src/start-proxy/types.test.ts index ee20e74aa7..3efaa3349d 100644 --- a/src/start-proxy/types.test.ts +++ b/src/start-proxy/types.test.ts @@ -7,23 +7,23 @@ import * as types from "./types"; setupTests(test); const validAzureCredential: types.AzureConfig = { - tenant_id: "12345678-1234-1234-1234-123456789012", - client_id: "abcdef01-2345-6789-abcd-ef0123456789", + "tenant-id": "12345678-1234-1234-1234-123456789012", + "client-id": "abcdef01-2345-6789-abcd-ef0123456789", }; const validAwsCredential: types.AWSConfig = { - aws_region: "us-east-1", - account_id: "123456789012", - role_name: "MY_ROLE", + "aws-region": "us-east-1", + "account-id": "123456789012", + "role-name": "MY_ROLE", domain: "MY_DOMAIN", - domain_owner: "987654321098", + "domain-owner": "987654321098", audience: "custom-audience", }; const validJFrogCredential: types.JFrogConfig = { - jfrog_oidc_provider_name: "MY_PROVIDER", + "jfrog-oidc-provider-name": "MY_PROVIDER", audience: "jfrog-audience", - identity_mapping_name: "my-mapping", + "identity-mapping-name": "my-mapping", }; test("credentialToStr - pretty-prints valid username+password configurations", (t) => { diff --git a/src/start-proxy/types.ts b/src/start-proxy/types.ts index 0d3bf86c5b..58adaf5439 100644 --- a/src/start-proxy/types.ts +++ b/src/start-proxy/types.ts @@ -59,29 +59,29 @@ export function isToken( } /** Configuration for Azure OIDC. */ -export type AzureConfig = { tenant_id: string; client_id: string }; +export type AzureConfig = { "tenant-id": string; "client-id": string }; /** Decides whether `config` is an Azure OIDC configuration. */ export function isAzureConfig( config: UnvalidatedObject, ): config is AzureConfig { return ( - "tenant_id" in config && - "client_id" in config && - isDefined(config.tenant_id) && - isDefined(config.client_id) && - json.isString(config.tenant_id) && - json.isString(config.client_id) + "tenant-id" in config && + "client-id" in config && + isDefined(config["tenant-id"]) && + isDefined(config["client-id"]) && + json.isString(config["tenant-id"]) && + json.isString(config["client-id"]) ); } /** Configuration for AWS OIDC. */ export type AWSConfig = { - aws_region: string; - account_id: string; - role_name: string; + "aws-region": string; + "account-id": string; + "role-name": string; domain: string; - domain_owner: string; + "domain-owner": string; audience?: string; }; @@ -91,11 +91,11 @@ export function isAWSConfig( ): config is AWSConfig { // All of these properties are required. const requiredProperties = [ - "aws_region", - "account_id", - "role_name", + "aws-region", + "account-id", + "role-name", "domain", - "domain_owner", + "domain-owner", ]; for (const property of requiredProperties) { @@ -118,30 +118,30 @@ export function isAWSConfig( /** Configuration for JFrog OIDC. */ export type JFrogConfig = { - jfrog_oidc_provider_name: string; + "jfrog-oidc-provider-name": string; audience?: string; - identity_mapping_name?: string; + "identity-mapping-name"?: string; }; /** Decides whether `config` is a JFrog OIDC configuration. */ export function isJFrogConfig( config: UnvalidatedObject, ): config is JFrogConfig { - // The "audience" and "identity_mapping_name" fields are optional, but should be strings if present. + // The "audience" and "identity-mapping-name" fields are optional, but should be strings if present. if ("audience" in config && !json.isStringOrUndefined(config.audience)) { return false; } if ( - "identity_mapping_name" in config && - !json.isStringOrUndefined(config.identity_mapping_name) + "identity-mapping-name" in config && + !json.isStringOrUndefined(config["identity-mapping-name"]) ) { return false; } return ( - "jfrog_oidc_provider_name" in config && - isDefined(config.jfrog_oidc_provider_name) && - json.isString(config.jfrog_oidc_provider_name) + "jfrog-oidc-provider-name" in config && + isDefined(config["jfrog-oidc-provider-name"]) && + json.isString(config["jfrog-oidc-provider-name"]) ); } @@ -189,18 +189,21 @@ export function credentialToStr(credential: Credential): string { } if (isAzureConfig(credential)) { - appendIfDefined("Tenant", credential.tenant_id); - appendIfDefined("Client", credential.client_id); + appendIfDefined("Tenant", credential["tenant-id"]); + appendIfDefined("Client", credential["client-id"]); } else if (isAWSConfig(credential)) { - appendIfDefined("AWS Region", credential.aws_region); - appendIfDefined("AWS Account", credential.account_id); - appendIfDefined("AWS Role", credential.role_name); + appendIfDefined("AWS Region", credential["aws-region"]); + appendIfDefined("AWS Account", credential["account-id"]); + appendIfDefined("AWS Role", credential["role-name"]); appendIfDefined("AWS Domain", credential.domain); - appendIfDefined("AWS Domain Owner", credential.domain_owner); + appendIfDefined("AWS Domain Owner", credential["domain-owner"]); appendIfDefined("AWS Audience", credential.audience); } else if (isJFrogConfig(credential)) { - appendIfDefined("JFrog Provider", credential.jfrog_oidc_provider_name); - appendIfDefined("JFrog Identity Mapping", credential.identity_mapping_name); + appendIfDefined("JFrog Provider", credential["jfrog-oidc-provider-name"]); + appendIfDefined( + "JFrog Identity Mapping", + credential["identity-mapping-name"], + ); appendIfDefined("JFrog Audience", credential.audience); }