Request 1615 (accepted)

pykolab.spec Changed

@@ -28,18 +28,15 @@
 
 Summary:            Kolab Groupware Solution
 Name:               pykolab
-Version:            0.8.0
-Release:            1%{?dist}
+Version:            0.8.1
+Release:            2%{?dist}
 License:            GPLv3+
 Group:              Applications/System
 URL:                http://kolab.org/
 
-Source0:            pykolab-0.8.0.tar.gz
+Source0:            pykolab-0.8.1.tar.gz
 Source1:            pykolab.logrotate
 
-Patch0001:          0001-Fix-mistake-in-manticore-configuration-template.patch
-Patch0002:          0002-Fix-default-template-for-Guam.patch
-
 BuildRoot:          %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch:          noarch
 %if 0%{?suse_version}
@@ -54,7 +51,14 @@
 BuildRequires:      gettext
 BuildRequires:      glib2-devel
 BuildRequires:      intltool
+%if 0%{?suse_version}
+BuildRequires:      python-mysql
+%else
+BuildRequires:      MySQL-python
+%endif
 BuildRequires:      python
+BuildRequires:      python-augeas
+BuildRequires:      python-gnupg
 BuildRequires:      python-icalendar
 BuildRequires:      python-kolab
 BuildRequires:      python-kolabformat
@@ -205,6 +209,7 @@
 %else
 Requires:           MySQL-python
 %endif
+Requires:           python-gnupg
 Requires:           python-icalendar >= 3.0
 Requires:           %{name}-xml = %{version}-%{release}
 
@@ -214,9 +219,6 @@
 %prep
 %setup -q
 
-%patch0001 -p1
-%patch0002 -p1
-
 %build
 autoreconf -v || automake --add-missing && autoreconf -v
 %configure
@@ -542,6 +544,9 @@
 %attr(0700,%{kolab_user},%{kolab_group}) %dir %{_var}/spool/pykolab/wallace
 
 %changelog
+* Wed Mar 09 2016 Timotheus Pokorra <tp@tbits.net> - 0.8.1-2
+- wallace requires python-gnupg to be installed. avoid ImportError: No module named gnupg
+
 * Wed Oct 14 2015 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 0.7.16-1
 - New upstream release 0.7.16

0001-Fix-mistake-in-manticore-configuration-template.patch Deleted

0002-Fix-default-template-for-Guam.patch Deleted

debian.changelog Changed

debian.control Changed

debian.series Changed

pykolab-0.8.0.tar.gz/kolabd/__init__.py -> pykolab-0.8.1.tar.gz/kolabd/__init__.py Changed

pykolab-0.8.0.tar.gz/pykolab/auth/ldap/__init__.py -> pykolab-0.8.1.tar.gz/pykolab/auth/ldap/__init__.py Changed

pykolab-0.8.0.tar.gz/pykolab/imap/__init__.py -> pykolab-0.8.1.tar.gz/pykolab/imap/__init__.py Changed

@@ -522,6 +522,9 @@
         if not hasattr(self, 'domain'):
             self.domain == None
 
+        if self.domain == None and len(mailbox_base_name.split('@')) > 1:
+            self.domain = mailbox_base_name.split('@')[1]
+
         if not self.domain == None:
             if conf.has_option(self.domain, "autocreate_folders"):
                 _additional_folders = conf.get_raw(
@@ -529,6 +532,25 @@
                         "autocreate_folders"
                     )
 
+            else:
+                from pykolab.auth import Auth
+                auth = Auth()
+                auth.connect()
+
+                domains = auth.list_domains(self.domain)
+
+                auth.disconnect()
+
+                if len(domains.keys()) > 0:
+                    if domains.has_key(self.domain):
+                        primary = domains[self.domain]
+
+                        if conf.has_option(primary, "autocreate_folders"):
+                            _additional_folders = conf.get_raw(
+                                    primary,
+                                    "autocreate_folders"
+                                )
+
         if _additional_folders == None:
             if conf.has_option('kolab', "autocreate_folders"):
                 _additional_folders = conf.get_raw(

pykolab-0.8.0.tar.gz/pykolab/imap/cyrus.py -> pykolab-0.8.1.tar.gz/pykolab/imap/cyrus.py Changed

@@ -25,12 +25,14 @@
 
 import pykolab
 
+from pykolab.constants import *
 from pykolab.imap import IMAP
 from pykolab.translate import _
 
 log = pykolab.getLogger('pykolab.imap')
 conf = pykolab.getConf()
 
+
 class Cyrus(cyruslib.CYRUS):
     """
         Abstraction class for some common actions to do exclusively in Cyrus.
@@ -70,14 +72,19 @@
 
         self.server = hostname
 
-        self.uri = "%s://%s:%s" % (scheme,hostname,port)
+        self.uri = "%s://%s:%s" % (scheme, hostname, port)
 
         while 1:
             try:
                 cyruslib.CYRUS.__init__(self, self.uri)
                 break
             except cyruslib.CYRUSError:
-                log.warning(_("Could not connect to Cyrus IMAP server %r") % (self.uri))
+                log.warning(
+                        _("Could not connect to Cyrus IMAP server %r") % (
+                                self.uri
+                            )
+                    )
+
                 time.sleep(10)
 
         if conf.debuglevel > 8:
@@ -134,17 +141,32 @@
         """
         cyruslib.CYRUS.login(self, *args, **kw)
         self.separator = self.SEP
+        try:
+            self._id()
+        except Exception, errmsg:
+            pass
+
+        log.debug(
+                _("Continuing with separator: %r") % (self.separator),
+                level=8
+            )
 
-        log.debug(_("Continuing with separator: %r") % (self.separator), level=8)
         self.murder = False
 
         for capability in self.m.capabilities:
             if capability.startswith("MUPDATE="):
-                log.debug(_("Detected we are running in a Murder topology"), level=8)
+                log.debug(
+                        _("Detected we are running in a Murder topology"),
+                        level=8
+                    )
+
                 self.murder = True
 
         if not self.murder:
-            log.debug(_("This system is not part of a murder topology"), level=8)
+            log.debug(
+                    _("This system is not part of a murder topology"),
+                    level=8
+                )
 
     def find_mailfolder_server(self, mailfolder):
         annotations = {}
@@ -153,8 +175,13 @@
 
         prefix = _mailfolder['path_parts'].pop(0)
         mbox = _mailfolder['path_parts'].pop(0)
-        if not _mailfolder['domain'] == None:
-            mailfolder = "%s%s%s@%s" % (prefix,self.separator,mbox,_mailfolder['domain'])
+        if _mailfolder['domain'] is not None:
+            mailfolder = "%s%s%s@%s" % (
+                    prefix,
+                    self.separator,
+                    mbox,
+                    _mailfolder['domain']
+                )
 
         # TODO: Workaround for undelete
         if len(self.lm(mailfolder)) < 1:
@@ -165,14 +192,20 @@
         if not self.murder:
             return self.server
 
-        log.debug(_("Checking actual backend server for folder %s through annotations") % (mailfolder), level=8)
+        log.debug(
+                _("Checking actual backend server for folder %s " +
+                    "through annotations") % (
+                        mailfolder
+                    ),
+                level=8
+            )
 
         if self.mbox.has_key(mailfolder):
             log.debug(
                     _(
-                            "Possibly reproducing the find " + \
-                            "mailfolder server answer from " + \
-                            "previously detected and stored " + \
+                            "Possibly reproducing the find " +
+                            "mailfolder server answer from " +
+                            "previously detected and stored " +
                             "annotation value: %r"
                         ) % (
                                 self.mbox[mailfolder]
@@ -185,26 +218,53 @@
 
         max_tries = 20
         num_try = 0
+
+        annotation_path = "/shared/vendor/cmu/cyrus-imapd/server"
+
         while 1:
             num_try += 1
-            annotations = self._getannotation(mailfolder, "/vendor/cmu/cyrus-imapd/server")
+            annotations = self._getannotation(
+                    mailfolder,
+                    annotation_path
+                )
 
             if annotations.has_key(mailfolder):
                 break
 
             if max_tries <= num_try:
-                log.error(_("Could not get the annotations after %s tries.") % (num_try))
-                annotations = { mailfolder: { '/shared/vendor/cmu/cyrus-imapd/server': self.server }}
+                log.error(
+                        _("Could not get the annotations after %s tries.") % (
+                                num_try
+                            )
+                    )
+
+                annotations = {
+                        mailfolder: {
+                                annotation_path: self.server
+                            }
+                    }
+
                 break
 
-            log.warning(_("No annotations for %s: %r") % (mailfolder,annotations))
+            log.warning(
+                    _("No annotations for %s: %r") % (
+                            mailfolder,
+                            annotations
+                        )
+                )
 
             time.sleep(1)
 
-        server = annotations[mailfolder]['/shared/vendor/cmu/cyrus-imapd/server']
+        server = annotations[mailfolder][annotation_path]
         self.mbox[mailfolder] = server
 
-        log.debug(_("Server for INBOX folder %s is %s") % (mailfolder,server), level=8)
+        log.debug(
+                _("Server for INBOX folder %s is %s") % (
+                        mailfolder,
+                        server
+                    ),
+                level=8
+            )
 
         return server
 
@@ -216,33 +276,68 @@
         from pykolab import imap_utf7
         return imap_utf7.decode(folder)
 
+    def _id(self, identity=None):
+        if identity is None:
+            identity = '("name" "Python/Kolab" "version" "%s")' % (__version__)
+
+        typ, dat = self.m._simple_command('ID', identity)
+        res, dat = self.m._untagged_response(typ, dat, 'ID')
+
     def _setquota(self, mailfolder, quota):
         """
             Login to the actual backend server.
         """
         server = self.find_mailfolder_server(mailfolder)
-        #print "server:", server
-        self.connect(self.uri.replace(self.server,server))
+        self.connect(self.uri.replace(self.server, server))
+
+        log.debug(
+                _("Setting quota for folder %s to %s") % (
+                        mailfolder,
+                        quota
+                    ),
+                level=8
+            )
 
-        log.debug(_("Setting quota for folder %s to %s") % (mailfolder,quota), level=8)
         try:
             self.m.setquota(mailfolder, quota)
         except:
-            log.error(_("Could not set quota for mailfolder %s") % (mailfolder))
+            log.error(
+                    _("Could not set quota for mailfolder %s") % (
+                            mailfolder
+                        )
+                )
 
     def _rename(self, from_mailfolder, to_mailfolder, partition=None):
         """
             Login to the actual backend server, then rename.
         """
         server = self.find_mailfolder_server(from_mailfolder)
-        self.connect(self.uri.replace(self.server,server))
+        self.connect(self.uri.replace(self.server, server))
+
+        if partition is not None:
+            log.debug(
+                    _("Moving INBOX folder %s to %s on partition %s") % (
+                            from_mailfolder,
+                            to_mailfolder,
+                            partition
+                        ),
+                    level=8
+                )
 
-        if not partition == None:
-            log.debug(_("Moving INBOX folder %s to %s on partition %s") % (from_mailfolder,to_mailfolder, partition), level=8)
         else:
-            log.debug(_("Moving INBOX folder %s to %s") % (from_mailfolder,to_mailfolder), level=8)
+            log.debug(
+                    _("Moving INBOX folder %s to %s") % (
+                            from_mailfolder,
+                            to_mailfolder
+                        ),
+                    level=8
+                )
 
-        self.m.rename(self.folder_utf7(from_mailfolder), self.folder_utf7(to_mailfolder), '"%s"' % (partition))
+        self.m.rename(
+                self.folder_utf7(from_mailfolder),
+                self.folder_utf7(to_mailfolder),
+                '"%s"' % (partition)
+            )
 
     def _getannotation(self, *args, **kw):
         return self.getannotation(*args, **kw)
@@ -256,24 +351,49 @@
         except:
             server = self.server
 
-        log.debug(_("Setting annotation %s on folder %s") % (annotation,mailfolder), level=8)
+        log.debug(
+                _("Setting annotation %s on folder %s") % (
+                        annotation,
+                        mailfolder
+                    ),
+                level=8
+            )
 
         try:
             self.setannotation(mailfolder, annotation, value, shared)
-        except cyruslib.CYRUSError, e:
-            log.error(_("Could not set annotation %r on mail folder %r: %r") % (annotation,mailfolder,e))
+        except cyruslib.CYRUSError, errmsg:
+            log.error(
+                    _("Could not set annotation %r on mail folder %r: %r") % (
+                            annotation,
+                            mailfolder,
+                            errmsg
+                        )
+                )
 
     def _xfer(self, mailfolder, current_server, new_server):
-        self.connect(self.uri.replace(self.server,current_server))
-        log.debug(_("Transferring folder %s from %s to %s") % (mailfolder, current_server, new_server), level=8)
+        self.connect(self.uri.replace(self.server, current_server))
+        log.debug(
+                _("Transferring folder %s from %s to %s") % (
+                        mailfolder,
+                        current_server,
+                        new_server
+                    ),
+                level=8
+            )
+
         self.xfer(mailfolder, new_server)
 
-    def undelete_mailfolder(self, mailfolder, to_mailfolder=None, recursive=True):
+    def undelete_mailfolder(
+                self,
+                mailfolder,
+                to_mailfolder=None,
+                recursive=True
+            ):
         """
             Login to the actual backend server, then "undelete" the mailfolder.
 
-            'mailfolder' may be a string representing either of the following two
-            options;
+            'mailfolder' may be a string representing either of the following
+            two options;
 
             - the fully qualified pathof the deleted folder in its current
               location, such as, for a deleted INBOX folder originally known as
@@ -295,7 +415,7 @@
 
         undelete_folders = self._find_deleted_folder(mailfolder)
 
-        if not to_mailfolder == None:
+        if to_mailfolder is not None:
             target_mbox = self.parse_mailfolder(to_mailfolder)
         else:
             target_mbox = mailfolder
@@ -306,39 +426,68 @@
             prefix = undelete_mbox['path_parts'].pop(0)
             mbox = undelete_mbox['path_parts'].pop(0)
 
-            if to_mailfolder == None:
-                target_folder = self.separator.join([prefix,mbox])
+            if to_mailfolder is None:
+                target_folder = self.separator.join([prefix, mbox])
             else:
                 target_folder = self.separator.join(target_mbox['path_parts'])
 
-            if not to_mailfolder == None:
-                target_folder = "%s%s%s" % (target_folder,self.separator,mbox)
+            if to_mailfolder is not None:
+                target_folder = "%s%s%s" % (
+                        target_folder,
+                        self.separator,
+                        mbox
+                    )
 
             if not len(undelete_mbox['path_parts']) == 0:
-                target_folder = "%s%s%s" % (target_folder,self.separator,self.separator.join(undelete_mbox['path_parts']))
+                target_folder = "%s%s%s" % (
+                        target_folder,
+                        self.separator,
+                        self.separator.join(undelete_mbox['path_parts'])
+                    )
 
             if target_folder in target_folders:
-                target_folder = "%s%s%s" % (target_folder,self.separator,undelete_mbox['hex_timestamp'])
+                target_folder = "%s%s%s" % (
+                        target_folder,
+                        self.separator,
+                        undelete_mbox['hex_timestamp']
+                    )
 
             target_folders.append(target_folder)
 
-            if not target_mbox['domain'] == None:
-                target_folder = "%s@%s" % (target_folder,target_mbox['domain'])
-
-            log.info(_("Undeleting %s to %s") % (undelete_folder,target_folder))
+            if target_mbox['domain'] is not None:
+                target_folder = "%s@%s" % (
+                        target_folder,
+                        target_mbox['domain']
+                    )
+
+            log.info(
+                    _("Undeleting %s to %s") % (
+                            undelete_folder,
+                            target_folder
+                        )
+                )
 
             target_server = self.find_mailfolder_server(target_folder)
 
-            if hasattr(conf,'dry_run') and not conf.dry_run:
-                if not target_server == self.server:
-                    self.xfer(undelete_folder,target_server)
+            if hasattr(conf, 'dry_run') and not conf.dry_run:
+                if target_server is not self.server:
+                    self.xfer(undelete_folder, target_server)
 
-                self.rename(undelete_folder,target_folder)
+                self.rename(undelete_folder, target_folder)
             else:
                 if not target_server == self.server:
-                    print >> sys.stdout, _("Would have transferred %s from %s to %s") % (undelete_folder, self.server, target_server)
-
-                print >> sys.stdout, _("Would have renamed %s to %s") % (undelete_folder, target_folder)
+                    print >> sys.stdout, \
+                        _("Would have transferred %s from %s to %s") % (
+                                undelete_folder,
+                                self.server,
+                                target_server
+                            )
+
+                print >> sys.stdout, \
+                    _("Would have renamed %s to %s") % (
+                            undelete_folder,
+                            target_folder
+                        )
 
     def parse_mailfolder(self, mailfolder):
         """
@@ -361,15 +510,16 @@
             mbox['path_parts'] = mailfolder.split(self.separator)
 
         # See if the path that has been specified is the current location for
-        # the deleted folder, or the original location, we have to find the deleted
-        # folder for.
-        if not mbox['path_parts'][0] in [ 'user', 'shared' ]:
+        # the deleted folder, or the original location, we have to find the
+        # deleted folder for.
+        if not mbox['path_parts'][0] in ['user', 'shared']:
             deleted_prefix = mbox['path_parts'].pop(0)
             # See if the hexadecimal timestamp is actually hexadecimal.
             # This prevents "DELETED/user/userid/Sent", but not
             # "DELETED/user/userid/FFFFFF" from being specified.
             try:
-                epoch = int(mbox['path_parts'][(len(mbox['path_parts'])-1)], 16)
+                hexstamp = mbox['path_parts'][(len(mbox['path_parts'])-1)]
+                epoch = int(hexstamp, 16)
                 try:
                     timestamp = time.asctime(time.gmtime(epoch))
                 except:
@@ -385,22 +535,28 @@
                     'mailfolder': self.separator.join(mbox['path_parts'])
                 }
 
-            if not mbox['domain'] == None:
-                verify_folder_search = "%s@%s" % (verify_folder_search, mbox['domain'])
+            if mbox['domain'] is not None:
+                verify_folder_search = "%s@%s" % (
+                        verify_folder_search,
+                        mbox['domain']
+                    )
 
             if ' ' in verify_folder_search:
-                folders = self.lm('"%s"' % self.folder_utf7(verify_folder_search))
+                folders = self.lm(
+                        '"%s"' % self.folder_utf7(verify_folder_search)
+                    )
+
             else:
                 folders = self.lm(self.folder_utf7(verify_folder_search))
 
-            # NOTE: Case also covered is valid hexadecimal folders; won't be the
-            # actual check as intended, but doesn't give you anyone else's data
-            # unless... See the following:
+            # NOTE: Case also covered is valid hexadecimal folders; won't be
+            # the actual check as intended, but doesn't give you anyone else's
+            # data unless... See the following:
             #
             # TODO: Case not covered is usernames that are hexadecimal.
             #
-            # We could probably attempt to convert the int(hex) into a time.gmtime(),
-            # but it still would not cover all cases.
+            # We could probably attempt to convert the int(hex) into a
+            # time.gmtime(), but it still would not cover all cases.
             #
 
             # If no folders were found... well... then there you go.
@@ -414,20 +570,24 @@
 
     def _find_deleted_folder(self, mbox):
         """
-            Give me the parts that are in an original mailfolder name and I'll find
-            the deleted folder name.
+            Give me the parts that are in an original mailfolder name and I'll
+            find the deleted folder name.
 
             TODO: It finds virtdomain folders for non-virtdomain searches.
         """
-        deleted_folder_search = "%(deleted_prefix)s%(separator)s%(mailfolder)s%(separator)s*" % {
-                    # TODO: The prefix used is configurable
-                    'deleted_prefix': "DELETED",
-                    'mailfolder': self.separator.join(mbox['path_parts']),
-                    'separator': self.separator,
-                }
+        deleted_folder_search = "%(deleted_prefix)s%(separator)s" + \
+            "%(mailfolder)s%(separator)s*" % {
+                # TODO: The prefix used is configurable
+                'deleted_prefix': "DELETED",
+                'mailfolder': self.separator.join(mbox['path_parts']),
+                'separator': self.separator,
+            }
 
-        if not mbox['domain'] == None:
-            deleted_folder_search = "%s@%s" % (deleted_folder_search,mbox['domain'])
+        if mbox['domain'] is not None:
+            deleted_folder_search = "%s@%s" % (
+                    deleted_folder_search,
+                    mbox['domain']
+                )
 
         folders = self.lm(deleted_folder_search)
 
@@ -438,7 +598,7 @@
         #
 
         # Here, we explicitly remove any virtdomain folders.
-        if mbox['domain'] == None:
+        if mbox['domain'] is None:
             _folders = []
             for folder in folders:
                 if len(folder.split('@')) < 2:

pykolab-0.8.0.tar.gz/pykolab/setup/__init__.py -> pykolab-0.8.1.tar.gz/pykolab/setup/__init__.py Changed

@@ -21,6 +21,7 @@
 import sys
 
 import pykolab
+from pykolab.translate import _
 
 log = pykolab.getLogger('pykolab.setup')
 conf = pykolab.getConf()
@@ -40,6 +41,36 @@
                     to_execute.append(sys.argv[arg_num].replace('-','_'))
 
     def run(self):
+        if os.path.isfile('/sys/fs/selinux/enforce'):
+            if os.access('/sys/fs/selinux/enforce', os.R_OK):
+                # Set a gentle default because strictly speaking,
+                # setup won't fail (run-time does)
+                enforce = "0"
+
+                with open('/sys/fs/selinux/enforce', 'r') as f:
+                    enforce = f.read()
+
+                if enforce.strip() == "1":
+                    log.fatal(
+                            _("SELinux currently enforcing. Read " + \
+                            "https://git.kolab.org/u/1")
+                        )
+
+                    sys.exit(1)
+
+        if os.path.isfile('/etc/selinux/config'):
+            if os.access('/etc/selinux/config', os.R_OK):
+                with open('/etc/selinux/config', 'r') as f:
+                    for line in f:
+                        if line.strip() == "SELINUX=enforcing":
+                            log.fatal(
+                                    _("SELinux configured to enforce a " + \
+                                    "policy on startup. Read " + \
+                                    "https://git.kolab.org/u/1")
+                                )
+
+                            sys.exit(1)
+
         components.execute('_'.join(to_execute))
 
         if os.path.exists('/tmp/kolab-setup-my.cnf'):

pykolab-0.8.0.tar.gz/pykolab/setup/setup_mta.py -> pykolab-0.8.1.tar.gz/pykolab/setup/setup_mta.py Changed

pykolab-0.8.0.tar.gz/pykolab/setup/setup_roundcube.py -> pykolab-0.8.1.tar.gz/pykolab/setup/setup_roundcube.py Changed

@@ -176,7 +176,8 @@
 
                 if len(schema_files) > 0:
                     break
-        break
+        if len(schema_files) > 0:
+            break
 
     for root, directories, filenames in os.walk(rcpath + 'plugins/calendar/drivers/kolab/'):
         for filename in filenames:
@@ -192,6 +193,22 @@
                 if not schema_filepath in schema_files:
                     schema_files.append(schema_filepath)
 
+    for root, directories, filenames in os.walk('/usr/share/doc/'):
+        directories.sort()
+        for directory in directories:
+            if directory.startswith("chwala"):
+                for nested_root, nested_directories, nested_filenames in os.walk(os.path.join(root, directory)):
+                    for filename in nested_filenames:
+                        if filename.startswith('mysql.initial') and filename.endswith('.sql'):
+                            schema_filepath = os.path.join(nested_root,filename)
+                            if not schema_filepath in schema_files:
+                                schema_files.append(schema_filepath)
+
+                if len(schema_files) > 0:
+                    break
+        if len(schema_files) > 0:
+            break
+
     if not os.path.isfile('/tmp/kolab-setup-my.cnf'):
         utils.multiline_message(
                 """Please supply the MySQL root password"""

pykolab-0.8.0.tar.gz/saslauthd/__init__.py -> pykolab-0.8.1.tar.gz/saslauthd/__init__.py Changed

pykolab-0.8.0.tar.gz/setup-kolab.py -> pykolab-0.8.1.tar.gz/setup-kolab.py Changed

pykolab-0.8.0.tar.gz/share/templates/guam.sys.config.tpl -> pykolab-0.8.1.tar.gz/share/templates/guam.sys.config.tpl Changed

pykolab-0.8.0.tar.gz/share/templates/manticore.js.tpl -> pykolab-0.8.1.tar.gz/share/templates/manticore.js.tpl Changed

pykolab-0.8.0.tar.gz/share/templates/roundcubemail/kolab_delegation.inc.php.tpl -> pykolab-0.8.1.tar.gz/share/templates/roundcubemail/kolab_delegation.inc.php.tpl Changed

pykolab-0.8.0.tar.gz/wallace/__init__.py -> pykolab-0.8.1.tar.gz/wallace/__init__.py Changed

pykolab-0.8.0.tar.gz/wallace/module_gpgencrypt.py -> pykolab-0.8.1.tar.gz/wallace/module_gpgencrypt.py Changed

@@ -28,6 +28,12 @@
 from email.utils import formataddr
 from email.utils import getaddresses
 
+import email.mime.application
+import email.mime.multipart
+import email.mime.text
+import email.encoders
+import gnupg
+
 import modules
 
 import pykolab
@@ -45,6 +51,40 @@
 def description():
     return """Encrypt messages to the recipient(s)."""
 
+def pgp_mime(msg, recepients):
+    gpg = gnupg.GPG(gnupghome='/var/lib/kolab/.gnupg', verbose=conf.debuglevel > 8)
+    gpg.encoding = 'utf-8'
+
+    msg = msg
+
+    msg_boundary = str(msg.get_boundary())
+    msg_content_type = str(msg.get_content_type())
+    payload = msg.get_payload()
+
+    content = "Content-Type: " + msg_content_type + ";" + "\n boundary=\"" + msg_boundary + "\"\n\n" + payload
+    encrypted_content = gpg.encrypt(content, recepients, always_trust=True)
+    msg.set_type("multipart/encrypted")
+    msg.set_param("protocol","application/pgp-encrypted")
+
+    msg_boundary_gpg = "--boundary-gpg-encryption-42"
+
+    msg_preamble = "This is an OpenPGP/MIME encrypted message (RFC 4880 and 3156)\n\
+" + msg_boundary_gpg + "\n\
+Content-Type: application/pgp-encrypted\n\
+Content-Description: PGP/MIME version identification\n\
+\n\
+Version: 1\n\
+\n\
+" + msg_boundary_gpg + "\n\
+Content-Type: application/octet-stream; name=\"encrypted.asc\"\n\
+Content-Description: OpenPGP encrypted message\n\
+Content-Disposition: inline; filename=\"encrypted.asc\"\n\n"
+
+    msg.set_boundary(msg_boundary_gpg)
+    msg.set_payload(msg_preamble + str(encrypted_content) + "\n" + msg_boundary_gpg)
+
+    return msg
+
 def execute(*args, **kw):
     if not os.path.isdir(mybasepath):
         os.makedirs(mybasepath)
@@ -175,7 +215,6 @@
         nocrypt_rcpts = []
 
 
-        import gnupg
         gpg = gnupg.GPG(gnupghome='/var/lib/kolab/.gnupg', verbose=conf.debuglevel > 8)
         gpg.encoding = 'utf-8'
 
@@ -211,16 +250,29 @@
                 encrypt_rcpts.append(key_local)
 
         payload = message.get_payload()
-        print "payload:", payload
+        #print "payload:", payload
         if len(encrypt_rcpts) < 1:
             return filepath
 
-        encrypted_data = gpg.encrypt(payload, encrypt_rcpts, always_trust=True)
-        encrypted_string = str(encrypted_data)
+        if "multipart" in message.get_content_type():
+
+            log.debug(_("Mime Message - we need to build multipart/encrypted structure"), level=8)
+
+            msg = message
+            enc_mime_message = pgp_mime(msg, encrypt_rcpts)
+
+            message = enc_mime_message
+
+        else:
+
+            log.debug(_("No Mime Message - encypt plain"), level=8)
+
+            encrypted_data = gpg.encrypt(payload, encrypt_rcpts, always_trust=True)
+            encrypted_string = str(encrypted_data)
 
-        print "encrypted string:", encrypted_string
+            message.set_payload(encrypted_string)
 
-        message.set_payload(encrypted_string)
+            message.add_header('X-wallace-gpg-encrypted', 'true')
 
         (fp, new_filepath) = tempfile.mkstemp(dir="/var/spool/pykolab/wallace/gpgencrypt/ACCEPT")
         os.write(fp, message.as_string())

pykolab.dsc Changed

Overview

Request 1615 (accepted)

Request History