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

cleanup in match_password_in_reply()

Browse Source
This commit is contained in:
Nikos Mavrogiannopoulos
2015-05-19 13:29:43 +02:00
parent 9797ccee81
commit a4cb90b8eb
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/worker-auth.c
+4 -8
View File
@@ -1033,11 +1033,10 @@ int post_common_handler(worker_st * ws, unsigned http_ver, const char *imsg)
return 0; return 0;
} }
/* Returns the contents of the provided fields in a newly allocated /* Returns the contents of the password field in a newly allocated
* string, or a negative value on error. * string, or a negative value on error.
* *
* @body: is the string to search the xml field at, should be null-terminated. * @body: is the string to search the xml field at, should be null-terminated.
* @xml_field: the XML field to check for (e.g., MYFIELD)
* @value: the value that was found * @value: the value that was found
*/ */
static static
@@ -1045,7 +1044,6 @@ int match_password_in_reply(worker_st * ws, char *body, unsigned body_length,
char **value) char **value)
{ {
char *p; char *p;
char temp1[64];
unsigned len, xml = 0; unsigned len, xml = 0;
if (body == NULL || body_length == 0) if (body == NULL || body_length == 0)
@@ -1054,11 +1052,9 @@ int match_password_in_reply(worker_st * ws, char *body, unsigned body_length,
if (memmem(body, body_length, "<?xml", 5) != 0) { if (memmem(body, body_length, "<?xml", 5) != 0) {
xml = 1; xml = 1;
strlcpy(temp1, "<password", sizeof(temp1)); /* body should contain <password?>test</password?> */
/* body should contain <field>test</field> */
*value = *value =
strcasestr(body, temp1); strcasestr(body, "<password");
if (*value == NULL) { if (*value == NULL) {
oclog(ws, LOG_HTTP_DEBUG, oclog(ws, LOG_HTTP_DEBUG,
"cannot find password in client XML message"); "cannot find password in client XML message");
@@ -1084,7 +1080,7 @@ int match_password_in_reply(worker_st * ws, char *body, unsigned body_length,
len++; len++;
} }
} else { /* non-xml version */ } else { /* non-xml version */
/* body should be "username=test&password=test" */ /* body should be "username=test&password?=test" */
*value = *value =
strcasestr(body, "password"); strcasestr(body, "password");
if (*value == NULL) { if (*value == NULL) {