Issue #6508: Add posix.{getresuid,getresgid,setresuid,setresgid}.

7 files changed, 195 insertions, 7 deletions

diff --git a/Doc/library/os.rst b/Doc/library/os.rst
index c8e47fc..70e9a34 100644
--- a/Doc/library/os.rst
+++ b/Doc/library/os.rst
@@ -173,6 +173,19 @@ process and user.
 
    Return the parent's process id. Availability: Unix.
 
+.. function:: getresgid()
+
+   Return a tuple (ruid, euid, suid) denoting the current process's
+   real, effective, and saved user ids. Availability: Unix.
+
+   .. versionadded:: 2.7/3.2
+
+.. function:: getresuid()
+
+   Return a tuple (rgid, egid, sgid) denoting the current process's
+   real, effective, and saved user ids. Availability: Unix.
+
+   .. versionadded:: 2.7/3.2
 
 .. function:: getuid()
 
@@ -247,14 +260,27 @@ process and user.
    for the semantics. Availability: Unix.
 
 
-.. function:: setreuid(ruid, euid)
+.. function:: setregid(rgid, egid)
 
-   Set the current process's real and effective user ids. Availability: Unix.
+   Set the current process's real and effective group ids. Availability: Unix.
 
+.. function:: setresgid(rgid, egid, sgid)
 
-.. function:: setregid(rgid, egid)
+   Set the current process's real, effective, and saved group ids.
+   Availability: Unix.
 
-   Set the current process's real and effective group ids. Availability: Unix.
+   .. versionadded:: 2.7/3.2
+
+.. function:: setresuid(ruid, euid, suid)
+
+   Set the current process's real, effective, and saved user ids.
+   Availibility: Unix.
+
+   .. versionadded:: 2.7/3.2
+
+.. function:: setreuid(ruid, euid)
+
+   Set the current process's real and effective user ids. Availability: Unix.
 
 
 .. function:: getsid(pid)
diff --git a/Lib/test/test_posix.py b/Lib/test/test_posix.py
index dc50e21..aaa3841 100644
--- a/Lib/test/test_posix.py
+++ b/Lib/test/test_posix.py
@@ -41,6 +41,48 @@ class PosixTester(unittest.TestCase):
                 posix_func()
                 self.assertRaises(TypeError, posix_func, 1)
 
+    if hasattr(posix, 'getresuid'):
+        def test_getresuid(self):
+            user_ids = posix.getresuid()
+            self.assertEqual(len(user_ids), 3)
+            for val in user_ids:
+                self.assertGreaterEqual(val, 0)
+
+    if hasattr(posix, 'getresgid'):
+        def test_getresgid(self):
+            group_ids = posix.getresgid()
+            self.assertEqual(len(group_ids), 3)
+            for val in group_ids:
+                self.assertGreaterEqual(val, 0)
+
+    if hasattr(posix, 'setresuid'):
+        def test_setresuid(self):
+            current_user_ids = posix.getresuid()
+            self.assertIsNone(posix.setresuid(*current_user_ids))
+            # -1 means don't change that value.
+            self.assertIsNone(posix.setresuid(-1, -1, -1))
+
+        def test_setresuid_exception(self):
+            # Don't do this test if someone is silly enough to run us as root.
+            current_user_ids = posix.getresuid()
+            if 0 not in current_user_ids:
+                new_user_ids = (current_user_ids[0]+1, -1, -1)
+                self.assertRaises(OSError, posix.setresuid, *new_user_ids)
+
+    if hasattr(posix, 'setresgid'):
+        def test_setresgid(self):
+            current_group_ids = posix.getresgid()
+            self.assertIsNone(posix.setresgid(*current_group_ids))
+            # -1 means don't change that value.
+            self.assertIsNone(posix.setresgid(-1, -1, -1))
+
+        def test_setresgid_exception(self):
+            # Don't do this test if someone is silly enough to run us as root.
+            current_group_ids = posix.getresgid()
+            if 0 not in current_group_ids:
+                new_group_ids = (current_group_ids[0]+1, -1, -1)
+                self.assertRaises(OSError, posix.setresgid, *new_group_ids)
+
     def test_statvfs(self):
         if hasattr(posix, 'statvfs'):
             self.assertTrue(posix.statvfs(os.curdir))
diff --git a/Misc/NEWS b/Misc/NEWS
index 4aa52c9..449cc2b 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -1589,6 +1589,8 @@ C-API
 Extension Modules
 -----------------
 
+- Issue #6508: Add posix.{getresuid,getresgid,setresuid,setresgid}.
+
 - Issue #7078: Set struct.__doc__ from _struct.__doc__.
 
 - Issue #3366: Add gamma function to math module.
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index 0d2ca54..68e7286 100644
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -8386,6 +8386,82 @@ vms_urandom(PyObject *self, PyObject *args)
 }
 #endif
 
+#ifdef HAVE_SETRESUID
+PyDoc_STRVAR(posix_setresuid__doc__,
+"setresuid(ruid, euid, suid)\n\n\
+Set the current process's real, effective, and saved user ids.");
+
+static PyObject*
+posix_setresuid (PyObject *self, PyObject *args)
+{
+	/* We assume uid_t is no larger than a long. */
+	long ruid, euid, suid;
+	if (!PyArg_ParseTuple(args, "lll", &ruid, &euid, &suid))
+		return NULL;
+	if (setresuid(ruid, euid, suid) < 0)
+		return posix_error();
+	Py_RETURN_NONE;
+}
+#endif
+
+#ifdef HAVE_SETRESGID
+PyDoc_STRVAR(posix_setresgid__doc__,
+"setresgid(rgid, egid, sgid)\n\n\
+Set the current process's real, effective, and saved group ids.");
+
+static PyObject*
+posix_setresgid (PyObject *self, PyObject *args)
+{
+	/* We assume uid_t is no larger than a long. */
+	long rgid, egid, sgid;
+	if (!PyArg_ParseTuple(args, "lll", &rgid, &egid, &sgid))
+		return NULL;
+	if (setresgid(rgid, egid, sgid) < 0)
+		return posix_error();
+	Py_RETURN_NONE;
+}
+#endif
+
+#ifdef HAVE_GETRESUID
+PyDoc_STRVAR(posix_getresuid__doc__,
+"getresuid() -> (ruid, euid, suid)\n\n\
+Get tuple of the current process's real, effective, and saved user ids.");
+
+static PyObject*
+posix_getresuid (PyObject *self, PyObject *noargs)
+{
+	uid_t ruid, euid, suid;
+	long l_ruid, l_euid, l_suid;
+	if (getresuid(&ruid, &euid, &suid) < 0)
+		return posix_error();
+	/* Force the values into long's as we don't know the size of uid_t. */
+	l_ruid = ruid;
+	l_euid = euid;
+	l_suid = suid;
+	return Py_BuildValue("(lll)", l_ruid, l_euid, l_suid);
+}
+#endif
+
+#ifdef HAVE_GETRESGID
+PyDoc_STRVAR(posix_getresgid__doc__,
+"getresgid() -> (rgid, egid, sgid)\n\n\
+Get tuple of the current process's real, effective, and saved user ids.");
+
+static PyObject*
+posix_getresgid (PyObject *self, PyObject *noargs)
+{
+	uid_t rgid, egid, sgid;
+	long l_rgid, l_egid, l_sgid;
+	if (getresgid(&rgid, &egid, &sgid) < 0)
+		return posix_error();
+	/* Force the values into long's as we don't know the size of uid_t. */
+	l_rgid = rgid;
+	l_egid = egid;
+	l_sgid = sgid;
+	return Py_BuildValue("(lll)", l_rgid, l_egid, l_sgid);
+}
+#endif
+
 static PyMethodDef posix_methods[] = {
 	{"access",	posix_access, METH_VARARGS, posix_access__doc__},
 #ifdef HAVE_TTYNAME
@@ -8696,6 +8772,19 @@ static PyMethodDef posix_methods[] = {
  #ifdef __VMS
  	{"urandom", vms_urandom, METH_VARARGS, vms_urandom__doc__},
  #endif
+#ifdef HAVE_SETRESUID
+        {"setresuid",	posix_setresuid, METH_VARARGS, posix_setresuid__doc__},
+#endif
+#ifdef HAVE_SETRESGID
+        {"setresgid",	posix_setresgid, METH_VARARGS, posix_setresgid__doc__},
+#endif
+#ifdef HAVE_GETRESUID
+        {"getresuid",	posix_getresuid, METH_NOARGS, posix_getresuid__doc__},
+#endif
+#ifdef HAVE_GETRESGID
+        {"getresgid",	posix_getresgid, METH_NOARGS, posix_getresgid__doc__},
+#endif
+
 	{NULL,		NULL}		 /* Sentinel */
 };
 
diff --git a/configure b/configure
index aae7494..a006a8e 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 76403 .
+# From configure.in Revision: 76432 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for python 2.7.
 #
@@ -17882,16 +17882,31 @@ 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 getpwent getspnam getspent getsid getwd \
+ getpriority getresuid getresgid getpwent getspnam getspent getsid getwd \
  kill killpg lchmod lchown lstat 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 \
  setgid \
  setlocale setregid setreuid setsid setpgid setpgrp setuid setvbuf snprintf \
+ setlocale setregid setreuid setresuid setresgid \
+ setsid setpgid setpgrp setuid setvbuf snprintf \
  sigaction siginterrupt sigrelse strftime \
  sysconf tcgetpgrp tcsetpgrp tempnam timegm times tmpfile tmpnam tmpnam_r \
  truncate uname unsetenv utimes waitpid wait3 wait4 wcscoll _getpty
diff --git a/configure.in b/configure.in
index 48043ad..3bef205 100644
--- a/configure.in
+++ b/configure.in
@@ -2546,13 +2546,15 @@ AC_MSG_RESULT(MACHDEP_OBJS)
 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 getpwent getspnam getspent getsid getwd \
+ getpriority getresuid getresgid getpwent getspnam getspent getsid getwd \
  kill killpg lchmod lchown lstat 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 \
  setgid \
  setlocale setregid setreuid setsid setpgid setpgrp setuid setvbuf snprintf \
+ setlocale setregid setreuid setresuid setresgid \
+ setsid setpgid setpgrp setuid setvbuf snprintf \
  sigaction siginterrupt sigrelse strftime \
  sysconf tcgetpgrp tcsetpgrp tempnam timegm times tmpfile tmpnam tmpnam_r \
  truncate uname unsetenv utimes waitpid wait3 wait4 wcscoll _getpty)
diff --git a/pyconfig.h.in b/pyconfig.h.in
index c045593..5900cb0 100644
--- a/pyconfig.h.in
+++ b/pyconfig.h.in
@@ -316,6 +316,12 @@
 /* Define to 1 if you have the `getpwent' function. */
 #undef HAVE_GETPWENT
 
+/* Define to 1 if you have the `getresgid' function. */
+#undef HAVE_GETRESGID
+
+/* Define to 1 if you have the `getresuid' function. */
+#undef HAVE_GETRESUID
+
 /* Define to 1 if you have the `getsid' function. */
 #undef HAVE_GETSID
 
@@ -580,6 +586,12 @@
 /* Define to 1 if you have the `setregid' function. */
 #undef HAVE_SETREGID
 
+/* Define to 1 if you have the `setresgid' function. */
+#undef HAVE_SETRESGID
+
+/* Define to 1 if you have the `setresuid' function. */
+#undef HAVE_SETRESUID
+
 /* Define to 1 if you have the `setreuid' function. */
 #undef HAVE_SETREUID