cassidy/GlobalProtect-openconnect
1
0
Fork 0
mirror of https://github.com/yuezk/GlobalProtect-openconnect.git synced 2025-04-02 18:31:50 -04:00
Code Issues Projects Releases Wiki Activity

Fix saml login for portal-userauthcookie (#12)

Browse Source
This commit is contained in:
Kevin Yue 2020-05-29 23:38:51 +08:00 committed by GitHub
parent 4313b9d0e7
commit 1e2322b938
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
GPClient/gatewayauthenticator.cpp
View File

@ -151,11 +151,16 @@ void GatewayAuthenticator::samlAuth(QString samlMethod, QString samlRequest, QSt
void GatewayAuthenticator::onSAMLLoginSuccess(const QMap<QString, QString> &samlResult) void GatewayAuthenticator::onSAMLLoginSuccess(const QMap<QString, QString> &samlResult)
{ {
PLOGI << "SAML login succeeded, got the prelogin cookie " << samlResult.value("preloginCookie"); if (samlResult.contains("preloginCookie")) {
PLOGI << "SAML login succeeded, got the prelogin-cookie " << samlResult.value("preloginCookie");
} else {
PLOGI << "SAML login succeeded, got the portal-userauthcookie " << samlResult.value("userAuthCookie");
}
LoginParams params; LoginParams params;
params.setUser(samlResult.value("username")); params.setUser(samlResult.value("username"));
params.setPreloginCookie(samlResult.value("preloginCookie")); params.setPreloginCookie(samlResult.value("preloginCookie"));
params.setUserAuthCookie(samlResult.value("userAuthCookie"));
login(params); login(params);
} }

11
GPClient/portalauthenticator.cpp
View File

@ -124,9 +124,13 @@ void PortalAuthenticator::samlAuth()
void PortalAuthenticator::onSAMLLoginSuccess(const QMap<QString, QString> samlResult) void PortalAuthenticator::onSAMLLoginSuccess(const QMap<QString, QString> samlResult)
{ {
PLOGI << "SAML login succeeded, got the prelogin cookie " << samlResult.value("preloginCookie"); if (samlResult.contains("preloginCookie")) {
PLOGI << "SAML login succeeded, got the prelogin-cookie " << samlResult.value("preloginCookie");
} else {
PLOGI << "SAML login succeeded, got the portal-userauthcookie " << samlResult.value("userAuthCookie");
}
fetchConfig(samlResult.value("username"), "", samlResult.value("preloginCookie")); fetchConfig(samlResult.value("username"), "", samlResult.value("preloginCookie"), samlResult.value("userAuthCookie"));
} }
void PortalAuthenticator::onSAMLLoginFail(const QString msg) void PortalAuthenticator::onSAMLLoginFail(const QString msg)
@ -134,13 +138,14 @@ void PortalAuthenticator::onSAMLLoginFail(const QString msg)
emitFail(msg); emitFail(msg);
} }
void PortalAuthenticator::fetchConfig(QString username, QString password, QString preloginCookie) void PortalAuthenticator::fetchConfig(QString username, QString password, QString preloginCookie, QString userAuthCookie)
{ {
LoginParams params; LoginParams params;
params.setServer(portal); params.setServer(portal);
params.setUser(username); params.setUser(username);
params.setPassword(password); params.setPassword(password);
params.setPreloginCookie(preloginCookie); params.setPreloginCookie(preloginCookie);
params.setUserAuthCookie(userAuthCookie);
// Save the username and password for future use. // Save the username and password for future use.
this->username = username; this->username = username;

2
GPClient/portalauthenticator.h
View File

@ -47,7 +47,7 @@ private:
void tryAutoLogin(); void tryAutoLogin();
void normalAuth(); void normalAuth();
void samlAuth(); void samlAuth();
void fetchConfig(QString username, QString password, QString preloginCookie = ""); void fetchConfig(QString username, QString password, QString preloginCookie = "", QString userAuthCookie = "");
void emitFail(const QString& msg = ""); void emitFail(const QString& msg = "");
}; };

13
GPClient/samlloginwindow.cpp
View File

@ -59,11 +59,19 @@ void SAMLLoginWindow::onResponseReceived(QJsonObject params)
const QString username = headers.value("saml-username").toString(); const QString username = headers.value("saml-username").toString();
const QString preloginCookie = headers.value("prelogin-cookie").toString(); const QString preloginCookie = headers.value("prelogin-cookie").toString();
const QString userAuthCookie = headers.value("portal-userauthcookie").toString();
if (!username.isEmpty() && !preloginCookie.isEmpty()) { if (!username.isEmpty()) {
samlResult.insert("username", username); samlResult.insert("username", username);
}
if (!preloginCookie.isEmpty()) {
samlResult.insert("preloginCookie", preloginCookie); samlResult.insert("preloginCookie", preloginCookie);
} }
if (!userAuthCookie.isEmpty()) {
samlResult.insert("userAuthCookie", userAuthCookie);
}
} }
void SAMLLoginWindow::onLoadFinished() void SAMLLoginWindow::onLoadFinished()
@ -71,7 +79,8 @@ void SAMLLoginWindow::onLoadFinished()
LOGI << "Load finished " << this->webView->page()->url().toString(); LOGI << "Load finished " << this->webView->page()->url().toString();
// Check the SAML result // Check the SAML result
if (!samlResult.value("username").isEmpty() && !samlResult.value("preloginCookie").isEmpty()) { if (samlResult.contains("username")
&& (samlResult.contains("preloginCookie") || samlResult.contains("userAuthCookie"))) {
emit success(samlResult); emit success(samlResult);
accept(); accept();
} else { } else {