Mirrors/libwebsockets
1
0
Fork 0
mirror of https://github.com/warmcat/libwebsockets.git synced 2025-03-09 00:00:04 +01:00
Code Issues Releases Wiki Activity

unix: use getpwnam_r and friends

Browse source 
Figure out if the threadsafe versions are available on the platform and
use them if so
This commit is contained in:
Andy Green 2021-03-24 06:11:03 +00:00
parent ffb49e2612
commit b9ee27f3c5
3 changed files with 67 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

@ -551,6 +551,10 @@ CHECK_FUNCTION_EXISTS(atoll LWS_HAVE_ATOLL)
CHECK_FUNCTION_EXISTS(_atoi64 LWS_HAVE__ATOI64)
CHECK_FUNCTION_EXISTS(_stat32i64 LWS_HAVE__STAT32I64)
CHECK_FUNCTION_EXISTS(clock_gettime LWS_HAVE_CLOCK_GETTIME)
CHECK_FUNCTION_EXISTS(getgrgid_r LWS_HAVE_GETGRGID_R)
CHECK_FUNCTION_EXISTS(getgrnam_r LWS_HAVE_GETGRNAM_R)
CHECK_FUNCTION_EXISTS(getpwuid_r LWS_HAVE_GETPWUID_R)
CHECK_FUNCTION_EXISTS(getpwnam_r LWS_HAVE_GETPWNAM_R)
if (NOT LWS_HAVE_GETIFADDRS)

4
cmake/lws_config.h.in
View file

@ -50,6 +50,10 @@
#cmakedefine LWS_HAVE_EVP_aes_128_xts
#cmakedefine LWS_HAVE_EVP_PKEY_new_raw_private_key
#cmakedefine LWS_HAVE_EXECVPE
#cmakedefine LWS_HAVE_GETGRGID_R
#cmakedefine LWS_HAVE_GETGRNAM_R
#cmakedefine LWS_HAVE_GETPWUID_R
#cmakedefine LWS_HAVE_GETPWNAM_R
#cmakedefine LWS_HAVE_LIBCAP
#cmakedefine LWS_HAVE_HMAC_CTX_new
#cmakedefine LWS_HAVE_MALLOC_H

74
lib/plat/unix/unix-caps.c
View file

@ -52,8 +52,8 @@ int
lws_plat_user_colon_group_to_ids(const char *u_colon_g, uid_t *puid, gid_t *pgid)
{
char *colon = strchr(u_colon_g, ':'), u[33];
struct passwd *p;
struct group *g;
struct passwd *p;
size_t ulen;
if (!colon)
@ -68,21 +68,41 @@ lws_plat_user_colon_group_to_ids(const char *u_colon_g, uid_t *puid, gid_t *pgid
colon++;
g = getgrnam(colon);
if (!g) {
lwsl_err("%s: unknown group '%s'\n", __func__, colon);
#if defined(LWS_HAVE_GETGRNAM_R)
{
struct group gr;
char strs[64];
return 1;
if (getgrnam_r(colon, &gr, strs, sizeof(strs), &g)) {
#else
{
g = getgrnam(colon);
if (!g) {
#endif
lwsl_err("%s: unknown group '%s'\n", __func__, colon);
return 1;
}
*pgid = g->gr_gid;
}
*pgid = g->gr_gid;
p = getpwnam(u);
if (!p) {
lwsl_err("%s: unknown user '%s'\n", __func__, u);
#if defined(LWS_HAVE_GETPWNAM_R)
{
struct passwd pr;
char strs[64];
return 1;
if (getpwnam_r(u, &pr, strs, sizeof(strs), &p)) {
#else
{
p = getpwnam(u);
if (!p) {
#endif
lwsl_err("%s: unknown user '%s'\n", __func__, u);
return 1;
}
*puid = p->pw_uid;
}
*puid = p->pw_uid;
return 0;
}
@ -96,9 +116,15 @@ lws_plat_drop_app_privileges(struct lws_context *context, int actually_drop)
/* if he gave us the groupname, align gid to match it */
if (context->groupname) {
g = getgrnam(context->groupname);
#if defined(LWS_HAVE_GETGRNAM_R)
struct group gr;
char strs[64];
if (!getgrnam_r(context->groupname, &gr, strs, sizeof(strs), &g)) {
#else
g = getgrnam(context->groupname);
if (g) {
#endif
lwsl_info("%s: group %s -> gid %u\n", __func__,
context->groupname, g->gr_gid);
context->gid = g->gr_gid;
@ -113,9 +139,15 @@ lws_plat_drop_app_privileges(struct lws_context *context, int actually_drop)
/* if he gave us the username, align uid to match it */
if (context->username) {
p = getpwnam(context->username);
#if defined(LWS_HAVE_GETPWNAM_R)
struct passwd pr;
char strs[64];
if (!getpwnam_r(context->username, &pr, strs, sizeof(strs), &p)) {
#else
p = getpwnam(context->username);
if (p) {
#endif
context->uid = p->pw_uid;
lwsl_info("%s: username %s -> uid %u\n", __func__,
@ -134,9 +166,15 @@ lws_plat_drop_app_privileges(struct lws_context *context, int actually_drop)
/* if he gave us the gid or we have it from the groupname, set it */
if (context->gid && context->gid != (gid_t)-1l) {
g = getgrgid(context->gid);
#if defined(LWS_HAVE_GETGRGID_R)
struct group gr;
char strs[64];
if (getgrgid_r(context->gid, &gr, strs, sizeof(strs), &g)) {
#else
g = getgrgid(context->gid);
if (!g) {
#endif
lwsl_err("%s: cannot find name for gid %d\n",
__func__, context->gid);
@ -159,9 +197,15 @@ lws_plat_drop_app_privileges(struct lws_context *context, int actually_drop)
/* if he gave us the uid or we have it from the username, set it */
if (context->uid && context->uid != (uid_t)-1l) {
p = getpwuid(context->uid);
#if defined(LWS_HAVE_GETPWUID_R)
struct passwd pr;
char strs[64];
if (getpwuid_r(context->uid, &pr, strs, sizeof(strs), &p)) {
#else
p = getpwuid(context->uid);
if (!p) {
#endif
lwsl_err("%s: getpwuid: unable to find uid %d\n",
__func__, context->uid);
return 1;