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

case-insensitive URI scheme comparison 

Required according to RFC 3986:

> An implementation should accept uppercase letters as equivalent to
> lowercase in scheme names

Closes #330
This commit is contained in:
Max Kellermann 2018-08-02 10:38:20 +02:00
parent 116edf5fce
commit 906972973e
17 changed files with 45 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -5,6 +5,7 @@ ver 0.20.21 (not yet released)
- simple: allow .mpdignore comments only at start of line
* output
- httpd: remove broken DLNA support code
* URI schemes are case insensitive
ver 0.20.20 (2018/05/22)
* protocol

4
src/LocateUri.cxx
View File

@ -23,7 +23,7 @@
#include "fs/AllocatedPath.hxx"
#include "ls.hxx"
#include "util/UriUtil.hxx"
#include "util/StringCompare.hxx"
#include "util/ASCII.hxx"
#ifdef ENABLE_DATABASE
#include "storage/StorageInterface.hxx"
@ -83,7 +83,7 @@ LocateUri(const char *uri, const Client *client
)
{
/* skip the obsolete "file://" prefix */
const char *path_utf8 = StringAfterPrefix(uri, "file://");
const char *path_utf8 = StringAfterPrefixCaseASCII(uri, "file://");
if (path_utf8 != nullptr) {
if (!PathTraitsUTF8::IsAbsolute(path_utf8))
throw std::runtime_error("Malformed file:// URI");

6
src/input/InputStream.cxx
View File

@ -20,7 +20,7 @@
#include "config.h"
#include "InputStream.hxx"
#include "thread/Cond.hxx"
#include "util/StringCompare.hxx"
#include "util/ASCII.hxx"
#include <stdexcept>
@ -77,8 +77,8 @@ gcc_pure
static bool
ExpensiveSeeking(const char *uri) noexcept
{
return StringStartsWith(uri, "http://") ||
StringStartsWith(uri, "https://");
return StringStartsWithCaseASCII(uri, "http://") ||
StringStartsWithCaseASCII(uri, "https://");
}
bool

4
src/input/plugins/AlsaInputPlugin.cxx
View File

@ -33,7 +33,7 @@
#include "util/RuntimeError.hxx"
#include "util/StringCompare.hxx"
#include "util/ReusableArray.hxx"
#include "util/ASCII.hxx"
#include "Log.hxx"
#include "event/MultiSocketMonitor.hxx"
#include "event/DeferredMonitor.hxx"
@ -147,7 +147,7 @@ private:
inline InputStream *
AlsaInputStream::Create(const char *uri, Mutex &mutex, Cond &cond)
{
const char *device = StringAfterPrefix(uri, "alsa://");
const char *device = StringAfterPrefixCaseASCII(uri, "alsa://");
if (device == nullptr)
return nullptr;

4
src/input/plugins/CdioParanoiaInputPlugin.cxx
View File

@ -26,7 +26,7 @@
#include "../InputStream.hxx"
#include "../InputPlugin.hxx"
#include "util/StringUtil.hxx"
#include "util/StringCompare.hxx"
#include "util/ASCII.hxx"
#include "util/RuntimeError.hxx"
#include "util/Domain.hxx"
#include "system/ByteOrder.hxx"
@ -128,7 +128,7 @@ struct cdio_uri {
static bool
parse_cdio_uri(struct cdio_uri *dest, const char *src)
{
if (!StringStartsWith(src, "cdda://"))
if (!StringStartsWithCaseASCII(src, "cdda://"))
return false;
src += 7;

4
src/input/plugins/CurlInputPlugin.cxx
View File

@ -458,8 +458,8 @@ CurlInputStream::Open(const char *url, Mutex &mutex, Cond &cond)
static InputStream *
input_curl_open(const char *url, Mutex &mutex, Cond &cond)
{
if (strncmp(url, "http://", 7) != 0 &&
strncmp(url, "https://", 8) != 0)
if (!StringStartsWithCaseASCII(url, "http://") &&
!StringStartsWithCaseASCII(url, "https://"))
return nullptr;
return CurlInputStream::Open(url, mutex, cond);

14
src/input/plugins/FfmpegInputPlugin.cxx
View File

@ -28,7 +28,7 @@
#include "../InputStream.hxx"
#include "../InputPlugin.hxx"
#include "PluginUnavailable.hxx"
#include "util/StringCompare.hxx"
#include "util/ASCII.hxx"
extern "C" {
#include <libavformat/avio.h>
@ -85,12 +85,12 @@ static InputStream *
input_ffmpeg_open(const char *uri,
Mutex &mutex, Cond &cond)
{
if (!StringStartsWith(uri, "gopher://") &&
!StringStartsWith(uri, "rtp://") &&
!StringStartsWith(uri, "rtsp://") &&
!StringStartsWith(uri, "rtmp://") &&
!StringStartsWith(uri, "rtmpt://") &&
!StringStartsWith(uri, "rtmps://"))
if (!StringStartsWithCaseASCII(uri, "gopher://") &&
!StringStartsWithCaseASCII(uri, "rtp://") &&
!StringStartsWithCaseASCII(uri, "rtsp://") &&
!StringStartsWithCaseASCII(uri, "rtmp://") &&
!StringStartsWithCaseASCII(uri, "rtmpt://") &&
!StringStartsWithCaseASCII(uri, "rtmps://"))
return nullptr;
AVIOContext *h;

10
src/input/plugins/MmsInputPlugin.cxx
View File

@ -22,7 +22,7 @@
#include "input/ThreadInputStream.hxx"
#include "input/InputPlugin.hxx"
#include "system/Error.hxx"
#include "util/StringCompare.hxx"
#include "util/ASCII.hxx"
#include <libmms/mmsx.h>
@ -74,10 +74,10 @@ static InputStream *
input_mms_open(const char *url,
Mutex &mutex, Cond &cond)
{
if (!StringStartsWith(url, "mms://") &&
!StringStartsWith(url, "mmsh://") &&
!StringStartsWith(url, "mmst://") &&
!StringStartsWith(url, "mmsu://"))
if (!StringStartsWithCaseASCII(url, "mms://") &&
!StringStartsWithCaseASCII(url, "mmsh://") &&
!StringStartsWithCaseASCII(url, "mmst://") &&
!StringStartsWithCaseASCII(url, "mmsu://"))
return nullptr;
auto m = new MmsInputStream(url, mutex, cond);

6
src/input/plugins/NfsInputPlugin.cxx
View File

@ -23,9 +23,7 @@
#include "../InputPlugin.hxx"
#include "lib/nfs/Glue.hxx"
#include "lib/nfs/FileReader.hxx"
#include "util/StringCompare.hxx"
#include <string.h>
#include "util/ASCII.hxx"
/**
* Do not buffer more than this number of bytes. It should be a
@ -219,7 +217,7 @@ static InputStream *
input_nfs_open(const char *uri,
Mutex &mutex, Cond &cond)
{
if (!StringStartsWith(uri, "nfs://"))
if (!StringStartsWithCaseASCII(uri, "nfs://"))
return nullptr;
NfsInputStream *is = new NfsInputStream(uri, mutex, cond);

4
src/input/plugins/SmbclientInputPlugin.cxx
View File

@ -25,7 +25,7 @@
#include "../InputPlugin.hxx"
#include "PluginUnavailable.hxx"
#include "system/Error.hxx"
#include "util/StringCompare.hxx"
#include "util/ASCII.hxx"
#include <libsmbclient.h>
@ -87,7 +87,7 @@ static InputStream *
input_smbclient_open(const char *uri,
Mutex &mutex, Cond &cond)
{
if (!StringStartsWith(uri, "smb://"))
if (!StringStartsWithCaseASCII(uri, "smb://"))
return nullptr;
const std::lock_guard<Mutex> protect(smbclient_mutex);

4
src/lib/nfs/FileReader.cxx
View File

@ -24,7 +24,7 @@
#include "Connection.hxx"
#include "event/Call.hxx"
#include "IOThread.hxx"
#include "util/StringCompare.hxx"
#include "util/ASCII.hxx"
#include <utility>
@ -93,7 +93,7 @@ NfsFileReader::Open(const char *uri)
{
assert(state == State::INITIAL);
if (!StringStartsWith(uri, "nfs://"))
if (!StringStartsWithCaseASCII(uri, "nfs://"))
throw std::runtime_error("Malformed nfs:// URI");
uri += 6;

4
src/ls.cxx
View File

@ -20,7 +20,7 @@
#include "config.h"
#include "ls.hxx"
#include "client/Response.hxx"
#include "util/StringCompare.hxx"
#include "util/ASCII.hxx"
#include "util/UriUtil.hxx"
#include <assert.h>
@ -97,7 +97,7 @@ uri_supported_scheme(const char *uri) noexcept
assert(uri_has_scheme(uri));
while (*urlPrefixes) {
if (StringStartsWith(uri, *urlPrefixes))
if (StringStartsWithCaseASCII(uri, *urlPrefixes))
return true;
urlPrefixes++;
}

5
src/playlist/plugins/SoundCloudPlaylistPlugin.cxx
View File

@ -24,6 +24,7 @@
#include "config/Block.hxx"
#include "input/InputStream.hxx"
#include "tag/TagBuilder.hxx"
#include "util/ASCII.hxx"
#include "util/StringCompare.hxx"
#include "util/Alloc.hxx"
#include "util/Domain.hxx"
@ -68,7 +69,7 @@ soundcloud_resolve(const char* uri)
{
char *u, *ru;
if (StringStartsWith(uri, "https://")) {
if (StringStartsWithCaseASCII(uri, "https://")) {
u = xstrdup(uri);
} else if (StringStartsWith(uri, "soundcloud.com")) {
u = xstrcatdup("https://", uri);
@ -273,7 +274,7 @@ try {
static SongEnumerator *
soundcloud_open_uri(const char *uri, Mutex &mutex, Cond &cond)
{
assert(strncmp(uri, "soundcloud://", 13) == 0);
assert(StringEqualsCaseASCII(uri, "soundcloud://", 13));
uri += 13;
char *u = nullptr;

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

@ -33,6 +33,7 @@
#include "event/DeferredMonitor.hxx"
#include "thread/Mutex.hxx"
#include "thread/Cond.hxx"
#include "util/ASCII.hxx"
#include "util/RuntimeError.hxx"
#include "util/StringCompare.hxx"
#include "util/StringFormat.hxx"
@ -590,8 +591,8 @@ CurlStorage::OpenDirectory(const char *uri_utf8)
static Storage *
CreateCurlStorageURI(EventLoop &event_loop, const char *uri)
{
if (strncmp(uri, "http://", 7) != 0 &&
strncmp(uri, "https://", 8) != 0)
if (!StringStartsWithCaseASCII(uri, "http://") &&
!StringStartsWithCaseASCII(uri, "https://"))
return nullptr;
return new CurlStorage(event_loop, uri);

6
src/storage/plugins/NfsStorage.cxx
View File

@ -35,6 +35,7 @@
#include "event/Call.hxx"
#include "event/DeferredMonitor.hxx"
#include "event/TimeoutMonitor.hxx"
#include "util/ASCII.hxx"
#include "util/StringCompare.hxx"
extern "C" {
@ -401,11 +402,10 @@ NfsStorage::OpenDirectory(const char *uri_utf8)
static Storage *
CreateNfsStorageURI(EventLoop &event_loop, const char *base)
{
if (strncmp(base, "nfs://", 6) != 0)
const char *p = StringAfterPrefixCaseASCII(base, "nfs://");
if (p == nullptr)
return nullptr;
const char *p = base + 6;
const char *mount = strchr(p, '/');
if (mount == nullptr)
throw std::runtime_error("Malformed nfs:// URI");

3
src/storage/plugins/SmbclientStorage.cxx
View File

@ -27,6 +27,7 @@
#include "fs/Traits.hxx"
#include "thread/Mutex.hxx"
#include "system/Error.hxx"
#include "util/ASCII.hxx"
#include "util/StringCompare.hxx"
#include "util/ScopeExit.hxx"
@ -182,7 +183,7 @@ SmbclientDirectoryReader::GetInfo(gcc_unused bool follow)
static Storage *
CreateSmbclientStorageURI(gcc_unused EventLoop &event_loop, const char *base)
{
if (strncmp(base, "smb://", 6) != 0)
if (!StringStartsWithCaseASCII(base, "smb://"))
return nullptr;
SmbclientInit();

4
src/util/UriUtil.cxx
View File

@ -18,7 +18,7 @@
*/
#include "UriUtil.hxx"
#include "StringCompare.hxx"
#include "ASCII.hxx"
#include "CharUtil.hxx"
#include <assert.h>
@ -169,7 +169,7 @@ SkipUriScheme(const char *uri) noexcept
{
const char *const schemes[] = { "http://", "https://", "ftp://" };
for (auto scheme : schemes) {
auto result = StringAfterPrefix(uri, scheme);
auto result = StringAfterPrefixCaseASCII(uri, scheme);
if (result != nullptr)
return result;
}