Fix various URI resolution bugs (#2278)

Signed-off-by: Juan Cruz Viotti <[email protected]>

Author: jviotti

src/core/uri/resolution.cc

@@ -202,11 +202,19 @@ auto URI::relative_to(const URI &base) -> URI & {
     return *this;
   }
 
-  // Hosts must match (but both can be null for URNs)
+  // The full authority must match (but components can be null for URNs)
+  if (this->userinfo_ != base.userinfo_) {
+    return *this;
+  }
+
   if (this->host_ != base.host_) {
     return *this;
   }
 
+  if (this->port_ != base.port_) {
+    return *this;
+  }
+
   // Special case: both URIs are exactly the same
   if (this->path_ == base.path_ && this->query_ == base.query_ &&
       this->fragment_ == base.fragment_) {

test/uri/uri_relative_to_test.cc

@@ -58,6 +58,27 @@ TEST(URI_relative_to, absolute_absolute_base_false_4) {
   EXPECT_EQ(uri.recompose(), "https://bar.com");
 }
 
+TEST(URI_relative_to, absolute_absolute_base_false_different_ports) {
+  const sourcemeta::core::URI base{"http://localhost:8000"};
+  sourcemeta::core::URI uri{"http://localhost:9000/schemas/test.json"};
+  uri.relative_to(base);
+  EXPECT_EQ(uri.recompose(), "http://localhost:9000/schemas/test.json");
+}
+
+TEST(URI_relative_to, absolute_absolute_base_false_different_userinfo) {
+  const sourcemeta::core::URI base{"https://[email protected]/foo"};
+  sourcemeta::core::URI uri{"https://[email protected]/foo/bar"};
+  uri.relative_to(base);
+  EXPECT_EQ(uri.recompose(), "https://[email protected]/foo/bar");
+}
+
+TEST(URI_relative_to, absolute_absolute_base_false_userinfo_vs_none) {
+  const sourcemeta::core::URI base{"https://example.com/foo"};
+  sourcemeta::core::URI uri{"https://[email protected]/foo/bar"};
+  uri.relative_to(base);
+  EXPECT_EQ(uri.recompose(), "https://[email protected]/foo/bar");
+}
+
 TEST(URI_relative_to, absolute_relative_1) {
   const sourcemeta::core::URI base{"https://www.example.com"};
   sourcemeta::core::URI uri{"foo"};