Correctly canonicalize relative URIs that do not begin with /

Signed-off-by: Juan Cruz Viotti <[email protected]>
sourcemeta · Nov 4, 2024 · 07b0bcf · 07b0bcf
1 parent 3b644bf
commit 07b0bcf
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/src/uri/uri.cc b/src/uri/uri.cc
@@ -93,7 +93,8 @@ static auto canonicalize_path(const std::string &path, const bool is_relative)
 
   // Reconstruct the canonical path
   std::string canonical_path;
-  std::string separator = is_relative ? "/" : "";
+  std::string separator = (is_relative && !has_leading_with_word) ? "/" : "";
+
   for (const auto &seg : segments) {
     canonical_path += separator + seg;
     separator = "/";

diff --git a/test/uri/uri_canonicalize_test.cc b/test/uri/uri_canonicalize_test.cc
@@ -77,7 +77,13 @@ TEST(URI_canonicalize, example_relative_1) {
 TEST(URI_canonicalize, example_relative_2) {
   sourcemeta::jsontoolkit::URI uri{"./foo"};
   uri.canonicalize();
-  EXPECT_EQ(uri.recompose(), "/foo");
+  EXPECT_EQ(uri.recompose(), "foo");
+}
+
+TEST(URI_canonicalize, example_relative_3) {
+  sourcemeta::jsontoolkit::URI uri{"foo"};
+  uri.canonicalize();
+  EXPECT_EQ(uri.recompose(), "foo");
 }
 
 TEST(URI_canonicalize, example_12) {