Merge remote-tracking branch 'upstream/master' into ldap_group_security

Conflicts:
	app/models.py
	config_template.py

app/lib/utils.py

@@ -5,7 +5,10 @@ import requests
 import urlparse
 from app import app
 
-TIMEOUT = app.config['TIMEOUT']
+if 'TIMEOUT' in app.config.keys():
+    TIMEOUT = app.config['TIMEOUT']
+else:
+    TIMEOUT = 10
 
 def auth_from_url(url):
     auth = None

app/models.py

@@ -19,10 +19,18 @@ LDAP_USERNAME = app.config['LDAP_USERNAME']
 LDAP_PASSWORD = app.config['LDAP_PASSWORD']
 LDAP_SEARCH_BASE = app.config['LDAP_SEARCH_BASE']
 LDAP_TYPE = app.config['LDAP_TYPE']
-LDAP_GROUP_SECURITY = app.config['LDAP_GROUP_SECURITY']
-if LDAP_GROUP_SECURITY == True:
-    LDAP_ADMIN_GROUP = app.config['LDAP_ADMIN_GROUP']
-    LDAP_USER_GROUP = app.config['LDAP_USER_GROUP']
+if 'LDAP_TYPE' in app.config.keys():
+    LDAP_URI = app.config['LDAP_URI']
+    LDAP_USERNAME = app.config['LDAP_USERNAME']
+    LDAP_PASSWORD = app.config['LDAP_PASSWORD']
+    LDAP_SEARCH_BASE = app.config['LDAP_SEARCH_BASE']
+    LDAP_TYPE = app.config['LDAP_TYPE']
+    LDAP_GROUP_SECURITY = app.config['LDAP_GROUP_SECURITY']
+    if LDAP_GROUP_SECURITY == True:
+        LDAP_ADMIN_GROUP = app.config['LDAP_ADMIN_GROUP']
+        LDAP_USER_GROUP = app.config['LDAP_USER_GROUP']
+else:
+    LDAP_TYPE = False
 
 PDNS_STATS_URL = app.config['PDNS_STATS_URL']
 PDNS_API_KEY = app.config['PDNS_API_KEY']
@@ -151,6 +159,10 @@ class User(db.Model):
                 return False
 
         elif method == 'LDAP':
+            if not LDAP_TYPE:
+                logging.error('LDAP authentication is disabled')
+                return False
+
             if LDAP_TYPE == 'ldap':
               searchFilter = "cn=%s" % self.username
             else:

app/templates/login.html

@@ -75,7 +75,9 @@
         <div class="form-group">
             <select class="form-control" name="auth_method">
                 <option value="LOCAL">Default Authentication</option>
+                {% if ldap_enabled %}
                 <option value="LDAP">LDAP Authentication</option>
+                {% endif %}
             </select>
         </div>
         <div class="form-actions">

app/views.py

@@ -65,7 +65,8 @@ def login():
         return redirect(url_for('dashboard'))
 
     if request.method == 'GET':
-        return render_template('login.html')
+        LDAP_ENABLED = True if 'LDAP_TYPE' in app.config.keys() else False
+        return render_template('login.html', ldap_enabled=LDAP_ENABLED)
     
     # process login
     username = request.form['username']