Changes requested from PR

Author: jrozner

extensions/ql-vscode/package.json

@@ -294,10 +294,10 @@
           "minimum": 0,
           "description": "Report a warning for any join order whose metric exceeds this value."
         },
-        "codeQL.allowHttp": {
+        "codeQL.databaseDownload.allowHttp": {
           "type": "boolean",
           "default": false,
-          "description": "Allow databased to be downloaded via HTTP"
+          "description": "Allow databased to be downloaded via HTTP. Warning: enabling this option will allow downloading from insecure servers."
         }
       }
     },

extensions/ql-vscode/src/config.ts

@@ -609,10 +609,9 @@ export function isCodespacesTemplate() {
   return !!CODESPACES_TEMPLATE.getValue<boolean>();
 }
 
-export const ALLOW_HTTP = new Setting(
-  "allowHttp",
-  ROOT_SETTING,
-);
+const DATABASE_DOWNLOAD_SETTING = new Setting("databaseDownload", ROOT_SETTING);
+
+export const ALLOW_HTTP_SETTING = new Setting("allowHttp", DATABASE_DOWNLOAD_SETTING);
 
 export function allowHttp(): boolean {
   return ALLOW_HTTP.getValue<boolean>() || false;

extensions/ql-vscode/src/databaseFetcher.ts

@@ -27,7 +27,7 @@ import {
 } from "./common/github-url-identifier-helper";
 import { Credentials } from "./common/authentication";
 import { AppCommandManager } from "./common/commands";
-import { ALLOW_HTTP } from "./config";
+import { ALLOW_HTTP_SETTING } from "./config";
 
 /**
  * Prompts a user to fetch a database from a remote location. Database is assumed to be an archive file.
@@ -50,9 +50,7 @@ export async function promptImportInternetDatabase(
     return;
   }
 
-  if (!ALLOW_HTTP.getValue()) {
-    validateHttpsUrl(databaseUrl);
-  }
+  validateUrl(databaseUrl);
 
   const item = await databaseArchiveFetcher(
     databaseUrl,
@@ -359,15 +357,15 @@ async function getStorageFolder(storagePath: string, urlStr: string) {
   return folderName;
 }
 
-function validateHttpsUrl(databaseUrl: string) {
+function validateUrl(databaseUrl: string) {
   let uri;
   try {
     uri = Uri.parse(databaseUrl, true);
   } catch (e) {
     throw new Error(`Invalid url: ${databaseUrl}`);
   }
 
-  if (uri.scheme !== "https") {
+  if (!ALLOW_HTTP_SETTING.getValue() && uri.scheme !== "https") {
     throw new Error("Must use https for downloading a database.");
   }
 }