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

When sending auth_id reply to pre-3.x clients use a different auth_id for username and password

Browse Source 
That is because some modified v2.x clients require that any response
that asks for information does not have an XML form with auth_id set
to "main".

Resolves #55
This commit is contained in:
Nikos Mavrogiannopoulos
2016-06-20 23:02:38 +02:00
parent bcef7c58cf
commit 954607e88a
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/worker-auth.c
View File

@@ -80,12 +80,15 @@ static const char login_msg_user[] =
#define LOGIN_MSG_PASSWORD_CTR \
"<input type=\"password\" name=\"secondary_password\" label=\"Password%d:\" />\n"
#define OCV3_LOGIN_MSG_START \
#define _OCV3_LOGIN_MSG_START(x) \
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" \
"<auth id=\"main\">\n" \
"<auth id=\""x"\">\n" \
"<message>%s</message>\n" \
"<form method=\"post\" action=\"/auth\">\n"
#define OCV3_LOGIN_MSG_START _OCV3_LOGIN_MSG_START("main")
#define OCV3_PASSWD_MSG_START _OCV3_LOGIN_MSG_START("passwd")
static const char ocv3_login_msg_end[] =
"</form></auth>\n";
@@ -175,7 +178,12 @@ int get_auth_handler2(worker_st * ws, unsigned http_ver, const char *pmsg, unsig
const char *login_msg_end;
if (ws->req.user_agent_type == AGENT_OPENCONNECT_V3) {
login_msg_start = OCV3_LOGIN_MSG_START;
/* certain v2.x modified clients require a different auth_id
* when password is being requested, rather than username */
if (ws->auth_state == S_AUTH_REQ)
login_msg_start = OCV3_PASSWD_MSG_START;
else
login_msg_start = OCV3_LOGIN_MSG_START;
login_msg_end = ocv3_login_msg_end;
} else {
login_msg_start = OC_LOGIN_MSG_START;