github
/
openvpn-gui
mirror of https://github.com/OpenVPN/openvpn-gui
1
0
Fork 0
Code Issues Releases Wiki Activity

Add support for WEB_AUTH requests from server 

WEB_AUTH is treated same way as OPEN_URL with no support
for optional flags in WEB_AUTH message. In particular
proxy is not supported.

Closes #414

Signed-off-by: Selva Nair <selva.nair@gmail.com>
pull/569/head
Selva Nair 2022-12-18 23:14:25 -05:00
parent e96d8e4289
commit 18a09688bf
1 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
openvpn.c
View File

@ -1426,16 +1426,36 @@ void OnByteCount(connection_t *c, char *msg)
/* /*
* Handle INFOMSG from OpenVPN. At the moment it handles * Handle INFOMSG from OpenVPN. At the moment it handles
* OPEN_URL:<url> and CR_TEXT:<flags>:<challenge-str> messages * WEB_AUTH:<flags>:<url>, OPEN_URL:<url> and CR_TEXT:<flags>:<challenge-str> messages
* used by two-step authentication. * used by two-step authentication.
*/ */
void OnInfoMsg(connection_t* c, char* msg) void OnInfoMsg(connection_t* c, char* msg)
{ {
PrintDebug(L"OnInfoMsg with msg = %hs", msg); PrintDebug(L"OnInfoMsg with msg = %hs", msg);
char *p = NULL;
wchar_t *url = NULL;
if (strbegins(msg, "OPEN_URL:")) if (strbegins(msg, "OPEN_URL:"))
{ {
wchar_t* url = Widen(msg + 9); url = Widen(msg + 9);
}
else if (strbegins(msg, "WEB_AUTH:") && (p = strchr(msg + 9, ':')) != NULL)
{
if (p != msg + 9)
{
/* flags not empty: log a message that we do not support any flags */
*p = '\0';
wchar_t *flags = Widen(msg + 9);
if (flags)
WriteStatusLog (c, L"GUI> Unsupported flags in WEB_AUTH request ignored: ", flags, false);
free(flags);
}
url = Widen(p+1);
}
if (url)
{
if (!open_url(url)) if (!open_url(url))
{ {
WriteStatusLog(c, L"GUI> ", L"Error: failed to open url from info msg", false); WriteStatusLog(c, L"GUI> ", L"Error: failed to open url from info msg", false);
@ -2389,7 +2409,7 @@ LaunchOpenVPN(connection_t *c)
/* Construct command line -- put log first */ /* Construct command line -- put log first */
_sntprintf_0(cmdline, _T("openvpn --log%ls \"%ls\" --config \"%ls\" " _sntprintf_0(cmdline, _T("openvpn --log%ls \"%ls\" --config \"%ls\" "
"--setenv IV_GUI_VER \"%hs\" --setenv IV_SSO openurl,crtext --service %ls 0 --auth-retry interact " "--setenv IV_GUI_VER \"%hs\" --setenv IV_SSO openurl,webauth,crtext --service %ls 0 --auth-retry interact "
"--management %hs %hd stdin --management-query-passwords %ls" "--management %hs %hd stdin --management-query-passwords %ls"
"--management-hold"), "--management-hold"),
(o.log_append ? _T("-append") : _T("")), c->log_path, (o.log_append ? _T("-append") : _T("")), c->log_path,