mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-29 12:19:03 +03:00
Code Issues Projects Releases Packages Wiki Activity

Wizard: Handle url-shortener redirects #5954

Browse source 
Grab any permanent redirects from the base url the user entered
before attempting to connect to a modified url (with status.php
added).
This commit is contained in:
Christian Kamm 2017-09-11 13:45:01 +02:00 committed by Roeland Jago Douma
parent 4d2261420d
commit 1aa1e7f833
No known key found for this signature in database
GPG key ID: F941078878347C0C
1 changed files with 31 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/gui/owncloudsetupwizard.cpp
View file

@ -173,13 +173,37 @@ void OwncloudSetupWizard::slotContinueDetermineAuth()
// Set fake credentials before we check what credential it actually is.
account->setCredentials(CredentialsFactory::create("dummy"));
CheckServerJob *job = new CheckServerJob(_ocWizard->account(), this);
job->setIgnoreCredentialFailure(true);
connect(job, SIGNAL(instanceFound(QUrl, QJsonObject)), SLOT(slotOwnCloudFoundAuth(QUrl, QJsonObject)));
connect(job, SIGNAL(instanceNotFound(QNetworkReply *)), SLOT(slotNoOwnCloudFoundAuth(QNetworkReply *)));
connect(job, SIGNAL(timeout(const QUrl &)), SLOT(slotNoOwnCloudFoundAuthTimeout(const QUrl &)));
job->setTimeout((account->url().scheme() == "https") ? 30 * 1000 : 10 * 1000);
job->start();
// Before we check the auth type, resolve any permanent redirect
// chain there might be. We cannot do this only on url/status.php
// in CheckServerJob, because things like url shorteners don't
// redirect subpaths.
auto redirectCheckJob = account->sendRequest("GET", account->url());
// Grab the chain of permanent redirects and adjust the account url
// accordingly
auto permanentRedirects = std::make_shared<int>(0);
connect(redirectCheckJob, &AbstractNetworkJob::redirected, this,
[permanentRedirects, account](QNetworkReply *reply, const QUrl &targetUrl, int count) {
int httpCode = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
if (count == *permanentRedirects && (httpCode == 301 || httpCode == 308)) {
qCInfo(lcWizard) << account->url() << " was redirected to" << targetUrl;
account->setUrl(targetUrl);
*permanentRedirects += 1;
}
});
// When done, start checking status.php.
connect(redirectCheckJob, &SimpleNetworkJob::finishedSignal, this,
[this, account]() {
CheckServerJob *job = new CheckServerJob(account, this);
job->setIgnoreCredentialFailure(true);
connect(job, SIGNAL(instanceFound(QUrl, QJsonObject)), SLOT(slotOwnCloudFoundAuth(QUrl, QJsonObject)));
connect(job, SIGNAL(instanceNotFound(QNetworkReply *)), SLOT(slotNoOwnCloudFoundAuth(QNetworkReply *)));
connect(job, SIGNAL(timeout(const QUrl &)), SLOT(slotNoOwnCloudFoundAuthTimeout(const QUrl &)));
job->setTimeout((account->url().scheme() == "https") ? 30 * 1000 : 10 * 1000);
job->start();
});
}
void OwncloudSetupWizard::slotOwnCloudFoundAuth(const QUrl &url, const QJsonObject &info)