summaryrefslogtreecommitdiff
path: root/src/libs6
diff options
context:
space:
mode:
Diffstat (limited to 'src/libs6')
-rw-r--r--src/libs6/s6_accessrules_keycheck_uidgid.c22
1 files changed, 18 insertions, 4 deletions
diff --git a/src/libs6/s6_accessrules_keycheck_uidgid.c b/src/libs6/s6_accessrules_keycheck_uidgid.c
index 61a6229..573382c 100644
--- a/src/libs6/s6_accessrules_keycheck_uidgid.c
+++ b/src/libs6/s6_accessrules_keycheck_uidgid.c
@@ -1,16 +1,30 @@
/* ISC license. */
+#include <unistd.h>
+
#include <skalibs/uint64.h>
#include <skalibs/types.h>
#include <s6/accessrules.h>
s6_accessrules_result_t s6_accessrules_keycheck_uidgid (void const *key, void *data, s6_accessrules_params_t *params, s6_accessrules_backend_func_t_ref check1)
{
+ uidgid_t const *uidgid = key ;
char fmt[4 + UINT64_FMT] = "uid/" ;
- s6_accessrules_result_t r = (*check1)(fmt, 4 + uid_fmt(fmt+4, ((uidgid_t const *)key)->left), data, params) ;
+ s6_accessrules_result_t r ;
+ if (uidgid->left == geteuid())
+ {
+ r = (*check1)("uid/self", 8, data, params) ;
+ if (r != S6_ACCESSRULES_NOTFOUND) return r ;
+ }
+ r = (*check1)(fmt, 4 + uid_fmt(fmt+4, uidgid->left), data, params) ;
if (r != S6_ACCESSRULES_NOTFOUND) return r ;
+ if (uidgid->right == getegid())
+ {
+ r = (*check1)("gid/self", 8, data, params) ;
+ if (r != S6_ACCESSRULES_NOTFOUND) return r ;
+ }
fmt[0] = 'g' ;
- r = (*check1)(fmt, 4 + gid_fmt(fmt+4, ((uidgid_t const *)key)->right), data, params) ;
- return (r != S6_ACCESSRULES_NOTFOUND) ? r :
- (*check1)("uid/default", 11, data, params) ;
+ r = (*check1)(fmt, 4 + gid_fmt(fmt+4, uidgid->right), data, params) ;
+ if (r != S6_ACCESSRULES_NOTFOUND) return r ;
+ return (*check1)("uid/default", 11, data, params) ;
}