net.urllib: fix parsing url error, when querypath is '//' (fix #20476) (

#20504)
vlang · Jan 12, 2024 · abc9e06 · abc9e06
1 parent 62872c6
commit abc9e06
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 1 deletion.
diff --git a/vlib/net/urllib/urllib.v b/vlib/net/urllib/urllib.v
@@ -512,7 +512,8 @@ fn parse_url(rawurl string, via_request bool) !URL {
 				''))
 		}
 	}
-	if ((url.scheme != '' || !via_request) && !rest.starts_with('///')) && rest.starts_with('//') {
+	if ((url.scheme != '' || !via_request) && !rest.starts_with('///')) && rest.starts_with('//')
+		&& rest.len > 2 {
 		authority, r := split(rest[2..], `/`, false)
 		rest = r
 		a := parse_authority(authority)!

diff --git a/vlib/net/urllib/urllib_test.v b/vlib/net/urllib/urllib_test.v
@@ -122,3 +122,9 @@ fn test_parse() {
 		}
 	}
 }
+
+fn test_parse_slashes() {
+	assert urllib.parse('/')!.str() == '/'
+	assert urllib.parse('//')!.str() == '//'
+	assert urllib.parse('///')!.str() == '///'
+}
diff --git a/vlib/vweb/tests/vweb_test.v b/vlib/vweb/tests/vweb_test.v
@@ -339,3 +339,16 @@ ${config.content}'
 	}
 	return read.bytestr()
 }
+
+// for issue 20476
+// phenomenon: parsing url error when querypath is `//`
+fn test_empty_querypath() {
+	mut x := http.get('http://${localserver}') or { panic(err) }
+	assert x.body == 'Welcome to VWeb'
+	x = http.get('http://${localserver}/') or { panic(err) }
+	assert x.body == 'Welcome to VWeb'
+	x = http.get('http://${localserver}//') or { panic(err) }
+	assert x.body == 'Welcome to VWeb'
+	x = http.get('http://${localserver}///') or { panic(err) }
+	assert x.body == 'Welcome to VWeb'
+}