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

Bug fix for challenge string parsing 

Fix parsing of the challenge text that could contain the
delimiter ':'

Signed-off-by: Selva Nair <selva.nair@gmail.com>
pull/443/head
Selva Nair 2021-08-14 01:22:59 -04:00
parent 04ce476a58
commit fcc964bf95
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
openvpn.c
View File

@ -914,9 +914,12 @@ parse_dynamic_cr (const char *str, auth_param_t *param)
if (!param || !p) goto out; if (!param || !p) goto out;
/* expected: str = "E,R:challenge_id:user_b64:challenge_str" */ /* expected: str = "E,R:challenge_id:user_b64:challenge_str" */
const char *delim = ":";
for (i = 0, p1 = p; i < 4; ++i, p1 = NULL) for (i = 0, p1 = p; i < 4; ++i, p1 = NULL)
{ {
token[i] = strtok (p1, ":"); /* strtok is thread-safe on Windows */ if (i == 3)
delim = "" ; /* take the entire trailing string as the challenge */
token[i] = strtok (p1, delim); /* strtok is thread-safe on Windows */
if (!token[i]) if (!token[i])
{ {
WriteStatusLog(param->c, L"GUI> ", L"Error parsing dynamic challenge string", false); WriteStatusLog(param->c, L"GUI> ", L"Error parsing dynamic challenge string", false);
@ -955,23 +958,22 @@ parse_crtext (const char* str, auth_param_t* param)
BOOL ret = FALSE; BOOL ret = FALSE;
char* token[2] = { 0 }; char* token[2] = { 0 };
char* p = strdup(str); char* p = strdup(str);
int i;
char* p1; char* p1;
if (!param || !p) goto out; if (!param || !p) goto out;
/* expected: str = "E,R:challenge_str" */ /* expected: str = "E,R:challenge_str" */
for (i = 0, p1 = p; i < 2; ++i, p1 = NULL) token[0] = p;
p1 = strchr(p, ':');
if (!p1)
{ {
token[i] = strtok(p1, ":"); /* strtok is thread-safe on Windows */ WriteStatusLog(param->c, L"GUI> ", L"Error parsing crtext challenge string", false);
if (!token[i]) goto out;
{
WriteStatusLog(param->c, L"GUI> ", L"Error parsing crtext string", false);
goto out;
}
} }
*p1 = '\0';
token[1] = p1 + 1;
param->flags |= FLAG_CR_TYPE_CRTEXT; param->flags |= FLAG_CR_TYPE_CRTEXT;
param->flags |= strchr(token[0], 'E') ? FLAG_CR_ECHO : 0; param->flags |= strchr(token[0], 'E') ? FLAG_CR_ECHO : 0;
param->flags |= strchr(token[0], 'R') ? FLAG_CR_RESPONSE : 0; param->flags |= strchr(token[0], 'R') ? FLAG_CR_RESPONSE : 0;