Skip to content

Commit eaec10d

Browse files
committed
fix: increase shlex usage
1 parent 6d88b7a commit eaec10d

5 files changed

Lines changed: 12 additions & 8 deletions

File tree

lib/modules/manager/bundler/artifacts.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ export async function updateArtifacts(
143143
if (hostRule.resolvedHost?.includes('-')) {
144144
// TODO: fix me, hostrules can missing all auth
145145
const creds = getAuthenticationHeaderValue(hostRule);
146-
authCommands.push(`${hostRule.resolvedHost} ${creds}`);
146+
authCommands.push(`${quote(hostRule.resolvedHost)} ${quote(creds)}`);
147147
}
148148
return authCommands;
149149
},

lib/modules/manager/cargo/artifacts.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ async function cargoUpdatePrecise(
5353
cmds.push(
5454
`cargo update --config net.git-fetch-with-cli=true` +
5555
` --manifest-path ${quote(manifestPath)}` +
56-
` --package ${dep.packageName!}@${dep.lockedVersion}` +
57-
` --precise ${dep.newVersion}`,
56+
` --package ${quote(`${dep.packageName}@${dep.lockedVersion}`)}` +
57+
` --precise ${quote(dep.newVersion!)}`,
5858
);
5959
}
6060

lib/modules/manager/composer/artifacts.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,9 @@ export async function updateArtifacts({
181181
'update ' +
182182
updatedDeps
183183
.map((dep) =>
184-
dep.newVersion ? `${dep.depName}:${dep.newVersion}` : dep.depName,
184+
dep.newVersion
185+
? quote(`${dep.depName}:${dep.newVersion}`)
186+
: quote(dep.depName!),
185187
)
186188
.filter(is.string)
187189
.map((dep) => quote(dep))

lib/modules/manager/hermit/artifacts.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { quote } from 'shlex';
12
import upath from 'upath';
23
import { logger } from '../../../logger';
34
import { exec } from '../../../util/exec';
@@ -210,7 +211,7 @@ async function updateHermitPackage(update: UpdateArtifact): Promise<void> {
210211
};
211212

212213
const packagesToInstall = toInstall.join(' ');
213-
const fromPackages = from.join(' ');
214+
const fromPackages = from.map(quote).join(' ');
214215

215216
const execCommands = `./hermit install ${packagesToInstall}`;
216217
logger.debug(

lib/modules/manager/pep621/processors/pdm.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import is from '@sindresorhus/is';
2+
import { quote } from 'shlex';
23
import { TEMPORARY_ERROR } from '../../../../constants/error-messages';
34
import { logger } from '../../../../logger';
45
import { exec } from '../../../../util/exec';
@@ -139,7 +140,7 @@ function generateCMDs(updatedDeps: Upgrade[]): string[] {
139140
const [group, name] = dep.depName!.split('/');
140141
addPackageToCMDRecord(
141142
packagesByCMD,
142-
`${pdmUpdateCMD} -G ${group}`,
143+
`${pdmUpdateCMD} -G ${quote(group)}`,
143144
name,
144145
);
145146
break;
@@ -148,7 +149,7 @@ function generateCMDs(updatedDeps: Upgrade[]): string[] {
148149
const [group, name] = dep.depName!.split('/');
149150
addPackageToCMDRecord(
150151
packagesByCMD,
151-
`${pdmUpdateCMD} -dG ${group}`,
152+
`${pdmUpdateCMD} -dG ${quote(group)}`,
152153
name,
153154
);
154155
break;
@@ -160,7 +161,7 @@ function generateCMDs(updatedDeps: Upgrade[]): string[] {
160161
}
161162

162163
for (const commandPrefix in packagesByCMD) {
163-
const packageList = packagesByCMD[commandPrefix].join(' ');
164+
const packageList = packagesByCMD[commandPrefix].map(quote).join(' ');
164165
const cmd = `${commandPrefix} ${packageList}`;
165166
cmds.push(cmd);
166167
}

0 commit comments

Comments
 (0)