File pykolab-0.6.11-saslauthd-logger-permissions.patch of Package pykolab

File pykolab-0.6.11-saslauthd-logger-permissions.patch of Package pykolab (Revision eade0d8df3ceb9badb10695ab970813a)

Currently displaying revision eade0d8df3ceb9badb10695ab970813a , Show latest

diff -ur pykolab-0.6.11.orig/pykolab/logger.py pykolab-0.6.11/pykolab/logger.py
--- pykolab-0.6.11.orig/pykolab/logger.py	2014-01-28 12:33:07.000000000 +0100
+++ pykolab-0.6.11/pykolab/logger.py	2014-02-14 15:49:34.519321952 +0100
@@ -37,6 +37,8 @@
     debuglevel = 0
     fork = False
     loglevel = logging.CRITICAL
+    process_username = 'kolab'
+    process_groupname = 'kolab-n'
 
     if hasattr(sys, 'argv'):
         for arg in sys.argv:
@@ -66,6 +68,26 @@
                 else:
                     loglevel = logging.DEBUG
 
+            if '-u' == arg or '--user' == arg:
+                process_username = -1
+                continue
+
+            if arg.startswith('--user='):
+                process_username = arg.split('=')[1]
+
+            if process_username == -1:
+                process_username = arg
+
+            if '-g' == arg or '--group' == arg:
+                process_groupname = -1
+                continue
+
+            if arg.startswith('--group='):
+                process_groupname = arg.split('=')[1]
+
+            if process_groupname == -1:
+                process_groupname = arg
+
     def __init__(self, *args, **kw):
         if kw.has_key('name'):
             name = kw['name']
@@ -89,25 +111,86 @@
         else:
             self.logfile = '/var/log/kolab/pykolab.log'
 
+        group_gid = 0
+        user_uid = 0
+
         # Make sure (read: attempt to change) the permissions
         try:
-            (ruid, euid, suid) = os.getresuid()
-            (rgid, egid, sgid) = os.getresgid()
-        except AttributeError, errmsg:
-            ruid = os.getuid()
-            rgid = os.getgid()
+            try:
+                (ruid, euid, suid) = os.getresuid()
+                (rgid, egid, sgid) = os.getresgid()
+            except AttributeError, errmsg:
+                ruid = os.getuid()
+                rgid = os.getgid()
+
+            if ruid == 0:
+                # Means we can setreuid() / setregid() / setgroups()
+                if rgid == 0:
+                    # Get group entry details
+                    try:
+                        (
+                                group_name,
+                                group_password,
+                                group_gid,
+                                group_members
+                            ) = grp.getgrnam(self.process_groupname)
+
+                    except KeyError:
+                        print >> sys.stderr, _("Group %s does not exist") % (
+                                self.process_groupname
+                            )
+
+                        sys.exit(1)
+
+                    # Set real and effective group if not the same as current.
+                    if not group_gid == rgid:
+                        self.debug(
+                                _("Switching real and effective group id to %d") % (
+                                        group_gid
+                                    ),
+                                level=8
+                            )
+
+                        os.setregid(group_gid, group_gid)
+
+                if ruid == 0:
+                    # Means we haven't switched yet.
+                    try:
+                        (
+                                user_name,
+                                user_password,
+                                user_uid,
+                                user_gid,
+                                user_gecos,
+                                user_homedir,
+                                user_shell
+                            ) = pwd.getpwnam(self.process_username)
+
+                    except KeyError:
+                        print >> sys.stderr, _("User %s does not exist") % (
+                                self.process_username
+                            )
+
+                        sys.exit(1)
 
-        if ruid == 0 or rgid == 0:
-            if os.path.isfile(self.logfile):
                 try:
                     os.chown(
                             self.logfile,
-                            pwd.getpwnam('kolab')[2],
-                            grp.getgrnam('kolab-n')[2]
+                            user_uid,
+                            group_gid
                         )
                     os.chmod(self.logfile, 0660)
-                except:
-                    pass
+                except Exception, errmsg:
+                    self.error(_("Could not change permissions on %s: %r") % (self.logfile, errmsg))
+                    if self.debuglevel > 8:
+                        import traceback
+                        traceback.print_exc()
+
+        except Exception, errmsg:
+            self.error(_("Could not change permissions on %s: %r") % (self.logfile, errmsg))
+            if self.debuglevel > 8:
+                import traceback
+                traceback.print_exc()
 
         # Make sure the log file exists
         try:
@@ -137,7 +220,7 @@
             self.console_stdout.close()
             self.removeHandler(self.console_stdout)
 
-    def debug(self, msg, level=1):
+    def debug(self, msg, level=1, *args, **kw):
         self.setLevel(self.loglevel)
         # Work around other applications not using various levels of debugging
         if not self.name.startswith('pykolab') and not self.debuglevel == 9:
diff -ur pykolab-0.6.11.orig/saslauthd/__init__.py pykolab-0.6.11/saslauthd/__init__.py
--- pykolab-0.6.11.orig/saslauthd/__init__.py	2014-01-28 12:33:07.000000000 +0100
+++ pykolab-0.6.11/saslauthd/__init__.py	2014-02-14 15:49:27.407336108 +0100
@@ -28,7 +28,9 @@
 from optparse import OptionParser
 from ConfigParser import SafeConfigParser
 
+import grp
 import os
+import pwd
 import shutil
 import sys
 import time
@@ -107,6 +109,79 @@
         exitcode = 0
 
         try:
+            try:
+                (ruid, euid, suid) = os.getresuid()
+                (rgid, egid, sgid) = os.getresgid()
+            except AttributeError, errmsg:
+                ruid = os.getuid()
+                rgid = os.getgid()
+
+            if ruid == 0:
+                # Means we can setreuid() / setregid() / setgroups()
+                if rgid == 0:
+                    # Get group entry details
+                    try:
+                        (
+                                group_name,
+                                group_password,
+                                group_gid,
+                                group_members
+                            ) = grp.getgrnam(conf.process_groupname)
+
+                    except KeyError:
+                        print >> sys.stderr, _("Group %s does not exist") % (
+                                conf.process_groupname
+                            )
+
+                        sys.exit(1)
+
+                    # Set real and effective group if not the same as current.
+                    if not group_gid == rgid:
+                        log.debug(
+                                _("Switching real and effective group id to %d") % (
+                                        group_gid
+                                    ),
+                                level=8
+                            )
+
+                        os.setregid(group_gid, group_gid)
+
+                if ruid == 0:
+                    # Means we haven't switched yet.
+                    try:
+                        (
+                                user_name,
+                                user_password,
+                                user_uid,
+                                user_gid,
+                                user_gecos,
+                                user_homedir,
+                                user_shell
+                            ) = pwd.getpwnam(conf.process_username)
+
+                    except KeyError:
+                        print >> sys.stderr, _("User %s does not exist") % (
+                                conf.process_username
+                            )
+
+                        sys.exit(1)
+
+
+                    # Set real and effective user if not the same as current.
+                    if not user_uid == ruid:
+                        log.debug(
+                                _("Switching real and effective user id to %d") % (
+                                        user_uid
+                                    ),
+                                level=8
+                            )
+
+                        os.setreuid(user_uid, user_uid)
+
+        except:
+            log.error(_("Could not change real and effective uid and/or gid"))
+
+        try:
             pid = 1
             if conf.fork_mode:
                 pid = os.fork()