Merge pull request #1390 from gavin-ts/improve-tooltip-url-check

compiler: improve tooltip url check
terrastruct · Jun 9, 2023 · f561b83 · f561b83
2 parents 5c49761 + 2f10721
commit f561b83
Show file tree

Hide file tree

Showing 4 changed files with 193 additions and 2 deletions.
diff --git a/ci/release/changelogs/next.md b/ci/release/changelogs/next.md
@@ -2,4 +2,6 @@
 
 #### Improvements 🧹
 
+- Improves compiler's tooltip URL check. [#1390](https://github.com/terrastruct/d2/pull/1390)
+
 #### Bugfixes ⛑️
diff --git a/d2compiler/compile.go b/d2compiler/compile.go
@@ -533,8 +533,8 @@ func (c *compiler) compileReserved(attrs *d2graph.Attributes, f *d2ir.Field) {
 	}
 
 	if attrs.Link != nil && attrs.Tooltip != nil {
-		_, err := url.ParseRequestURI(attrs.Tooltip.Value)
-		if err == nil {
+		u, err := url.ParseRequestURI(attrs.Tooltip.Value)
+		if err == nil && u.Host != "" {
 			c.errorf(scalar, "Tooltip cannot be set to URL when link is also set (for security)")
 		}
 	}

diff --git a/d2compiler/compile_test.go b/d2compiler/compile_test.go
@@ -1505,6 +1505,11 @@ x -> y: {
 			text:   `x: {link: https://not-google.com; tooltip: https://google.com}`,
 			expErr: `d2/testdata/d2compiler/TestCompile/no_url_link_and_url_tooltip_concurrently.d2:1:44: Tooltip cannot be set to URL when link is also set (for security)`,
 		},
+		{
+			name:   "url_link_non_url_tooltip_ok",
+			text:   `x: {link: https://not-google.com; tooltip: note: url.ParseRequestURI might see this as a URL}`,
+			expErr: ``,
+		},
 		{
 			name: "url_link_and_not_url_tooltip_concurrently",
 			text: `x: {link: https://google.com; tooltip: hello world}`,

diff --git a/testdata/d2compiler/TestCompile/url_link_non_url_tooltip_ok.exp.json b/testdata/d2compiler/TestCompile/url_link_non_url_tooltip_ok.exp.json
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,6 @@

		#### Improvements 🧹

		- Improves compiler's tooltip URL check. [#1390](https://github.com/terrastruct/d2/pull/1390)

		#### Bugfixes ⛑️