fix: Improve set_port validation

src/url.cpp

@@ -782,12 +782,24 @@ bool url::set_port(const std::string_view input) {
     port = std::nullopt;
     return true;
   }
+
+  if (!ada::unicode::is_ascii_digit(trimmed.front())) {
+    return false;
+  }
+
+  auto non_digit_pos = std::find_if_not(trimmed.begin(), trimmed.end(),
+                                        ada::unicode::is_ascii_digit);
+  if (non_digit_pos != trimmed.end()) {
+    trimmed.erase(non_digit_pos, trimmed.end());
+  }
+
   // Input should not start with control characters.
   if (ada::unicode::is_c0_control_or_space(trimmed.front())) {
     return false;
   }
-  // Input should contain at least one ascii digit.
-  if (input.find_first_of("0123456789") == std::string_view::npos) {
+
+  // Input should contain ascii digits.
+  if (!std::ranges::all_of(trimmed, ada::unicode::is_ascii_digit)) {
     return false;
   }
 

src/url_aggregator.cpp

@@ -285,12 +285,24 @@ bool url_aggregator::set_port(const std::string_view input) {
     clear_port();
     return true;
   }
+
+  if (!ada::unicode::is_ascii_digit(trimmed.front())) {
+    return false;
+  }
+
+  auto non_digit_pos = std::find_if_not(trimmed.begin(), trimmed.end(),
+                                        ada::unicode::is_ascii_digit);
+  if (non_digit_pos != trimmed.end()) {
+    trimmed.erase(non_digit_pos, trimmed.end());
+  }
+
   // Input should not start with control characters.
   if (ada::unicode::is_c0_control_or_space(trimmed.front())) {
     return false;
   }
-  // Input should contain at least one ascii digit.
-  if (input.find_first_of("0123456789") == std::string_view::npos) {
+
+  // Input should contain ascii digits.
+  if (!std::ranges::all_of(trimmed, ada::unicode::is_ascii_digit)) {
     return false;
   }
 

tests/basic_tests.cpp

@@ -462,4 +462,13 @@ TYPED_TEST(basic_tests, negativeport) {
   auto url = ada::parse<TypeParam>("https://www.google.com");
   ASSERT_FALSE(url->set_port("-1"));
   SUCCEED();
-}
+}
+
+// https://github.com/ada-url/ada/issues/826
+TYPED_TEST(basic_tests, set_invalid_port) {
+  auto url = ada::parse<TypeParam>("fake://dummy.test");
+  ASSERT_TRUE(url);
+  ASSERT_FALSE(url->set_port("invalid80"));
+  ASSERT_TRUE(url->is_valid);
+  SUCCEED();
+}