vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Pull out ldap validation into validator class

Browse source
This commit is contained in:
Joseph Schorr 2017-02-09 16:09:57 -08:00
parent 2d64cf3000
commit c55ddf7341
3 changed files with 75 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

13
util/config/validators/validate_ldap.py
View file

@ -1,5 +1,10 @@
from app import app
from util.config.validators import BaseValidator
import ldap
import subprocess
from app import app, config_provider
from data.users import LDAP_CERT_FILENAME
from data.users.externalldap import LDAPConnection, LDAPUsers
from util.config.validators import BaseValidator, ConfigValidationException
class LDAPValidator(BaseValidator):
name = "ldap"
@ -50,8 +55,8 @@ class LDAPValidator(BaseValidator):
users = LDAPUsers(ldap_uri, base_dn, admin_dn, admin_passwd, user_rdn, uid_attr, email_attr,
allow_tls_fallback, requires_email=requires_email)
username = user_obj.username
(result, err_msg) = users.verify_credentials(username, password)
username = user.username
(result, err_msg) = users.verify_credentials(username, user_password)
if not result:
msg = ('Verification of superuser %s failed: %s. \n\nThe user either does not exist ' +
'in the remote authentication system ' +