GitLab/ocserv
1
0
Fork 0
mirror of https://gitlab.com/openconnect/ocserv.git synced 2026-02-09 08:16:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Combine username and password in one form

Browse Source 
Fixes issue #551.

This patch combines the initial username and password text fields
into a single form. Subsequent requests due to a wrong password
would receive only the password field as before. This mimicks
AnyConnect's default behaviour.

Signed-off-by: Lee Keitel <lee@keitel.xyz>
This commit is contained in:
Lee Keitel
2025-05-05 12:07:01 -05:00
committed by Nikos Mavrogiannopoulos
parent e12b278260
commit 6e5bbcf5ac
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/worker-auth.c
View File

@@ -346,6 +346,13 @@ int get_auth_handler2(worker_st *ws, unsigned int http_ver, const char *pmsg,
ret = -1;
goto cleanup;
}
ret = str_append_str(&str,
OC_LOGIN_FORM_INPUT_PASSWORD);
if (ret < 0) {
ret = -1;
goto cleanup;
}
}
if ((ws->selected_auth->type & AUTH_TYPE_CERTIFICATE) &&
@@ -1835,7 +1842,14 @@ int post_auth_handler(worker_st *ws, unsigned int http_ver)
if (ws->selected_auth->type & AUTH_TYPE_GSSAPI) {
ret = basic_auth_handler(ws, http_ver, msg);
} else {
ret = get_auth_handler2(ws, http_ver, msg, pcounter);
if (username != NULL) {
/* Process the same request a second time to get the password
and do the necessary secmod requests */
ret = post_auth_handler(ws, http_ver);
} else {
ret = get_auth_handler2(ws, http_ver, msg,
pcounter);
}
}
goto cleanup;
} else if (ret < 0) {