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

when restoring a cookie connection, extend the lifetime of the cookie.

Browse Source
This commit is contained in:
Nikos Mavrogiannopoulos
2013-02-15 22:45:41 +01:00
parent 59026fb8f1
commit 0ff3f6de3c
3 changed files with 46 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/cookies-gdbm.c
View File

@@ -38,6 +38,9 @@
#ifdef HAVE_GDBM
/* Note that it receives allocated data and stores them. Do not
* free the sc.
*/
static
int cookie_gdbm_store(main_server_st *s, struct stored_cookie_st* sc)
{
@@ -71,6 +74,7 @@ finish:
return ret;
}
/* retrieves and deletes the entry */
static
int cookie_gdbm_retrieve(main_server_st *s, const void* cookie, unsigned cookie_size,
struct stored_cookie_st* sc)
@@ -95,11 +99,9 @@ int ret;
goto finish;
}
memcpy(sc, data.dptr, data.dsize);
gdbm_delete(dbf, key);
if (sc->expiration >= time(0))
ret = 0;
else
ret = -1;
ret = 0;
finish:
gdbm_close(dbf);

8
src/cookies-hash.c
View File

@@ -39,7 +39,8 @@
#define MAX_COOKIES(n) ((n>0&&n>64)?(2*n):128)
/* receives allocated data and stores them.
/* Note that it receives allocated data and stores them. Do not
* free the sc.
*/
static
int store_cookie_hash(main_server_st *s, struct stored_cookie_st* sc)
@@ -60,6 +61,7 @@ size_t key;
return 0;
}
/* retrieves and deletes the entry */
static
int retrieve_cookie_hash(main_server_st *s, const void* cookie, unsigned cookie_size,
struct stored_cookie_st* rsc)
@@ -75,10 +77,8 @@ struct stored_cookie_st * sc;
if (cookie_size == COOKIE_SIZE &&
memcmp (cookie, sc->cookie, COOKIE_SIZE) == 0) {
if (sc->expiration < time(0))
return -1;
memcpy(rsc, sc, sizeof(*sc));
htable_delval(&s->cookie_db->ht, &iter);
return 0;
}

46
src/main-auth.c
View File

@@ -103,18 +103,29 @@ int handle_auth_cookie_req(main_server_st* s, struct proc_st* proc,
const struct cmd_auth_cookie_req_st * req, struct lease_st **lease)
{
int ret;
struct stored_cookie_st sc;
struct stored_cookie_st *sc;
time_t now = time(0);
ret = retrieve_cookie(s, req->cookie, sizeof(req->cookie), &sc);
if (ret < 0) {
sc = malloc(sizeof(*sc));
if (sc == NULL)
return -1;
ret = retrieve_cookie(s, req->cookie, sizeof(req->cookie), sc);
if (ret < 0) {
ret = -1;
goto cleanup;
}
if (sc->expiration < now) {
ret = -1;
goto cleanup;
}
memcpy(proc->cookie, req->cookie, sizeof(proc->cookie));
memcpy(proc->username, sc.username, sizeof(proc->username));
memcpy(proc->groupname, sc.groupname, sizeof(proc->groupname));
memcpy(proc->hostname, sc.hostname, sizeof(proc->hostname));
memcpy(proc->session_id, sc.session_id, sizeof(proc->session_id));
memcpy(proc->username, sc->username, sizeof(proc->username));
memcpy(proc->groupname, sc->groupname, sizeof(proc->groupname));
memcpy(proc->hostname, sc->hostname, sizeof(proc->hostname));
memcpy(proc->session_id, sc->session_id, sizeof(proc->session_id));
proc->session_id_size = sizeof(proc->session_id);
proc->username[sizeof(proc->username)-1] = 0;
@@ -124,19 +135,34 @@ struct stored_cookie_st sc;
if (req->tls_auth_ok != 0) {
if (strcmp(proc->username, req->cert_user) != 0) {
mslog(s, proc, LOG_INFO, "user '%s' presented a certificate from user '%s'", proc->username, req->cert_user);
return -1;
ret = -1;
goto cleanup;
}
if (strcmp(proc->groupname, req->cert_group) != 0) {
mslog(s, proc, LOG_INFO, "user '%s' presented a certificate from group '%s' but he is member of '%s'", proc->username, req->cert_group, proc->groupname);
return -1;
ret = -1;
goto cleanup;
}
}
ret = open_tun(s, lease);
if (ret < 0) {
ret = -1; /* sorry */
goto cleanup;
}
/* ok auth ok. Renew the cookie. */
sc->expiration = time(0) + s->config->cookie_validity;
ret = store_cookie(s, sc);
if (ret < 0)
return -1; /* sorry */
goto cleanup;
/* sc is freed in store_cookie() */
return 0;
cleanup:
free(sc);
return ret;
}
int generate_and_store_vals(main_server_st *s, struct proc_st* proc)