mirror of
https://github.com/renovatebot/renovate.git
synced 2026-10-24 14:34:21 +00:00
59852479bf
* test(versioning): cover four uncovered guards - `cargo`: a converted range whose operators are already attached to their versions, so `npm2cargo` leaves the elements alone - `hashicorp`: a widen on a complex range ending in `>=`, which the underlying semver implementation refuses and returns null for - `poetry`: a version list holding an unparseable entry, for both `getSatisfyingVersion` and `minSatisfyingVersion`, plus the same widen refusal, which falls back to the current value - `swift`: an open-ended range whose bound is not a valid semver Co-authored-by: Claude Opus 5 <michael.kriese+claude-code@mend.io> * refactor(versioning): drop two guards that cannot be false - `hermit`: `major` is the only mandatory group in the version regex, so the `if (major)` around the first release segment always holds; the sibling parser already pushes it unconditionally - `rpm`: after `c1 === c2` is ruled out, one of `c1 > c2` and `c1 < c2` must hold, so the second comparison becomes a ternary Co-authored-by: Claude Opus 5 <michael.kriese+claude-code@mend.io> * test(versioning/gradle): cover three uncovered guards - `getMajor` on a version whose leading token is not a number - `getSatisfyingVersion` with a later match that is not greater than the one already held - `minSatisfyingVersion` with a later match that is not smaller than the one already held Two branches in `compare.ts` are still open and are looked at next. Co-authored-by: Claude Opus 5 <michael.kriese+claude-code@mend.io> * test(versioning/ivy): cover a later match that is not the greatest `getSatisfyingVersion` kept every matching version it walked past, so the guard that holds on to the one already found was never taken. Co-authored-by: Claude Opus 5 <michael.kriese+claude-code@mend.io> * refactor(versioning): drop three guards that cannot be false - `gradle`: `tokenCmp` compares two tokens whose only types are `Number` and `String`, so once both-numbers and both-strings are handled exactly one side is a number; the chain becomes a ternary and the unreachable `return 0` goes - `ivy`: `tokenize` always yields at least one token for a non-empty version, so the length check around the last one always holds - `ivy`: `rangeToStr` only returns null for a null range, which the `length === 1` check above it already rules out Co-authored-by: Claude Opus 5 <michael.kriese+claude-code@mend.io> * test(versioning/nuget): cover a later match that is not the greatest Both loops in `getSatisfyingVersion` walked version lists that only ever climbed, so the guard that holds on to the candidate already found was never taken -- once for a bracket range, once for a bare version acting as a minimum. Also pin down that a floating range needs a major component: `-*` alone does not parse. Co-authored-by: Claude Opus 5 <michael.kriese+claude-code@mend.io> * refactor(versioning): drop three more guards that cannot be false - `maven`: the interval picked for auto-extension is only picked when the new value is at or past its upper bound, and that upper bound is the lower one incremented, so the new value never sorts below the lower bound - `maven`: an interval never has both bounds open, because the parser only nulls one side when the other is a version - `nuget`: a floating range always carries a major component, so neither the parser's NaN check nor the serializer's undefined check can fail Co-authored-by: Claude Opus 5 <michael.kriese+claude-code@mend.io> * refactor(versioning/pep440): drop three unreachable range paths `updateRangeValue` handles `!=`, a `.*` prefix, `~=`, `==` and `<=` itself, `handleUpperBound` handles `<`, and `parseCurrentRange` rejects `===`. Only `>` and `>=` can reach `handleLowerBound`, so its operator check always holds and it never returns null. Making it total removes the null check at the call site as well. This does drop the `logger.error` that followed, which was guarded by a comment saying it could not happen unless pep440 itself changed. `isLessThanRange` classifies the same fixed operator set, so the last check there is the only one left and its fallback was dead. `divideCompatibleReleaseRange` only ever sees a `~=` version, and pep440 requires at least two release components after that operator, so there is always a component to drop. A new test pins down that `~=7` is not a valid range. Co-authored-by: Claude Opus 5 <michael.kriese+claude-code@mend.io> * test(versioning): cover three more uncovered guards - `elm`: a widen where the new version sits below the lower bound, so the upper bound is kept rather than extended - `hex`: a widen on a complex range ending in `>=`, which the underlying semver implementation refuses and returns null for - `rust-release-channel`: a concrete current version paired with a channel name as the new version, which falls through to the new version unchanged Co-authored-by: Claude Opus 5 <michael.kriese+claude-code@mend.io> * refactor(versioning): drop two more guards that cannot be false - `composer`: `getNewValue` falls back to the new version whenever nothing else matched, so it never returns null and the recursive call in the or-range path always has a value to work with - `docker`: a version's prerelease is always a string, so once an empty one on either side is handled, the remaining pair is both non-empty and unequal Co-authored-by: Claude Opus 5 <michael.kriese+claude-code@mend.io> * test(config,datasource): cover two more uncovered guards - `config/validation`: `hostRules[].allowInternal` nested inside a `packageRules[]` entry, which reports a plain configuration error rather than a security one, because nested host rules are never applied - `datasource/docker`: a non-list manifest whose response carries no `docker-content-digest` header, so the digest falls back to the hash of the manifest body Co-authored-by: Claude Opus 5 <michael.kriese+claude-code@mend.io> * refactor(config,datasource): unwind three branches v8 could not count - `config/decrypt` and `datasource/docker/common` each picked a response with an `await` inside a ternary. v8 gives the branch that follows such a ternary a negative hit count, which the reporters read as uncovered even though both paths run. Spelling the choice as an if/else makes the count come out right; behaviour is unchanged. - `datasource/index` and `datasource/npm/npmrc` each ended an exhaustive chain with an `else if` whose implicit else v8 counts but nothing can reach: `registryStrategy` is one of three literals, and `npmrc` starts as an object and is only ever reassigned to one. Co-authored-by: Claude Opus 5 <michael.kriese+claude-code@mend.io> * test(workers/global): cover seven uncovered guards The config parsers rewrite legacy boolean spellings of `dryRun`, `requireConfig` and `platformCommit`, but nothing passed a value that was already current, so the fall-through of each chain went untaken. Cover it from both the CLI and the environment. Also cover a datasource env var that names no auth field, one whose value is undefined, a default config file that cannot be read, and the error `isLimitReached` throws when asked for a concurrent limit without a branch config. That last one had an ignore hint saying it should not happen; the error message documents the contract, so it is now tested and the hint is gone. Co-authored-by: Claude Opus 5 <michael.kriese+claude-code@mend.io> * refactor(workers/global): drop a guard that cannot be false `getConfig` in the additional-config-file parser returns early unless `RENOVATE_ADDITIONAL_CONFIG_FILE` is set, so by the time a parse error is being classified the variable is always present. Co-authored-by: Claude Opus 5 <michael.kriese+claude-code@mend.io> * refactor(workers/repository): drop a dead changelog file lookup The gitea, gitlab and forgejo changelog sources each declared `files` as an empty array and then guarded the only assignment to it with `if (!files.length)`, which is always true one line after the declaration. Collapse it to the filter itself. Co-authored-by: Claude Opus 5 <michael.kriese+claude-code@mend.io> * ci: ratchet the branch coverage threshold A full run on this branch reports 100% statements (49471/49471), 100% functions (7381/7381), 100% lines (48961/48961) and 99.73% branches (25690/25759), up from 99.53% before this branch's work. The threshold moves to 99.71, keeping the same rounding-down margin as before. Statements, functions and lines are already pinned at 100 and stay there. Co-authored-by: Claude Opus 5 <michael.kriese+claude-code@mend.io> * refactor(config,datasource): say why the ternary was unwound Both sites now carry a comment explaining that the if/else is deliberate: v8 gives the branch following an `await` inside a ternary a negative hit count, which the coverage reporters read as uncovered. `apiCheckResponse` also gets an explicit `HttpResponse<unknown>` type, which is what the two branches have in common and what `isECRMaxResultsResponse` already expects. Also fix a type error in the new config file spec: the `pathExists` spy needs the same `as never` cast the surrounding tests use. Co-authored-by: Claude Opus 5 <michael.kriese+claude-code@mend.io> * refactor(versioning/pep440): use a template literal in handleLowerBound The exclude-style return is the one line this branch rewrote in that function, so it now builds its string with a template literal instead of the `+` operator. Co-authored-by: Claude Opus 5 <michael.kriese+claude-code@mend.io> * test(workers/global): drop the cast from the limits throw test Calling the overload with a non-null assertion on the config argument says the same thing without retyping the whole function. Co-authored-by: Claude Opus 5 <michael.kriese+claude-code@mend.io> --------- Co-authored-by: Claude Opus 5 <michael.kriese+claude-code@mend.io>
255 lines
8.9 KiB
TypeScript
255 lines
8.9 KiB
TypeScript
import {
|
|
isArray,
|
|
isNonEmptyString,
|
|
isObject,
|
|
isString,
|
|
} from '@sindresorhus/is';
|
|
import { CONFIG_VALIDATION } from '../constants/error-messages.ts';
|
|
import { logger } from '../logger/index.ts';
|
|
import { getEnv } from '../util/env.ts';
|
|
import { regEx } from '../util/regex.ts';
|
|
import { addSecretForSanitizing } from '../util/sanitize.ts';
|
|
import { ensureTrailingSlash, parseUrl, trimSlashes } from '../util/url.ts';
|
|
import { tryDecryptBcPgp } from './decrypt/bcpgp.ts';
|
|
import { tryDecryptOpenPgp } from './decrypt/openpgp.ts';
|
|
import { GlobalConfig } from './global.ts';
|
|
import { DecryptedObject } from './schema.ts';
|
|
import type { AllConfig, RenovateConfig } from './types.ts';
|
|
|
|
let privateKey: string | undefined;
|
|
let privateKeyOld: string | undefined;
|
|
|
|
export function setPrivateKeys(
|
|
pKey: string | undefined,
|
|
pKeyOld: string | undefined,
|
|
): void {
|
|
privateKey = pKey;
|
|
privateKeyOld = pKeyOld;
|
|
}
|
|
|
|
export async function tryDecrypt(
|
|
key: string,
|
|
encryptedStr: string,
|
|
repository: string,
|
|
): Promise<string | null> {
|
|
let decryptedStr: string | null = null;
|
|
// Written as an if/else rather than a ternary on purpose: v8 gives the branch
|
|
// that follows an `await` inside a ternary a negative hit count, which the
|
|
// coverage reporters then read as uncovered.
|
|
let decryptedObjStr: string | null;
|
|
if (getEnv().RENOVATE_X_USE_OPENPGP === 'true') {
|
|
decryptedObjStr = await tryDecryptOpenPgp(key, encryptedStr);
|
|
} else {
|
|
decryptedObjStr = await tryDecryptBcPgp(key, encryptedStr);
|
|
}
|
|
if (decryptedObjStr) {
|
|
decryptedStr = validateDecryptedValue(decryptedObjStr, repository);
|
|
}
|
|
return decryptedStr;
|
|
}
|
|
|
|
export function validateDecryptedValue(
|
|
decryptedObjStr: string,
|
|
repository: string,
|
|
): string | null {
|
|
try {
|
|
const decryptedObj = DecryptedObject.safeParse(decryptedObjStr);
|
|
if (!decryptedObj.success) {
|
|
const error = new Error('config-validation');
|
|
error.validationError = `Could not parse decrypted config.`;
|
|
throw error;
|
|
}
|
|
|
|
const { o: org, r: repo, v: value } = decryptedObj.data;
|
|
|
|
if (!isNonEmptyString(value)) {
|
|
const error = new Error('config-validation');
|
|
error.validationError = `Encrypted value in config is missing a value.`;
|
|
throw error;
|
|
}
|
|
|
|
if (!isNonEmptyString(org)) {
|
|
const error = new Error('config-validation');
|
|
error.validationError = `Encrypted value in config is missing a scope.`;
|
|
throw error;
|
|
}
|
|
|
|
const repositories = [repository.toUpperCase()];
|
|
|
|
const azureCollection = getAzureCollection();
|
|
if (isNonEmptyString(azureCollection)) {
|
|
// used for full 'org/project/repo' matching
|
|
repositories.push(`${azureCollection}/${repository}`.toUpperCase());
|
|
// used for org prefix matching without repo
|
|
repositories.push(`${azureCollection}/*/`.toUpperCase());
|
|
}
|
|
|
|
const orgPrefixes = org
|
|
.split(',')
|
|
.map((o) => o.trim())
|
|
.map((o) => o.toUpperCase())
|
|
.map((o) => ensureTrailingSlash(o));
|
|
|
|
if (isNonEmptyString(repo)) {
|
|
const scopedRepos = orgPrefixes.map((orgPrefix) =>
|
|
`${orgPrefix}${repo}`.toUpperCase(),
|
|
);
|
|
for (const rp of repositories) {
|
|
if (scopedRepos.some((r) => r === rp)) {
|
|
return value;
|
|
}
|
|
}
|
|
|
|
logger.debug(
|
|
{ scopedRepos },
|
|
'Secret is scoped to a different repository',
|
|
);
|
|
const error = new Error('config-validation');
|
|
const scopeString = scopedRepos.join(',');
|
|
error.validationError = `Encrypted secret is scoped to a different repository: "${scopeString}".`;
|
|
throw error;
|
|
}
|
|
|
|
// no scoped repos, only org
|
|
const azcol =
|
|
azureCollection === undefined
|
|
? undefined
|
|
: ensureTrailingSlash(azureCollection).toUpperCase();
|
|
for (const rp of repositories) {
|
|
if (
|
|
orgPrefixes.some(
|
|
(orgPrefix) => rp.startsWith(orgPrefix) && orgPrefix !== azcol,
|
|
)
|
|
) {
|
|
return value;
|
|
}
|
|
}
|
|
logger.debug({ orgPrefixes }, 'Secret is scoped to a different org');
|
|
const error = new Error('config-validation');
|
|
const scopeString = orgPrefixes.join(',');
|
|
error.validationError = `Encrypted secret is scoped to a different org: "${scopeString}".`;
|
|
throw error;
|
|
} catch (err) {
|
|
logger.warn({ err }, 'Could not parse decrypted string');
|
|
}
|
|
return null;
|
|
}
|
|
|
|
export async function decryptConfig<T extends RenovateConfig = AllConfig>(
|
|
config: T,
|
|
repository: string,
|
|
existingPath = '$',
|
|
): Promise<T> {
|
|
logger.trace({ config }, 'decryptConfig()');
|
|
const decryptedConfig = { ...config };
|
|
for (const [key, val] of Object.entries(config)) {
|
|
if (key === 'encrypted' && isObject(val)) {
|
|
const path = `${existingPath}.${key}`;
|
|
logger.debug({ config: val }, `Found encrypted config in ${path}`);
|
|
|
|
const encryptedWarning = GlobalConfig.get('encryptedWarning');
|
|
if (isString(encryptedWarning)) {
|
|
logger.once.warn(encryptedWarning);
|
|
}
|
|
|
|
if (privateKey) {
|
|
for (const [eKey, eVal] of Object.entries(val)) {
|
|
logger.debug(`Trying to decrypt ${eKey} in ${path}`);
|
|
let decryptedStr = await tryDecrypt(privateKey, eVal, repository);
|
|
if (privateKeyOld && !isNonEmptyString(decryptedStr)) {
|
|
logger.debug(`Trying to decrypt with old private key`);
|
|
decryptedStr = await tryDecrypt(privateKeyOld, eVal, repository);
|
|
}
|
|
if (!isNonEmptyString(decryptedStr)) {
|
|
const error = new Error('config-validation');
|
|
error.validationError = `Failed to decrypt field ${eKey}. Please re-encrypt and try again.`;
|
|
throw error;
|
|
}
|
|
logger.debug(`Decrypted ${eKey} in ${path}`);
|
|
// v8 ignore if -- TODO: add test #40625
|
|
if (eKey === 'npmToken') {
|
|
const token = decryptedStr.replace(regEx(/\n$/), '');
|
|
decryptedConfig[eKey] = token;
|
|
addSecretForSanitizing(token);
|
|
} else {
|
|
// @ts-expect-error -- type can't be narrowed
|
|
decryptedConfig[eKey] = decryptedStr;
|
|
addSecretForSanitizing(decryptedStr);
|
|
}
|
|
}
|
|
} else {
|
|
const env = getEnv();
|
|
if (env.RENOVATE_X_ENCRYPTED_STRICT === 'true') {
|
|
const error = new Error(CONFIG_VALIDATION);
|
|
error.validationSource = 'config';
|
|
error.validationError = 'Encrypted config unsupported';
|
|
error.validationMessage = `This config contains an encrypted object at location \`$.${key}\` but no privateKey is configured. To support encrypted config, the Renovate administrator must configure a \`privateKey\` in Global Configuration.`;
|
|
if (env.MEND_HOSTED === 'true') {
|
|
error.validationMessage = `Mend-hosted Renovate Apps no longer support the use of encrypted secrets in Renovate file config (e.g. renovate.json).
|
|
Please migrate all secrets to the Developer Portal using the web UI available at https://developer.mend.io/
|
|
|
|
Refer to migration documents here: ${GlobalConfig.get('productLinks').documentation}mend-hosted/migrating-secrets/`;
|
|
}
|
|
throw error;
|
|
} else {
|
|
logger.error('Found encrypted data but no privateKey');
|
|
}
|
|
}
|
|
delete decryptedConfig.encrypted;
|
|
} else if (isArray(val)) {
|
|
// @ts-expect-error -- type can't be narrowed
|
|
decryptedConfig[key] = [];
|
|
for (const [index, item] of val.entries()) {
|
|
if (isObject(item) && !isArray(item)) {
|
|
const path = `${existingPath}.${key}[${index}]`;
|
|
// @ts-expect-error -- type can't be narrowed
|
|
(decryptedConfig[key] as RenovateConfig[]).push(
|
|
await decryptConfig(item as RenovateConfig, repository, path),
|
|
);
|
|
} else {
|
|
// @ts-expect-error -- type can't be narrowed
|
|
(decryptedConfig[key] as unknown[]).push(item);
|
|
}
|
|
}
|
|
} else if (isObject(val) && key !== 'content') {
|
|
const path = `${existingPath}.${key}`;
|
|
// @ts-expect-error -- type can't be narrowed
|
|
decryptedConfig[key] = await decryptConfig(
|
|
val as RenovateConfig,
|
|
repository,
|
|
path,
|
|
);
|
|
}
|
|
}
|
|
delete decryptedConfig.encrypted;
|
|
logger.trace({ config: decryptedConfig }, 'decryptedConfig');
|
|
return decryptedConfig;
|
|
}
|
|
|
|
export function getAzureCollection(): string | undefined {
|
|
const platform = GlobalConfig.get('platform');
|
|
if (platform !== 'azure') {
|
|
return undefined;
|
|
}
|
|
|
|
const endpoint = GlobalConfig.get('endpoint');
|
|
const endpointUrl = parseUrl(endpoint);
|
|
if (endpointUrl === null) {
|
|
// should not happen
|
|
logger.warn({ endpoint }, 'Unable to parse endpoint for token decryption');
|
|
return undefined;
|
|
}
|
|
|
|
const azureCollection = trimSlashes(endpointUrl.pathname);
|
|
if (!isNonEmptyString(azureCollection)) {
|
|
logger.debug({ endpoint }, 'Unable to find azure collection name from URL');
|
|
return undefined;
|
|
}
|
|
|
|
if (azureCollection.startsWith('tfs/')) {
|
|
// Azure DevOps Server
|
|
return azureCollection.substring(4);
|
|
}
|
|
return azureCollection;
|
|
}
|