diff --git a/CHANGELOG.md b/CHANGELOG.md index 4e3322cd..d82898a2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -54,7 +54,7 @@ Expected: July 2023 ### C/CLI-API changes on existing features Developers may need to change their code -* Added `uid` and `gid` parameters to `clixon_process_register()` for drop privs +* Added `uid`, `gid` and `fdkeep` parameters to `clixon_process_register()` for drop privs * Added output function to JSON output: * `xml2json_vec(...,skiptop)` --> `xml2json_vec(..., cligen_output, skiptop)` * `yang2cli_yspec` removed last argument `printgen`. diff --git a/apps/backend/backend_plugin_restconf.c b/apps/backend/backend_plugin_restconf.c index c12769c1..db6b5b2e 100644 --- a/apps/backend/backend_plugin_restconf.c +++ b/apps/backend/backend_plugin_restconf.c @@ -314,7 +314,7 @@ restconf_pseudo_process_control(clicon_handle h) if (clixon_process_register(h, RESTCONF_PROCESS, "Clixon RESTCONF process", NULL /* XXX network namespace */, - -1, -1, + -1, -1, -1, restconf_rpc_wrapper, argv, nr) < 0) goto done; diff --git a/lib/clixon/clixon_proc.h b/lib/clixon/clixon_proc.h index 399f8c5d..f7828339 100644 --- a/lib/clixon/clixon_proc.h +++ b/lib/clixon/clixon_proc.h @@ -70,7 +70,7 @@ int clixon_proc_socket_close(pid_t pid, int sock); int clixon_process_pid(clicon_handle h, const char *name, pid_t *pid); proc_operation clixon_process_op_str2int(char *opstr); int clixon_process_argv_get(clicon_handle h, const char *name, char ***argv, int *argc); -int clixon_process_register(clicon_handle h, const char *name, const char *descr, const char *netns, uid_t uid, gid_t gid, proc_cb_t *callback, char **argv, int argc); +int clixon_process_register(clicon_handle h, const char *name, const char *descr, const char *netns, uid_t uid, gid_t gid, int fdkeep, proc_cb_t *callback, char **argv, int argc); int clixon_process_delete_all(clicon_handle h); int clixon_process_operation(clicon_handle h, const char *name, proc_operation op, const int wrapit); int clixon_process_status(clicon_handle h, const char *name, cbuf *cbret); diff --git a/lib/src/clixon_proc.c b/lib/src/clixon_proc.c index dbfbc3b1..31d9a1d8 100644 --- a/lib/src/clixon_proc.c +++ b/lib/src/clixon_proc.c @@ -147,6 +147,7 @@ struct process_entry_t { char *pe_netns; /* Network namespace */ uid_t pe_uid; /* UID of process or -1 to keep same as backend */ gid_t pe_gid; /* GID of process or -1 to keep same as backend */ + gid_t pe_fdkeep; /* Unless -1 skip closing (one) filedes, typically 2/stderr */ char **pe_argv; /* argv with command as element 0 and NULL-terminated */ int pe_argc; /* Length of argc */ pid_t pe_pid; /* Running process id (state) or 0 if dead (pid is set if exiting=1) */ @@ -266,6 +267,7 @@ clixon_proc_socket_close(pid_t pid, * @param[in] argv NULL-terminated Argument vector * @param[in] netns Network namespace (or NULL) * @param[in] uid User-id or -1 to keep existing + * @param[in] fdkeep If -1 keep this filedes open * @param[out] pid Process id * @retval 0 OK * @retval -1 Error. @@ -275,6 +277,7 @@ clixon_proc_background(char **argv, const char *netns, uid_t uid, gid_t gid, + int fdkeep, pid_t *pid0) { int retval = -1; @@ -315,19 +318,20 @@ clixon_proc_background(char **argv, char nsfile[PATH_MAX]; int nsfd; #endif - clicon_debug(1, "%s child", __FUNCTION__); clicon_signal_unblock(0); signal(SIGTSTP, SIG_IGN); - if (chdir("/") < 0){ - clicon_err(OE_UNIX, errno, "chdirq"); + clicon_err(OE_UNIX, errno, "chdir"); exit(1); } /* Close open descriptors */ if ( ! getrlimit(RLIMIT_NOFILE, &rlim)) - for (i = 0; i < rlim.rlim_cur; i++) + for (i = 0; i < rlim.rlim_cur; i++){ + if (fdkeep != -1 && i == fdkeep) // XXX stderr + continue; close(i); + } #ifdef HAVE_SETNS /* linux network namespaces */ /* If network namespace is defined, let child join it * XXX: this is work-in-progress @@ -445,6 +449,7 @@ clixon_process_argv_get(clicon_handle h, * @param[in] netns Namespace netspace (or NULL) * @param[in] uid UID of process (or -1 to keep same) * @param[in] gid GID of process (or -1 to keep same) + * @param[in] fdkeep Unless -1 skip closing (one) filedes, typically 2/stderr * @param[in] callback Wrapper function * @param[in] argv NULL-terminated vector of vectors * @param[in] argc Length of argv @@ -459,6 +464,7 @@ clixon_process_register(clicon_handle h, const char *netns, const uid_t uid, const gid_t gid, + const int fdkeep, proc_cb_t *callback, char **argv, int argc) @@ -494,6 +500,7 @@ clixon_process_register(clicon_handle h, } pe->pe_uid = uid; pe->pe_gid = gid; + pe->pe_fdkeep = fdkeep; pe->pe_argc = argc; if ((pe->pe_argv = calloc(argc, sizeof(char *))) == NULL){ clicon_err(OE_UNIX, errno, "calloc"); @@ -864,7 +871,7 @@ clixon_process_sched(int fd, goto done; if (!isrunning) if (clixon_proc_background(pe->pe_argv, pe->pe_netns, - pe->pe_uid, pe->pe_gid, + pe->pe_uid, pe->pe_gid, pe->pe_fdkeep, &pe->pe_pid) < 0) goto done; clicon_debug(1, "%s %s(%d) %s --%s--> %s", __FUNCTION__, @@ -891,7 +898,7 @@ clixon_process_sched(int fd, if (isrunning) /* Already runs */ break; if (clixon_proc_background(pe->pe_argv, pe->pe_netns, - pe->pe_uid, pe->pe_gid, + pe->pe_uid, pe->pe_gid, pe->pe_fdkeep, &pe->pe_pid) < 0) goto done; clicon_debug(1, "%s %s(%d) %s --%s--> %s", __FUNCTION__, @@ -996,7 +1003,7 @@ clixon_process_waitpid(clicon_handle h) /* This is the case where there is an existing process running. * it was killed above but still runs and needs to be reaped */ if (clixon_proc_background(pe->pe_argv, pe->pe_netns, - pe->pe_uid, pe->pe_gid, + pe->pe_uid, pe->pe_gid, pe->pe_fdkeep, &pe->pe_pid) < 0) goto done; gettimeofday(&pe->pe_starttime, NULL);