mrva/vscode-codeql
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Validate user input for "owner/repo"

Browse Source
This commit is contained in:
shati-patel
2021-08-12 18:16:09 +01:00
committed by Shati Patel
parent b1f426672c
commit 10b4e08bf8
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
extensions/ql-vscode/src/config.ts
View File

@@ -292,14 +292,13 @@ export function isCanary() {
*/ */
export const NO_CACHE_AST_VIEWER = new Setting('disableCache', AST_VIEWER_SETTING); export const NO_CACHE_AST_VIEWER = new Setting('disableCache', AST_VIEWER_SETTING);
/* /**
* Lists of GitHub repositories that you want to query remotely via the "Run Remote query" command. * Lists of GitHub repositories that you want to query remotely via the "Run Remote query" command.
* Note: This command is only available for internal users. * Note: This command is only available for internal users.
* *
* This setting should be a JSON object where each key is a user-specified name (string), * This setting should be a JSON object where each key is a user-specified name (string),
* and the value is an array of GitHub repositories (of the form `<owner>/<repo>`). * and the value is an array of GitHub repositories (of the form `<owner>/<repo>`).
*/ */
const REMOTE_REPO_LISTS = new Setting('remoteRepositoryLists', ROOT_SETTING); const REMOTE_REPO_LISTS = new Setting('remoteRepositoryLists', ROOT_SETTING);
export function getRemoteRepositoryLists(): Record<string, string[]> | undefined { export function getRemoteRepositoryLists(): Record<string, string[]> | undefined {

6
extensions/ql-vscode/src/run-remote-query.ts
View File

@@ -69,7 +69,7 @@ async function getRepositories(): Promise<string[] | undefined> {
placeHolder: 'Select a repository list. You can define repository lists in the `codeQL.remoteRepositoryLists` setting.', placeHolder: 'Select a repository list. You can define repository lists in the `codeQL.remoteRepositoryLists` setting.',
ignoreFocusOut: true, ignoreFocusOut: true,
}); });
if (quickpick && quickpick.repoList.length > 0) { if (quickpick?.repoList.length) {
void logger.log(`Selected repositories: ${quickpick.repoList}`); void logger.log(`Selected repositories: ${quickpick.repoList}`);
return quickpick.repoList; return quickpick.repoList;
} else { } else {
@@ -78,6 +78,7 @@ async function getRepositories(): Promise<string[] | undefined> {
} }
} else { } else {
void logger.log('No repository lists defined. Displaying text input box.'); void logger.log('No repository lists defined. Displaying text input box.');
const repoRegex = /^(?:[a-zA-Z0-9]+-?)*[a-zA-Z0-9]\/[a-zA-Z0-9-_]+$/;
const remoteRepo = await window.showInputBox({ const remoteRepo = await window.showInputBox({
title: 'Enter a GitHub repository in the format <owner>/<repo> (e.g. github/codeql)', title: 'Enter a GitHub repository in the format <owner>/<repo> (e.g. github/codeql)',
placeHolder: '<owner>/<repo>', placeHolder: '<owner>/<repo>',
@@ -87,6 +88,9 @@ async function getRepositories(): Promise<string[] | undefined> {
if (!remoteRepo) { if (!remoteRepo) {
void showAndLogErrorMessage('No repositories entered.'); void showAndLogErrorMessage('No repositories entered.');
return; return;
} else if (!repoRegex.test(remoteRepo)) { // Check if user entered invalid input
void showAndLogErrorMessage('Invalid repository format. Must be in the format <owner>/<repo> (e.g. github/codeql)');
return;
} }
void logger.log(`Entered repository: ${remoteRepo}`); void logger.log(`Entered repository: ${remoteRepo}`);
return [remoteRepo]; return [remoteRepo];