chore: fixed webview errors in tests (#724)

JohnstonCode · Nov 9, 2019 · 0bac1a3 · 0bac1a3
1 parent 1bc1d9e
commit 0bac1a3
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 12 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -58,10 +58,10 @@
     "@semantic-release/git": "^7.0.16",
     "@types/glob": "^7.1.1",
     "@types/mocha": "^5.2.7",
-    "@types/node": "8.9.5",
+    "@types/node": "^12.11.7",
     "@types/semver": "^6.0.0",
     "@types/tmp": "0.1.0",
-    "@types/vscode": "1.26.0",
+    "@types/vscode": "1.40.0",
     "@types/xml2js": "^0.4.4",
     "@typescript-eslint/eslint-plugin": "^2.5.0",
     "@typescript-eslint/parser": "^2.5.0",
@@ -85,8 +85,7 @@
   },
   "greenkeeper": {
     "ignore": [
-      "@types/node",
-      "@types/vscode"
+      "@types/node"
     ]
   },
   "contributes": {

diff --git a/src/messages.ts b/src/messages.ts
@@ -48,9 +48,10 @@ async function showCommitInput(message?: string, filePaths?: string[]) {
       }
     );
 
-    const styleUri = Uri.file(
+    const stylePathOnDisk = Uri.file(
       path.join(__dirname, "..", "css", "commit-message.css")
-    ).with({ scheme: "vscode-resource" });
+    );
+    const styleUri = panel.webview.asWebviewUri(stylePathOnDisk);
 
     let beforeForm = "";
     if (filePaths && filePaths.length) {
@@ -72,6 +73,13 @@ async function showCommitInput(message?: string, filePaths?: string[]) {
 <head>
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+  <!--
+  Use a content security policy to only allow loading images from https or from our extension directory,
+  and only allow scripts that have a specific nonce.
+  -->
+  <meta http-equiv="Content-Security-Policy" content="default-src 'none'; img-src ${panel.webview.cspSource} https:; script-src ${panel.webview.cspSource}; style-src ${panel.webview.cspSource};">
+
   <title>Commit Message</title>
   <link rel="stylesheet" href="${styleUri}">
 </head>