Bump version, changelog for 1.25.2 and cherry pick #3983 (#3984)

* Bump version, changelog for 1.25.2 * Enable only `revealFileInOS` command for container tooltips
microsoft · Jun 28, 2023 · eb247cb · eb247cb
1 parent 2558764
commit eb247cb
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.25.2 - 23 June 2023
+### Fixed
+* Fixed a potential security issue involving Markdown tooltips for containers. [#3983](https://github.com/microsoft/vscode-docker/pull/3983)
+
 ## 1.25.1 - 16 May 2023
 ### Fixed
 * The extension was not activating when a Dockerfile was opened. [#3928](https://github.com/microsoft/vscode-docker/pull/3928)

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "vscode-docker",
-    "version": "1.25.1",
+    "version": "1.25.2",
     "publisher": "ms-azuretools",
     "displayName": "Docker",
     "description": "Makes it easy to create, manage, and debug containerized applications.",

diff --git a/src/tree/resolveTooltipMarkdown.ts b/src/tree/resolveTooltipMarkdown.ts
@@ -13,7 +13,7 @@ export async function resolveTooltipMarkdown(templateString: string, context: un
 
     const markdownString = template(context);
     const result = new MarkdownString(markdownString, true);
-    result.isTrusted = true;
+    result.isTrusted = { enabledCommands: ['revealFileInOS'] }; // revealFileInOS is used in container tooltips
     return result;
 }