fixup: don't allow ~.'()*+,; and ' ' on url utils

Author: martinsaposnic

lightning-liquidity/src/lsps5/url_utils.rs

@@ -83,21 +83,11 @@ impl LSPSUrl {
 
 	fn is_valid_url_char(c: char) -> bool {
 		c.is_ascii_alphanumeric()
-			|| matches!(
-				c,
-				':' | '/'
-					| '.' | '@' | '?'
-					| '#' | '%' | '-'
-					| '_' | '~' | '!'
-					| '$' | '&' | '\''
-					| '(' | ')' | '*'
-					| '+' | ',' | ';'
-					| '=' | ' '
-			)
+			|| matches!(c, ':' | '/' | '.' | '@' | '?' | '#' | '%' | '-' | '_' | '&' | '=')
 	}
 
 	fn is_valid_host_char(c: char) -> bool {
-		c.is_ascii_alphanumeric() || matches!(c, '.' | '-' | ':')
+		c.is_ascii_alphanumeric() || matches!(c, '.' | '-' | ':' | '_')
 	}
 }
 
@@ -138,8 +128,9 @@ mod tests {
 			"https://example.com/search?q=test#results",
 			"https://user:[email protected]/",
 			"https://192.168.1.1/admin",
-			"https://example.com/path with spaces",
 			"https://example.com://path",
+			"https://example.com/path%20with%20spaces",
+			"https://example_example.com/path?query=with&spaces=true",
 		];
 		for url_str in test_vec {
 			let url = LSPSUrl::parse(url_str.to_string());
@@ -160,6 +151,7 @@ mod tests {
 			"a123+-.://example.com",
 			"https:\\\\example.com\\path",
 			"https:///whatever",
+			"https://example.com/path with spaces",
 		];
 		for url_str in test_vec {
 			let url = LSPSUrl::parse(url_str.to_string());
@@ -206,9 +198,9 @@ mod tests {
 		fn proptest_parse_round_trip(
 			host in host_strategy(),
 			port in proptest::option::of(0u16..=65535u16),
-			path in proptest::option::of(proptest::string::string_regex("[a-zA-Z0-9._~%!$&()*+,;=:@/-]{0,20}").unwrap()),
-			query in proptest::option::of(proptest::string::string_regex("[a-zA-Z0-9._~%!$&()*+,;=:@/-]{0,20}").unwrap()),
-			fragment in proptest::option::of(proptest::string::string_regex("[a-zA-Z0-9._~%!$&()*+,;=:@/-]{0,20}").unwrap())
+			path in proptest::option::of(proptest::string::string_regex("[a-zA-Z0-9._%&=:@/-]{0,20}").unwrap()),
+			query in proptest::option::of(proptest::string::string_regex("[a-zA-Z0-9._%&=:@/-]{0,20}").unwrap()),
+			fragment in proptest::option::of(proptest::string::string_regex("[a-zA-Z0-9._%&=:@/-]{0,20}").unwrap())
 		) {
 			let mut url = format!("https://{}", host);
 			if let Some(p) = port {