From f7033d3fee696a0d1a775686d1b229eae1b5a137 Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Tue, 6 Jan 2015 23:38:19 +0000 Subject: Add s6-applyuidgid --- doc/index.html | 1 + doc/s6-applyuidgid.html | 63 ++++++++++++++++++++++++ package/deps.mak | 3 ++ package/modes | 1 + package/targets.mak | 5 +- src/daemontools-extras/deps-exe/s6-applyuidgid | 1 + src/daemontools-extras/s6-applyuidgid.c | 68 ++++++++++++++++++++++++++ 7 files changed, 141 insertions(+), 1 deletion(-) create mode 100644 doc/s6-applyuidgid.html create mode 100644 src/daemontools-extras/deps-exe/s6-applyuidgid create mode 100644 src/daemontools-extras/s6-applyuidgid.c diff --git a/doc/index.html b/doc/index.html index 54e8925..bf8d0ae 100644 --- a/doc/index.html +++ b/doc/index.html @@ -138,6 +138,7 @@ counterpart.
  • The s6-setlock program
  • The s6-setsid program
  • The s6-setuidgid program
    • +
  • The s6-applyuidgid program
  • The s6-softlimit program
  • The s6-tai64n program
  • The s6-tai64nlocal program
    • diff --git a/doc/s6-applyuidgid.html b/doc/s6-applyuidgid.html new file mode 100644 index 0000000..9b4293e --- /dev/null +++ b/doc/s6-applyuidgid.html @@ -0,0 +1,63 @@ + + + + + s6: the s6-applyuidgid program + + + + + + +

    +s6
    +Software
    +skarnet.org +

    + +

    The s6-applyuidgid program

    + +

    + s6-applyuidgid executes a program with reduced privileges. +

    + +

    Interface

    + +
    +     s6-applyuidgid [ -z ] [ -u uid ] [ -g gid ] [ -G gidlist ] [ -U ] prog...
+
    + + + +

    Options

    + + + +

    Notes

    + + + + + diff --git a/package/deps.mak b/package/deps.mak index e728bb0..4b33279 100644 --- a/package/deps.mak +++ b/package/deps.mak @@ -5,6 +5,7 @@ src/include/s6/ftrigr.h: src/include/s6/config.h src/include/s6/s6.h: src/include/s6/ftrigr.h src/include/s6/ftrigw.h src/include/s6/s6-supervise.h src/include/s6/s6lock.h src/include/s6/s6lock.h: src/include/s6/config.h +src/daemontools-extras/s6-applyuidgid.o src/daemontools-extras/s6-applyuidgid.lo: src/daemontools-extras/s6-applyuidgid.c src/daemontools-extras/s6-envdir.o src/daemontools-extras/s6-envdir.lo: src/daemontools-extras/s6-envdir.c src/daemontools-extras/s6-envuidgid.o src/daemontools-extras/s6-envuidgid.lo: src/daemontools-extras/s6-envuidgid.c src/daemontools-extras/s6-fghack.o src/daemontools-extras/s6-fghack.lo: src/daemontools-extras/s6-fghack.c @@ -69,6 +70,8 @@ src/supervision/s6-svscanctl.o src/supervision/s6-svscanctl.lo: src/supervision/ src/supervision/s6-svstat.o src/supervision/s6-svstat.lo: src/supervision/s6-svstat.c src/include/s6/s6-supervise.h src/supervision/s6-svwait.o src/supervision/s6-svwait.lo: src/supervision/s6-svwait.c src/include/s6/ftrigr.h src/include/s6/s6-supervise.h +s6-applyuidgid: private EXTRA_LIBS := +s6-applyuidgid: src/daemontools-extras/s6-applyuidgid.o -lskarnet s6-envdir: private EXTRA_LIBS := s6-envdir: src/daemontools-extras/s6-envdir.o -lskarnet s6-envuidgid: private EXTRA_LIBS := diff --git a/package/modes b/package/modes index d3fb2e0..4b86721 100644 --- a/package/modes +++ b/package/modes @@ -15,6 +15,7 @@ s6-svscanctl 0755 s6-svok 0755 s6-svstat 0755 s6-svwait 0755 +s6-applyuidgid 0700 s6-envdir 0755 s6-envuidgid 0755 s6-fghack 0755 diff --git a/package/targets.mak b/package/targets.mak index 5353fc6..283cc67 100644 --- a/package/targets.mak +++ b/package/targets.mak @@ -21,12 +21,15 @@ s6-fghack \ s6-log \ s6-setlock \ s6-setsid \ -s6-setuidgid \ s6-softlimit \ s6-tai64n \ s6-tai64nlocal \ ucspilogd +SBIN_TARGETS := \ +s6-applyuidgid \ +s6-setuidgid + LIBEXEC_TARGETS := s6lockd-helper ifdef DO_SHARED diff --git a/src/daemontools-extras/deps-exe/s6-applyuidgid b/src/daemontools-extras/deps-exe/s6-applyuidgid new file mode 100644 index 0000000..e7187fe --- /dev/null +++ b/src/daemontools-extras/deps-exe/s6-applyuidgid @@ -0,0 +1 @@ +-lskarnet diff --git a/src/daemontools-extras/s6-applyuidgid.c b/src/daemontools-extras/s6-applyuidgid.c new file mode 100644 index 0000000..77beef2 --- /dev/null +++ b/src/daemontools-extras/s6-applyuidgid.c @@ -0,0 +1,68 @@ +/* ISC license. */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define USAGE "s6-applyuidgid [ -z ] [ -u uid ] [ -g gid ] [ -G gidlist ] [ -U ] prog..." +#define dieusage() strerr_dieusage(100, USAGE) + +int main (int argc, char const *const *argv, char const *const *envp) +{ + unsigned int uid = 0, gid = 0 ; + gid_t gids[NGROUPS_MAX] ; + unsigned int gidn = (unsigned int)-1 ; + int unexport = 0 ; + PROG = "s6-applyuidgid" ; + { + subgetopt_t l = SUBGETOPT_ZERO ; + for (;;) + { + register int opt = subgetopt_r(argc, argv, "zUu:g:G:", &l) ; + if (opt == -1) break ; + switch (opt) + { + case 'z' : unexport = 1 ; break ; + case 'u' : if (!uint0_scan(l.arg, &uid)) dieusage() ; break ; + case 'g' : if (!uint0_scan(l.arg, &gid)) dieusage() ; break ; + case 'G' : if (!gid_scanlist(gids, NGROUPS_MAX, l.arg, &gidn)) dieusage() ; break ; + case 'U' : + { + char const *x = env_get2(envp, "UID") ; + if (!x) strerr_dienotset(100, "UID") ; + if (!uint0_scan(x, &uid)) strerr_dieinvalid(100, "UID") ; + x = env_get2(envp, "GID") ; + if (!x) strerr_dienotset(100, "GID") ; + if (!uint0_scan(x, &gid)) strerr_dieinvalid(100, "GID") ; + x = env_get2(envp, "GIDLIST") ; + if (!x) strerr_dienotset(100, "GIDLIST") ; + if (!gid_scanlist(gids, NGROUPS_MAX, x, &gidn) && *x) + strerr_dieinvalid(100, "GIDLIST") ; + break ; + } + default : dieusage() ; + } + } + argc -= l.ind ; argv += l.ind ; + } + if (!argc) dieusage() ; + + if (gidn != (unsigned int)-1 && setgroups(gidn, gids) < 0) + strerr_diefu1sys(111, "set supplementary group list") ; + if (gid && setgid(gid) < 0) + strerr_diefu1sys(111, "setgid") ; + if (uid && setuid(uid) < 0) + strerr_diefu1sys(111, "setuid") ; + + if (unexport) pathexec_r(argv, envp, env_len(envp), "UID\0GID\0GIDLIST", 16) ; + else pathexec_run(argv[0], argv, envp) ; + strerr_dieexec(111, argv[0]) ; +} -- cgit v1.3.1