From b7572f08f48c4b29c137c7b62f10be9436b6efa3 Mon Sep 17 00:00:00 2001 From: Antoine Pitrou Date: Wed, 2 Dec 2009 20:46:48 +0000 Subject: [PATCH] Merged revisions 76636 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ........ r76636 | antoine.pitrou | 2009-12-02 21:37:54 +0100 (mer., 02 déc. 2009) | 5 lines Issue #7333: The `posix` module gains an `initgroups()` function providing access to the initgroups(3) C library call on Unix systems which implement it. Patch by Jean-Paul Calderone. ........ --- Doc/library/os.rst | 9 +++++++++ Lib/test/test_posix.py | 22 ++++++++++++++++++++++ Misc/NEWS | 4 ++++ Modules/posixmodule.c | 27 +++++++++++++++++++++++++++ configure | 5 +++-- configure.in | 2 +- pyconfig.h.in | 3 +++ 7 files changed, 69 insertions(+), 3 deletions(-) diff --git a/Doc/library/os.rst b/Doc/library/os.rst index 29e789972c6..7c96bfe2340 100644 --- a/Doc/library/os.rst +++ b/Doc/library/os.rst @@ -161,6 +161,15 @@ process and user. Availability: Unix. +.. function:: initgroups(username, gid) + + Call the system initgroups() to initialize the group access list with all of + the groups of which the specified username is a member, plus the specified + group id. Availability: Unix. + + .. versionadded:: 3.2 + + .. function:: getlogin() Return the name of the user logged in on the controlling terminal of the diff --git a/Lib/test/test_posix.py b/Lib/test/test_posix.py index f3edf33fb61..3a404833327 100644 --- a/Lib/test/test_posix.py +++ b/Lib/test/test_posix.py @@ -5,6 +5,7 @@ from test import support # Skip these tests if there is no posix module. posix = support.import_module('posix') +import errno import time import os import pwd @@ -82,6 +83,27 @@ class PosixTester(unittest.TestCase): new_group_ids = (current_group_ids[0]+1, -1, -1) self.assertRaises(OSError, posix.setresgid, *new_group_ids) + @unittest.skipUnless(hasattr(posix, 'initgroups'), + "test needs os.initgroups()") + def test_initgroups(self): + # It takes a string and an integer; check that it raises a TypeError + # for other argument lists. + self.assertRaises(TypeError, posix.initgroups) + self.assertRaises(TypeError, posix.initgroups, None) + self.assertRaises(TypeError, posix.initgroups, 3, "foo") + self.assertRaises(TypeError, posix.initgroups, "foo", 3, object()) + + # If a non-privileged user invokes it, it should fail with OSError + # EPERM. + if os.getuid() != 0: + name = pwd.getpwuid(posix.getuid()).pw_name + try: + posix.initgroups(name, 13) + except OSError as e: + self.assertEquals(e.errno, errno.EPERM) + else: + self.fail("Expected OSError to be raised by initgroups") + def test_statvfs(self): if hasattr(posix, 'statvfs'): self.assertTrue(posix.statvfs(os.curdir)) diff --git a/Misc/NEWS b/Misc/NEWS index 46a591224bf..6a51600ad21 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -146,6 +146,10 @@ C-API Library ------- +- Issue #7333: The `posix` module gains an `initgroups()` function providing + access to the initgroups(3) C library call on Unix systems which implement + it. Patch by Jean-Paul Calderone. + - Issue #7408: Fixed distutils.tests.sdist so it doesn't check for group ownership when the group is not forced, because the group may be different from the user's group and inherit from its container when the test is run. diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c index eaf5b403067..3ed8d5f71f0 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -3979,6 +3979,30 @@ posix_getgroups(PyObject *self, PyObject *noargs) } #endif +#ifdef HAVE_INITGROUPS +PyDoc_STRVAR(posix_initgroups__doc__, +"initgroups(username, gid) -> None\n\n\ +Call the system initgroups() to initialize the group access list with all of\n\ +the groups of which the specified username is a member, plus the specified\n\ +group id."); + +static PyObject * +posix_initgroups(PyObject *self, PyObject *args) +{ + char *username; + long gid; + + if (!PyArg_ParseTuple(args, "sl:initgroups", &username, &gid)) + return NULL; + + if (initgroups(username, (gid_t) gid) == -1) + return PyErr_SetFromErrno(PyExc_OSError); + + Py_INCREF(Py_None); + return Py_None; +} +#endif + #ifdef HAVE_GETPGID PyDoc_STRVAR(posix_getpgid__doc__, "getpgid(pid) -> pgid\n\n\ @@ -7184,6 +7208,9 @@ static PyMethodDef posix_methods[] = { #ifdef HAVE_SETGROUPS {"setgroups", posix_setgroups, METH_O, posix_setgroups__doc__}, #endif /* HAVE_SETGROUPS */ +#ifdef HAVE_INITGROUPS + {"initgroups", posix_initgroups, METH_VARARGS, posix_initgroups__doc__}, +#endif /* HAVE_INITGROUPS */ #ifdef HAVE_GETPGID {"getpgid", posix_getpgid, METH_VARARGS, posix_getpgid__doc__}, #endif /* HAVE_GETPGID */ diff --git a/configure b/configure index a7dfabb1206..50d07698b9f 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 76552 . +# From configure.in Revision: 76566 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for python 3.2. # @@ -17377,13 +17377,14 @@ echo "${ECHO_T}MACHDEP_OBJS" >&6; } + for ac_func in alarm setitimer getitimer bind_textdomain_codeset chown \ clock confstr ctermid execv fchmod fchown fork fpathconf ftime ftruncate \ gai_strerror getgroups getlogin getloadavg getpeername getpgid getpid \ getpriority getresuid getresgid getpwent getspnam getspent getsid getwd \ - kill killpg lchmod lchown lstat mbrtowc mkfifo mknod mktime \ + initgroups kill killpg lchmod lchown lstat mbrtowc mkfifo mknod mktime \ mremap nice pathconf pause plock poll pthread_init \ putenv readlink realpath \ select sem_open sem_timedwait sem_getvalue sem_unlink setegid seteuid \ diff --git a/configure.in b/configure.in index f9840d45546..a7a596e6da8 100644 --- a/configure.in +++ b/configure.in @@ -2418,7 +2418,7 @@ AC_CHECK_FUNCS(alarm setitimer getitimer bind_textdomain_codeset chown \ clock confstr ctermid execv fchmod fchown fork fpathconf ftime ftruncate \ gai_strerror getgroups getlogin getloadavg getpeername getpgid getpid \ getpriority getresuid getresgid getpwent getspnam getspent getsid getwd \ - kill killpg lchmod lchown lstat mbrtowc mkfifo mknod mktime \ + initgroups kill killpg lchmod lchown lstat mbrtowc mkfifo mknod mktime \ mremap nice pathconf pause plock poll pthread_init \ putenv readlink realpath \ select sem_open sem_timedwait sem_getvalue sem_unlink setegid seteuid \ diff --git a/pyconfig.h.in b/pyconfig.h.in index e9c930cd8ae..c9225a2d061 100644 --- a/pyconfig.h.in +++ b/pyconfig.h.in @@ -299,6 +299,9 @@ /* Define to 1 if you have the `getpeername' function. */ #undef HAVE_GETPEERNAME +/* Define to 1 if you have the `initgroups' function. */ +#undef HAVE_INITGROUPS + /* Define to 1 if you have the `getpgid' function. */ #undef HAVE_GETPGID