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

ocserv: eliminated race condition with up/down scripts

Browse Source 
If a user is disconnected while the connect script is running,
kill the script and wait for its termination. If it successfully
terminated (exit code = 0) then run the user disconnect (down) script.
This commit is contained in:
Nikos Mavrogiannopoulos
2016-06-05 10:38:32 +02:00
parent ceed05b030
commit 1276ebeb48
2 changed files with 31 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/main-proc.c
View File

@@ -94,6 +94,8 @@ struct proc_st *ctmp;
*/
void remove_proc(main_server_st * s, struct proc_st *proc, unsigned flags)
{
pid_t pid;
ev_io_stop(EV_A_ &proc->io);
ev_child_stop(EV_A_ &proc->ev_child);
@@ -114,9 +116,22 @@ void remove_proc(main_server_st * s, struct proc_st *proc, unsigned flags)
mslog(s, proc, LOG_INFO, "user disconnected (reason: %s, rx: %"PRIu64", tx: %"PRIu64")",
discon_reason_to_str(proc->discon_reason), proc->bytes_in, proc->bytes_out);
remove_from_script_list(s, proc);
if (proc->status == PS_AUTH_COMPLETED) {
user_disconnected(s, proc);
pid = remove_from_script_list(s, proc);
if (proc->status == PS_AUTH_COMPLETED || pid > 0) {
if (pid > 0) {
int wstatus;
/* we were called during the connect script being run.
* wait for it to finish and if it returns zero run the
* disconnect script */
if (waitpid(pid, &wstatus, 0) > 0) {
if (WEXITSTATUS(wstatus) == 0)
user_disconnected(s, proc);
}
} else { /* pid > 0 or status == PS_AUTH_COMPLETED are mutually exclusive
* since PS_AUTH_COMPLETED is set only after a successful script run.
*/
user_disconnected(s, proc);
}
}
/* close the intercomm fd */

14
src/script-list.h
View File

@@ -22,6 +22,8 @@
# define SCRIPT_LIST_H
#include <main.h>
#include <sys/types.h>
#include <signal.h>
#include <ev.h>
void script_child_watcher_cb(struct ev_loop *loop, ev_child *w, int revents);
@@ -44,17 +46,27 @@ struct script_wait_st *stmp;
list_add(&s->script_list.head, &(stmp->list));
}
inline static void remove_from_script_list(main_server_st* s, struct proc_st* proc)
/* Removes the tracked connect script, and kills it. It returns the pid
* of the removed script or -1.
*/
inline static pid_t remove_from_script_list(main_server_st* s, struct proc_st* proc)
{
struct script_wait_st *stmp = NULL, *spos;
pid_t ret = -1;
list_for_each_safe(&s->script_list.head, stmp, spos, list) {
if (stmp->proc == proc) {
list_del(&stmp->list);
if (stmp->pid > 0) {
kill(stmp->pid, SIGTERM);
ret = stmp->pid;
}
talloc_free(stmp);
break;
}
}
return ret;
}
#endif