Request 3137 (superseded)

pykolab.spec Changed

@@ -45,23 +45,21 @@
 %global pythonmysql python-mysql
 %else
 %if 0%{?use_python3}
-%global pythonmysql python3-mysqlclient
+%global pythonmysql python3-PyMySQL
 %else
 %global pythonmysql MySQL-python
 %endif
 %endif
 
-%global upstream_version 0.9.0
-
 Summary:            Kolab Groupware Solution
 Name:               pykolab
-Version: 0.9.0.7
+Version:            0.9.0
 Release:            1%{?dist}
 License:            GPLv3+
 Group:              Applications/System
 URL:                http://kolab.org/
 
-Source0:            pykolab-%{upstream_version}.tar.gz
+Source0:            pykolab-%{version}.tar.gz
 Source1:            pykolab.logrotate
 
 BuildRoot:          %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -250,7 +248,19 @@
 This is the Kolab Content Filter, with plugins
 
 %prep
-%setup -q -n %{name}-%{upstream_version}
+%setup -q
+
+%if 0%{?use_python3}
+sed -i 's|#!/usr/bin/python|#!/usr/bin/python3|g' kolabd.py
+sed -i 's|#!/usr/bin/python|#!/usr/bin/python3|g' saslauthd.py
+sed -i 's|#!/usr/bin/python|#!/usr/bin/python3|g' conf.py
+sed -i 's|#!/usr/bin/python|#!/usr/bin/python3|g' setup-kolab.py
+sed -i 's|#!/usr/bin/python|#!/usr/bin/python3|g' wallace.py
+sed -i 's|#!/usr/bin/python|#!/usr/bin/python3|g' kolab-cli.py
+sed -i 's|#!/usr/bin/python|#!/usr/bin/python3|g' bin/kolab_parse_telemetry.py
+sed -i 's|#!/usr/bin/python|#!/usr/bin/python3|g' bin/kolab_smtp_access_policy.py
+%endif
+
 
 %build
 autoreconf -v || automake --add-missing && autoreconf -v

cyrus-imapd.conf-cert-paths.patch Changed

@@ -1,24 +1,20 @@
 diff -ur pykolab-0.8.6.orig/share/templates/guam.sys.config.tpl pykolab-0.8.6/share/templates/guam.sys.config.tpl
 --- pykolab-0.8.6.orig/share/templates/guam.sys.config.tpl	2016-11-18 12:24:34.000000000 +0100
 +++ pykolab-0.8.6/share/templates/guam.sys.config.tpl	2016-11-18 13:35:14.350503922 +0100
-@@ -26,9 +26,7 @@
+@@ -26,7 +26,7 @@
                              },
                              {
                                  tls_config, 
--                                    { certfile, "/etc/pki/cyrus-imapd/cyrus-imapd.pem" },
--                                    { cacertfile, "/etc/pki/cyrus-imapd/cyrus-imapd-ca.pem" },
--                                    { keyfile, "/etc/pki/cyrus-imapd/cyrus-imapd-key.pem" }
+-                                    { certfile, "/etc/pki/cyrus-imapd/cyrus-imapd.pem" }
 +                                    { certfile, "/etc/ssl/private/cyrus-imapd.pem" }
                                  
                              }
                          
-@@ -43,9 +43,7 @@
+@@ -43,7 +43,7 @@
                              },
                              {
                                  tls_config, 
--                                    { certfile, "/etc/pki/cyrus-imapd/cyrus-imapd.pem" },
--                                    { cacertfile, "/etc/pki/cyrus-imapd/cyrus-imapd-ca.pem" },
--                                    { keyfile, "/etc/pki/cyrus-imapd/cyrus-imapd-key.pem" }
+-                                    { certfile, "/etc/pki/cyrus-imapd/cyrus-imapd.pem" }
 +                                    { certfile, "/etc/ssl/private/cyrus-imapd.pem" }
                                  
                              }

debian.changelog Changed

debian.control Changed

@@ -45,7 +45,6 @@
             python3-pymysql,
             python3-six,
             python3-sqlalchemy,
-            ${python3:Depends},
             ${misc:Depends},
             ${shlibs:Depends},
             ${ucs:Depends}
@@ -58,7 +57,6 @@
             python3,
             python3-augeas,
             python3-cheetah,
-            ${python3:Depends},
             ${misc:Depends},
             ${ucs:Depends}
 Description: Command-line utilities for Kolab
@@ -66,13 +64,7 @@
 
 Package: kolab-conf
 Architecture: all
-Depends:    pykolab (= ${binary:Version}),
-            kolab-ldap,
-            python3,
-            ${python3:Depends},
-            ${misc:Depends},
-            python3-augeas,
-            python3-cheetah
+Depends: pykolab (= ${binary:Version}), kolab-ldap, ${python3:Depends}, python3, ${misc:Depends}, python3-augeas, python3-cheetah
 Description: Configuration management for Kolab
  This package includes configuration management utilities for
  Kolab Groupware
@@ -82,7 +74,6 @@
 Depends:    lsb-base (>= 3.0-6),
             pykolab (= ${binary:Version}),
             python3,
-            ${python3:Depends},
             sasl2-bin,
             ${misc:Depends}
 Description: SASL Authentication Daemon for Kolab
@@ -90,14 +81,14 @@
 
 Package: kolab-server
 Architecture: all
-Depends: pykolab (= ${binary:Version}), python3, ${python3:Depends}, ${misc:Depends}, lsb-base (>= 3.0-6)
+Depends: pykolab (= ${binary:Version}), python3, ${misc:Depends}, lsb-base (>= 3.0-6)
 Description: Kolab Groupware Server
  Server daemon synchronizing the mutations between various
  Kolab Groupware components.
 
 Package: kolab-telemetry
 Architecture: all
-Depends: kolab-cli (= ${binary:Version}), python3, ${python3:Depends}, ${misc:Depends}
+Depends: kolab-cli (= ${binary:Version}), python3, ${misc:Depends}
 Description: Kolab Telemetry Logging Capabilities
  Cyrus IMAP Telemetry logging handling capabilities for Kolab Groupware
 
@@ -107,7 +98,6 @@
          python3,
          python3-kolabformat,
          ${misc:Depends},
-         ${python3:Depends},
          python3-icalendar,
          python3-tzlocal
 Description: Kolab XML format wrapper for pykolab
@@ -119,7 +109,6 @@
          kolab-xml (= ${binary:Version}),
          python3-gnupg,
          python3,
-         ${python3:Depends},
          ${misc:Depends},
          lsb-base (>= 3.0-6),
          python3-dateutil,

debian.rules Changed

pykolab-0.9.0.tar.gz/bin/kolab_parse_telemetry.py Changed

pykolab-0.9.0.tar.gz/bin/kolab_smtp_access_policy.py Changed

pykolab-0.9.0.tar.gz/conf.py Changed

pykolab-0.9.0.tar.gz/conf/kolab.conf Changed

pykolab-0.9.0.tar.gz/cyruslib.py Changed

@@ -139,6 +139,7 @@
 
 
 # TODO handle escape sequences?
+# TODO handle literal continuations
 def parseLiteral(data, offset):
 i = offset
 while i < len(data):
@@ -148,16 +149,6 @@
 i += 1
 
 
-def parseContinuation(data, offset):
- i = offset
- while i < len(data):
- c = datai:i+1
- if c == b'}':
- length = int(dataoffset:i)
- return datai + 2:i + length + 1, i + length + 2
- i += 1
-
-
 def parse(data, offset):
 result = 
 i = offset
@@ -171,12 +162,6 @@
 continue
 if c == b')':
 return result, i + 1
- if c == b'{':
- res, newOffset = parseContinuation(data, i + 1)
- # print("Found continuation", res, newOffset)
- result.append(res)
- i = newOffset
- continue
 if c == b'"':
 res, newOffset = parseLiteral(data, i + 1)
 # print("Found literal", res, newOffset)
@@ -859,11 +844,11 @@
 ann = {}
 annotations = 
 
- # Deal with partial metadata responses by making sure we have an even count of brackets
+ # Deal with partial metadata responses
 concat_items = 
 for item in data:
 if isinstance(item, tuple):
- item = b' '.join(list(item))
+ item = ' '.join(str(x) for x in item)
 
 if len(concat_items) > 0:
 concat_items.append(item)
@@ -872,28 +857,28 @@
 if joined.count(b'(') == joined.count(b')'):
 annotations.append(joined)
 concat_items = 
-
- continue
-
- if item.count(b'(') == item.count(b')'):
- annotations.append(item)
- continue
-
- concat_items.append(item)
+ continue
+ else:
+ if item.count(b'(') == item.count(b')'):
+ annotations.append(item)
+ continue
+ else:
+ concat_items.append(item)
+ continue
 
 for annotation in annotations:
 annotation = annotation.strip()
 tokens = tokenize(annotation)
 folder = tokens0
 
- if mailbox != b'*' and folder != mailbox:
+ if folder != mailbox:
 quoted_mailbox = "\"%s\"" % (mailbox)
 if folder != quoted_mailbox:
 # print("mismatch")
 # print(quoted_mailbox)
 self.__verbose(
- 'GETMETADATA %s Mailbox \'%s\' is not the same as \'%s\''
- % (mailbox, quoted_mailbox, folder)
+ 'GETMETADATA %s Mailbox \'%s\' is not the same as \'%s\'' \
+ % (mailbox, quoted_mailbox, folder)
 )
 return {}

pykolab-0.9.0.tar.gz/ext/python/Tools/freeze/freeze.py Changed

pykolab-0.9.0.tar.gz/kolab-cli.py Changed

pykolab-0.9.0.tar.gz/kolabd.py Changed

pykolab-0.9.0.tar.gz/pykolab/auth/__init__.py Changed

pykolab-0.9.0.tar.gz/pykolab/auth/ldap/__init__.py Changed

@@ -124,7 +124,13 @@
 log.error(_l("Authentication cache failed: %r") % (errmsg))
 
 if base_dn is None:
- base_dn = self._base_dn()
+ config_base_dn = self.config_get('base_dn')
+ ldap_base_dn = self._kolab_domain_root_dn(self.domain)
+
+ if ldap_base_dn is not None and not ldap_base_dn == config_base_dn:
+ base_dn = ldap_base_dn
+ else:
+ base_dn = config_base_dn
 
 try:
 auth_cache.set_entry(self.domain, base_dn)
@@ -453,11 +459,18 @@
 return entry_id'dn'
 
 unique_attribute = self.config_get('unique_attribute')
+ config_base_dn = self.config_get('base_dn')
+ ldap_base_dn = self._kolab_domain_root_dn(self.domain)
+
+ if ldap_base_dn is not None and not ldap_base_dn == config_base_dn:
+ base_dn = ldap_base_dn
+ else:
+ base_dn = config_base_dn
 
 _filter = "(%s=%s)" % (unique_attribute, ldap.filter.escape_filter_chars(entry_id))
 
 _search = self.ldap.search_ext(
- self._base_dn(),
+ base_dn,
 ldap.SCOPE_SUBTREE,
 _filter,
 'entrydn'
@@ -701,13 +714,19 @@
 
 _filter = "%s%s%s" % (__filter_prefix, _filter, __filter_suffix)
 
- base_dn = self._base_dn()
-
- log.debug(_l("Finding recipient with filter %r in %s") % (_filter, base_dn), level=8)
+ log.debug(_l("Finding recipient with filter %r") % (_filter), level=8)
 
 if len(_filter) <= 6:
 return None
 
+ config_base_dn = self.config_get('base_dn')
+ ldap_base_dn = self._kolab_domain_root_dn(self.domain)
+
+ if ldap_base_dn is not None and not ldap_base_dn == config_base_dn:
+ base_dn = ldap_base_dn
+ else:
+ base_dn = config_base_dn
+
 _results = self.ldap.search_s(
 base_dn,
 scope=ldap.SCOPE_SUBTREE,
@@ -771,13 +790,13 @@
 
 _filter = "%s%s%s" % (__filter_prefix, _filter, __filter_suffix)
 
+ log.debug(_l("Finding resource with filter %r") % (_filter), level=8)
+
 if len(_filter) <= 6:
 return None
 
 resource_base_dn = self._object_base_dn('resource')
 
- log.debug(_l("Finding resource with filter %s in %s") % (_filter, resource_base_dn), level=8)
-
 _results = self.ldap.search_s(
 resource_base_dn,
 scope=ldap.SCOPE_SUBTREE,
@@ -1201,9 +1220,13 @@
 
 _filter = "(%s=%s)" % (attr, ldap.filter.escape_filter_chars(value))
 
- base_dn = self._base_dn()
+ config_base_dn = self.config_get('base_dn')
+ ldap_base_dn = self._kolab_domain_root_dn(self.domain)
 
- log.debug(_l("Finding entry %s in %s") % (_filter, base_dn), level=8)
+ if ldap_base_dn is not None and not ldap_base_dn == config_base_dn:
+ base_dn = ldap_base_dn
+ else:
+ base_dn = config_base_dn
 
 _results = self._search(
 base_dn,
@@ -1298,14 +1321,22 @@
 
 _filter = "(&%s(modifytimestamp>=%s))" % (_filter, modified_after)
 
+ log.debug(_l("Synchronization is using filter %r") % (_filter), level=8)
+
 if mode != 0:
 override_search = mode
 else:
- override_search = None
+ override_search = False
 
- base_dn = self._base_dn()
+ config_base_dn = self.config_get('base_dn')
+ ldap_base_dn = self._kolab_domain_root_dn(self.domain)
 
- log.debug(_l("Synchronization is searching for %s in %s") % (_filter, base_dn), level=8)
+ if ldap_base_dn is not None and not ldap_base_dn == config_base_dn:
+ base_dn = ldap_base_dn
+ else:
+ base_dn = config_base_dn
+
+ log.debug(_l("Synchronization is searching against base DN: %s") % (base_dn), level=8)
 
 if callback is None:
 callback = self._synchronize_callback
@@ -2398,7 +2429,14 @@
 self._bind()
 
 entry_dn = self.entry_dn(entry_id)
- base_dn = self._base_dn()
+
+ config_base_dn = self.config_get('base_dn')
+ ldap_base_dn = self._kolab_domain_root_dn(self.domain)
+
+ if ldap_base_dn is not None and not ldap_base_dn == config_base_dn:
+ base_dn = ldap_base_dn
+ else:
+ base_dn = config_base_dn
 
 for _type in 'user', 'group', 'sharedfolder':
 __filter = self.config_get('kolab_%s_filter' % (_type))
@@ -2424,14 +2462,14 @@
 
 return None
 
- def _find_user_dn(self, login, kolabuser=False, domain=None):
+ def _find_user_dn(self, login, kolabuser=False):
 """
 Find the distinguished name (DN) for a (Kolab) user entry in LDAP.
 """
 
 conf_prefix = 'kolab_' if kolabuser else ''
 
- user_base_dn = self._object_base_dn('user', conf_prefix, domain)
+ user_base_dn = self._object_base_dn('user', conf_prefix)
 
 auth_attrs = self.config_get_list('auth_attributes')
 
@@ -2644,12 +2682,18 @@
 
 return domains
 
- def _object_base_dn(self, objectType, prefix='', domain=None):
+ def _object_base_dn(self, objectType, prefix=''):
 """
 Get configured base DN for specified Kolab object type
 """
- object_base_dn = self.config_get_raw(prefix + objectType + '_base_dn')
- base_dn = self._base_dn(domain)
+ object_base_dn = self.config_get(prefix + objectType + '_base_dn')
+ config_base_dn = self.config_get('base_dn')
+ ldap_base_dn = self._kolab_domain_root_dn(self.domain)
+
+ if ldap_base_dn is not None and not ldap_base_dn == config_base_dn:
+ base_dn = ldap_base_dn
+ else:
+ base_dn = config_base_dn
 
 if object_base_dn is None:
 object_base_dn = base_dn
@@ -2658,15 +2702,6 @@
 
 return object_base_dn
 
- def _base_dn(self, domain=None):
- config_base_dn = self.config_get('base_dn')
- ldap_base_dn = self._kolab_domain_root_dn(domain if domain is not None else self.domain)
-
- if ldap_base_dn is not None and not ldap_base_dn == config_base_dn:
- return ldap_base_dn
-
- return config_base_dn
-
 def _synchronize_callback(self, *args, **kw):
 """
 Determine the characteristics of the callback being placed, and
@@ -2809,7 +2844,7 @@
 attrlist=None,
 attrsonly=0,
 timeout=-1,
- callback=None,
+ callback=False,
 primary_domain=None,
 secondary_domains=
 ):
@@ -2825,8 +2860,6 @@
 )
 )
 
- log.debug(_l("Searching with filter %r in %s") % (filterstr, base_dn), level=8)
-
 _search = self.ldap.search_ext(
 base_dn,
 scope=scope,
@@ -2905,7 +2938,7 @@
 attrlist=None,
 attrsonly=0,
 timeout=-1,
- callback=None,
+ callback=False,
 primary_domain=None,
 secondary_domains=
 ):
@@ -2915,8 +2948,6 @@
 
 server_page_control = ldap.controls.libldap.SimplePagedResultsControl(size=page_size,cookie='')
 
- log.debug(_l("Searching for %r in %s") % (filterstr, base_dn), level=8)
-
 _search = self.ldap.search_ext(
 base_dn,
 scope=scope,
@@ -2994,7 +3025,7 @@
 attrlist=None,
 attrsonly=0,
 timeout=-1,
- callback=None,
+ callback=False,
 primary_domain=None,
 secondary_domains=
 ):
@@ -3008,7 +3039,7 @@
 attrlist=None,
 attrsonly=0,
 timeout=-1,
- callback=None,
+ callback=False,
 primary_domain=None,
 secondary_domains=
 ):
@@ -3054,7 +3085,7 @@
 attrlist=None,
 attrsonly=0,
 timeout=None,
- callback=None,
+ callback=False,
 primary_domain=None,
 secondary_domains=
 ):
@@ -3062,7 +3093,7 @@
 if timeout is None:
 timeout = float(self.config_get('ldap', 'timeout', default=10))
 
- log.debug(_l("Searching for %r in %s") % (filterstr, base_dn), level=8)
+ log.debug(_l("Searching with filter %r") % (filterstr), level=8)
 
 _search = self.ldap.search(
 base_dn,
@@ -3092,8 +3123,8 @@
 attrlist=None,
 attrsonly=0,
 timeout=None,
- override_search=None,
- callback=None,
+ override_search=False,
+ callback=False,
 primary_domain=None,
 secondary_domains=
 ):
@@ -3150,7 +3181,7 @@
 
 _results = 
 
- if override_search:
+ if override_search is not False:
 _use_ldap_controls = override_search
 else:
 _use_ldap_controls = self.ldap.supported_controls

pykolab-0.9.0.tar.gz/pykolab/auth/ldap/syncrepl.py Changed

pykolab-0.9.0.tar.gz/pykolab/cli/cmd_delete_mailbox.py Changed

pykolab-0.9.0.tar.gz/pykolab/cli/cmd_list_deleted_mailboxes.py Changed

pykolab-0.9.0.tar.gz/pykolab/cli/cmd_list_mailbox_metadata.py Changed

pykolab-0.9.0.tar.gz/pykolab/cli/cmd_list_mailboxes.py Changed

pykolab-0.9.0.tar.gz/pykolab/imap/__init__.py Changed

pykolab-0.9.0.tar.gz/pykolab/imap/cyrus.py Changed

@@ -201,14 +201,13 @@
 )
 
 # TODO: Workaround for undelete
- if 'hex_timestamp' in _mailfolder:
- mailfolder = "DELETED/%s%s%s@%s" % (
+ if len(self.lm(mailfolder)) < 1 and 'hex_timestamp' in _mailfolder:
+ mailfolder = self.folder_utf7("DELETED/%s%s%s@%s" % (
 self.separator.join(_mailfolder'path_parts'),
 self.separator,
 _mailfolder'hex_timestamp',
 _mailfolder'domain')
-
- mailfolder = self.folder_utf7(mailfolder)
+ )
 
 # TODO: Murder capabilities may have been suppressed using Cyrus IMAP
 # configuration.
@@ -242,15 +241,18 @@
 max_tries = 20
 num_try = 0
 
- ann_path = b"/vendor/cmu/cyrus-imapd/server"
- s_ann_path = b"/shared%s" % (ann_path)
+ ann_path = "/vendor/cmu/cyrus-imapd/server"
+ s_ann_path = "/shared%s" % (ann_path)
 
 while 1:
 num_try += 1
- annotations = self._getmetadata(mailfolder, ann_path)
+ annotations = self._getmetadata(
+ '"%s"' % (mailfolder),
+ ann_path
+ )
 
 if mailfolder in annotations:
- if s_ann_path.encode('utf-8') in annotationsmailfolder:
+ if s_ann_path in annotationsmailfolder:
 break
 
 if max_tries <= num_try:
@@ -277,7 +279,7 @@
 
 time.sleep(1)
 
- server = annotationsmailfolders_ann_path.encode('utf-8')
+ server = annotationsmailfolders_ann_path
 self.mboxmailfolder = server
 
 log.debug(
@@ -452,11 +454,6 @@
 
 for undelete_folder in undelete_folders:
 undelete_mbox = self.parse_mailfolder(undelete_folder)
- if undelete_mbox is None:
- print(_("The folder to undelete does not exist") % (
- undelete_mbox
- ), file=sys.stdout)
- return
 
 prefix = undelete_mbox'path_parts'.pop(0)
 mbox = undelete_mbox'path_parts'.pop(0)
@@ -502,12 +499,8 @@
 )
 )
 
+ target_server = self.find_mailfolder_server(target_folder)
 source_server = self.find_mailfolder_server(undelete_folder)
- try:
- target_server = self.find_mailfolder_server(target_folder)
- except cyruslib.CYRUSError as errmsg:
- # This is normal for a toplevel folder, the target does not exist
- target_server = source_server
 
 if hasattr(conf, 'dry_run') and not conf.dry_run:
 undelete_folder = self.folder_utf7(undelete_folder)

pykolab-0.9.0.tar.gz/pykolab/setup/setup_imap.py Changed

pykolab-0.9.0.tar.gz/pykolab/setup/setup_ldap.py Changed

@@ -56,14 +56,6 @@
         )
 
     ldap_group.add_option(
-            "--domain",
-            dest    = "domain",
-            action  = "store",
-            default = None,
-            help    = _("Specify the domain (defaults to one level up from fqdn).")
-        )
-
-    ldap_group.add_option(
             "--allow-anonymous",
             dest    = "anonymous",
             action  = "store_true",
@@ -256,13 +248,19 @@
 
     # TODO: Verify the user and group exist.
 
-    _input'fqdn' = conf.fqdn
-    _input'hostname' = conf.fqdn.split('.')0
-    if conf.domain:
-        _input'domain' = conf.domain
-    else:
-        _input'domain' = '.'.join(conf.fqdn.split('.')1:)
+    # TODO: This takes the system fqdn, domainname and hostname, rather then
+    # the desired fqdn, domainname and hostname.
+    #
+    # TODO^2: This should be confirmed.
 
+    if conf.fqdn:
+        _input'fqdn' = conf.fqdn
+        _input'hostname' = conf.fqdn.split('.')0
+        _input'domain' = '.'.join(conf.fqdn.split('.')1:)
+    else:
+        _input'fqdn' = fqdn
+        _input'hostname' = hostname.split('.')0
+        _input'domain' = domainname
     _input'nodotdomain' = _input'domain'.replace('.','_')
 
     _input'rootdn' = utils.standard_root_dn(_input'domain')

pykolab-0.9.0.tar.gz/pykolab/telemetry.py Changed

pykolab-0.9.0.tar.gz/pykolab/utils.py Changed

pykolab-0.9.0.tar.gz/pykolab/xml/contact.py Changed

pykolab-0.9.0.tar.gz/pykolab/xml/event.py Changed

pykolab-0.9.0.tar.gz/pykolab/xml/note.py Changed

pykolab-0.9.0.tar.gz/pykolab/xml/todo.py Changed

pykolab-0.9.0.tar.gz/saslauthd.py Changed

pykolab-0.9.0.tar.gz/setup-kolab.py Changed

pykolab-0.9.0.tar.gz/share/templates/guam.sys.config.tpl Changed

@@ -26,9 +26,7 @@
                             },
                             {
                                 tls_config, 
-                                    { certfile, "/etc/pki/cyrus-imapd/cyrus-imapd.pem" },
-                                    { cacertfile, "/etc/pki/cyrus-imapd/cyrus-imapd-ca.pem" },
-                                    { keyfile, "/etc/pki/cyrus-imapd/cyrus-imapd-key.pem" }
+                                    { certfile, "/etc/pki/cyrus-imapd/cyrus-imapd.pem" }
                                 
                             }
                         
@@ -45,9 +43,7 @@
                             },
                             {
                                 tls_config, 
-                                    { certfile, "/etc/pki/cyrus-imapd/cyrus-imapd.pem" },
-                                    { cacertfile, "/etc/pki/cyrus-imapd/cyrus-imapd-ca.pem" },
-                                    { keyfile, "/etc/pki/cyrus-imapd/cyrus-imapd-key.pem" }
+                                    { certfile, "/etc/pki/cyrus-imapd/cyrus-imapd.pem" }
                                 
                             }

pykolab-0.9.0.tar.gz/share/templates/imapd.conf.tpl Changed

pykolab-0.9.0.tar.gz/share/templates/roundcubemail/acl.inc.php.tpl Changed

pykolab-0.9.0.tar.gz/share/templates/roundcubemail/calendar.inc.php.tpl Changed

@@ -24,7 +24,7 @@
 
     \$config'calendar_resources_driver' = 'ldap';
 
-    \$config'calendar_resources_directory' = 
+    \$config'calendar_resources_directory' = array(
             'name'                  => 'Kolab Resources',
             'hosts'                 => 'localhost',
             'port'                  => 389,
@@ -39,11 +39,11 @@
             'search_filter'         => '(&(objectClass=inetOrgPerson)(mail=%fu))',
             'ldap_version'          => 3,
             'filter'                => '$ldap_resource_filter',
-            'search_fields'         => 'cn',
-            'sort'                  => 'cn',
+            'search_fields'         => array('cn'),
+            'sort'                  => array('cn'),
             'scope'                 => 'sub',
             'fuzzy_search'          => true,
-            'fieldmap'              => 
+            'fieldmap'              => array(
                     // Internal     => LDAP
                     'name'          => 'cn',
                     'email'         => 'mail',
@@ -54,18 +54,20 @@
                     // these mappings are required for owner display
                     'phone'         => 'telephoneNumber',
                     'mobile'        => 'mobile',
-            ,
+                ),
 
-            'class_type_map'        => 
+            'class_type_map'        => array(
                     'kolabsharedfolder'     => 'resource',
                     'groupofuniquenames'    => 'collection',
-            ,
+                ),
 
-            'groups'                => 
+            'groups'                => array(
                     'name_attr'     => 'cn',
-            ,
-    ;
+                ),
+        );
 
-    if (file_exists(RCUBE_CONFIG_DIR . '/' . (\$_SERVER'HTTP_HOST' ?? '') . '/' . basename(__FILE__))) {
-        include_once(RCUBE_CONFIG_DIR . '/' . (\$_SERVER'HTTP_HOST' ?? '') . '/' . basename(__FILE__));
+    if (file_exists(RCUBE_CONFIG_DIR . '/' . \$_SERVER"HTTP_HOST" . '/' . basename(__FILE__))) {
+        include_once(RCUBE_CONFIG_DIR . '/' . \$_SERVER"HTTP_HOST" . '/' . basename(__FILE__));
     }
+
+?>

pykolab-0.9.0.tar.gz/share/templates/roundcubemail/config.inc.php.tpl Changed

@@ -1,10 +1,10 @@
 <?php
- \$config = ;
+ \$config = array();
 
 \$config'db_dsnw' = '$mysql_uri';
 
- \$config'des_key' = "$des_key";
 \$config'session_domain' = '';
+ \$config'des_key' = "$des_key";
 \$config'username_domain' = '$primary_domain';
 \$config'use_secure_urls' = true;
 \$config'assets_path' = '/roundcubemail/assets/';
@@ -13,20 +13,20 @@
 \$config'mail_domain' = '';
 
 // IMAP Server Settings
- \$config'default_host' = 'ssl://localhost';
- \$config'default_port' = 9993;
+ \$config'default_host' = 'tls://localhost';
+ \$config'default_port' = 143;
 \$config'imap_delimiter' = '/';
 \$config'imap_force_lsub' = true;
 
 // IMAP Connection TLS settings, adjust for Production
 // Required for PHP >= 5.6
- \$config'imap_conn_options' = 
- 'ssl' => 
+ \$config'imap_conn_options' = Array(
+ 'ssl' => Array(
 'verify_peer_name' => false,
 'verify_peer' => false,
 'allow_self_signed' => true
- 
- ;
+ )
+ );
 
 // Caching and storage settings
 \$config'imap_cache' = 'db';
@@ -40,17 +40,17 @@
 \$config'smtp_port' = 587;
 \$config'smtp_user' = '%u';
 \$config'smtp_pass' = '%p';
- \$config'smtp_helo_host' = \$_SERVER'HTTP_HOST' ?? null;
+ \$config'smtp_helo_host' = \$_SERVER"HTTP_HOST";
 
 // SMTP Connection TLS settings, adjust for Production
 // Required for PHP >= 5.6
- \$config'smtp_conn_options' = 
- 'ssl' => 
+ \$config'smtp_conn_options' = Array(
+ 'ssl' => Array(
 'verify_peer_name' => false,
 'verify_peer' => false,
 'allow_self_signed' => true
- 
- ;
+ )
+ );
 
 // LDAP Settings
 \$config'ldap_cache' = 'db';
@@ -66,7 +66,7 @@
 \$config'mdn_use_from' = true;
 
 // Plugins
- \$config'plugins' = 
+ \$config'plugins' = array(
 'kolab_auth',
 'acl',
 'archive',
@@ -88,7 +88,8 @@
 'tasklist',
 // contextmenu must be after kolab_addressbook (#444)
 'contextmenu',
- ;
+ );
+
 
 // Do not show deleted messages, mark deleted messages as read,
 // and flag them as deleted instead of moving them to the Trash
@@ -109,7 +110,7 @@
 \$config'spellcheck_ignore_caps' = true;
 \$config'spellcheck_ignore_nums' = true;
 \$config'spellcheck_ignore_syms' = true;
- \$config'spellcheck_languages' = 
+ \$config'spellcheck_languages' = array(
 'da' => 'Dansk',
 'de' => 'Deutsch',
 'en' => 'English',
@@ -120,11 +121,13 @@
 'pt' => 'Português',
 'ru' => 'Русский',
 'sv' => 'Svenska'
- ;
+ );
 
 \$config'undo_timeout' = 10;
+ \$config'upload_progress' = 2;
 \$config'address_template' = '{street} {locality} {zipcode} {country} {region}';
- \$config'mail_read_time' = 0;
+ \$config'preview_pane' = true;
+ \$config'preview_pane_mark_read' = 0;
 
 \$config'autoexpand_threads' = 2;
 \$config'top_posting' = 0;
@@ -133,30 +136,28 @@
 \$config'mdn_default' = false;
 \$config'dsn_default' = false;
 \$config'reply_same_folder' = false;
- \$config'htmleditor' = 0;
 
- if (file_exists(RCUBE_CONFIG_DIR . '/' . (\$_SERVER'HTTP_HOST' ?? '') . '/' . basename(__FILE__))) {
- include_once(RCUBE_CONFIG_DIR . '/' . (\$_SERVER'HTTP_HOST' ?? '') . '/' . basename(__FILE__));
+ if (file_exists(RCUBE_CONFIG_DIR . '/' . \$_SERVER"HTTP_HOST" . '/' . basename(__FILE__))) {
+ include_once(RCUBE_CONFIG_DIR . '/' . \$_SERVER"HTTP_HOST" . '/' . basename(__FILE__));
 }
 
 // Re-apply mandatory settings here.
 
+ \$config'debug_level' = 1;
 \$config'devel_mode' = false;
 \$config'log_driver' = 'file';
 \$config'log_date_format' = 'd-M-Y H:i:s,u O';
 \$config'syslog_id' = 'roundcube';
 \$config'syslog_facility' = LOG_USER;
-
+ \$config'smtp_log' = false;
+ \$config'log_logins' = true;
+ \$config'log_session' = false;
 \$config'sql_debug' = false;
 \$config'memcache_debug' = false;
 \$config'imap_debug' = false;
 \$config'ldap_debug' = false;
 \$config'smtp_debug' = false;
 
- \$config'smtp_log' = false;
- \$config'log_logins' = true;
- \$config'log_session' = false;
-
 \$config'skin' = '$skin';
 \$config'skin_include_php' = false;
 \$config'mime_magic' = null;
@@ -169,15 +170,16 @@
 \$config'archive_mbox' = 'Archive';
 // The Kolab daemon by default creates 'Spam'
 \$config'junk_mbox' = 'Spam';
+ \$config'default_folders' = array('INBOX', 'Drafts', 'Sent', 'Spam', 'Trash', 'Archive');
 
 \$config'address_book_type' = 'ldap';
 \$config'autocomplete_min_length' = 3;
 \$config'autocomplete_threads' = 0;
 \$config'autocomplete_max' = 15;
- \$config'ldap_public' = 
- 'kolab_addressbook' => 
+ \$config'ldap_public' = array(
+ 'kolab_addressbook' => array(
 'name' => 'Global Address Book',
- 'hosts' => 'localhost',
+ 'hosts' => Array('localhost'),
 'port' => 389,
 'use_tls' => false,
 'base_dn' => '$ldap_user_base_dn',
@@ -189,12 +191,12 @@
 'search_bind_pw' => '$ldap_service_bind_pw',
 'search_filter' => '(&(objectClass=inetOrgPerson)(mail=%fu))',
 'writable' => false,
- 'LDAP_Object_Classes' => "top", "inetOrgPerson",
- 'required_fields' => "cn", "sn", "mail",
+ 'LDAP_Object_Classes' => array("top", "inetOrgPerson"),
+ 'required_fields' => array("cn", "sn", "mail"),
 'LDAP_rdn' => 'uid',
- 'ldap_version' => 3,
- 'search_fields' => 'displayname', 'mail',
- 'sort' => 'displayname', 'sn', 'givenname', 'cn',
+ 'ldap_version' => 3, // using LDAPv3
+ 'search_fields' => array('displayname', 'mail'),
+ 'sort' => array('displayname', 'sn', 'givenname', 'cn'),
 'scope' => 'sub',
 'filter' => '(objectClass=inetOrgPerson)',
 'vlv' => false,
@@ -202,42 +204,46 @@
 'fuzzy_search' => true,
 'sizelimit' => '0',
 'timelimit' => '0',
- 'fieldmap' => 
- // Roundcube => LDAP
- 'name' => 'displayName',
- 'surname' => 'sn',
- 'firstname' => 'givenName',
- 'middlename' => 'initials',
- 'email:primary' => 'mail',
- 'email:alias' => 'alias',
- 'email:personal' => 'mailalternateaddress',
- 'phone:main' => 'telephoneNumber',
- 'phone:work' => 'alternateTelephoneNumber',
- 'phone:mobile' => 'mobile',
- 'phone:work2' => 'blackberry',
- 'jobtitle' => 'title',
- 'manager' => 'manager',
- 'assistant' => 'secretary',
- 'photo' => 'jpegphoto'
- ,
- 'groups' => 
- 'base_dn' => '$ldap_group_base_dn',
- 'filter' => '(&' . '$ldap_group_filter' . '(mail=*))',
- 'object_classes' => "top", "groupOfUniqueNames",
- 'member_attr' => 'uniqueMember',
- ,
- ,
- ;
-
- \$config'autocomplete_addressbooks' = 
+ 'fieldmap' => Array(
+ // Roundcube => LDAP
+ 'name' => 'displayName',
+ 'surname' => 'sn',
+ 'firstname' => 'givenName',
+ 'middlename' => 'initials',
+ 'email:primary' => 'mail',
+ 'email:alias' => 'alias',
+ 'email:personal' => 'mailalternateaddress',
+ 'phone:main' => 'telephoneNumber',
+ 'phone:work' => 'alternateTelephoneNumber',
+ 'phone:mobile' => 'mobile',
+ 'phone:work2' => 'blackberry',
+ 'jobtitle' => 'title',
+ 'manager' => 'manager',
+ 'assistant' => 'secretary',
+ 'photo' => 'jpegphoto'
+ ),
+ 'groups' => Array(
+ 'base_dn' => '$ldap_group_base_dn',
+ 'filter' => '(&' . '$ldap_group_filter' . '(mail=*))',
+ 'object_classes' => Array("top", "groupOfUniqueNames"),
+ 'member_attr' => 'uniqueMember',
+ ),
+ ),
+ );
+
+ \$config'autocomplete_addressbooks' = Array(
 'kolab_addressbook'
- ;
+ );
 
 \$config'autocomplete_single' = true;
 
- \$config'kolab_http_request' = 
+ \$config'htmleditor' = 0;
+
+ \$config'kolab_http_request' = Array(
 'ssl_verify_host' => false,
 'ssl_verify_peer' => false,
- ;
+ );
 
 @include('/etc/roundcubemail/kolab_syncroton.inc.php');
+
+?>

pykolab-0.9.0.tar.gz/share/templates/roundcubemail/kolab_addressbook.inc.php.tpl Changed

pykolab-0.9.0.tar.gz/share/templates/roundcubemail/kolab_auth.inc.php.tpl Changed

@@ -2,36 +2,36 @@
 
     // The id of the LDAP address book (which refers to the rcmail_config'ldap_public')
     // or complete addressbook definition array.
-    \$config'kolab_auth_addressbook' = 
-        'name'              => 'Kolab Auth',
-        'hosts'             => 'localhost',
-        'port'              => 389,
-        'use_tls'           => false,
-        'user_specific'     => false,
-        'base_dn'           => '$ldap_user_base_dn',
-        'bind_dn'           => '$ldap_service_bind_dn',
-        'bind_pass'         => '$ldap_service_bind_pw',
-        'writable'          => false,
-        'ldap_version'      => 3,
-        'fieldmap'          => 
-                'name'          => 'displayname',
-                'email'         => 'mail',
-                'email:alias'   => 'alias',
-                'role'          => 'nsroledn',
-        ,
-        'sort'              => 'displayname',
-        'scope'             => 'sub',
-        'filter'            => '(objectClass=*)',
-        'fuzzy_search'      => true,
-        'sizelimit'         => '0',
-        'timelimit'         => '0',
-        'groups'            => 
-                'base_dn'        => '$ldap_group_base_dn',
-                'filter'         => '$ldap_group_filter',
-                'object_classes' => 'top', 'groupOfUniqueNames',
-                'member_attr'    => 'uniqueMember',
-        ,
-    ;
+    \$config'kolab_auth_addressbook' = Array(
+        'name'                      => 'Kolab Auth',
+        'hosts'                     => Array('localhost'),
+        'port'                      => 389,
+        'use_tls'                   => false,
+        'user_specific'             => false,
+        'base_dn'                   => '$ldap_user_base_dn',
+        'bind_dn'                   => '$ldap_service_bind_dn',
+        'bind_pass'                 => '$ldap_service_bind_pw',
+        'writable'                  => false,
+        'ldap_version'              => 3,       // using LDAPv3
+        'fieldmap'                  => Array(
+                'name'              => 'displayname',
+                'email'             => 'mail',
+                'email:alias'       => 'alias',
+                'role'              => 'nsroledn',
+            ),
+        'sort'                      => 'displayname',
+        'scope'                     => 'sub',
+        'filter'                    => '(objectClass=*)',
+        'fuzzy_search'              => true,
+        'sizelimit'                 => '0',
+        'timelimit'                 => '0',
+        'groups'                    => Array(
+                'base_dn'           => '$ldap_group_base_dn',
+                'filter'            => '$ldap_group_filter',
+                'object_classes'    => Array('top', 'groupOfUniqueNames'),
+                'member_attr'       => 'uniqueMember',
+            ),
+    );
 
 
     // This will overwrite defined filter
@@ -45,7 +45,7 @@
     \$config'kolab_auth_alias' = 'alias';
     \$config'kolab_auth_email' = 'email';
 
-    if (preg_match('/\/helpdesk-login\//', \$_SERVER'REQUEST_URI' ?? '')) {
+    if (preg_match('/\/helpdesk-login\//', \$_SERVER"REQUEST_URI") ) {
 
         // Login and password of the admin user. Enables "Login As" feature.
         \$config'kolab_auth_admin_login'    = '$imap_admin_login';
@@ -63,6 +63,8 @@
     // which adds privilege to login as another user.
     \$config'kolab_auth_group' = 'Kolab Helpdesk';
 
-    if (file_exists(RCUBE_CONFIG_DIR . '/' . (\$_SERVER"HTTP_HOST" ?? '') . '/' . basename(__FILE__))) {
-        include_once(RCUBE_CONFIG_DIR . '/' . (\$_SERVER"HTTP_HOST" ?? ''). '/' . basename(__FILE__));
+    if (file_exists(RCUBE_CONFIG_DIR . '/' . \$_SERVER"HTTP_HOST" . '/' . basename(__FILE__))) {
+        include_once(RCUBE_CONFIG_DIR . '/' . \$_SERVER"HTTP_HOST" . '/' . basename(__FILE__));
     }
+
+?>

pykolab-0.9.0.tar.gz/share/templates/roundcubemail/kolab_delegation.inc.php.tpl Changed

pykolab-0.9.0.tar.gz/share/templates/roundcubemail/kolab_files.inc.php.tpl Changed

pykolab-0.9.0.tar.gz/share/templates/roundcubemail/kolab_folders.inc.php.tpl Changed

pykolab-0.9.0.tar.gz/share/templates/roundcubemail/libkolab.inc.php.tpl Changed

pykolab-0.9.0.tar.gz/share/templates/roundcubemail/managesieve.inc.php.tpl Changed

@@ -8,7 +8,7 @@
     \$config'managesieve_default' = '/etc/dovecot/sieve/global';
     \$config'managesieve_mbox_encoding' = 'UTF-8';
     \$config'managesieve_replace_delimiter' = '';
-    \$config'managesieve_disabled_extensions' = ;
+    \$config'managesieve_disabled_extensions' = array();
     \$config'managesieve_debug' = false;
     \$config'managesieve_vacation' = 1;
 
@@ -16,14 +16,16 @@
     \$config'managesieve_kolab_master' = true;
 
     // ManageSieve Connection TLS settings, adjust for Production
-    \$config'managesieve_conn_options' = 
-            'ssl' => 
+    \$config'managesieve_conn_options' = Array(
+            'ssl' => Array(
                     'verify_peer_name' => false,
                     'verify_peer' => false,
                     'allow_self_signed' => true
-            
-    ;
+                )
+        );
 
-    if (file_exists(RCUBE_CONFIG_DIR . '/' . (\$_SERVER'HTTP_HOST' ?? '') . '/' . basename(__FILE__))) {
-        include_once(RCUBE_CONFIG_DIR . '/' . (\$_SERVER'HTTP_HOST' ?? '') . '/' . basename(__FILE__));
+    if (file_exists(RCUBE_CONFIG_DIR . '/' . \$_SERVER"HTTP_HOST" . '/' . basename(__FILE__))) {
+        include_once(RCUBE_CONFIG_DIR . '/' . \$_SERVER"HTTP_HOST" . '/' . basename(__FILE__));
     }
+
+?>

pykolab-0.9.0.tar.gz/share/templates/roundcubemail/mimetypes.php.tpl Changed

pykolab-0.9.0.tar.gz/share/templates/roundcubemail/password.inc.php.tpl Changed

pykolab-0.9.0.tar.gz/share/templates/roundcubemail/recipient_to_contact.inc.php.tpl Changed

pykolab-0.9.0.tar.gz/share/templates/roundcubemail/terms.inc.php.tpl Changed

pykolab-0.9.0.tar.gz/ucs/kolab_sieve.py Changed

pykolab-0.9.0.tar.gz/ucs/listener.py Changed

pykolab-0.9.0.tar.gz/wallace.py Changed

pykolab-0.9.0.tar.gz/wallace/__init__.py Changed

@@ -154,50 +154,6 @@
             break
 
 
-class WallaceSMTPChannel(smtpd.SMTPChannel):
-    callback = None
-
-    def __init__(self, connection, address, callback):
-        self.callback = callback
-        if conf.debuglevel > 8:
-            smtpd.DEBUGSTREAM = pykolab.logger.StderrToLogger(log)
-        super().__init__(self, connection, address)
-
-    def data_header(self, mailfrom, rcpttos):
-        return "X-Kolab-From: " + mailfrom + "\r\n" + \
-            "X-Kolab-To: " + ', '.join(rcpttos) + "\r\n"
-
-    def process_message(self, peer, mailfrom, rcpttos, data, **kwargs):
-        """
-            We have retrieved the message. This should be as fast as possible,
-            and not ever block.
-        """
-
-        header = self.data_header(mailfrom, rcpttos)
-
-        try:
-            (fp, filename) = tempfile.mkstemp(dir="/var/spool/pykolab/wallace/")
-
-            # @TODO: and add line separator (\n or \r\n?)
-            # we should make sure there's only one line separator between
-            # kolab headers and the original message (data)
-            os.write(fp, bytes(header.encode("UTF-8")))
-            os.write(fp, data)
-        except Exception as errmsg:
-            log.warning(
-                _l("failed to write to file: %s" % (errmsg))
-            )
-        finally:
-            os.close(fp)
-
-        self.callback(filename)
-
-        return "250 OK Message %s queued" % (filename)
-
-    def loop(self):
-        asyncore.loop()
-
-
 class WallaceDaemon:
     heartbeat = None
     timer = None
@@ -389,22 +345,25 @@
                     time.sleep(0.5)
 
                 pair = s.accept()
+                log.debug(
+                    _l("Accepted connection %r with address %r") % (
+                        pair if pair is not None else (None, None)
+                    ),
+                    level=8
+                )
 
                 if pair is not None:
+                    self.current_connections += 1
                     connection, address = pair
-                    log.debug(
-                        _l("Accepted connection %r with address %r") % (
-                            connection, address 
-                        ),
-                        level=8
-                    )
 
-                    def callback(filename):
-                        self.pool.apply_async(pickup_message, (filename, (self.modules)))
+                    _smtpd = smtpd
+                    # Set DEBUGSTREAM of smtpd to log to pykolab logger
+                    if conf.debuglevel > 8:
+                        _smtpd.DEBUGSTREAM = pykolab.logger.StderrToLogger(log)
 
-                    self.current_connections += 1
-                    WallaceSMTPChannel(connection, address, callback).loop()
-                    self.current_connections -= 1
+                    log.debug(_l("Creating SMTPChannel for accepted message"), level=8)
+                    _smtpd.SMTPChannel(self, connection, address)
+                    asyncore.loop()
                 else:
                     log.error(_l("Socket accepted, but (conn, address) tuple is None."))
 
@@ -419,6 +378,13 @@
         self.timer.cancel()
         self.timer.join()
 
+    # pylint: disable=no-self-use
+    def data_header(self, mailfrom, rcpttos):
+        COMMASPACE = ', '
+
+        return "X-Kolab-From: " + mailfrom + "\r\n" + \
+            "X-Kolab-To: " + COMMASPACE.join(rcpttos) + "\r\n"
+
     def pickup_spool_messages(self, sync=False):
         # Mind you to include the trailing slash
         pickup_path = '/var/spool/pykolab/wallace/'
@@ -508,6 +474,30 @@
 
             self.current_connections -= 1
 
+    def process_message(self, peer, mailfrom, rcpttos, data):
+        """
+            We have retrieved the message. This should be as fast as possible,
+            and not ever block.
+        """
+
+        header = self.data_header(mailfrom, rcpttos)
+
+        (fp, filename) = tempfile.mkstemp(dir="/var/spool/pykolab/wallace/")
+
+        # @TODO: and add line separator (\n or \r\n?)
+        # we should make sure there's only one line separator between
+        # kolab headers and the original message (data)
+        os.write(fp, header)
+        os.write(fp, data)
+        os.close(fp)
+
+        log.debug(_l("Started processing accepted message %s") % filename, level=8)
+        self.pool.apply_async(pickup_message, (filename, (self.modules)))
+
+        self.current_connections -= 1
+
+        return "250 OK Message %s queued" % (filename)
+
     def reload_config(self, *args, **kwargs):
         pass

pykolab-0.9.0.tar.gz/wallace/module_footer.py Changed

@@ -85,17 +85,16 @@
 if not os.path.isdir(mybasepath):
 os.makedirs(mybasepath)
 
- for stage in 'incoming':
+ for stage in 'incoming', 'ACCEPT':
 if not os.path.isdir(os.path.join(mybasepath, stage)):
 os.makedirs(os.path.join(mybasepath, stage))
 
- # FIXME: This section of the code is probably not needed since we do not ACCEPT the mail anymore
 if 'stage' in kw:
 log.debug(_("Issuing callback after processing to stage %s") % (kw'stage'), level=8)
 log.debug(_("Testing cb_action_%s()") % (kw'stage'), level=8)
 if hasattr(modules, 'cb_action_%s' % (kw'stage')):
 log.debug(_("Attempting to execute cb_action_%s()") % (kw'stage'), level=8)
- exec('modules.cb_action_%s(%r, %r)' % (kw'stage','footer',filepath))
+ exec('modules.cb_action_%s(%r, %r)' % (kw'stage','optout',filepath))
 return
 
 log.debug(_("Executing module footer for %r, %r") % (args, kw), level=8)
@@ -113,28 +112,13 @@
 footer = {}
 
 footer_position = conf.get('wallace', 'footer_position')
- footer_html_file = conf.get('wallace', 'footer_html') or ''
- footer_text_file = conf.get('wallace', 'footer_text') or ''
- sender_exceptions = conf.get('wallace', 'footer_sender_exceptions')
-
- if sender_exceptions:
- sender = message.get("X-Kolab-From")
- log.debug("Checking sender %r" % (sender), level=8)
-
- if sender:
- for item in sender_exceptions.split(','):
- item = item.strip()
- regex = '@' + item.replace('*', '^@+').replace('.', '\\.') + '$'
- if item == 'NONE':
- regex = '^<>$'
-
- if re.search(regex, sender, re.IGNORECASE):
- log.debug("Sender matches %s, pass along" % (item), level=8)
- return filepath
+ footer_html_file = conf.get('wallace', 'footer_html')
+ footer_text_file = conf.get('wallace', 'footer_text')
 
 if not os.path.isfile(footer_text_file) and not os.path.isfile(footer_html_file):
- log.warning(_("No contents configured for footer module, pass along"))
- return filepath
+ log.warning(_("No contents configured for footer module"))
+ exec('modules.cb_action_%s(%r, %r)' % ('ACCEPT','footer', filepath))
+ return
 
 if os.path.isfile(footer_text_file):
 footer'plain' = open(footer_text_file, 'r').read()
@@ -147,7 +131,8 @@
 footer'html' = '' + footer'plain' + ''
 
 if footer'plain' == "" and footer'html' == "":
- return filepath
+ exec('modules.cb_action_%s(%r, %r)' % ('ACCEPT','footer', filepath))
+ return
 
 footer_added = False
 
@@ -157,7 +142,8 @@
 pass
 
 if _footer_added == "YES":
- return filepath
+ exec('modules.cb_action_%s(%r, %r)' % ('ACCEPT','footer', filepath))
+ return
 
 for part in message.walk():
 disposition = None
@@ -188,15 +174,12 @@
 footer_added = set_part_content(part, content)
 
 if footer_added:
+ log.debug("Footer attached.")
 message.add_header("X-Wallace-Footer", "YES")
 
- (fp, new_filepath) = tempfile.mkstemp(dir="/var/spool/pykolab/wallace/footer/incoming")
-
- log.debug("Footer attached, saving mail to %s and passing along" % (new_filepath), level=8)
-
- os.write(fp, message.as_string())
- os.close(fp)
- os.unlink(filepath)
- filepath = new_filepath
+ (fp, new_filepath) = tempfile.mkstemp(dir="/var/spool/pykolab/wallace/footer/ACCEPT")
+ os.write(fp, message.as_string())
+ os.close(fp)
+ os.unlink(filepath)
 
- return filepath
+ exec('modules.cb_action_%s(%r, %r)' % ('ACCEPT','footer', new_filepath))

pykolab-0.9.0.tar.gz/wallace/module_gpgencrypt.py Changed

pykolab-0.9.0.tar.gz/wallace/module_invitationpolicy.py Changed

@@ -34,7 +34,7 @@
 import traceback
 import re
 
-from email import message_from_bytes
+from email import message_from_string
 from email.parser import Parser
 from email.utils import formataddr
 from email.utils import getaddresses
@@ -706,15 +706,13 @@
 if local_domains is not None:
 local_domains = list(set(local_domains.keys()))
 
- domain = email_address.split('@')1
-
- if not domain in local_domains:
+ if not email_address.split('@')1 in local_domains:
 user_dn_from_email_address.cacheemail_address = None
 return None
 
 log.debug(_("Checking if email address %r belongs to a local user") % (email_address), level=8)
 
- user_dn = auth.find_user_dn(email_address, True, domain)
+ user_dn = auth.find_user_dn(email_address, True)
 
 if isinstance(user_dn, string_types):
 log.debug(_("User DN: %r") % (user_dn), level=8)
@@ -809,7 +807,7 @@
 if not imap_proxy_auth(user_rec):
 return result
 
- folders = imap.get_metadata('*', FOLDER_TYPE_ANNOTATION)
+ folders = imap.get_metadata('*')
 
 log.debug(
 _("List %r folders for user %r: %r") % (
@@ -822,17 +820,16 @@
 
 (ns_personal, ns_other, ns_shared) = imap.namespaces()
 
- _type = _type.encode('utf-8')
 _folders = {}
 
 # Filter the folders by type relevance
 for folder, metadata in folders.items():
- key = ('/shared' + FOLDER_TYPE_ANNOTATION).encode('utf-8')
+ key = '/shared' + FOLDER_TYPE_ANNOTATION
 if key in metadata:
 if metadatakey.startswith(_type):
 _foldersfolder = metadata
 
- key = ('/private' + FOLDER_TYPE_ANNOTATION).encode('utf-8')
+ key = '/private' + FOLDER_TYPE_ANNOTATION
 if key in metadata:
 if metadatakey.startswith(_type):
 _foldersfolder = metadata
@@ -860,25 +857,33 @@
 if len(_ns for _ns in ns_shared if folder.startswith(_ns)) > 0:
 continue
 
- key = ('/private' + FOLDER_TYPE_ANNOTATION).encode('utf-8')
- if key in metadata and metadatakey.startswith(_type):
- # store default,private and confidential folders in user record
- if metadatakey.endswith(b'.default'):
- if '_default_folder' not in user_rec:
- user_rec'_default_folder' = folder
- elif metadatakey.endswith(b'.confidential'):
+ key = '/shared' + FOLDER_TYPE_ANNOTATION
+ if key in metadata:
+ if metadatakey.startswith(_type):
+ result.append(folder)
+
+ key = '/private' + FOLDER_TYPE_ANNOTATION
+ if key in metadata:
+ if metadatakey.startswith(_type):
+ result.append(folder)
+
+ # store default folder in user record
+ if metadatakey.endswith('.default'):
+ user_rec'_default_folder' = folder
+ continue
+
+ # store private and confidential folders in user record
+ if metadatakey.endswith('.confidential'):
 if '_confidential_folder' not in user_rec:
 user_rec'_confidential_folder' = folder
- elif metadatakey.endswith(b'.private'):
+
+ continue
+
+ if metadatakey.endswith('.private'):
 if '_private_folder' not in user_rec:
 user_rec'_private_folder' = folder
 
- result.append(folder)
- continue
-
- key = ('/shared' + FOLDER_TYPE_ANNOTATION).encode('utf-8')
- if key in metadata and metadatakey.startswith(_type):
- result.append(folder)
+ continue
 
 # cache with user record
 user_rec'_imap_folders' = result
@@ -909,16 +914,16 @@
 res, data = imap.imap.m.fetch(num, '(UID RFC822)')
 
 try:
- msguid = re.search(r"\WUID (\d+)", data00.decode('utf-8')).group(1)
+ msguid = re.search(r"\WUID (\d+)", data00).group(1)
 except Exception:
 log.error(_("No UID found in IMAP response: %r") % (data00))
 continue
 
 try:
 if type == 'task':
- event = todo_from_message(message_from_bytes(data01))
+ event = todo_from_message(message_from_string(data01))
 else:
- event = event_from_message(message_from_bytes(data01))
+ event = event_from_message(message_from_string(data01))
 
 # find instance in a recurring series
 if recurrence_id and (event.is_recurring() or event.has_exceptions() or event.get_recurrence_id()):
@@ -976,7 +981,7 @@
 res, data = imap.imap.m.fetch(num, '(RFC822)')
 
 try:
- event = event_from_message(message_from_bytes(data01))
+ event = event_from_message(message_from_string(data01))
 except Exception as errmsg:
 log.error(_("Failed to parse event from message %s/%s: %r") % (folder, num, errmsg))
 continue
@@ -1050,7 +1055,7 @@
 
 
 def get_lock_key(user, uid):
- return hashlib.md5(("%s/%s" % (user'mail', uid)).encode('utf-8')).hexdigest()
+ return hashlib.md5("%s/%s" % (user'mail', uid)).hexdigest()
 
 
 def update_object(object, user_rec, master=None):
@@ -1118,7 +1123,7 @@
 imap.folder_utf7(targetfolder),
 None,
 None,
- saveobj.to_message(creator="Kolab Server <wallace@localhost>").as_string().encode('utf-8')
+ saveobj.to_message(creator="Kolab Server <wallace@localhost>").as_string()
 )
 return result

pykolab-0.9.0.tar.gz/wallace/module_resources.py Changed

@@ -22,7 +22,7 @@
 import datetime
 import sys
 
-from email import message_from_bytes
+from email import message_from_string
 from email.parser import Parser
 from email.utils import formataddr
 from email.utils import getaddresses
@@ -665,7 +665,7 @@
         typ, data = imap.imap.m.fetch(num, '(RFC822)')
 
         try:
-            event = event_from_message(message_from_bytes(data01))
+            event = event_from_message(message_from_string(data01))
         # pylint: disable=broad-except
         except Exception as errmsg:
             log.error(_("Failed to parse event from message %s/%s: %r") % (mailbox, num, errmsg))
@@ -915,14 +915,14 @@
         typ, data = imap.imap.m.fetch(num, '(UID RFC822)')
 
         try:
-            msguid = re.search(r"\WUID (\d+)", data00.decode('utf-8')).group(1)
+            msguid = re.search(r"\WUID (\d+)", data00).group(1)
         # pylint: disable=broad-except
         except Exception:
             log.error(_("No UID found in IMAP response: %r") % (data00))
             continue
 
         try:
-            event = event_from_message(message_from_bytes(data01))
+            event = event_from_message(message_from_string(data01))
         # pylint: disable=broad-except
         except Exception as e:
             log.error(_("Failed to parse event from message %s/%s: %r") % (mailbox, num, e))
@@ -977,14 +977,14 @@
         typ, data = imap.imap.m.fetch(num, '(UID RFC822)')
 
         try:
-            msguid = re.search(r"\WUID (\d+)", data00.decode('utf-8')).group(1)
+            msguid = re.search(r"\WUID (\d+)", data00).group(1)
         # pylint: disable=broad-except
         except Exception:
             log.error(_("No UID found in IMAP response: %r") % (data00))
             continue
 
         try:
-            event = event_from_message(message_from_bytes(data01))
+            event = event_from_message(message_from_string(data01))
 
             # find instance in a recurring series
             if recurrence_id and (event.is_recurring() or event.has_exceptions()):

pykolab-0.9.0.tar.gz/wallace/modules.py Changed

pykolab.dsc Changed

release.sh Deleted

Overview

Request 3137 (superseded)

Request History