owen/lms
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Subsonic API: send back an error on bad login parameters

Browse Source
This commit is contained in:
emeric
2019-04-07 17:55:25 +02:00
parent b4103999a7
commit 99b56da15f
1 changed files with 25 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/api/subsonic/SubsonicResource.cpp
+25 -37
View File
@@ -187,42 +187,32 @@ getMandatoryParameterAs(const Wt::Http::ParameterMap& parameterMap, const std::s
struct ClientInfo struct ClientInfo
{ {
std::string name; std::string name;
ResponseFormat format;
std::string user; std::string user;
std::string password; std::string password;
}; };
boost::optional<ClientInfo> ClientInfo
getClientInfo(const Wt::Http::ParameterMap& parameters) getClientInfo(const Wt::Http::ParameterMap& parameters)
{ {
boost::optional<ClientInfo> res {ClientInfo {}}; ClientInfo res;
// Mandatory parameters // Mandatory parameters
auto param {getParameterAs<std::string>(parameters, "c")}; res.name = getMandatoryParameterAs<std::string>(parameters, "c");
if (!param) res.user = getMandatoryParameterAs<std::string>(parameters, "u");
return {};
res->name = *param;
param = getParameterAs<std::string>(parameters, "u");
if (!param)
return {};
res->user = *param;
param = getParameterAs<std::string>(parameters, "p");
if (!param)
return {};
if (param->find("enc:") == 0)
{ {
param = stringFromHex(param->substr(4)); std::string password {getMandatoryParameterAs<std::string>(parameters, "p")};
if (!param) if (password.find("enc:") == 0)
return {}; {
} auto decodedPassword {stringFromHex(password.substr(4))};
res->password = *param; if (!decodedPassword)
throw Error {Error::Code::WrongUsernameOrPassword};
// Optional parameters res.password = *decodedPassword;
param = getParameterAs<std::string>(parameters, "f"); }
res->format = (param ? ResponseFormat::json : ResponseFormat::xml); // TODO else
res.password = password;
}
return res; return res;
} }
@@ -265,30 +255,28 @@ SubsonicResource::handleRequest(const Wt::Http::Request &request, Wt::Http::Resp
{ {
LMS_LOG(API_SUBSONIC, DEBUG) << "REQUEST " << request.path(); LMS_LOG(API_SUBSONIC, DEBUG) << "REQUEST " << request.path();
const Wt::Http::ParameterMap parameters {request.getParameterMap()}; const Wt::Http::ParameterMap& parameters {request.getParameterMap()};
auto clientInfo {getClientInfo(parameters)}; // Optional parameters
if (!clientInfo) ResponseFormat format {getParameterAs<std::string>(parameters, "f").get_value_or("xml") == "json" ? ResponseFormat::json : ResponseFormat::xml};
{
LMS_LOG(API_SUBSONIC, ERROR) << "Failed to parse client info";
return;
}
try try
{ {
static std::mutex mutex; static std::mutex mutex;
ClientInfo clientInfo {getClientInfo(parameters)};
std::unique_lock<std::mutex> lock{mutex}; // For now just handle request s one by one std::unique_lock<std::mutex> lock{mutex}; // For now just handle request s one by one
if (!checkPassword(_db, *clientInfo)) if (!checkPassword(_db, clientInfo))
throw Error {Error::Code::WrongUsernameOrPassword}; throw Error {Error::Code::WrongUsernameOrPassword};
auto itHandler {requestHandlers.find(request.path())}; auto itHandler {requestHandlers.find(request.path())};
if (itHandler != requestHandlers.end()) if (itHandler != requestHandlers.end())
{ {
Response resp {(itHandler->second)(request.getParameterMap(), _db)}; Response resp {(itHandler->second)(request.getParameterMap(), _db)};
resp.write(response.out(), clientInfo->format); resp.write(response.out(), format);
response.setMimeType(ResponseFormatToMimeType(clientInfo->format)); response.setMimeType(ResponseFormatToMimeType(format));
return; return;
} }
@@ -306,8 +294,8 @@ SubsonicResource::handleRequest(const Wt::Http::Request &request, Wt::Http::Resp
{ {
LMS_LOG(API_SUBSONIC, ERROR) << "Error while processing command. code = " << static_cast<int>(e.getCode()) << ", msg = '" << e.getMessage() << "'"; LMS_LOG(API_SUBSONIC, ERROR) << "Error while processing command. code = " << static_cast<int>(e.getCode()) << ", msg = '" << e.getMessage() << "'";
Response resp {Response::createFailedResponse(e)}; Response resp {Response::createFailedResponse(e)};
resp.write(response.out(), clientInfo->format); resp.write(response.out(), format);
response.setMimeType(ResponseFormatToMimeType(clientInfo->format)); response.setMimeType(ResponseFormatToMimeType(format));
} }
} }