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

Use uri_has_scheme for Webdav response href 

Use uri_has_scheme to find out if the href in Webdav responses is absolute
to use the matching base path extraction.

Signed-off-by: Vincent Petry <PVince81@yahoo.fr>
This commit is contained in:
Vincent Petry 2021-01-05 12:04:08 +01:00
parent 216f62ea14
commit 74b2fc7fdc
No known key found for this signature in database
GPG Key ID: E055D6A4D513575C
3 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -516,7 +516,6 @@ private:
*/
gcc_pure
StringView HrefToEscapedName(const char *href) const noexcept {
StringView relative_path;
StringView path = uri_get_path(href);
if (path == nullptr)
return nullptr;
@ -524,23 +523,23 @@ private:
/* kludge: ignoring case in this comparison to avoid
false negatives if the web server uses a different
case */
relative_path = StringAfterPrefixIgnoreCase(path, base_path.c_str());
if (relative_path == nullptr || relative_path.empty()) {
// try relative base path
relative_path = StringAfterPrefixIgnoreCase(path, base_path_relative.c_str());
if (uri_has_scheme(path)) {
path = StringAfterPrefixIgnoreCase(path, base_path.c_str());
} else {
path = StringAfterPrefixIgnoreCase(path, base_path_relative.c_str());
}
if (relative_path == nullptr || relative_path.empty()) {
if (path == nullptr || path.empty()) {
return nullptr;
}
const char *slash = relative_path.Find('/');
const char *slash = path.Find('/');
if (slash == nullptr)
/* regular file */
return relative_path;
else if (slash == &relative_path.back())
return path;
else if (slash == &path.back())
/* trailing slash: collection; strip the slash */
return {relative_path.data, slash};
return {path.data, slash};
else
/* strange, better ignore it */
return nullptr;

2
src/util/UriExtract.cxx
View File

@ -85,7 +85,7 @@ uri_after_scheme(std::string_view uri) noexcept
}
bool
uri_has_scheme(const char *uri) noexcept
uri_has_scheme(std::string_view uri) noexcept
{
return !uri_get_scheme(uri).empty();
}

2
src/util/UriExtract.hxx
View File

@ -40,7 +40,7 @@
*/
gcc_pure
bool
uri_has_scheme(const char *uri) noexcept;
uri_has_scheme(std::string_view uri) noexcept;
/**
* Returns the scheme name of the specified URI, or an empty string.