Merge pull request #8845 from cole-h/fix-double-percent-encoding

libutil: fix double-encoding of URLs

src/libexpr/tests/flakeref.cc

@@ -0,0 +1,22 @@
+#include <gtest/gtest.h>
+
+#include "flake/flakeref.hh"
+
+namespace nix {
+
+/* ----------- tests for flake/flakeref.hh --------------------------------------------------*/
+
+ /* ----------------------------------------------------------------------------
+ * to_string
+ * --------------------------------------------------------------------------*/
+
+ TEST(to_string, doesntReencodeUrl) {
+ auto s = "https://localhost:8181/test/+3d.tar.gz";
+ auto flakeref = parseFlakeRef(s);
+ auto parsed = flakeref.to_string();
+ auto expected = "https://localhost:8181/test/%2B3d.tar.gz";
+
+ ASSERT_EQ(parsed, expected);
+ }
+
+}

src/libutil/url.cc

@@ -44,7 +44,7 @@ ParsedURL parseURL(const std::string & url)
  .base = base,
  .scheme = scheme,
  .authority = authority,
- .path = path,
+ .path = percentDecode(path),
  .query = decodeQuery(query),
  .fragment = percentDecode(std::string(fragment))
  };