[23053] in Source-Commits
/svn/athena r22714 - in trunk/debathena/debathena/libnss-nonlocal: . debian
daemon@ATHENA.MIT.EDU (tabbott@MIT.EDU)
Tue Jan 29 22:27:53 2008
Date: Tue, 29 Jan 2008 22:12:17 -0500 (EST)
From: tabbott@MIT.EDU
Message-Id: <200801300312.WAA29279@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: tabbott
Date: 2008-01-29 22:12:16 -0500 (Tue, 29 Jan 2008)
New Revision: 22714
Added:
trunk/debathena/debathena/libnss-nonlocal/debian/libnss-nonlocal.postrm
trunk/debathena/debathena/libnss-nonlocal/debian/libnss-nonlocal.preinst
Modified:
trunk/debathena/debathena/libnss-nonlocal/debian/changelog
trunk/debathena/debathena/libnss-nonlocal/debian/control.in
trunk/debathena/debathena/libnss-nonlocal/debian/copyright
trunk/debathena/debathena/libnss-nonlocal/nonlocal-group.c
trunk/debathena/debathena/libnss-nonlocal/nonlocal-passwd.c
trunk/debathena/debathena/libnss-nonlocal/nonlocal.h
Log:
Modified: trunk/debathena/debathena/libnss-nonlocal/debian/changelog
===================================================================
--- trunk/debathena/debathena/libnss-nonlocal/debian/changelog 2008-01-29 06:58:28 UTC (rev 22713)
+++ trunk/debathena/debathena/libnss-nonlocal/debian/changelog 2008-01-30 03:12:16 UTC (rev 22714)
@@ -1,3 +1,12 @@
+libnss-nonlocal (1.3-0debathena1) unstable; urgency=low
+
+ * Have initgroups() only add nonlocal groups to nonlocal users.
+ * If a group called nss-local-users exists, add local users to it.
+ * If a group called nss-nonlocal-users exists, add nonlocal users to it.
+ * Create nss-local-users and nss-nonlocal-users at installation.
+
+ -- Tim Abbott <tabbott@mit.edu> Tue, 29 Jan 2008 22:11:37 -0500
+
libnss-nonlocal (1.2) unstable; urgency=low
* Use a magic buflen instead of thread-local variables, to avoid
Modified: trunk/debathena/debathena/libnss-nonlocal/debian/control.in
===================================================================
--- trunk/debathena/debathena/libnss-nonlocal/debian/control.in 2008-01-29 06:58:28 UTC (rev 22713)
+++ trunk/debathena/debathena/libnss-nonlocal/debian/control.in 2008-01-30 03:12:16 UTC (rev 22714)
@@ -1,7 +1,7 @@
Source: libnss-nonlocal
Section: debathena/libs
Priority: optional
-Maintainer: Anders Kaseorg <andersk@mit.edu>
+Maintainer: Debian-Athena Project <debathena@mit.edu>
Standards-Version: 3.7.2
Build-Depends: @cdbs@
Modified: trunk/debathena/debathena/libnss-nonlocal/debian/copyright
===================================================================
--- trunk/debathena/debathena/libnss-nonlocal/debian/copyright 2008-01-29 06:58:28 UTC (rev 22713)
+++ trunk/debathena/debathena/libnss-nonlocal/debian/copyright 2008-01-30 03:12:16 UTC (rev 22714)
@@ -1,4 +1,5 @@
-Copyright © 2007 Anders Kaseorg <andersk@mit.edu>
+Copyright © 2007 Anders Kaseorg <andersk@mit.edu> and Tim Abbott
+<tabbott@mit.edu>
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
Added: trunk/debathena/debathena/libnss-nonlocal/debian/libnss-nonlocal.postrm
Added: trunk/debathena/debathena/libnss-nonlocal/debian/libnss-nonlocal.preinst
Modified: trunk/debathena/debathena/libnss-nonlocal/nonlocal-group.c
===================================================================
--- trunk/debathena/debathena/libnss-nonlocal/nonlocal-group.c 2008-01-29 06:58:28 UTC (rev 22713)
+++ trunk/debathena/debathena/libnss-nonlocal/nonlocal-group.c 2008-01-30 03:12:16 UTC (rev 22714)
@@ -2,7 +2,8 @@
* nonlocal-group.c
* group database for nss_nonlocal proxy
*
- * Copyright © 2007 Anders Kaseorg <andersk@mit.edu>
+ * Copyright © 2007 Anders Kaseorg <andersk@mit.edu> and Tim Abbott
+ * <tabbott@mit.edu>
*
* Permission is hereby granted, free of charge, to any person
* obtaining a copy of this software and associated documentation
@@ -41,6 +42,8 @@
#include "nonlocal.h"
#define MAGIC_LOCAL_GR_BUFLEN (sysconf(_SC_GETGR_R_SIZE_MAX) + 7)
+#define MAGIC_NONLOCAL_GROUPNAME "nss-nonlocal-users"
+#define MAGIC_LOCAL_GROUPNAME "nss-local-users"
static service_user *
@@ -49,7 +52,7 @@
static service_user *nip = NULL;
if (nip == NULL)
__nss_database_lookup("group_nonlocal", NULL, "", &nip);
-
+
return nip;
}
@@ -83,6 +86,47 @@
return status;
}
+enum nss_status
+get_local_group(const char *name, struct group *grp, char *buffer, size_t buflen, int *errnop)
+{
+ enum nss_status status = NSS_STATUS_NOTFOUND;
+ struct group gbuf;
+ struct group *gbufp = &gbuf;
+ int ret;
+ int old_errno = errno;
+ int len = MAGIC_LOCAL_GR_BUFLEN;
+ char *buf = malloc(len);
+ if (buf == NULL) {
+ *errnop = ENOMEM;
+ errno = old_errno;
+ return NSS_STATUS_TRYAGAIN;
+ }
+ errno = 0;
+ ret = getgrnam_r(name, gbufp, buf, len, &gbufp);
+ if (ret != 0) {
+ *errnop = old_errno;
+ status = NSS_STATUS_TRYAGAIN;
+ } else if (gbufp != NULL) {
+ status = NSS_STATUS_SUCCESS;
+ grp->gr_name = strncpy(buffer, gbufp->gr_name, buflen);
+ buffer = buffer + strlen(grp->gr_name);
+ buflen = buflen - strlen(grp->gr_name);
+ grp->gr_passwd = strncpy(buffer, gbufp->gr_passwd, buflen);
+ buffer = buffer + strlen(grp->gr_passwd);
+ buflen = buflen - strlen(grp->gr_passwd);
+ grp->gr_gid = gbufp->gr_gid;
+ if (buflen < sizeof(void *)) {
+ *errnop = ERANGE;
+ status = NSS_STATUS_TRYAGAIN;
+ }
+ else {
+ grp->gr_mem = memset(buffer, 0, sizeof(void *));
+ }
+ }
+ free(buf);
+ errno = old_errno;
+ return status;
+}
static service_user *grent_nip = NULL;
static void *grent_fct_start;
@@ -202,6 +246,9 @@
void *ptr;
} fct;
+ if (buflen == MAGIC_LOCAL_GR_BUFLEN)
+ return NSS_STATUS_UNAVAIL;
+
nip = nss_group_nonlocal_database();
if (nip == NULL)
return NSS_STATUS_UNAVAIL;
@@ -275,7 +322,50 @@
void *ptr;
} fct;
int in = *start, out = *start, i;
+ gid_t local_users_gid;
+ int is_local = 0;
+ // Check that the user is a nonlocal user before adding any groups
+ status = check_nonlocal_user(user, errnop);
+ if (status == NSS_STATUS_NOTFOUND) {
+ is_local = 1;
+ }
+ else if (status != NSS_STATUS_SUCCESS) {
+ return status;
+ }
+
+ int buflen = sysconf(_SC_GETGR_R_SIZE_MAX);
+ char *buffer = malloc(buflen);
+ if (buffer == NULL) {
+ *errnop = ENOMEM;
+ return NSS_STATUS_TRYAGAIN;
+ }
+ struct group local_users_group;
+ status = get_local_group(MAGIC_LOCAL_GROUPNAME,
+ &local_users_group, buffer, buflen, errnop);
+ free(buffer);
+ if (status == NSS_STATUS_NOTFOUND) {
+ syslog(LOG_WARNING, "nss_nonlocal: Group %s does not exist locally!",
+ MAGIC_LOCAL_GROUPNAME);
+ local_users_gid = 0;
+ }
+ else if (status == NSS_STATUS_SUCCESS) {
+ if (is_local == 1) {
+ // add the (local) user to the magic local users group, and finish
+ (*groupsp)[out++] = local_users_group.gr_gid;
+ syslog(LOG_DEBUG, "nss_nonlocal: Added %s to special group %s",
+ user, MAGIC_LOCAL_GROUPNAME);
+ *start = out;
+ return NSS_STATUS_SUCCESS;
+ }
+ else {
+ local_users_gid = local_users_group.gr_gid;
+ }
+ }
+ else {
+ return status;
+ }
+
nip = nss_group_nonlocal_database();
if (nip == NULL)
return NSS_STATUS_UNAVAIL;
@@ -305,7 +395,14 @@
status = check_nonlocal_gid(user, (*groupsp)[in], &nonlocal_errno);
if (status == NSS_STATUS_SUCCESS) {
- (*groupsp)[out++] = (*groupsp)[in];
+ // Don't let users get into MAGIC_LOCAL_GROUPNAME from nonlocal reasons.
+ if ((*groupsp)[in] == local_users_gid) {
+ syslog(LOG_WARNING, "nss_nonlocal: Nonlocal user %s removed from special local users group %s",
+ user, MAGIC_LOCAL_GROUPNAME);
+ }
+ else {
+ (*groupsp)[out++] = (*groupsp)[in];
+ }
} else if (status != NSS_STATUS_NOTFOUND) {
*start = out;
*errnop = nonlocal_errno;
@@ -313,6 +410,27 @@
}
}
+ // add the (nonlocal) user to the magic nonlocal users group
+ buflen = sysconf(_SC_GETGR_R_SIZE_MAX);
+ buffer = malloc(buflen);
+ if (buffer == NULL) {
+ *errnop = ENOMEM;
+ return NSS_STATUS_TRYAGAIN;
+ }
+ struct group nonlocal_users_group;
+ status = get_local_group(MAGIC_NONLOCAL_GROUPNAME,
+ &nonlocal_users_group, buffer, buflen, errnop);
+ if (status == NSS_STATUS_NOTFOUND) {
+ syslog(LOG_WARNING, "nss_nonlocal: (local) group %s does not exist!",
+ MAGIC_NONLOCAL_GROUPNAME);
+ }
+ else if (status == NSS_STATUS_SUCCESS) {
+ (*groupsp)[out++] = nonlocal_users_group.gr_gid;
+ syslog(LOG_DEBUG, "nss_nonlocal: Added %s to special group %s",
+ user, MAGIC_NONLOCAL_GROUPNAME);
+ }
+ free(buffer);
+
*start = out;
return NSS_STATUS_SUCCESS;
}
Modified: trunk/debathena/debathena/libnss-nonlocal/nonlocal-passwd.c
===================================================================
--- trunk/debathena/debathena/libnss-nonlocal/nonlocal-passwd.c 2008-01-29 06:58:28 UTC (rev 22713)
+++ trunk/debathena/debathena/libnss-nonlocal/nonlocal-passwd.c 2008-01-30 03:12:16 UTC (rev 22714)
@@ -2,7 +2,8 @@
* nonlocal-passwd.c
* passwd database for nss_nonlocal proxy.
*
- * Copyright © 2007 Anders Kaseorg <andersk@mit.edu>
+ * Copyright © 2007 Anders Kaseorg <andersk@mit.edu> and Tim Abbott
+ * <tabbott@mit.edu>
*
* Permission is hereby granted, free of charge, to any person
* obtaining a copy of this software and associated documentation
@@ -85,6 +86,33 @@
return status;
}
+enum nss_status
+check_nonlocal_user(const char *user, int *errnop)
+{
+ enum nss_status status = NSS_STATUS_SUCCESS;
+ struct passwd pwbuf;
+ struct passwd *pwbufp = &pwbuf;
+ int ret;
+ int old_errno = errno;
+ int buflen = MAGIC_LOCAL_PW_BUFLEN;
+ char *buf = malloc(buflen);
+ if (buf == NULL) {
+ *errnop = ENOMEM;
+ errno = old_errno;
+ return NSS_STATUS_TRYAGAIN;
+ }
+ errno = 0;
+ ret = getpwnam_r(user, pwbufp, buf, buflen, &pwbufp);
+ if (ret != 0) {
+ *errnop = errno;
+ status = NSS_STATUS_TRYAGAIN;
+ } else if (pwbufp != NULL) {
+ status = NSS_STATUS_NOTFOUND;
+ }
+ free(buf);
+ errno = old_errno;
+ return status;
+}
static service_user *pwent_nip = NULL;
static void *pwent_fct_start;
@@ -205,6 +233,9 @@
} fct;
int group_errno;
+ if (buflen == MAGIC_LOCAL_PW_BUFLEN)
+ return NSS_STATUS_UNAVAIL;
+
nip = nss_passwd_nonlocal_database();
if (nip == NULL)
return NSS_STATUS_UNAVAIL;
Modified: trunk/debathena/debathena/libnss-nonlocal/nonlocal.h
===================================================================
--- trunk/debathena/debathena/libnss-nonlocal/nonlocal.h 2008-01-29 06:58:28 UTC (rev 22713)
+++ trunk/debathena/debathena/libnss-nonlocal/nonlocal.h 2008-01-30 03:12:16 UTC (rev 22714)
@@ -2,4 +2,5 @@
#define NONLOCAL_H
enum nss_status check_nonlocal_uid(const char *user, uid_t uid, int *errnop);
enum nss_status check_nonlocal_gid(const char *user, gid_t gid, int *errnop);
+enum nss_status check_nonlocal_user(const char *user, int *errnop);
#endif /* NON_LOCAL_H */
