Skip to content

chore(network): enable again our request timeout feature #9646

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

Merged
mgallien merged 1 commit into from
Mar 19, 2026
Merged

chore(network): enable again our request timeout feature #9646

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/libsync/abstractnetworkjob.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* SPDX-License-Identifier: GPL-2.0-or-later
*/

#include "common/asserts.h"

Check failure on line 7 in src/libsync/abstractnetworkjob.cpp

View workflow job for this annotation

GitHub Actions / build

src/libsync/abstractnetworkjob.cpp:7:10 [clang-diagnostic-error] 

'common/asserts.h' file not found
#include "networkjobs.h"
#include "account.h"
#include "owncloudpropagator.h"
Expand Down Expand Up @@ -38,7 +38,7 @@

// If not set, it is overwritten by the Application constructor with the value from the config
int AbstractNetworkJob::httpTimeout = qEnvironmentVariableIntValue("OWNCLOUD_TIMEOUT");
bool AbstractNetworkJob::enableTimeout = false;
bool AbstractNetworkJob::enableTimeout = true;

AbstractNetworkJob::AbstractNetworkJob(const AccountPtr &account, const QString &path, QObject *parent)
: QObject(parent)
Expand Down Expand Up @@ -120,8 +120,8 @@

QNetworkReply *AbstractNetworkJob::sendRequest(const QByteArray &verb,
const QUrl &url,
QNetworkRequest req,

Check warning on line 123 in src/libsync/abstractnetworkjob.cpp

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Unmodified variable "req" of type "class QNetworkRequest" should be const-qualified. 


See more on https://sonarcloud.io/project/issues?id=nextcloud_desktop&issues=AZ0FpxDDWtRlZe-ICyu5&open=AZ0FpxDDWtRlZe-ICyu5&pullRequest=9646
QIODevice *requestBody)

Check warning on line 124 in src/libsync/abstractnetworkjob.cpp

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Unmodified variable "requestBody" of type "class QIODevice *" should be const-qualified. 


See more on https://sonarcloud.io/project/issues?id=nextcloud_desktop&issues=AZ0FpxDDWtRlZe-ICyu6&open=AZ0FpxDDWtRlZe-ICyu6&pullRequest=9646
{
auto reply = _account->sendRawRequest(verb, url, req, requestBody);
_requestBody = requestBody;
Expand All @@ -134,7 +134,7 @@

QNetworkReply *AbstractNetworkJob::sendRequest(const QByteArray &verb,
const QUrl &url,
QNetworkRequest req,

Check warning on line 137 in src/libsync/abstractnetworkjob.cpp

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Unmodified variable "req" of type "class QNetworkRequest" should be const-qualified. 


See more on https://sonarcloud.io/project/issues?id=nextcloud_desktop&issues=AZ0FpxDDWtRlZe-ICyu7&open=AZ0FpxDDWtRlZe-ICyu7&pullRequest=9646
const QByteArray &requestBody)
{
auto reply = _account->sendRawRequest(verb, url, req, requestBody);
Expand Down Expand Up @@ -276,7 +276,7 @@

auto request = reply()->request();

if (!(requestedUrl.host() == redirectUrl.host() && requestedUrl.port() == redirectUrl.port())) {

Check failure on line 279 in src/libsync/abstractnetworkjob.cpp

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Refactor this code to not nest more than 3 if|for|do|while|switch statements. 


See more on https://sonarcloud.io/project/issues?id=nextcloud_desktop&issues=AZ0FpxDDWtRlZe-ICyu8&open=AZ0FpxDDWtRlZe-ICyu8&pullRequest=9646
qCWarning(lcNetworkJob).nospace() << "redirect target mismatches origin, removing credentials"
<< " origin=" << requestedUrl.host() << ":" << requestedUrl.port()
<< " target=" << redirectUrl.host() << ":" << redirectUrl.port();
Expand Down Expand Up @@ -384,7 +384,7 @@

void AbstractNetworkJob::slotTimeout()
{
// TODO: workaround, find cause of https://github.com/nextcloud/desktop/issues/7184

Check warning on line 387 in src/libsync/abstractnetworkjob.cpp

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Complete the task associated to this "TODO" comment. 


See more on https://sonarcloud.io/project/issues?id=nextcloud_desktop&issues=AZ0FpxDDWtRlZe-ICyu4&open=AZ0FpxDDWtRlZe-ICyu4&pullRequest=9646
if (!AbstractNetworkJob::enableTimeout) {
return;
}
Expand Down Expand Up @@ -588,7 +588,7 @@
sendRequest(verb, requestedUrl, req, _requestBody);
}

std::optional<QString> AbstractNetworkJob::hstsErrorStringFromReply(QNetworkReply *reply)

Check warning on line 591 in src/libsync/abstractnetworkjob.cpp

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Unmodified variable "reply" of type "class QNetworkReply *" should be const-qualified. 


See more on https://sonarcloud.io/project/issues?id=nextcloud_desktop&issues=AZ0FpxDDWtRlZe-ICyu-&open=AZ0FpxDDWtRlZe-ICyu-&pullRequest=9646

Check warning on line 591 in src/libsync/abstractnetworkjob.cpp

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Make the type of this parameter a pointer-to-const. The current type of "reply" is "class QNetworkReply *". 


See more on https://sonarcloud.io/project/issues?id=nextcloud_desktop&issues=AZ0FpxDDWtRlZe-ICyu9&open=AZ0FpxDDWtRlZe-ICyu9&pullRequest=9646
{
if (!reply) {
return {};
Expand Down
Loading