From 97550e5d7a03de991228065338ab8012d478926e Mon Sep 17 00:00:00 2001 From: rindeal Date: Wed, 4 Sep 2024 18:08:59 +0200 Subject: [PATCH] Update repo.ts --- src/repo.ts | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/src/repo.ts b/src/repo.ts index 2e42363..a59ca37 100644 --- a/src/repo.ts +++ b/src/repo.ts @@ -14,6 +14,11 @@ export interface Ref { hash: string } + +const gitOidRegExp = /^[0-9a-f]{40}$/ +const gitRefRegExp = /^(?:refs\/(?:heads|tags|remotes)\/|HEAD$)/ + + export class RefDiff { type: string = 'NO_TYPE' sourceRepo: Repo @@ -110,7 +115,7 @@ export class Repo { throw new Error(errorMsg) } Logger.debug(`Executing \`git ls-remote\` for \`${this.url}\``) - execFile('git', ['ls-remote', '--quiet' , '--exit-code', '--', this.url], {}, (error, stdout/*, stderr*/) => { + execFile('git', ['ls-remote', '--quiet', '--exit-code', '--', this.url], {}, (error, stdout/*, stderr*/) => { if ( error ) { Logger.error(`Error fetching refs for \`${this.url}\`: \`${error.message}\``) reject(error) @@ -120,18 +125,35 @@ export class Repo { } }) }) + const refs = result.split('\n') - .filter(line => line) .map(line => { const [hash, name] = line.split('\t') + if ( ! hash || ! name ) { + const errorMsg = `Invalid \`git ls-remote\` output line: \`${line}\`` + Logger.error(errorMsg) + throw new Error(errorMsg) + } + if ( ! gitOidRegExp.test(hash) ) { + const errorMsg = `Invalid Git OID hash: \`${hash}\`` + Logger.error(errorMsg) + throw new Error(errorMsg) + } + if ( ! gitRefRegExp.test(name) ) { + const errorMsg = `Invalid Git ref name: \`${name}\`` + Logger.error(errorMsg) + throw new Error(errorMsg) + } Logger.silly(`Parsed ref: \`${name}\` with hash: \`${hash}\` from \`${this.url}\``) - return {name, hash} + return { name, hash } }) + this._refs = refs Logger.debug(`Fetched \`${refs.length}\` refs for \`${this.url}\``) return refs } + async _buildRefIndexes() { Logger.trace(`GitLsRemote.Repo._buildRefIndexes() called for \`${this.url}\``) if ( ! this._refs ) {