From 52b866481399dfcecd295560800d3e3fe0090f24 Mon Sep 17 00:00:00 2001 Message-Id: <52b866481399dfcecd295560800d3e3fe0090f24.1714750115.git.mdw@distorted.org.uk> From: Mark Wooding Date: Mon, 8 Dec 2008 12:00:14 +0000 Subject: [PATCH] server, common: Split more code into utilities. Organization: Straylight/Edgeware From: Mark Wooding * Move mystrieq to server/servutil.c where it belongs. * Move code to resolve user and group names, and to set user and group, into common/util.c where the client can get at it. (This will eventually be useful for privilege separation.) --- common/util.c | 86 +++++++++++++++++++++++++++++++++++++++++++++++ common/util.h | 43 ++++++++++++++++++++++++ server/servutil.c | 17 ++++++++++ server/tripe.c | 62 ++++------------------------------ 4 files changed, 153 insertions(+), 55 deletions(-) diff --git a/common/util.c b/common/util.c index d78dd78d..92b9853d 100644 --- a/common/util.c +++ b/common/util.c @@ -31,7 +31,14 @@ #include #include +#include +#include + +#include +#include + #include +#include #include "util.h" @@ -65,4 +72,83 @@ void u_quotify(dstr *d, const char *p) } } +/* --- @u_getuser@ --- * + * + * Arguments: @const char *name@ = user name or id requested + * @gid_t *gg@ = where to store corresponding gid + * + * Returns: Corresponding uid. + * + * Use: Resolves a user name into a uid. Dies on failure; suitable + * for use in argument parsing. + */ + +uid_t u_getuser(const char *name, gid_t *gg) +{ + struct passwd *pw; + char *p; + unsigned long i = strtoul(name, &p, 0); + + if (!*p) + pw = getpwuid(i); + else + pw = getpwnam(name); + if (!pw) + die(EXIT_FAILURE, "user `%s' not found", name); + if (gg && *gg == -1) + *gg = pw->pw_gid; + return (pw->pw_uid); +} + +/* --- @u_getgroup@ --- * + * + * Arguments: @const char *name@ = user name or id requested + * + * Returns: Corresponding gid. + * + * Use: Resolves a group name into a gid. Dies on failure; suitable + * for use in argument parsing. + */ + +gid_t u_getgroup(const char *name) +{ + struct group *gr; + char *p; + unsigned long i = strtoul(name, &p, 0); + + if (!*p) + gr = getgrgid(i); + else + gr = getgrnam(name); + if (!gr) + die(EXIT_FAILURE, "group `%s' not found", name); + return (gr->gr_gid); +} + +/* --- @u_setugid@ --- * + * + * Arguments: @uid_t u@ = user to set + * @gid_t g@ = group to set + * + * Returns: --- + * + * Use: Sets user and group to the given values; aborts on failure. + */ + +void u_setugid(uid_t u, gid_t g) +{ + if (g != (gid_t)-1) { + if (setgid(g) || (getuid() == 0 && setgroups(1, &g))) { + die(EXIT_FAILURE, "couldn't setgid to %u: %s", + (unsigned)g, strerror(errno)); + } + } + if (u != (uid_t)-1) { + if (setuid(u)) { + die(EXIT_FAILURE, "couldn't setuid to %u: %s", + (unsigned)u, strerror(errno)); + } + } +} + /*----- That's all, folks -------------------------------------------------*/ diff --git a/common/util.h b/common/util.h index aaef36f3..1928c042 100644 --- a/common/util.h +++ b/common/util.h @@ -27,6 +27,12 @@ #ifndef UTIL_H #define UTIL_H +#ifndef CONFIG_H +# include "config.h" +#endif + +#include + #ifdef __cplusplus extern "C" { #endif @@ -46,6 +52,43 @@ extern void u_quotify(dstr */*d*/, const char */*p*/); +/* --- @u_getuser@ --- * + * + * Arguments: @const char *name@ = user name or id requested + * @gid_t *gg@ = where to store corresponding gid + * + * Returns: Corresponding uid. + * + * Use: Resolves a user name into a uid. Dies on failure; suitable + * for use in argument parsing. + */ + +extern uid_t u_getuser(const char */*name*/, gid_t */*gg*/); + +/* --- @u_getgroup@ --- * + * + * Arguments: @const char *name@ = user name or id requested + * + * Returns: Corresponding gid. + * + * Use: Resolves a group name into a gid. Dies on failure; suitable + * for use in argument parsing. + */ + +extern gid_t u_getgroup(const char */*name*/); + +/* --- @u_setugid@ --- * + * + * Arguments: @uid_t u@ = user to set + * @gid_t g@ = group to set + * + * Returns: --- + * + * Use: Sets user and group to the given values; aborts on failure. + */ + +extern void u_setugid(uid_t /*u*/, gid_t /*g*/); + /*----- That's all, folks -------------------------------------------------*/ #ifdef __cplusplus diff --git a/server/servutil.c b/server/servutil.c index c95b23fd..1f6301a4 100644 --- a/server/servutil.c +++ b/server/servutil.c @@ -89,6 +89,23 @@ const char *timestr(time_t t) return ((const char *)buf_t); } +/* --- @mystrieq@ --- * + * + * Arguments: @const char *x, *y@ = two strings + * + * Returns: True if @x@ and @y are equal, up to case. + */ + +int mystrieq(const char *x, const char *y) +{ + for (;;) { + if (!*x && !*y) return (1); + if (tolower((unsigned char)*x) != tolower((unsigned char)*y)) + return (0); + x++; y++; + } +} + /* --- @seq_reset@ --- * * * Arguments: @seqwin *s@ = sequence-checking window diff --git a/server/tripe.c b/server/tripe.c index 280878c9..60ab4fd8 100644 --- a/server/tripe.c +++ b/server/tripe.c @@ -60,23 +60,6 @@ static void interval(struct timeval *tv, void *v) sel_addtimer(&sel, &it, &tvv, interval, v); } -/* --- @mystrieq@ --- * - * - * Arguments: @const char *x, *y@ = two strings - * - * Returns: True if @x@ and @y are equal, up to case. - */ - -int mystrieq(const char *x, const char *y) -{ - for (;;) { - if (!*x && !*y) return (1); - if (tolower((unsigned char)*x) != tolower((unsigned char)*y)) - return (0); - x++; y++; - } -} - /* --- @main@ --- * * * Arguments: @int argc@ = number of command line arguments @@ -200,32 +183,12 @@ int main(int argc, char *argv[]) case 'D': f |= f_daemon; break; - case 'U': { - struct passwd *pw; - char *p; - unsigned long i = strtoul(optarg, &p, 0); - if (!*p) - pw = getpwuid(i); - else - pw = getpwnam(optarg); - if (!pw) - die(EXIT_FAILURE, "user `%s' not found", optarg); - u = pw->pw_uid; - if (g == -1) - g = pw->pw_gid; - } break; - case 'G': { - struct group *gr; - char *p; - unsigned long i = strtoul(optarg, &p, 0); - if (!*p) - gr = getgrgid(i); - else - gr = getgrnam(optarg); - if (!gr) - die(EXIT_FAILURE, "group `%s' not found", optarg); - g = gr->gr_gid; - } break; + case 'U': + u = u_getuser(optarg, &g); + break; + case 'G': + g = u_getgroup(optarg); + break; case 'b': { struct hostent *h = gethostbyname(optarg); @@ -314,18 +277,7 @@ int main(int argc, char *argv[]) a_create(STDIN_FILENO, STDOUT_FILENO, AF_WARN); #endif } - if (g != (gid_t)-1) { - if (setgid(g) || (getuid() == 0 && setgroups(1, &g))) { - die(EXIT_FAILURE, "couldn't setgid to %u: %s", - (unsigned)g, strerror(errno)); - } - } - if (u != (uid_t)-1) { - if (setuid(u)) { - die(EXIT_FAILURE, "couldn't setuid to %u: %s", - (unsigned)u, strerror(errno)); - } - } + u_setugid(u, g); km_init(kr_priv, kr_pub, tag_priv); a_init(csock); if (f & f_daemon) { -- [mdw]