mirror of
https://github.com/renovatebot/renovate.git
synced 2026-10-25 23:11:31 +00:00
a1971afa78
* ci(linter): add renovate/require-regex-util rule Adds a custom oxlint rule that flags raw RegExp usage in lib/ production code: any `new RegExp(...)` call and any regex literal that is not the direct first argument of `regEx(...)`. The regEx() helper from lib/util/regex.ts uses the RE2 engine for ReDoS-safe matching and caches compiled patterns. lib/util/regex.ts itself is exempt. The rule is disabled for **/*.spec.ts, test/**, and tools/** via config overrides, because vitest APIs such as expect.stringMatching need bare RegExp instances (a past commit reverted regEx() there). Severity is set to "warn" instead of "error": the repo currently has 197 pre-existing violations (above the agreed mechanical-fix threshold of 80), and a number of them are deliberately RE2-incompatible patterns (lookahead/lookbehind/named backreferences, see TODO #12872/#12875 markers in e.g. lib/modules/versioning/rez/ pattern.ts and lib/modules/manager/dockerfile/extract.ts) that need per-site judgment before they can be wrapped in regEx() or suppressed with a justified disable comment. No violation fixes are included in this commit. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * ci(linter): enforce renovate/require-regex-util at error Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * refactor: use regEx() for regex literals and RegExp construction in lib Burn down all renovate/require-regex-util violations (197): - wrap RE2-compatible regex literals and RegExp constructions in regEx() - rewrite lookaround patterns where behavior is provably preserved: goproxy separator split, sbt-package link extraction, leiningen comment stripping and keyword search, npm GitHub owner validation (unit-count bound replaced by an explicit length check) - keep native RegExp with disable comments where RE2 cannot be used: moo / good-enough-parser lexer patterns (moo rejects RE2 instances), MigrationsService propertyName (matched via isRegExp, which RE2 instances fail), rez named backreferences and lookaheads, GitHub markdown link negative lookbehind, emoji astral-plane matching - drop stale TODO #12875 comments for patterns current re2 handles Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * refactor: reduce require-regex-util disable comments Rewrite the github massage-markdown-links URL regex to capture an optional `api.` prefix in a named group (skipped in code) instead of relying on a negative lookbehind, so both the base and global variants can use regEx()/RE2 and their two disable comments are removed. Add spec cases for api-prefixed URLs that match the URL shape. Consolidate the four related line disables in rez/pattern.ts (bound and range patterns emulating Python conditional patterns via named backreferences and lookaheads, which RE2 cannot express) into a single block disable/enable pair, matching the treatment of the lexer files. Disable comment count drops from 13 to 8. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * refactor(datasource/sbt-package): use named capture group in link regex Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * refactor(manager/cake): restore original multiLineComment regex spelling The [^] -> [\\s\\S] rewrite was only needed for an RE2 wrap that was later reverted; keep the diff minimal. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(datasource/go): skip empty GOPROXY segments The switch from a lookahead split to a capture-group split (needed because RE2 has no lookahead support) changed how empty GOPROXY segments parse: `a|,b` yielded `{ url: ',', fallback: '|' }` before and `{ url: '', fallback: ',' }` after. The comma fallback only continues on 404/410, so a failing proxy ahead of an empty segment silently stopped the lookup instead of falling through to the remaining proxies. Empty segments carry no url to query, so drop them. * refactor(datasource/go): use isTruthy for empty segment filter * fix(datasource/go): filter empty segments before mapping Filtering after the map broke the contextual typing from the GoproxyItem[] annotation, widening fallback to string. * refactor(platform/github): use regEx() for merge queue query stripping --------- Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
184 lines
5.8 KiB
TypeScript
184 lines
5.8 KiB
TypeScript
import os from 'node:os';
|
|
import { isNonEmptyStringAndNotWhitespace } from '@sindresorhus/is';
|
|
import fs from 'fs-extra';
|
|
import upath from 'upath';
|
|
import { PLATFORM_GPG_FAILED } from '../../constants/error-messages.ts';
|
|
import { logger } from '../../logger/index.ts';
|
|
import { exec } from '../exec/index.ts';
|
|
import { newlineRegex, regEx } from '../regex.ts';
|
|
import { addSecretForSanitizing } from '../sanitize.ts';
|
|
import { fromBase64, toBase64 } from '../string.ts';
|
|
|
|
type PrivateKeyFormat = 'gpg' | 'ssh';
|
|
|
|
const sshKeyRegex = regEx(
|
|
/-----BEGIN (?:[A-Z ]+ )?PRIVATE KEY-----.*?-----END (?:[A-Z]+ )?PRIVATE KEY-----/,
|
|
's',
|
|
);
|
|
|
|
let gitPrivateKey: PrivateKey | undefined;
|
|
|
|
/**
|
|
* Decodes Base64 string if roundtrip encoding matches
|
|
*/
|
|
function tryBase64(value: string): string | null {
|
|
const decodedValue = fromBase64(value);
|
|
const encodedValue = toBase64(decodedValue);
|
|
if (value !== encodedValue) {
|
|
return null;
|
|
}
|
|
|
|
return decodedValue;
|
|
}
|
|
|
|
abstract class PrivateKey {
|
|
protected readonly key: string;
|
|
protected readonly passphrase: string | undefined;
|
|
protected keyId: string | undefined;
|
|
protected abstract readonly gpgFormat: string;
|
|
|
|
constructor(key: string, passphrase: string | undefined) {
|
|
const decodedKey = tryBase64(key);
|
|
|
|
if (decodedKey) {
|
|
this.key = decodedKey;
|
|
addSecretForSanitizing(key, 'global');
|
|
logger.debug('gitPrivateKey: decoded key from Base64');
|
|
} else {
|
|
this.key = key;
|
|
}
|
|
addSecretForSanitizing(this.key, 'global');
|
|
|
|
this.passphrase = passphrase;
|
|
if (this.passphrase) {
|
|
addSecretForSanitizing(this.passphrase, 'global');
|
|
}
|
|
logger.debug(
|
|
'gitPrivateKey: successfully set (but not yet written/configured)',
|
|
);
|
|
}
|
|
|
|
async writeKey(): Promise<void> {
|
|
try {
|
|
this.keyId ??= await this.importKey();
|
|
logger.debug('gitPrivateKey: imported');
|
|
} catch (err) {
|
|
logger.warn({ err }, 'gitPrivateKey: error importing');
|
|
throw new Error(PLATFORM_GPG_FAILED);
|
|
}
|
|
}
|
|
|
|
async configSigningKey(cwd: string): Promise<void> {
|
|
logger.debug('gitPrivateKey: configuring commit signing');
|
|
// TODO: types (#22198)
|
|
await exec(`git config user.signingkey ${this.keyId!}`, { cwd });
|
|
await exec(`git config commit.gpgsign true`, { cwd });
|
|
await exec(`git config gpg.format ${this.gpgFormat}`, { cwd });
|
|
}
|
|
|
|
protected abstract importKey(): Promise<string | undefined>;
|
|
}
|
|
|
|
class GPGKey extends PrivateKey {
|
|
protected readonly gpgFormat = 'openpgp';
|
|
|
|
constructor(key: string, passphrase: string | undefined) {
|
|
super(key.trim(), passphrase);
|
|
if (passphrase) {
|
|
logger.warn(
|
|
'Passphrase is not yet supported for GPG keys, it will be ignored',
|
|
);
|
|
}
|
|
}
|
|
|
|
protected async importKey(): Promise<string | undefined> {
|
|
const keyFileName = upath.join(`${os.tmpdir()}/git-private-gpg.key`);
|
|
await fs.outputFile(keyFileName, this.key);
|
|
const { stdout, stderr } = await exec(
|
|
// --batch --no-tty flags allow Renovate to skip warnings about unsupported algorithms in the key
|
|
`gpg --batch --no-tty --import ${keyFileName}`,
|
|
);
|
|
logger.debug({ stdout, stderr }, 'Private key import result');
|
|
await fs.remove(keyFileName);
|
|
return `${stdout}${stderr}`
|
|
.split(newlineRegex)
|
|
.find((line) => line.includes('secret key imported'))
|
|
?.replace('gpg: key ', '')
|
|
.split(':')
|
|
.shift();
|
|
}
|
|
}
|
|
|
|
class SSHKey extends PrivateKey {
|
|
protected readonly gpgFormat = 'ssh';
|
|
|
|
protected async importKey(): Promise<string | undefined> {
|
|
const keyFileName = upath.join(`${os.tmpdir()}/git-private-ssh.key`);
|
|
await fs.outputFile(keyFileName, this.key.replace(regEx(/\n?$/), '\n'));
|
|
/* v8 ignore next -- not easily testable */
|
|
process.on('exit', () => fs.rmSync(keyFileName, { force: true }));
|
|
await fs.chmod(keyFileName, 0o600);
|
|
|
|
// If there's a passphrase, decrypt the private key and save without passphrase
|
|
if (this.passphrase) {
|
|
await exec(
|
|
// -p: change passphrase
|
|
// -f: key file
|
|
// -P: old passphrase
|
|
// -N: new passphrase (empty = no passphrase)
|
|
`ssh-keygen -p -f ${keyFileName} -P "${this.passphrase}" -N ""`,
|
|
);
|
|
}
|
|
|
|
// HACK: `git` calls `ssh-keygen -Y sign ...` internally for SSH-based
|
|
// commit signing. Technically, only the private key is needed for signing,
|
|
// but `ssh-keygen` has an implementation quirk which requires also the
|
|
// public key file to exist. Therefore, we derive the public key from the
|
|
// private key just to satisfy `ssh-keygen` until the problem has been
|
|
// resolved.
|
|
// https://github.com/renovatebot/renovate/issues/18197#issuecomment-2152333710
|
|
const { stdout } = await exec(`ssh-keygen -y -f ${keyFileName}`);
|
|
const pubFileName = `${keyFileName}.pub`;
|
|
await fs.outputFile(pubFileName, stdout);
|
|
/* v8 ignore next -- not easily testable */
|
|
process.on('exit', () => fs.rmSync(pubFileName, { force: true }));
|
|
return keyFileName;
|
|
}
|
|
}
|
|
|
|
function getPrivateKeyFormat(key: string): PrivateKeyFormat {
|
|
return sshKeyRegex.test(key) ? 'ssh' : 'gpg';
|
|
}
|
|
|
|
function createPrivateKey(
|
|
key: string,
|
|
passphrase: string | undefined,
|
|
): PrivateKey {
|
|
switch (getPrivateKeyFormat(key)) {
|
|
case 'gpg':
|
|
logger.debug('gitPrivateKey: GPG key detected');
|
|
return new GPGKey(key, passphrase);
|
|
case 'ssh':
|
|
logger.debug('gitPrivateKey: SSH key detected');
|
|
return new SSHKey(key, passphrase);
|
|
}
|
|
}
|
|
|
|
export function setPrivateKey(
|
|
key: string | undefined,
|
|
passphrase: string | undefined,
|
|
): void {
|
|
if (!isNonEmptyStringAndNotWhitespace(key)) {
|
|
return;
|
|
}
|
|
gitPrivateKey = createPrivateKey(key, passphrase);
|
|
}
|
|
|
|
export async function writePrivateKey(): Promise<void> {
|
|
await gitPrivateKey?.writeKey();
|
|
}
|
|
|
|
export async function configSigningKey(cwd: string): Promise<void> {
|
|
await gitPrivateKey?.configSigningKey(cwd);
|
|
}
|