storage/plugins/CurlStorage: URL-encode paths in CurlStorage::MapUTF8

When using a database that was not created with a WebDAV music_directory (i.e., if using a remote database, on which updates happen locally) and using the Curl storage plugin, MPD would previously send GET requests that had unescaped spaces in them. This change uses Curl's URL-encode API to solve this.

storage/plugins/CurlStorage: URL-encode paths in CurlStorage::MapUTF8
29f78b18 · Joshua Wise · Max Kellermann · 147872fe · 29f78b18 · 29f78b18
Commit 29f78b18 authored Aug 17, 2018 by Joshua Wise Committed by Max Kellermann Aug 17, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 14 additions and 2 deletions

NEWS NEWS +2 -0

CurlStorage.cxx src/storage/plugins/CurlStorage.cxx +12 -2

No files found.
--- a/NEWS
+++ b/NEWS
 ver 0.20.22 (not yet released)
+* storage
+  - curl: URL-encode paths

 ver 0.20.21 (2018/08/17)
 * database

--- a/src/storage/plugins/CurlStorage.cxx
+++ b/src/storage/plugins/CurlStorage.cxx
@@ -34,6 +34,7 @@
 #include "thread/Mutex.hxx"
 #include "thread/Cond.hxx"
 #include "util/ASCII.hxx"
+#include "util/IterableSplitString.hxx"
 #include "util/RuntimeError.hxx"
 #include "util/StringCompare.hxx"
 #include "util/StringFormat.hxx"
@@ -79,9 +80,18 @@ CurlStorage::MapUTF8(const char *uri_utf8) const noexcept
 	if (StringIsEmpty(uri_utf8))
 		return base;

-	// TODO: escape the given URI
+	CurlEasy easy;
+	std::string path_esc;
+
+	for (auto elt: IterableSplitString(uri_utf8, '/')) {
+		char *elt_esc = easy.Escape(elt.data, elt.size);
+		if (!path_esc.empty())
+			path_esc.push_back('/');
+		path_esc += elt_esc;
+		curl_free(elt_esc);
+	}

-	return PathTraitsUTF8::Build(base.c_str(), uri_utf8);
+	return PathTraitsUTF8::Build(base.c_str(), path_esc.c_str());
 }

 const char *