cwinfo/powerdns-admin
4
0
Fork 0
mirror of https://github.com/cwinfo/powerdns-admin.git synced 2025-06-14 20:16:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adjustment in application config

Browse Source
This commit is contained in:
Khanh Ngo
2016-04-13 11:13:59 +07:00
parent 454dce2d71
commit 53b4fe2f8b
4 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/lib/utils.py
View File

@ -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

17
app/models.py
View File

@ -14,11 +14,14 @@ from lib import utils
from lib.log import logger
logging = logger('MODEL', app.config['LOG_LEVEL'], app.config['LOG_FILE']).config()
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']
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']
else:
LDAP_TYPE = False
PDNS_STATS_URL = app.config['PDNS_STATS_URL']
PDNS_API_KEY = app.config['PDNS_API_KEY']
@ -147,6 +150,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: