oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Webdav href in response can be relative

Browse Source 
Fixed Webdav base path stripping in cases where href is a relative path.

Signed-off-by: Vincent Petry <PVince81@yahoo.fr>
This commit is contained in:
Vincent Petry 2021-01-04 21:50:03 +01:00
parent b7d0001390
commit 216f62ea14
No known key found for this signature in database
GPG Key ID: E055D6A4D513575C
1 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/storage/plugins/CurlStorage.cxx
View File

@ -468,11 +468,19 @@ CurlStorage::GetInfo(std::string_view uri_utf8, [[maybe_unused]] bool follow)
gcc_pure gcc_pure
static std::string_view static std::string_view
UriPathOrSlash(const char *uri) noexcept UriPathOrSlash(const char *uri, bool relative) noexcept
{ {
auto path = uri_get_path(uri); auto path = uri_get_path(uri);
if (path.data() == nullptr) if (path.data() == nullptr)
path = "/"; path = "/";
else if (relative) {
// search after first slash
path = path.substr(1);
auto slash = path.find('/');
if (slash != std::string_view::npos)
path = path.substr(slash);
}
return path; return path;
} }
@ -481,13 +489,15 @@ UriPathOrSlash(const char *uri) noexcept
*/ */
class HttpListDirectoryOperation final : public PropfindOperation { class HttpListDirectoryOperation final : public PropfindOperation {
const std::string base_path; const std::string base_path;
const std::string base_path_relative;
MemoryStorageDirectoryReader::List entries; MemoryStorageDirectoryReader::List entries;
public: public:
HttpListDirectoryOperation(CurlGlobal &curl, const char *uri) HttpListDirectoryOperation(CurlGlobal &curl, const char *uri)
:PropfindOperation(curl, uri, 1), :PropfindOperation(curl, uri, 1),
base_path(CurlUnescape(GetEasy(), UriPathOrSlash(uri))) {} base_path(CurlUnescape(GetEasy(), UriPathOrSlash(uri, false))),
base_path_relative(CurlUnescape(GetEasy(), UriPathOrSlash(uri, true))) {}
std::unique_ptr<StorageDirectoryReader> Perform() { std::unique_ptr<StorageDirectoryReader> Perform() {
DeferStart(); DeferStart();
@ -506,6 +516,7 @@ private:
*/ */
gcc_pure gcc_pure
StringView HrefToEscapedName(const char *href) const noexcept { StringView HrefToEscapedName(const char *href) const noexcept {
StringView relative_path;
StringView path = uri_get_path(href); StringView path = uri_get_path(href);
if (path == nullptr) if (path == nullptr)
return nullptr; return nullptr;
@ -513,17 +524,23 @@ private:
/* kludge: ignoring case in this comparison to avoid /* kludge: ignoring case in this comparison to avoid
false negatives if the web server uses a different false negatives if the web server uses a different
case */ case */
path = StringAfterPrefixIgnoreCase(path, base_path.c_str()); relative_path = StringAfterPrefixIgnoreCase(path, base_path.c_str());
if (path == nullptr || path.empty()) if (relative_path == nullptr || relative_path.empty()) {
return nullptr; // try relative base path
relative_path = StringAfterPrefixIgnoreCase(path, base_path_relative.c_str());
}
const char *slash = path.Find('/'); if (relative_path == nullptr || relative_path.empty()) {
return nullptr;
}
const char *slash = relative_path.Find('/');
if (slash == nullptr) if (slash == nullptr)
/* regular file */ /* regular file */
return path; return relative_path;
else if (slash == &path.back()) else if (slash == &relative_path.back())
/* trailing slash: collection; strip the slash */ /* trailing slash: collection; strip the slash */
return {path.data, slash}; return {relative_path.data, slash};
else else
/* strange, better ignore it */ /* strange, better ignore it */
return nullptr; return nullptr;