Kolab Groupware OBS

pykolab.spec Changed

pykolab-0.6.5-2230-correct-fatal-escape-mistake.patch Deleted

debian.changelog Changed

pykolab-0.6.6.tar.gz/bin/kolab_smtp_access_policy.py -> pykolab-0.6.8.tar.gz/bin/kolab_smtp_access_policy.py Changed

pykolab-0.6.6.tar.gz/configure.ac -> pykolab-0.6.8.tar.gz/configure.ac Changed

pykolab-0.6.6.tar.gz/kolabd/__init__.py -> pykolab-0.6.8.tar.gz/kolabd/__init__.py Changed

pykolab-0.6.6.tar.gz/pykolab/auth/ldap/__init__.py -> pykolab-0.6.8.tar.gz/pykolab/auth/ldap/__init__.py Changed

@@ -169,7 +169,11 @@
             else:
                 base_dn = config_base_dn
 
-            auth_cache.set_entry(self.domain, base_dn)
+            try:
+                auth_cache.set_entry(self.domain, base_dn)
+            except Exception, errmsg:
+                log.error(_("Authentication cache failed: %r") % (errmsg))
+                pass
 
         user_filter = self.config_get_raw('user_filter') % ({'base_dn':base_dn})
 
@@ -216,7 +220,11 @@
                 # to True!!
                 self.ldap.simple_bind_s(entry_dn, login[1])
                 retval = True
-                auth_cache.set_entry(_filter, entry_dn)
+                try:
+                    auth_cache.set_entry(_filter, entry_dn)
+                except Exception, errmsg:
+                    log.error(_("Authentication cache failed: %r") % (errmsg))
+                    pass
             except:
                 try:
                     log.debug(
@@ -528,7 +536,10 @@
         """
             List alias domain name spaces for the current domain name space.
         """
-        return [s for s, p in self.secondary_domains.iteritems() if p == self.domain]
+        if not self.domains == None:
+            return [s for s in self.domains.keys() if not s in self.domains.values()]
+        else:
+            return []
 
     def recipient_policy(self, entry):
         """
@@ -1300,6 +1311,22 @@
 
         server = self.imap.user_mailbox_server(folder)
 
+        log.debug(
+                _("Entry %s attribute value: %r") % (
+                        mailserver_attribute,
+                        entry[mailserver_attribute]
+                    ),
+                level=8
+            )
+
+        log.debug(
+                _("imap.user_mailbox_server(%r) result: %r") % (
+                        folder,
+                        server
+                    ),
+                level=8
+            )
+
         if not entry[mailserver_attribute] == server:
             self.set_entry_attribute(entry, mailserver_attribute, server)

pykolab-0.6.6.tar.gz/pykolab/auth/ldap/auth_cache.py -> pykolab-0.6.8.tar.gz/pykolab/auth/ldap/auth_cache.py Changed

@@ -71,7 +71,7 @@
         'entries', metadata,
         Column('id', Integer, primary_key=True),
         Column('domain', String(128), index=True, nullable=True),
-        Column('key', String(128), index=True, nullable=False),
+        Column('key', String(512), index=True, nullable=False),
         Column('value', String(128), nullable=False),
         Column('last_change', DateTime, nullable=False, default=datetime.datetime.now())
     )
@@ -114,9 +114,8 @@
 
         db.commit()
 
-#def purge_entries():
-    #db = init_db()
-    #db.query(Entry).filter(Entry.last_change <= datetime.datetime.now()).delete()
+def purge_entries(db):
+    db.query(Entry).filter(Entry.last_change <= (datetime.datetime.now() - datetime.timedelta(1))).delete()
 
 def init_db():
     """
@@ -127,12 +126,16 @@
     if not db == None:
         return db
 
-    db_uri = 'sqlite:///%s/auth_cache.db' % (KOLAB_LIB_PATH)
+    db_uri = conf.get('ldap', 'auth_cache_uri')
+    if db_uri == None:
+        db_uri = 'sqlite:///%s/auth_cache.db' % (KOLAB_LIB_PATH)
+
     echo = conf.debuglevel > 8
     engine = create_engine(db_uri, echo=echo)
     metadata.create_all(engine)
 
     Session = sessionmaker(bind=engine)
     db = Session()
+    purge_entries(db)
 
     return db

pykolab-0.6.6.tar.gz/pykolab/cli/cmd_delete_mailbox.py -> pykolab-0.6.8.tar.gz/pykolab/cli/cmd_delete_mailbox.py Changed

pykolab-0.6.6.tar.gz/pykolab/cli/cmd_list_deleted_mailboxes.py -> pykolab-0.6.8.tar.gz/pykolab/cli/cmd_list_deleted_mailboxes.py Changed

pykolab-0.6.6.tar.gz/pykolab/cli/cmd_list_mailbox_metadata.py -> pykolab-0.6.8.tar.gz/pykolab/cli/cmd_list_mailbox_metadata.py Changed

pykolab-0.6.6.tar.gz/pykolab/cli/cmd_list_mailboxes.py -> pykolab-0.6.8.tar.gz/pykolab/cli/cmd_list_mailboxes.py Changed

pykolab-0.6.6.tar.gz/pykolab/cli/cmd_set_mailbox_metadata.py -> pykolab-0.6.8.tar.gz/pykolab/cli/cmd_set_mailbox_metadata.py Changed

pykolab-0.6.6.tar.gz/pykolab/cli/cmd_sync.py -> pykolab-0.6.8.tar.gz/pykolab/cli/cmd_sync.py Changed

pykolab-0.6.6.tar.gz/pykolab/cli/cmd_sync_mailhost_attrs.py -> pykolab-0.6.8.tar.gz/pykolab/cli/cmd_sync_mailhost_attrs.py Changed

@@ -73,7 +73,49 @@
 
     domains = auth.list_domains()
 
-    for primary,secondaries in domains:
+    folders = imap.lm()
+
+    imap_domains_not_domains = []
+
+    for folder in folders:
+        if len(folder.split('@')) > 1 and not folder.startswith('DELETED'):
+            _folder_domain = folder.split('@')[-1]
+            if not _folder_domain in list(set(domains.keys() + domains.values())):
+                imap_domains_not_domains.append(folder.split('@')[-1])
+
+    imap_domains_not_domains = list(set(imap_domains_not_domains))
+
+    log.debug(_("Domains in IMAP not in LDAP: %r") % (imap_domains_not_domains), level=8)
+
+    if len(imap_domains_not_domains) > 0:
+        for domain in imap_domains_not_domains:
+            folders = []
+
+            folders.extend(imap.lm('shared/%%@%s' % (domain)))
+            folders.extend(imap.lm('user/%%@%s' % (domain)))
+
+            for folder in folders:
+                if conf.delete:
+                    if conf.dry_run:
+                        if not folder.split('/')[0] == 'shared':
+                            log.warning(_("No recipients for '%s' (would have deleted the mailbox if not for --dry-run)!") % ('/'.join(folder.split('/')[1:])))
+                        else:
+                            continue
+                    else:
+                        if not '/'.join(folder.split('/')[0]) == 'shared':
+                            log.info(_("Deleting mailbox '%s' because it has no recipients") % (folder))
+                            try:
+                                imap.dm(folder)
+                            except Exception, errmsg:
+                                log.error(_("An error occurred removing mailbox %r: %r") % (folder, errmsg))
+                        else:
+                            log.info(_("Not automatically deleting shared folder '%s'") % (folder))
+                else:
+                    log.warning(_("No recipients for '%s' (use --delete to delete)!") % ('/'.join(folder.split('/')[1:])))
+
+    for primary in list(set(domains.values())):
+        secondaries = [x for x in domains.keys() if domains[x] == primary]
+
         folders = []
 
         folders.extend(imap.lm('shared/%%@%s' % (primary)))
@@ -103,7 +145,10 @@
                         else:
                             if not '/'.join(folder.split('/')[0]) == 'shared':
                                 log.info(_("Deleting mailbox '%s' because it has no recipients") % (folder))
-                                imap.dm(folder)
+                                try:
+                                    imap.dm(folder)
+                                except Exception, errmsg:
+                                    log.error(_("An error occurred removing mailbox %r: %r") % (folder, errmsg))
                             else:
                                 log.info(_("Not automatically deleting shared folder '%s'") % (folder))
                     else:

pykolab-0.6.6.tar.gz/pykolab/imap/cyrus.py -> pykolab-0.6.8.tar.gz/pykolab/imap/cyrus.py Changed

@@ -166,7 +166,20 @@
         log.debug(_("Checking actual backend server for folder %s through annotations") % (mailfolder), level=8)
 
         if self.mbox.has_key(mailfolder):
-            return self.mbox[mailfolder]
+            log.debug(
+                    _(
+                            "Possibly reproducing the find " + \
+                            "mailfolder server answer from " + \
+                            "previously detected and stored " + \
+                            "annotation value: %r"
+                        ) % (
+                                self.mbox[mailfolder]
+                            ),
+                    level=8
+                )
+
+            if not self.mbox[mailfolder] == self.server:
+                return self.mbox[mailfolder]
 
         max_tries = 20
         num_try = 0
@@ -363,7 +376,10 @@
             if not mbox['domain'] == None:
                 verify_folder_search = "%s@%s" % (verify_folder_search, mbox['domain'])
 
-            folders = self.lm(verify_folder_search)
+            if ' ' in verify_folder_search:
+                folders = self.lm('"%s"' % verify_folder_search)
+            else:
+                folders = self.lm(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

pykolab-0.6.6.tar.gz/pykolab/setup/setup_ldap.py -> pykolab-0.6.8.tar.gz/pykolab/setup/setup_ldap.py Changed

pykolab-0.6.6.tar.gz/share/templates/header_checks.submission -> pykolab-0.6.8.tar.gz/share/templates/header_checks.submission Changed

pykolab-0.6.6.tar.gz/share/templates/roundcubemail/config.inc.php.tpl -> pykolab-0.6.8.tar.gz/share/templates/roundcubemail/config.inc.php.tpl Changed

pykolab-0.6.6.tar.gz/ucs/listener.py -> pykolab-0.6.8.tar.gz/ucs/listener.py Changed

@@ -25,7 +25,7 @@
 import logging
 import os
 import sys
-import univention_baseconfig
+from univention.config_registry import ConfigRegistry
 import univention.debug as ulog
 
 sys.path = [
@@ -147,13 +147,17 @@
                 else:
                     log.info("Entry deletion notification for %r does not have a mail server attribute specified." % (dn))
 
-                auth._auth._synchronize_callback(
-                        change_type = 'delete',
-                        previous_dn = None,
-                        change_number = None,
-                        dn = dn,
-                        entry = old
-                    )
+                cfg = ConfigRegistry()
+                cfg.load()
+
+                if cfg.is_true('mail/cyrus/mailbox/delete', True):
+                    auth._auth._synchronize_callback(
+                            change_type = 'delete',
+                            previous_dn = None,
+                            change_number = None,
+                            dn = dn,
+                            entry = old
+                        )
 
         elif isinstance(new, dict) and len(new.keys()) > 0:
             # Old is not a dict (or empty), so the entry is just created

pykolab.dsc Changed

Changes of Revision 21