Skip to content

Commit 39df2c9

Browse files
ksuprynowiczksuprynowicz
authored
Merge pull request overte-org#711 from HifiExperiments/deprecatedRedirect
Fix QNetworkRequest::FollowRedirectsAttribute deprecated warning
2 parents 476cf0b + d9ee379 commit 39df2c9

22 files changed

+43
-30
lines changed

‎assignment-client/src/avatars/ScriptableAvatar.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ void ScriptableAvatar::updateJointMappings() {
225225
// connects.
226226
QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
227227
QNetworkRequest networkRequest = QNetworkRequest(_skeletonModelURL);
228-
networkRequest.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
228+
networkRequest.setAttribute(QNetworkRequest::RedirectPolicyAttribute, QNetworkRequest::NoLessSafeRedirectPolicy);
229229
networkRequest.setHeader(QNetworkRequest::UserAgentHeader, NetworkingConstants::OVERTE_USER_AGENT);
230230
DependencyManager::get<ResourceRequestObserver>()->update(
231231
_skeletonModelURL, -1, "AvatarData::updateJointMappings");

‎domain-server/src/DomainGatekeeper.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
// Created by Stephen Birarda on 2015-08-24.
66
// Copyright 2015 High Fidelity, Inc.
77
// Copyright 2020 Vircadia contributors.
8+
// Copyright 2023 Overte e.V.
89
//
910
// Distributed under the Apache License, Version 2.0.
1011
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
@@ -1252,7 +1253,7 @@ void DomainGatekeeper::requestDomainUser(const QString& username, const QString&
12521253

12531254
request.setUrl(domainUserURL);
12541255

1255-
request.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
1256+
request.setAttribute(QNetworkRequest::RedirectPolicyAttribute, QNetworkRequest::NoLessSafeRedirectPolicy);
12561257

12571258
QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
12581259
QNetworkReply* requestReply = networkAccessManager.post(request, formData);

‎domain-server/src/DomainServer.cpp

+3-2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
// Created by Stephen Birarda on 9/26/13.
66
// Copyright 2013 High Fidelity, Inc.
77
// Copyright 2020 Vircadia contributors.
8+
// Copyright 2023 Overte e.V.
89
//
910
// Distributed under the Apache License, Version 2.0.
1011
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
@@ -2641,7 +2642,7 @@ bool DomainServer::handleHTTPSRequest(HTTPSConnection* connection, const QUrl &u
26412642
.arg(authorizationCode, oauthRedirectURL().toString(), _oauthClientID, _oauthClientSecret);
26422643

26432644
QNetworkRequest tokenRequest(tokenRequestUrl);
2644-
tokenRequest.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
2645+
tokenRequest.setAttribute(QNetworkRequest::RedirectPolicyAttribute, QNetworkRequest::NoLessSafeRedirectPolicy);
26452646
tokenRequest.setHeader(QNetworkRequest::UserAgentHeader, NetworkingConstants::OVERTE_USER_AGENT);
26462647
tokenRequest.setHeader(QNetworkRequest::ContentTypeHeader, "application/x-www-form-urlencoded");
26472648

@@ -2986,7 +2987,7 @@ QNetworkReply* DomainServer::profileRequestGivenTokenReply(QNetworkReply* tokenR
29862987
qDebug() << "Sending profile request to: " << profileURL;
29872988

29882989
QNetworkRequest profileRequest(profileURL);
2989-
profileRequest.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
2990+
profileRequest.setAttribute(QNetworkRequest::RedirectPolicyAttribute, QNetworkRequest::NoLessSafeRedirectPolicy);
29902991
profileRequest.setHeader(QNetworkRequest::UserAgentHeader, NetworkingConstants::OVERTE_USER_AGENT);
29912992
return NetworkAccessManager::getInstance().get(profileRequest);
29922993
}

‎ice-server/src/IceServer.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
// Created by Stephen Birarda on 2014-10-01.
66
// Copyright 2014 High Fidelity, Inc.
77
// Copyright 2021 Vircadia contributors.
8+
// Copyright 2023 Overte e.V.
89
//
910
// Distributed under the Apache License, Version 2.0.
1011
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
@@ -281,7 +282,7 @@ void IceServer::requestDomainPublicKey(const QUuid& domainID) {
281282
// qDebug() << "publicKeyURL.errorString()" << publicKeyURL.errorString();
282283

283284
QNetworkRequest publicKeyRequest { publicKeyURL };
284-
publicKeyRequest.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
285+
publicKeyRequest.setAttribute(QNetworkRequest::RedirectPolicyAttribute, QNetworkRequest::NoLessSafeRedirectPolicy);
285286
publicKeyRequest.setAttribute(QNetworkRequest::User, domainID);
286287

287288
qDebug() << "Requesting public key for domain with ID" << domainID;

‎interface/src/Application.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -7757,7 +7757,7 @@ bool Application::askToLoadScript(const QString& scriptFilenameOrURL) {
77577757
bool Application::askToWearAvatarAttachmentUrl(const QString& url) {
77587758
QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
77597759
QNetworkRequest networkRequest = QNetworkRequest(url);
7760-
networkRequest.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
7760+
networkRequest.setAttribute(QNetworkRequest::RedirectPolicyAttribute, QNetworkRequest::NoLessSafeRedirectPolicy);
77617761
networkRequest.setHeader(QNetworkRequest::UserAgentHeader, NetworkingConstants::OVERTE_USER_AGENT);
77627762
QNetworkReply* reply = networkAccessManager.get(networkRequest);
77637763
int requestNumber = ++_avatarAttachmentRequest;

‎interface/src/ui/ModelsBrowser.cpp

+3-2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
// Created by Clement on 3/17/14.
66
// Copyright 2014 High Fidelity, Inc.
77
// Copyright 2020 Vircadia contributors.
8+
// Copyright 2023 Overte e.V.
89
//
910
// Distributed under the Apache License, Version 2.0.
1011
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
@@ -226,7 +227,7 @@ void ModelHandler::update() {
226227
QUrl url(_model.item(i,0)->data(Qt::UserRole).toString());
227228
QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
228229
QNetworkRequest request(url);
229-
request.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
230+
request.setAttribute(QNetworkRequest::RedirectPolicyAttribute, QNetworkRequest::NoLessSafeRedirectPolicy);
230231
request.setHeader(QNetworkRequest::UserAgentHeader, NetworkingConstants::OVERTE_USER_AGENT);
231232
QNetworkReply* reply = networkAccessManager.head(request);
232233
connect(reply, SIGNAL(finished()), SLOT(downloadFinished()));
@@ -279,7 +280,7 @@ void ModelHandler::queryNewFiles(QString marker) {
279280
url.setQuery(query);
280281
QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
281282
QNetworkRequest request(url);
282-
request.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
283+
request.setAttribute(QNetworkRequest::RedirectPolicyAttribute, QNetworkRequest::NoLessSafeRedirectPolicy);
283284
request.setHeader(QNetworkRequest::UserAgentHeader, NetworkingConstants::OVERTE_USER_AGENT);
284285
QNetworkReply* reply = networkAccessManager.get(request);
285286
connect(reply, SIGNAL(finished()), SLOT(downloadFinished()));

‎libraries/auto-updater/src/AutoUpdater.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ void AutoUpdater::getLatestVersionData() {
5252

5353
QNetworkRequest latestVersionRequest(buildsURL);
5454

55-
latestVersionRequest.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
55+
latestVersionRequest.setAttribute(QNetworkRequest::RedirectPolicyAttribute, QNetworkRequest::NoLessSafeRedirectPolicy);
5656
latestVersionRequest.setHeader(QNetworkRequest::UserAgentHeader, NetworkingConstants::OVERTE_USER_AGENT);
5757
QNetworkReply* reply = networkAccessManager.get(latestVersionRequest);
5858
connect(reply, &QNetworkReply::finished, this, &AutoUpdater::parseLatestVersionData);

‎libraries/baking/src/JSBaker.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ void JSBaker::loadScript() {
6363
QNetworkRequest networkRequest;
6464

6565
// setup the request to follow re-directs and always hit the network
66-
networkRequest.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
66+
networkRequest.setAttribute(QNetworkRequest::RedirectPolicyAttribute, QNetworkRequest::NoLessSafeRedirectPolicy);
6767
networkRequest.setAttribute(QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::AlwaysNetwork);
6868
networkRequest.setHeader(QNetworkRequest::UserAgentHeader, NetworkingConstants::OVERTE_USER_AGENT);
6969

‎libraries/baking/src/ModelBaker.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ void ModelBaker::saveSourceModel() {
160160
QNetworkRequest networkRequest;
161161

162162
// setup the request to follow re-directs and always hit the network
163-
networkRequest.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
163+
networkRequest.setAttribute(QNetworkRequest::RedirectPolicyAttribute, QNetworkRequest::NoLessSafeRedirectPolicy);
164164
networkRequest.setAttribute(QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::AlwaysNetwork);
165165
networkRequest.setHeader(QNetworkRequest::UserAgentHeader, NetworkingConstants::OVERTE_USER_AGENT);
166166

‎libraries/baking/src/TextureBaker.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ void TextureBaker::loadTexture() {
100100
QNetworkRequest networkRequest;
101101

102102
// setup the request to follow re-directs and always hit the network
103-
networkRequest.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
103+
networkRequest.setAttribute(QNetworkRequest::RedirectPolicyAttribute, QNetworkRequest::NoLessSafeRedirectPolicy);
104104
networkRequest.setAttribute(QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::AlwaysNetwork);
105105
networkRequest.setHeader(QNetworkRequest::UserAgentHeader, NetworkingConstants::OVERTE_USER_AGENT);
106106

‎libraries/model-serializers/src/FSTReader.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
//
55
// Created by Clement on 3/26/15.
66
// Copyright 2015 High Fidelity, Inc.
7+
// Copyright 2023 Overte e.V.
78
//
89
// Distributed under the Apache License, Version 2.0.
910
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
@@ -272,7 +273,7 @@ QVector<QString> FSTReader::getScripts(const QUrl& url, const hifi::VariantMulti
272273
hifi::VariantMultiHash FSTReader::downloadMapping(const QString& url) {
273274
QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
274275
QNetworkRequest networkRequest = QNetworkRequest(url);
275-
networkRequest.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
276+
networkRequest.setAttribute(QNetworkRequest::RedirectPolicyAttribute, QNetworkRequest::NoLessSafeRedirectPolicy);
276277
networkRequest.setHeader(QNetworkRequest::UserAgentHeader, NetworkingConstants::OVERTE_USER_AGENT);
277278
QNetworkReply* reply = networkAccessManager.get(networkRequest);
278279
QEventLoop loop;

‎libraries/model-serializers/src/GLTFSerializer.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
//
55
// Created by Luis Cuenca on 8/30/17.
66
// Copyright 2017 High Fidelity, Inc.
7+
// Copyright 2023 Overte e.V.
78
//
89
// Distributed under the Apache License, Version 2.0.
910
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
@@ -1826,7 +1827,7 @@ QNetworkReply* GLTFSerializer::request(hifi::URL& url, bool isTest) {
18261827
});
18271828
QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
18281829
QNetworkRequest netRequest(url);
1829-
netRequest.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
1830+
netRequest.setAttribute(QNetworkRequest::RedirectPolicyAttribute, QNetworkRequest::NoLessSafeRedirectPolicy);
18301831
QNetworkReply* netReply = isTest ? networkAccessManager.head(netRequest) : networkAccessManager.get(netRequest);
18311832
if (!qApp || aboutToQuit) {
18321833
netReply->deleteLater();

‎libraries/model-serializers/src/OBJSerializer.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -478,7 +478,7 @@ QNetworkReply* request(hifi::URL& url, bool isTest) {
478478
});
479479
QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
480480
QNetworkRequest netRequest(url);
481-
netRequest.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
481+
netRequest.setAttribute(QNetworkRequest::RedirectPolicyAttribute, QNetworkRequest::NoLessSafeRedirectPolicy);
482482
QNetworkReply* netReply = isTest ? networkAccessManager.head(netRequest) : networkAccessManager.get(netRequest);
483483
if (!qApp || aboutToQuit) {
484484
netReply->deleteLater();

‎libraries/networking/src/AccountManager.cpp

+8-7
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
//
55
// Created by Stephen Birarda on 2/18/2014.
66
// Copyright 2014 High Fidelity, Inc.
7+
// Copyright 2023 Overte e.V.
78
//
89
// Distributed under the Apache License, Version 2.0.
910
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
@@ -218,7 +219,7 @@ void AccountManager::setSessionID(const QUuid& sessionID) {
218219

219220
QNetworkRequest AccountManager::createRequest(QString path, AccountManagerAuth::Type authType) {
220221
QNetworkRequest networkRequest;
221-
networkRequest.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
222+
networkRequest.setAttribute(QNetworkRequest::RedirectPolicyAttribute, QNetworkRequest::NoLessSafeRedirectPolicy);
222223
networkRequest.setHeader(QNetworkRequest::UserAgentHeader, _userAgentGetter());
223224

224225
networkRequest.setRawHeader(METAVERSE_SESSION_ID_HEADER,
@@ -563,7 +564,7 @@ void AccountManager::requestAccessToken(const QString& login, const QString& pas
563564
QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
564565

565566
QNetworkRequest request;
566-
request.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
567+
request.setAttribute(QNetworkRequest::RedirectPolicyAttribute, QNetworkRequest::NoLessSafeRedirectPolicy);
567568
request.setHeader(QNetworkRequest::UserAgentHeader, _userAgentGetter());
568569

569570
QUrl grantURL = _authURL;
@@ -586,7 +587,7 @@ void AccountManager::requestAccessTokenWithAuthCode(const QString& authCode, con
586587
QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
587588

588589
QNetworkRequest request;
589-
request.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
590+
request.setAttribute(QNetworkRequest::RedirectPolicyAttribute, QNetworkRequest::NoLessSafeRedirectPolicy);
590591
request.setHeader(QNetworkRequest::UserAgentHeader, _userAgentGetter());
591592

592593
QUrl grantURL = _authURL;
@@ -662,7 +663,7 @@ void AccountManager::refreshAccessToken() {
662663
QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
663664

664665
QNetworkRequest request;
665-
request.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
666+
request.setAttribute(QNetworkRequest::RedirectPolicyAttribute, QNetworkRequest::NoLessSafeRedirectPolicy);
666667
request.setHeader(QNetworkRequest::UserAgentHeader, _userAgentGetter());
667668

668669
QUrl grantURL = _authURL;
@@ -798,7 +799,7 @@ void AccountManager::requestProfile() {
798799
profileURL.setPath(getMetaverseServerURLPath() + "/api/v1/user/profile");
799800

800801
QNetworkRequest profileRequest(profileURL);
801-
profileRequest.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
802+
profileRequest.setAttribute(QNetworkRequest::RedirectPolicyAttribute, QNetworkRequest::NoLessSafeRedirectPolicy);
802803
profileRequest.setHeader(QNetworkRequest::UserAgentHeader, _userAgentGetter());
803804
profileRequest.setRawHeader(ACCESS_TOKEN_AUTHORIZATION_HEADER, _accountInfo.getAccessToken().authorizationHeaderValue());
804805

@@ -848,7 +849,7 @@ void AccountManager::requestAccountSettings() {
848849
lockerURL.setPath(getMetaverseServerURLPath() + "/api/v1/user/locker");
849850

850851
QNetworkRequest lockerRequest(lockerURL);
851-
lockerRequest.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
852+
lockerRequest.setAttribute(QNetworkRequest::RedirectPolicyAttribute, QNetworkRequest::NoLessSafeRedirectPolicy);
852853
lockerRequest.setHeader(QNetworkRequest::UserAgentHeader, _userAgentGetter());
853854
lockerRequest.setRawHeader(ACCESS_TOKEN_AUTHORIZATION_HEADER, _accountInfo.getAccessToken().authorizationHeaderValue());
854855

@@ -919,7 +920,7 @@ void AccountManager::postAccountSettings() {
919920
lockerURL.setPath(getMetaverseServerURLPath() + "/api/v1/user/locker");
920921

921922
QNetworkRequest lockerRequest(lockerURL);
922-
lockerRequest.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
923+
lockerRequest.setAttribute(QNetworkRequest::RedirectPolicyAttribute, QNetworkRequest::NoLessSafeRedirectPolicy);
923924
lockerRequest.setHeader(QNetworkRequest::UserAgentHeader, _userAgentGetter());
924925
lockerRequest.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
925926
lockerRequest.setRawHeader(ACCESS_TOKEN_AUTHORIZATION_HEADER, _accountInfo.getAccessToken().authorizationHeaderValue());

‎libraries/networking/src/DomainAccountManager.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
//
55
// Created by David Rowe on 23 Jul 2020.
66
// Copyright 2020 Vircadia contributors.
7+
// Copyright 2023 Overte e.V.
78
//
89
// Distributed under the Apache License, Version 2.0.
910
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
@@ -96,7 +97,7 @@ void DomainAccountManager::requestAccessToken(const QString& username, const QSt
9697

9798
request.setUrl(_currentAuth.authURL);
9899

99-
request.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
100+
request.setAttribute(QNetworkRequest::RedirectPolicyAttribute, QNetworkRequest::NoLessSafeRedirectPolicy);
100101

101102
QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
102103
QNetworkReply* requestReply = networkAccessManager.post(request, formData);

‎libraries/networking/src/HTTPResourceRequest.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
//
55
// Created by Ryan Huffman on 2015/07/23
66
// Copyright 2015 High Fidelity, Inc.
7+
// Copyright 2023 Overte e.V.
78
//
89
// Distributed under the Apache License, Version 2.0.
910
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
@@ -54,7 +55,7 @@ void HTTPResourceRequest::doSend() {
5455
DependencyManager::get<StatTracker>()->incrementStat(STAT_HTTP_REQUEST_STARTED);
5556

5657
QNetworkRequest networkRequest(_url);
57-
networkRequest.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
58+
networkRequest.setAttribute(QNetworkRequest::RedirectPolicyAttribute, QNetworkRequest::NoLessSafeRedirectPolicy);
5859
networkRequest.setHeader(QNetworkRequest::UserAgentHeader, NetworkingConstants::OVERTE_USER_AGENT);
5960

6061
if (_cacheEnabled) {

‎libraries/networking/src/OAuthNetworkAccessManager.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
//
55
// Created by Stephen Birarda on 2014-09-18.
66
// Copyright 2014 High Fidelity, Inc.
7+
// Copyright 2023 Overte e.V.
78
//
89
// Distributed under the Apache License, Version 2.0.
910
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
@@ -38,7 +39,7 @@ QNetworkReply* OAuthNetworkAccessManager::createRequest(QNetworkAccessManager::O
3839
if (accountManager->hasValidAccessToken()
3940
&& req.url().host() == MetaverseAPI::getCurrentMetaverseServerURL().host()) {
4041
QNetworkRequest authenticatedRequest(req);
41-
authenticatedRequest.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
42+
authenticatedRequest.setAttribute(QNetworkRequest::RedirectPolicyAttribute, QNetworkRequest::NoLessSafeRedirectPolicy);
4243
authenticatedRequest.setHeader(QNetworkRequest::UserAgentHeader, NetworkingConstants::OVERTE_USER_AGENT);
4344
authenticatedRequest.setRawHeader(ACCESS_TOKEN_AUTHORIZATION_HEADER,
4445
accountManager->getAccountInfo().getAccessToken().authorizationHeaderValue());

‎libraries/networking/src/ResourceManager.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
//
55
// Created by Ryan Huffman on 2015/07/23
66
// Copyright 2015 High Fidelity, Inc.
7+
// Copyright 2023 Overte e.V.
78
//
89
// Distributed under the Apache License, Version 2.0.
910
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
@@ -162,7 +163,7 @@ bool ResourceManager::resourceExists(const QUrl& url) {
162163
auto& networkAccessManager = NetworkAccessManager::getInstance();
163164
QNetworkRequest request{ url };
164165

165-
request.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
166+
request.setAttribute(QNetworkRequest::RedirectPolicyAttribute, QNetworkRequest::NoLessSafeRedirectPolicy);
166167
request.setHeader(QNetworkRequest::UserAgentHeader, NetworkingConstants::OVERTE_USER_AGENT);
167168

168169
auto reply = networkAccessManager.head(request);

‎libraries/networking/src/SandboxUtils.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
//
55
// Created by Brad Hefta-Gaub on 2016-10-15.
66
// Copyright 2016 High Fidelity, Inc.
7+
// Copyright 2023 Overte e.V.
78
//
89
// Distributed under the Apache License, Version 2.0.
910
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
@@ -29,7 +30,7 @@ namespace SandboxUtils {
2930
QNetworkReply* getStatus() {
3031
auto& networkAccessManager = NetworkAccessManager::getInstance();
3132
QNetworkRequest sandboxStatus(SANDBOX_STATUS_URL);
32-
sandboxStatus.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
33+
sandboxStatus.setAttribute(QNetworkRequest::RedirectPolicyAttribute, QNetworkRequest::NoLessSafeRedirectPolicy);
3334
sandboxStatus.setHeader(QNetworkRequest::UserAgentHeader, NetworkingConstants::OVERTE_USER_AGENT);
3435
return networkAccessManager.get(sandboxStatus);
3536
}

0 commit comments

Comments
 (0)