GitLab/ocserv
1
0
Fork 0
mirror of https://gitlab.com/openconnect/ocserv.git synced 2026-03-06 06:47:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

sec-mod: pass all failures through handle_sec_auth_res()

Browse Source 
That will set the proper state to the user entry.
This commit is contained in:
Nikos Mavrogiannopoulos
2015-01-28 12:55:54 +01:00
parent 0dc2e43335
commit 5d3b2da2e1
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/sec-mod-auth.c
View File

@@ -447,15 +447,17 @@ int handle_sec_auth_cont(int cfd, sec_mod_st * sec, const SecAuthContMsg * req)
if (e->status != PS_AUTH_INIT) {
seclog(sec, LOG_ERR, "auth cont received but we are on state %u!", e->status);
return -1;
ret = -1;
goto cleanup;
}
seclog(sec, LOG_DEBUG, "auth cont for user '%s'", e->username);
if (req->password == NULL) {
seclog(sec, LOG_ERR, "no password given in auth cont for user '%s'",
e->username);
return -1;
e->username);
ret = -1;
goto cleanup;
}
ret =
@@ -467,6 +469,7 @@ int handle_sec_auth_cont(int cfd, sec_mod_st * sec, const SecAuthContMsg * req)
e->username);
}
cleanup:
return handle_sec_auth_res(cfd, sec, e, ret);
}
@@ -504,14 +507,16 @@ int handle_sec_auth_init(int cfd, sec_mod_st * sec, const SecAuthInitMsg * req)
module->auth_init(&e->auth_ctx, e, req->user_name, req->ip,
sec->config->auth_additional);
if (ret < 0) {
return ret;
goto cleanup;
}
ret =
module->auth_group(e->auth_ctx, req->group_name, e->groupname,
sizeof(e->groupname));
if (ret != 0)
return -1;
if (ret != 0) {
ret = -1;
goto cleanup;
}
e->groupname[sizeof(e->groupname) - 1] = 0;
/* a module is allowed to change the name of the user */
@@ -538,7 +543,8 @@ int handle_sec_auth_init(int cfd, sec_mod_st * sec, const SecAuthInitMsg * req)
if (found == 0) {
seclog(sec, LOG_AUTH, "user '%s' requested group '%s' but is not included on his certificate groups",
req->user_name, req->group_name);
return -1;
ret = -1;
goto cleanup;
}
}
}