浏览代码

Raise an ConfigurationError if ldap_group_enabled is set to True

Bastien Sevajol 9 年前
父节点
当前提交
7c49d12fc3
共有 2 个文件被更改,包括 6 次插入0 次删除
  1. 2 0
      tracim/tracim/lib/auth/ldap.py
  2. 4 0
      tracim/tracim/lib/exception.py

+ 2 - 0
tracim/tracim/lib/auth/ldap.py 查看文件

5
 from who_ldap import LDAPSearchAuthenticatorPlugin as BaseLDAPSearchAuthenticatorPlugin
5
 from who_ldap import LDAPSearchAuthenticatorPlugin as BaseLDAPSearchAuthenticatorPlugin
6
 
6
 
7
 from tracim.lib.auth.base import Auth
7
 from tracim.lib.auth.base import Auth
8
+from tracim.lib.exception import ConfigurationError
8
 from tracim.lib.helpers import ini_conf_to_bool
9
 from tracim.lib.helpers import ini_conf_to_bool
9
 from tracim.lib.user import UserApi
10
 from tracim.lib.user import UserApi
10
 from tracim.model import DBSession, User
11
 from tracim.model import DBSession, User
33
 
34
 
34
         mdproviders = [('ldapuser', self.ldap_user_provider)]
35
         mdproviders = [('ldapuser', self.ldap_user_provider)]
35
         if ini_conf_to_bool(self._config.get('ldap_group_enabled', False)):
36
         if ini_conf_to_bool(self._config.get('ldap_group_enabled', False)):
37
+            raise ConfigurationError("ldap_group_enabled is not yet available")
36
             mdproviders.append(('ldapgroups', self.ldap_groups_provider))
38
             mdproviders.append(('ldapgroups', self.ldap_groups_provider))
37
         self._config['sa_auth'].mdproviders = mdproviders
39
         self._config['sa_auth'].mdproviders = mdproviders
38
 
40
 

+ 4 - 0
tracim/tracim/lib/exception.py 查看文件

5
     pass
5
     pass
6
 
6
 
7
 
7
 
8
+class ConfigurationError(TracimError):
9
+    pass
10
+
11
+
8
 class AlreadyExistError(TracimError):
12
 class AlreadyExistError(TracimError):
9
     pass
13
     pass
10
 
14