Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[stable-3.14] Properly check for webdav or dav path in provided host url for cmd.cpp #7301

Merged
merged 3 commits into from
Oct 11, 2024
Merged

[stable-3.14] Properly check for webdav or dav path in provided host url for cmd.cpp #7301

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
35a4e7f
Remove unused <random> import in cmd.cpp
claucambra Oct 9, 2024
02f9acb
Encourage use of https in error message for cmd.cpp
claucambra Oct 9, 2024
5e14c7c
Properly check for webdav or dav path in provided host url for cmd.cpp
claucambra Oct 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions src/cmd/cmd.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*

Check notice on line 1 in src/cmd/cmd.cpp

View workflow job for this annotation

GitHub Actions / build

Run clang-format on src/cmd/cmd.cpp 

File src/cmd/cmd.cpp does not conform to Custom style guidelines. (lines 347, 348)
* Copyright (C) by Olivier Goffart <ogoffart@owncloud.com>
* Copyright (C) by Klaas Freitag <freitag@owncloud.com>
* Copyright (C) by Daniel Heule <daniel.heule@gmail.com>
Expand All @@ -15,8 +15,7 @@
*/

#include <iostream>
#include <random>
#include <qcoreapplication.h>

Check failure on line 18 in src/cmd/cmd.cpp

View workflow job for this annotation

GitHub Actions / build

src/cmd/cmd.cpp:18:10 [clang-diagnostic-error] 

'qcoreapplication.h' file not found
#include <QStringList>
#include <QUrl>
#include <QFile>
Expand Down Expand Up @@ -307,7 +306,7 @@
}
}

int main(int argc, char **argv)

Check warning on line 309 in src/cmd/cmd.cpp

View workflow job for this annotation

GitHub Actions / build

src/cmd/cmd.cpp:309:5 [readability-function-cognitive-complexity] 

function 'main' has cognitive complexity of 35 (threshold 25)
{
#ifdef Q_OS_WIN
SetDllDirectory(L"");
Expand Down Expand Up @@ -345,15 +344,18 @@
return EXIT_FAILURE;
}

if (options.target_url.contains("/webdav", Qt::CaseInsensitive) || options.target_url.contains("/dav", Qt::CaseInsensitive)) {
const auto sanitisedTargetUrl = options.target_url.endsWith('/') || options.target_url.endsWith('\\')
? options.target_url.chopped(1)
: options.target_url;
QUrl hostUrl = QUrl::fromUserInput(sanitisedTargetUrl);

Check warning on line 350 in src/cmd/cmd.cpp

View workflow job for this annotation

GitHub Actions / build

src/cmd/cmd.cpp:350:10 [cppcoreguidelines-init-variables] 

variable 'hostUrl' is not initialized

if (const auto hostUrlPath = hostUrl.path(); hostUrlPath.contains("/webdav", Qt::CaseInsensitive) || hostUrlPath.contains("/dav", Qt::CaseInsensitive)) {
qWarning("Dav or webdav in server URL.");
std::cerr << "Error! Please specify only the base URL of your host with username and password. Example:" << std::endl
<< "http(s)://username:password@cloud.example.com" << std::endl;
<< "https://username:password@cloud.example.com" << std::endl;
return EXIT_FAILURE;
}

QUrl hostUrl = QUrl::fromUserInput((options.target_url.endsWith(QLatin1Char('/')) || options.target_url.endsWith(QLatin1Char('\\'))) ? options.target_url.chopped(1) : options.target_url);

// Order of retrieval attempt (later attempts override earlier ones):
// 1. From URL
// 2. From options
Expand Down
Loading