Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-29 04:19:37 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

libs/libc/pwd and libs/libc/grp: Modify to giet user/group data from /etc/passwd and /etc/group if so configurated.

Browse Source 
Squashed commit of the following:

    Last minute clean-up
    libs/libc/grp/lib_find_grpfile.c:  Fix some problems found in testing.
    libs/libc/pwd:  Finishes off implementation using /etc/passwd.
    libs/libc/grp:  Finishes off implementation using /etc/group.
    libs/libc/pwd/lib_find_pwdfile.c:  Add logic to look up user information in /etc/passwd file, if available.
    libs/libc/grp/lib_find_grpfile.c:  Add logic to look up group information in /etc/group file, if available.
This commit is contained in:
Gregory Nutt
2019-08-04 13:32:36 -06:00
parent 19b81899de
commit 89da9f2fea
23 changed files with 1245 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libs/libc/pwd/Kconfig
+37
View File
@@ -0,0 +1,37 @@
#
# For a description of the syntax of this configuration file,
# see the file kconfig-language.txt in the NuttX tools repository.
#
config LIBC_PASSWD_FILE
bool "Have passwd file"
default n
depends on FS_READABLE
---help---
Have a passwd file. The format of the password file is:
user:x:uid:gid:home
Where:
user: User name
x: Encrypted password
uid: User ID
gid: Group ID
home: Login directory
if LIBC_PASSWD_FILE
config LIBC_PASSWD_FILEPATH
string "Path to passwd file"
default "/etc/passwd"
---help---
Provides the location of the passwd file. The default is /etc/passwd
config LIBC_PASSWD_LINESIZE
int "Maximum line size"
default 80
---help---
The maximum length of one line in the passwd file. This determines
the size of the I/O buffer used to access the passwd file.
endif # LIBC_PASSWD_FILE
libs/libc/pwd/Make.defs
+6 -1
View File
@@ -36,7 +36,12 @@
# Add the pwd C files to the build
CSRCS += lib_getpwnam.c lib_getpwnamr.c lib_getpwuid.c lib_getpwuidr.c
CSRCS += lib_pwd.c
ifeq ($(CONFIG_LIBC_PASSWD_FILE),y)
CSRCS += lib_find_pwdfile.c lib_pwd_globals.c
else
CSRCS += lib_getpwbuf.c lib_getpwbufr.c
endif
# Add the pwd directory to the build
libs/libc/pwd/lib_find_pwdfile.c
+319
View File
@@ -0,0 +1,319 @@
/****************************************************************************
* libs/libc/pwd/lib_find_pwdfile.c
*
* Copyright (C) 2019 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
* 3. Neither the name NuttX nor the names of its contributors may be
* used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
****************************************************************************/
/****************************************************************************
* Included Files
****************************************************************************/
#include <nuttx/config.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <pwd.h>
#include <assert.h>
#include "pwd/lib_pwd.h"
/****************************************************************************
* Private Types
****************************************************************************/
typedef CODE int (pwd_foreach_match_t)(FAR const struct passwd *entry,
FAR void *arg);
/****************************************************************************
* Private Functions
****************************************************************************/
/****************************************************************************
* Name: pwd_match_name
*
* Description:
* Called for each record in the passwd file. Returns "1" if the record
* matches the user name (passed as arg)
*
* Input Parameters:
* entry - The parsed passwd file record
* arg - A pointer to the user name to match
*
* Returned Value:
* < 0 : An error has occurred.
* = 0 : No entry name does not match.
* = 1 : The entry name matches
*
****************************************************************************/
static int pwd_match_name(FAR const struct passwd *entry, FAR void *arg)
{
FAR const char *uname = (FAR const char *)arg;
return strcmp(entry->pw_name, uname) == 0 ? 1 : 0;
}
/****************************************************************************
* Name: pwd_match_uid
*
* Description:
* Called for each record in the passwd file. Returns "1" if the record
* matches the user ID (passed as arg)
*
* Input Parameters:
* entry - The parsed passwd file record
* arg - The user ID to match
*
* Returned Value:
* < 0 : An error has occurred.
* = 0 : No entry name does not match.
* = 1 : The entry name matches
*
****************************************************************************/
static int pwd_match_uid(FAR const struct passwd *entry, FAR void *arg)
{
int match_uid = (int)((uintptr_t)arg);
return match_uid == entry->pw_uid ? 1 : 0;
}
/****************************************************************************
* Name: pwd_foreach
*
* Description:
* Visit each record in passwd file.
*
* Input Parameters:
* match - The match function to call on each record
* arg - Argument passed to the match function
* entry - Location to return the parsed passwd file entry
* buffer - I/O buffer used to access the passwd file
* buflen - The size of the I/O buffer in bytes
*
* Returned Value:
* < 0 : An error has occurred.
* = 0 : No entry with this name was found.
* = 1 : The entry with this name was found.
*
****************************************************************************/
static int pwd_foreach(pwd_foreach_match_t match, FAR void *arg,
FAR struct passwd *entry, FAR char *buffer,
size_t buflen)
{
FAR FILE *stream;
FAR char *ptr;
FAR char *save;
int ret;
stream = fopen(CONFIG_LIBC_PASSWD_FILEPATH, "r");
if (stream == NULL)
{
int errcode = errno;
DEBUGASSERT(errno > 0);
return -errcode;
}
/* Read the password file line by line until the record with the matching
* username is found, or until the end of the file is reached.
*
* The format of the password file is:
*
* user:x:uid:uid:home
*
* Where:
* user: User name
* x: Encrypted password
* uid: User ID
* uid: Group ID
* home: Login directory
*/
while (fgets(buffer, buflen, stream) != NULL)
{
ptr = buffer;
entry->pw_name = ptr;
/* Skip to the end of the name and properly terminate it. The name
* must be terminated with the field delimiter ':'.
*/
for (; *ptr != '\n' && *ptr != '\0' && *ptr != ':'; ptr++)
{
}
if (*ptr == '\n' || *ptr == '\0')
{
/* Bad line format? */
continue;
}
*ptr++ = '\0';
/* Skip to the end of the password and properly terminate it. The
* password must be terminated with the field delimiter ':'.
*/
for (; *ptr != '\n' && *ptr != '\0' && *ptr != ':'; ptr++)
{
}
if (*ptr == '\n' || *ptr == '\0')
{
/* Bad line format? */
continue;
}
*ptr++ = '\0';
save = ptr;
/* Skip to the end of the user ID and properly terminate it. The
* user ID must be terminated with the field delimiter ':'.
*/
for (; *ptr != '\n' && *ptr != '\0' && *ptr != ':'; ptr++)
{
}
if (*ptr == '\n' || *ptr == '\0')
{
/* Bad line format? */
continue;
}
*ptr++ = '\0';
entry->pw_uid = (uid_t)atoi(save);
save = ptr;
/* Skip to the end of the group ID and properly terminate it. The
* group ID must be terminated with the field delimiter ':'.
*/
for (; *ptr != '\n' && *ptr != '\0' && *ptr != ':'; ptr++)
{
}
if (*ptr == '\n' || *ptr == '\0')
{
/* Bad line format? */
continue;
}
*ptr++ = '\0';
entry->pw_gid = (gid_t)atoi(save);
entry->pw_dir = ptr;
/* Skip to the end of the home directory and properly terminate it.
* The home directory must be the last thing on the line.
*/
for (; *ptr != '\n' && *ptr != '\0' /* && *ptr != ':' */ ; ptr++)
{
}
*ptr++ = '\0';
entry->pw_shell = ROOT_SHELL;
/* Check for a match */
ret = match(entry, arg);
if (ret != 0)
{
/* We either have the match or an error occurred. */
fclose(stream);
return ret;
}
}
fclose(stream);
return 0;
}
/****************************************************************************
* Public Functions
****************************************************************************/
/****************************************************************************
* Name: pwd_findby_name
*
* Description:
* Find passwd file entry using the user name.
*
* Input Parameters:
* uname - The user name
* entry - Location to return the parsed passwd file entry
* buffer - I/O buffer used to access the passwd file
* buflen - The size of the I/O buffer in bytes
*
* Returned Value:
* < 0 : An error has occurred.
* = 0 : No entry with this name was found.
* = 1 : The entry with this name was found.
*
****************************************************************************/
int pwd_findby_name(FAR const char *uname, FAR struct passwd *entry,
FAR char *buffer, size_t buflen)
{
return pwd_foreach(pwd_match_name, (FAR void *)uname, entry, buffer, buflen);
}
/****************************************************************************
* Name: pwd_findby_uid
*
* Description:
* Find passwd file entry using the user ID.
*
* Input Parameters:
* uid - The user ID
* entry - Location to return the parsed passwd file entry
* buffer - I/O buffer used to access the passwd file
* buflen - The size of the I/O buffer in bytes
*
* Returned Value:
* < 0 : An error has occurred.
* = 0 : No entry with this name was found.
* = 1 : The entry with this name was found.
*
****************************************************************************/
int pwd_findby_uid(uid_t uid, FAR struct passwd *entry, FAR char *buffer,
size_t buflen)
{
return pwd_foreach(pwd_match_uid, (FAR void *)((uintptr_t)uid), entry,
buffer, buflen);
}
libs/libc/pwd/lib_pwd.c → libs/libc/pwd/lib_getpwbuf.c
+1 -57
View File
@@ -1,5 +1,5 @@
/****************************************************************************
* libs/libc/pwd/lib_pwd.c
* libs/libc/pwd/lib_getpwbuf.c
*
* Copyright (C) 2019 Gregory Nutt. All rights reserved.
* Author: Michael Jung <mijung@gmx.net>
@@ -126,59 +126,3 @@ error:
return NULL;
}
/****************************************************************************
* Name: getpwbuf_r
*
* Description:
* libc/grp internal helper function for getpwuid_r and getpwnam_r to setup
* the caller supplied 'pwd' and 'buf' buffers once a matching entry has
* been found.
*
* Input Parameters:
* uid - Value to set the passwd structure's pw_uid field to.
* gid - Value to set the passwd structure's pw_gid field to.
* name - Value to set the passwd structure's pw_name field to.
* dir - Value to set the passwd structure's pw_dir field to.
* shell - Value to set the passwd structure's pw_shell field to.
* pwd - Pointer to the space to store the retrieved passwd structure in.
* buf - String fields pointed to by the passwd struct are stored here.
* buflen - The length of buf in bytes.
* result - Pointer to the resulting passwd struct, or NULL in case of fail.
*
* Returned Value:
* On success getpwgid_r returns 0 and sets *result to pwd. In case of
* failure an error number is returned.
*
****************************************************************************/
int getpwbuf_r(uid_t uid, gid_t gid, FAR const char *name,
FAR const char *dir, FAR const char *shell,
FAR struct passwd *pwd, FAR char *buf, size_t buflen,
FAR struct passwd **result)
{
size_t reqdlen;
reqdlen = strlen(name) + 1 + strlen(dir) + 1 + strlen(shell) + 1;
if (buflen < reqdlen)
{
/* Insufficient buffer space supplied. */
*result = NULL;
return ERANGE;
}
pwd->pw_name = buf;
pwd->pw_dir = &buf[strlen(name) + 1];
pwd->pw_shell = &buf[strlen(name) + 1 + strlen(dir) + 1];
pwd->pw_uid = uid;
pwd->pw_gid = gid;
strcpy(pwd->pw_name, name);
strcpy(pwd->pw_dir, dir);
strcpy(pwd->pw_shell, shell);
*result = pwd;
return 0;
}
libs/libc/pwd/lib_getpwbufr.c
+107
View File
@@ -0,0 +1,107 @@
/****************************************************************************
* libs/libc/pwd/lib_getpwbufr.c
*
* Copyright (C) 2019 Gregory Nutt. All rights reserved.
* Author: Michael Jung <mijung@gmx.net>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
* 3. Neither the name NuttX nor the names of its contributors may be
* used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
****************************************************************************/
/****************************************************************************
* Included Files
****************************************************************************/
#include <nuttx/config.h>
#include <stdlib.h>
#include <string.h>
#include <errno.h>
#include <pwd.h>
#include "pwd/lib_pwd.h"
/****************************************************************************
* Public Functions
****************************************************************************/
/****************************************************************************
* Name: getpwbuf_r
*
* Description:
* libc/grp internal helper function for getpwuid_r and getpwnam_r to setup
* the caller supplied 'pwd' and 'buf' buffers once a matching entry has
* been found.
*
* Input Parameters:
* uid - Value to set the passwd structure's pw_uid field to.
* gid - Value to set the passwd structure's pw_gid field to.
* name - Value to set the passwd structure's pw_name field to.
* dir - Value to set the passwd structure's pw_dir field to.
* shell - Value to set the passwd structure's pw_shell field to.
* pwd - Pointer to the space to store the retrieved passwd structure in.
* buf - String fields pointed to by the passwd struct are stored here.
* buflen - The length of buf in bytes.
* result - Pointer to the resulting passwd struct, or NULL in case of fail.
*
* Returned Value:
* On success getpwgid_r returns 0 and sets *result to pwd. In case of
* failure an error number is returned.
*
****************************************************************************/
int getpwbuf_r(uid_t uid, gid_t gid, FAR const char *name,
FAR const char *dir, FAR const char *shell,
FAR struct passwd *pwd, FAR char *buf, size_t buflen,
FAR struct passwd **result)
{
size_t reqdlen;
reqdlen = strlen(name) + 1 + strlen(dir) + 1 + strlen(shell) + 1;
if (buflen < reqdlen)
{
/* Insufficient buffer space supplied. */
*result = NULL;
return ERANGE;
}
pwd->pw_name = buf;
pwd->pw_dir = &buf[strlen(name) + 1];
pwd->pw_shell = &buf[strlen(name) + 1 + strlen(dir) + 1];
pwd->pw_uid = uid;
pwd->pw_gid = gid;
strcpy(pwd->pw_name, name);
strcpy(pwd->pw_dir, dir);
strcpy(pwd->pw_shell, shell);
*result = pwd;
return 0;
}
libs/libc/pwd/lib_getpwnam.c
+13
View File
@@ -69,10 +69,23 @@
FAR struct passwd *getpwnam(FAR const char *name)
{
#ifdef CONFIG_LIBC_PASSWD_FILE
int ret;
ret = pwd_findby_name(name, &g_passwd, g_passwd_buffer,
CONFIG_LIBC_PASSWD_LINESIZE);
if (ret != 1)
{
return NULL;
}
return &g_passwd;
#else
if (strcmp(name, ROOT_NAME))
{
return NULL;
}
return getpwbuf(ROOT_UID, ROOT_GID, ROOT_NAME, ROOT_DIR, ROOT_SHELL);
#endif
}
libs/libc/pwd/lib_getpwnamr.c
+14
View File
@@ -73,6 +73,19 @@
int getpwnam_r(FAR const char *name, FAR struct passwd *pwd, FAR char *buf,
size_t buflen, FAR struct passwd **result)
{
#ifdef CONFIG_LIBC_PASSWD_FILE
int ret;
ret = pwd_findby_name(name, pwd, buf, buflen);
if (ret != 1)
{
*result = NULL;
return ret < 0 ? -ret : 0;
}
*result = pwd;
return 0;
#else
if (strcmp(name, ROOT_NAME))
{
/* The only known user is 'root', which has a uid of 0. Thus, report
@@ -85,4 +98,5 @@ int getpwnam_r(FAR const char *name, FAR struct passwd *pwd, FAR char *buf,
return getpwbuf_r(ROOT_UID, ROOT_GID, ROOT_NAME, ROOT_DIR, ROOT_SHELL, pwd,
buf, buflen, result);
#endif
}
libs/libc/pwd/lib_getpwuid.c
+13
View File
@@ -68,10 +68,23 @@
FAR struct passwd *getpwuid(uid_t uid)
{
#ifdef CONFIG_LIBC_PASSWD_FILE
int ret;
ret = pwd_findby_uid(uid, &g_passwd, g_passwd_buffer,
CONFIG_LIBC_PASSWD_LINESIZE);
if (ret != 1)
{
return NULL;
}
return &g_passwd;
#else
if (uid != ROOT_UID)
{
return NULL;
}
return getpwbuf(ROOT_UID, ROOT_GID, ROOT_NAME, ROOT_DIR, ROOT_SHELL);
#endif
}
libs/libc/pwd/lib_getpwuidr.c
+14
View File
@@ -72,6 +72,19 @@
int getpwuid_r(uid_t uid, FAR struct passwd *pwd, FAR char *buf,
size_t buflen, FAR struct passwd **result)
{
#ifdef CONFIG_LIBC_PASSWD_FILE
int ret;
ret = pwd_findby_uid(uid, pwd, buf, buflen);
if (ret != 1)
{
*result = NULL;
return ret < 0 ? -ret : 0;
}
*result = pwd;
return 0;
#else
if (uid != ROOT_UID)
{
/* The only known user is 'root', which has a uid of 0. Thus, report
@@ -84,4 +97,5 @@ int getpwuid_r(uid_t uid, FAR struct passwd *pwd, FAR char *buf,
return getpwbuf_r(ROOT_UID, ROOT_GID, ROOT_NAME, ROOT_DIR, ROOT_SHELL, pwd,
buf, buflen, result);
#endif
}
libs/libc/pwd/lib_pwd.h
+14
View File
@@ -66,6 +66,13 @@ extern "C"
#define EXTERN extern
#endif
#ifdef CONFIG_LIBC_PASSWD_FILE
/* Data for non-reentrant group functions */
EXTERN struct passwd g_passwd;
EXTERN char g_passwd_buffer[CONFIG_LIBC_PASSWD_LINESIZE];
#endif
/****************************************************************************
* Public Function Prototypes
****************************************************************************/
@@ -77,6 +84,13 @@ int getpwbuf_r(uid_t uid, gid_t gid, FAR const char *name,
FAR struct passwd *pwd, FAR char *buf, size_t buflen,
FAR struct passwd **result);
#ifdef CONFIG_LIBC_PASSWD_FILE
int pwd_findby_name(FAR const char *uname, FAR struct passwd *entry,
FAR char *buffer, size_t buflen);
int pwd_findby_uid(uid_t uid, FAR struct passwd *entry, FAR char *buffer,
size_t buflen);
#endif
#undef EXTERN
#ifdef __cplusplus
}
libs/libc/pwd/lib_pwd_globals.c
+55
View File
@@ -0,0 +1,55 @@
/****************************************************************************
* libs/libc/pwd/lib_pwd_globals.c
*
* Copyright (C) 2019 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
* 3. Neither the name NuttX nor the names of its contributors may be
* used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
****************************************************************************/
/****************************************************************************
* Included Files
****************************************************************************/
#include <nuttx/config.h>
#include "pwd/lib_pwd.h"
#ifdef CONFIG_LIBC_PASSWD_FILE
/****************************************************************************
* Public Data
****************************************************************************/
/* Data for non-reentrant group functions */
struct passwd g_passwd;
char g_passwd_buffer[CONFIG_LIBC_PASSWD_LINESIZE];
#endif /* CONFIG_LIBC_GROUP_FILE */