diff --git a/cps/admin.py b/cps/admin.py
index 69316e8f..4003027d 100644
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -547,7 +547,7 @@ def _configuration_update_helper():
if config.config_login_type == constants.LOGIN_LDAP:
reboot_required |= _config_string("config_ldap_provider_url")
reboot_required |= _config_int("config_ldap_port")
- # _config_string("config_ldap_schema")
+ reboot_required |= _config_int("config_ldap_authentication")
reboot_required |= _config_string("config_ldap_dn")
reboot_required |= _config_string("config_ldap_serv_username")
reboot_required |= _config_string("config_ldap_user_object")
@@ -569,9 +569,13 @@ def _configuration_update_helper():
return _configuration_result(_('Please Enter a LDAP Provider, '
'Port, DN and User Object Identifier'), gdriveError)
-
- if not config.config_ldap_serv_username or not bool(config.config_ldap_serv_password):
- return _configuration_result('Please Enter a LDAP Service Account and Password', gdriveError)
+ if config.config_ldap_authentication > constants.LDAP_AUTH_ANONYMOUS:
+ if config.config_ldap_authentication > constants.LDAP_AUTH_UNAUTHENTICATE:
+ if not config.config_ldap_serv_username:
+ return _configuration_result('Please Enter a LDAP Service Account', gdriveError)
+ else:
+ if not config.config_ldap_serv_username or not bool(config.config_ldap_serv_password):
+ return _configuration_result('Please Enter a LDAP Service Account and Password', gdriveError)
#_config_checkbox("config_ldap_use_ssl")
#_config_checkbox("config_ldap_use_tls")
diff --git a/cps/config_sql.py b/cps/config_sql.py
index 7fc99a91..a6c82213 100644
--- a/cps/config_sql.py
+++ b/cps/config_sql.py
@@ -97,12 +97,10 @@ class _Settings(_Base):
config_ldap_provider_url = Column(String, default='example.org')
config_ldap_port = Column(SmallInteger, default=389)
- # config_ldap_schema = Column(String, default='ldap')
+ config_ldap_authentication = Column(SmallInteger, default=constants.LDAP_AUTH_SIMPLE)
config_ldap_serv_username = Column(String, default='cn=admin,dc=example,dc=org')
config_ldap_serv_password = Column(String, default="")
config_ldap_encryption = Column(SmallInteger, default=0)
- # config_ldap_use_tls = Column(Boolean, default=False)
- # config_ldap_require_cert = Column(Boolean, default=False)
config_ldap_cert_path = Column(String, default="")
config_ldap_dn = Column(String, default='dc=example,dc=org')
config_ldap_user_object = Column(String, default='uid=%s')
diff --git a/cps/constants.py b/cps/constants.py
index 8301800b..d1fc299a 100644
--- a/cps/constants.py
+++ b/cps/constants.py
@@ -92,7 +92,10 @@ AUTO_UPDATE_NIGHTLY = 1 << 2
LOGIN_STANDARD = 0
LOGIN_LDAP = 1
LOGIN_OAUTH = 2
-# LOGIN_OAUTH_GOOGLE = 3
+
+LDAP_AUTH_ANONYMOUS = 0
+LDAP_AUTH_UNAUTHENTICATE = 1
+LDAP_AUTH_SIMPLE = 0
DEFAULT_MAIL_SERVER = "mail.example.org"
diff --git a/cps/services/simpleldap.py b/cps/services/simpleldap.py
index 841f61e1..05574af1 100644
--- a/cps/services/simpleldap.py
+++ b/cps/services/simpleldap.py
@@ -42,11 +42,17 @@ def init_app(app, config):
app.config['LDAP_SCHEMA'] = 'ldaps'
else:
app.config['LDAP_SCHEMA'] = 'ldap'
- # app.config['LDAP_SCHEMA'] = config.config_ldap_schema
- app.config['LDAP_USERNAME'] = config.config_ldap_serv_username
- if config.config_ldap_serv_password is None:
- config.config_ldap_serv_password = ''
- app.config['LDAP_PASSWORD'] = base64.b64decode(config.config_ldap_serv_password)
+ if config.config_ldap_authentication > constants.LDAP_AUTH_ANONYMOUS:
+ if config.config_ldap_authentication > constants.LDAP_AUTH_UNAUTHENTICATE:
+ if config.config_ldap_serv_password is None:
+ config.config_ldap_serv_password = ''
+ app.config['LDAP_PASSWORD'] = base64.b64decode(config.config_ldap_serv_password)
+ else:
+ app.config['LDAP_PASSWORD'] = base64.b64decode("''")
+ app.config['LDAP_USERNAME'] = config.config_ldap_serv_username
+ else:
+ app.config['LDAP_USERNAME'] = "''"
+ app.config['LDAP_PASSWORD'] = base64.b64decode("''")
if bool(config.config_ldap_cert_path):
app.config['LDAP_REQUIRE_CERT'] = True
app.config['LDAP_CERT_PATH'] = config.config_ldap_cert_path
diff --git a/cps/templates/config_edit.html b/cps/templates/config_edit.html
index e9abdfde..553be036 100644
--- a/cps/templates/config_edit.html
+++ b/cps/templates/config_edit.html
@@ -233,7 +233,6 @@
-
-
-
-
+
+
-