github/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent synced 2025-08-19 04:49:47 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

WebAPI: Don't trim string parameters

Browse source 
PR #22266.
Closes #19485.
Closes #22254.
This commit is contained in:
Vladimir Golovnev 2025-02-12 09:33:41 +03:00 • committed by GitHub
commit c9eb1fbac8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/webui/api/rsscontroller.cpp
View file

@ -49,7 +49,7 @@ void RSSController::addFolderAction()
{ {
requireParams({u"path"_s}); requireParams({u"path"_s});
const QString path = params()[u"path"_s].trimmed(); const QString path = params()[u"path"_s];
const nonstd::expected<void, QString> result = RSS::Session::instance()->addFolder(path); const nonstd::expected<void, QString> result = RSS::Session::instance()->addFolder(path);
if (!result) if (!result)
throw APIError(APIErrorType::Conflict, result.error()); throw APIError(APIErrorType::Conflict, result.error());
@ -59,8 +59,8 @@ void RSSController::addFeedAction()
{ {
requireParams({u"url"_s, u"path"_s}); requireParams({u"url"_s, u"path"_s});
const QString url = params()[u"url"_s].trimmed(); const QString url = params()[u"url"_s];
const QString path = params()[u"path"_s].trimmed(); const QString path = params()[u"path"_s];
const nonstd::expected<void, QString> result = RSS::Session::instance()->addFeed(url, (path.isEmpty() ? url : path)); const nonstd::expected<void, QString> result = RSS::Session::instance()->addFeed(url, (path.isEmpty() ? url : path));
if (!result) if (!result)
throw APIError(APIErrorType::Conflict, result.error()); throw APIError(APIErrorType::Conflict, result.error());
@ -70,8 +70,8 @@ void RSSController::setFeedURLAction()
{ {
requireParams({u"path"_s, u"url"_s}); requireParams({u"path"_s, u"url"_s});
const QString path = params()[u"path"_s].trimmed(); const QString path = params()[u"path"_s];
const QString url = params()[u"url"_s].trimmed(); const QString url = params()[u"url"_s];
const nonstd::expected<void, QString> result = RSS::Session::instance()->setFeedURL(path, url); const nonstd::expected<void, QString> result = RSS::Session::instance()->setFeedURL(path, url);
if (!result) if (!result)
throw APIError(APIErrorType::Conflict, result.error()); throw APIError(APIErrorType::Conflict, result.error());
@ -81,7 +81,7 @@ void RSSController::removeItemAction()
{ {
requireParams({u"path"_s}); requireParams({u"path"_s});
const QString path = params()[u"path"_s].trimmed(); const QString path = params()[u"path"_s];
const nonstd::expected<void, QString> result = RSS::Session::instance()->removeItem(path); const nonstd::expected<void, QString> result = RSS::Session::instance()->removeItem(path);
if (!result) if (!result)
throw APIError(APIErrorType::Conflict, result.error()); throw APIError(APIErrorType::Conflict, result.error());
@ -91,8 +91,8 @@ void RSSController::moveItemAction()
{ {
requireParams({u"itemPath"_s, u"destPath"_s}); requireParams({u"itemPath"_s, u"destPath"_s});
const QString itemPath = params()[u"itemPath"_s].trimmed(); const QString itemPath = params()[u"itemPath"_s];
const QString destPath = params()[u"destPath"_s].trimmed(); const QString destPath = params()[u"destPath"_s];
const nonstd::expected<void, QString> result = RSS::Session::instance()->moveItem(itemPath, destPath); const nonstd::expected<void, QString> result = RSS::Session::instance()->moveItem(itemPath, destPath);
if (!result) if (!result)
throw APIError(APIErrorType::Conflict, result.error()); throw APIError(APIErrorType::Conflict, result.error());
@ -146,8 +146,8 @@ void RSSController::setRuleAction()
{ {
requireParams({u"ruleName"_s, u"ruleDef"_s}); requireParams({u"ruleName"_s, u"ruleDef"_s});
const QString ruleName {params()[u"ruleName"_s].trimmed()}; const QString ruleName {params()[u"ruleName"_s]};
const QByteArray ruleDef {params()[u"ruleDef"_s].trimmed().toUtf8()}; const QByteArray ruleDef {params()[u"ruleDef"_s].toUtf8()};
const auto jsonObj = QJsonDocument::fromJson(ruleDef).object(); const auto jsonObj = QJsonDocument::fromJson(ruleDef).object();
RSS::AutoDownloader::instance()->setRule(RSS::AutoDownloadRule::fromJsonObject(jsonObj, ruleName)); RSS::AutoDownloader::instance()->setRule(RSS::AutoDownloadRule::fromJsonObject(jsonObj, ruleName));
@ -157,8 +157,8 @@ void RSSController::renameRuleAction()
{ {
requireParams({u"ruleName"_s, u"newRuleName"_s}); requireParams({u"ruleName"_s, u"newRuleName"_s});
const QString ruleName {params()[u"ruleName"_s].trimmed()}; const QString ruleName {params()[u"ruleName"_s]};
const QString newRuleName {params()[u"newRuleName"_s].trimmed()}; const QString newRuleName {params()[u"newRuleName"_s]};
RSS::AutoDownloader::instance()->renameRule(ruleName, newRuleName); RSS::AutoDownloader::instance()->renameRule(ruleName, newRuleName);
} }
@ -167,7 +167,7 @@ void RSSController::removeRuleAction()
{ {
requireParams({u"ruleName"_s}); requireParams({u"ruleName"_s});
const QString ruleName {params()[u"ruleName"_s].trimmed()}; const QString ruleName {params()[u"ruleName"_s]};
RSS::AutoDownloader::instance()->removeRule(ruleName); RSS::AutoDownloader::instance()->removeRule(ruleName);
} }