Kolab Groupware OBS

pykolab.spec Changed

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

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

debian.changelog 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,20 @@
                         "autocreate_folders"
                     )
 
+            else:
+                from pykolab.auth import Auth
+                auth = Auth()
+                auth.connect()
+                domains = auth._list_domains(self.domain)
+                auth.disconnect()
+                if len(domains) > 0:
+                    (primary,secondaries) = domains[1]
+                    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/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,23 @@
                 if not schema_filepath in schema_files:
                     schema_files.append(schema_filepath)
 
+    schema_files = []
+    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/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/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

Changes of Revision 4