Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions src/testRunner/unittests/tsserver/codeFix.ts
Original file line number Diff line number Diff line change
Expand Up @@ -56,4 +56,24 @@ describe("unittests:: tsserver:: codeFix::", () => {
});
baselineTsserverLogs("codeFix", "install package when serialized", session);
});

it("install package rejects invalid package names", () => {
const { host, session } = setup();
// A client could craft an applyCodeActionCommand with arbitrary package names.
// The server must validate and reject names with invalid characters to prevent shell injection.
for (const packageName of ["; echo 'hello' #", "react'test", "a/b/c"]) {
session.executeCommandSeq<ts.server.protocol.ApplyCodeActionCommandRequest>({
command: ts.server.protocol.CommandTypes.ApplyCodeActionCommand,
arguments: {
command: {
type: "install package",
file: "/home/src/projects/project/src/file.ts",
packageName,
},
},
});
}
host.runPendingInstalls();
baselineTsserverLogs("codeFix", "install package rejects invalid package names", session);
});
});
16 changes: 16 additions & 0 deletions src/typingsInstallerCore/typingsInstaller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,22 @@ export abstract class TypingsInstaller {
/** @internal */
installPackage(req: InstallPackageRequest): void {
const { fileName, packageName, projectName, projectRootPath, id } = req;
const validationResult = JsTyping.validatePackageName(packageName);
if (validationResult !== JsTyping.NameValidationResult.Ok) {
const message = JsTyping.renderPackageNameValidationFailure(validationResult, packageName);
if (this.log.isEnabled()) {
this.log.writeLine(message);
}
const response: PackageInstalledResponse = {
kind: ActionPackageInstalled,
projectName,
id,
success: false,
message,
};
this.sendResponse(response);
return;
}
const cwd = forEachAncestorDirectory(getDirectoryPath(fileName), directory => {
if (this.installTypingHost.fileExists(combinePaths(directory, "package.json"))) {
return directory;
Expand Down
Loading
Loading