mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-10-25 13:55:47 +03:00
Code Issues Projects Releases Packages Wiki Activity

DetermineAuth: Remove concept of Unknown #6148

Browse source 
This restores 2.3 behavior. Some servers reply 404 to GETs and PROPFINDs
to the remote.php/webdav/ url and used to work. Being more picky would
break them.
This commit is contained in:
Christian Kamm 2017-11-09 11:04:12 +01:00 committed by ckamm
parent 820ebf4b6e
commit 3ae2071129
4 changed files with 11 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/gui/creds/httpcredentialsgui.cpp
View file

@ -46,15 +46,6 @@ void HttpCredentialsGui::askFromUserAsync()
// First, we will check what kind of auth we need.
auto job = new DetermineAuthTypeJob(_account->sharedFromThis(), this);
QObject::connect(job, &DetermineAuthTypeJob::authType, this, [this](DetermineAuthTypeJob::AuthType type) {
if (type == DetermineAuthTypeJob::Unknown) {
// network error, timeout, unsupported auth type?
// This fallback exists for backwards compatibility reasons:
// in versions before 2.4 we tried basic auth when the auth type
// couldn't be determined.
qCWarning(lcHttpCredentialsGui) << "Could not determine auth type, falling back to Basic";
type = DetermineAuthTypeJob::Basic;
}
if (type == DetermineAuthTypeJob::OAuth) {
_asyncAuth.reset(new OAuth(_account, this));
_asyncAuth->_expectedUser = _user;
@ -69,7 +60,7 @@ void HttpCredentialsGui::askFromUserAsync()
// We will re-enter the event loop, so better wait the next iteration
QMetaObject::invokeMethod(this, "showDialog", Qt::QueuedConnection);
} else {
// Unsupported auth type? Shibboleth?
// Shibboleth?
qCWarning(lcHttpCredentialsGui) << "Bad http auth type:" << type;
emit asked();
}

8
src/gui/wizard/owncloudsetuppage.cpp
View file

@ -201,13 +201,15 @@ bool OwncloudSetupPage::urlHasChanged()
int OwncloudSetupPage::nextId() const
{
if (_authType == DetermineAuthTypeJob::Basic) {
switch (_authType) {
case DetermineAuthTypeJob::Basic:
return WizardCommon::Page_HttpCreds;
} else if (_authType == DetermineAuthTypeJob::OAuth) {
case DetermineAuthTypeJob::OAuth:
return WizardCommon::Page_OAuthCreds;
} else {
case DetermineAuthTypeJob::Shibboleth:
return WizardCommon::Page_ShibbolethCreds;
}
return WizardCommon::Page_HttpCreds;
}
QString OwncloudSetupPage::url() const

4
src/libsync/networkjobs.cpp
View file

@ -863,8 +863,8 @@ void DetermineAuthTypeJob::start()
auto authChallenge = reply->rawHeader("WWW-Authenticate").toLower();
if (authChallenge.contains("bearer ")) {
_resultPropfind = OAuth;
} else if (!authChallenge.isEmpty()) {
_resultPropfind = Basic;
} else if (authChallenge.isEmpty()) {
qCWarning(lcDetermineAuthTypeJob) << "Did not receive WWW-Authenticate reply to auth-test PROPFIND";
}
_propfindDone = true;
checkBothDone();

7
src/libsync/networkjobs.h
View file

@ -360,8 +360,7 @@ class OWNCLOUDSYNC_EXPORT DetermineAuthTypeJob : public QObject
Q_OBJECT
public:
enum AuthType {
Unknown,
Basic,
Basic, // also the catch-all fallback for backwards compatibility reasons
OAuth,
Shibboleth
};
@ -375,8 +374,8 @@ private:
void checkBothDone();
AccountPtr _account;
AuthType _resultGet = Unknown;
AuthType _resultPropfind = Unknown;
AuthType _resultGet = Basic;
AuthType _resultPropfind = Basic;
bool _getDone = false;
bool _propfindDone = false;
};