From afd9b68d102fc4a7614885267e99299247a031d8 Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Tue, 8 Mar 2022 11:02:17 +0000 Subject: Add getpeerid compat. --- compat/getpeereid.c | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 compat/getpeereid.c (limited to 'compat/getpeereid.c') diff --git a/compat/getpeereid.c b/compat/getpeereid.c new file mode 100644 index 00000000..722f14a2 --- /dev/null +++ b/compat/getpeereid.c @@ -0,0 +1,40 @@ +/* + * Copyright (c) 2022 Nicholas Marriott + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER + * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING + * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +#include +#include + +#include + +#include "compat.h" + +int +getpeereid(int s, uid_t *uid, gid_t *gid) +{ +#ifdef HAVE_SO_PEERCRED + struct ucred uc; + int len = sizeof uc; + + if (getsockopt(s, SOL_SOCKET, SO_PEERCRED, &uc, &len) == -1) + return (-1); + *uid = uc.uid; + *gid = uc.gid; + return (0); +#else + errno = EOPNOTSUPP; + return (-1); +#endif +} -- cgit From 04952f15df1bc81d1878833533d344a6b1d1326c Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Tue, 8 Mar 2022 11:35:06 +0000 Subject: Use getpeerucred if available (not tested). --- compat/getpeereid.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'compat/getpeereid.c') diff --git a/compat/getpeereid.c b/compat/getpeereid.c index 722f14a2..5a593c07 100644 --- a/compat/getpeereid.c +++ b/compat/getpeereid.c @@ -19,6 +19,10 @@ #include +#ifdef HAVE_UCRED_H +#include +#endif + #include "compat.h" int @@ -33,6 +37,21 @@ getpeereid(int s, uid_t *uid, gid_t *gid) *uid = uc.uid; *gid = uc.gid; return (0); +#elif defined(HAVE_GETPEERUCRED) +int +getpeereid(int s, uid_t *uid, gid_t *gid) +{ + ucred_t *ucred = NULL; + + if (getpeerucred(s, &ucred) == -1) + return (-1); + if ((*uid = ucred_geteuid(ucred)) == -1) + return (-1); + if ((*gid = ucred_getrgid(ucred)) == -1) + return (-1); + ucred_free(ucred); + return (0); +} #else errno = EOPNOTSUPP; return (-1); -- cgit From 8bcd392ee79996f828fd40c52198071ec0f273dd Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Wed, 6 Apr 2022 16:47:59 +0100 Subject: On platforms with no way to get peer UID, use getuid(), also fix some failure checks. --- compat/getpeereid.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'compat/getpeereid.c') diff --git a/compat/getpeereid.c b/compat/getpeereid.c index 5a593c07..c4988438 100644 --- a/compat/getpeereid.c +++ b/compat/getpeereid.c @@ -53,7 +53,6 @@ getpeereid(int s, uid_t *uid, gid_t *gid) return (0); } #else - errno = EOPNOTSUPP; - return (-1); + return (getuid()); #endif } -- cgit From be2617036ff7f53343e24101654015b875258777 Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Thu, 2 Jun 2022 21:44:28 +0100 Subject: Remove extra definition of getpeereid. From Eric N Vander Weele in GitHub issue 3209. --- compat/getpeereid.c | 4 ---- 1 file changed, 4 deletions(-) (limited to 'compat/getpeereid.c') diff --git a/compat/getpeereid.c b/compat/getpeereid.c index c4988438..c194e886 100644 --- a/compat/getpeereid.c +++ b/compat/getpeereid.c @@ -38,9 +38,6 @@ getpeereid(int s, uid_t *uid, gid_t *gid) *gid = uc.gid; return (0); #elif defined(HAVE_GETPEERUCRED) -int -getpeereid(int s, uid_t *uid, gid_t *gid) -{ ucred_t *ucred = NULL; if (getpeerucred(s, &ucred) == -1) @@ -51,7 +48,6 @@ getpeereid(int s, uid_t *uid, gid_t *gid) return (-1); ucred_free(ucred); return (0); -} #else return (getuid()); #endif -- cgit