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

Update ldap validation test to match expected behavior

Browse source
This commit is contained in:
Sam Chow 2018-07-16 11:18:22 -04:00
parent 1add992525
commit ba4b10b386
2 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
util/config/validators/test/test_validate_ldap.py
View file

@ -47,22 +47,21 @@ def test_invalid_uri(uri, app):
LDAPValidator.validate(config) LDAPValidator.validate(config)
@pytest.mark.parametrize('username, password, expected_exception', [ @pytest.mark.parametrize('admin_dn, admin_passwd, user_rdn, expected_exception', [
('invaliduser', 'invalidpass', ConfigValidationException), ('uid=testy,ou=employees,dc=quay,dc=io', 'password', ['ou=employees'], None),
('someuser', 'invalidpass', ConfigValidationException), ('uid=invalidadmindn', 'password', ['ou=employees'], ConfigValidationException),
('invaliduser', 'somepass', ConfigValidationException), ('uid=testy,ou=employees,dc=quay,dc=io', 'invalid_password', ['ou=employees'], ConfigValidationException),
('someuser', 'somepass', None), ('uid=testy,ou=employees,dc=quay,dc=io', 'password', ['ou=invalidgroup'], ConfigValidationException),
]) ])
def test_validated_ldap(username, password, expected_exception, app): def test_validated_ldap(admin_dn, admin_passwd, user_rdn, expected_exception, app):
config = {} config = {}
config['AUTHENTICATION_TYPE'] = 'LDAP' config['AUTHENTICATION_TYPE'] = 'LDAP'
config['LDAP_BASE_DN'] = ['dc=quay', 'dc=io'] config['LDAP_BASE_DN'] = ['dc=quay', 'dc=io']
config['LDAP_ADMIN_DN'] = 'uid=testy,ou=employees,dc=quay,dc=io' config['LDAP_ADMIN_DN'] = admin_dn
config['LDAP_ADMIN_PASSWD'] = 'password' config['LDAP_ADMIN_PASSWD'] = admin_passwd
config['LDAP_USER_RDN'] = ['ou=employees'] config['LDAP_USER_RDN'] = user_rdn
unvalidated_config = ValidatorContext(config, user_password=password, config_provider=config_provider) unvalidated_config = ValidatorContext(config, config_provider=config_provider)
unvalidated_config.user = AttrDict(dict(username=username))
if expected_exception is not None: if expected_exception is not None:
with pytest.raises(ConfigValidationException): with pytest.raises(ConfigValidationException):

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

@ -13,8 +13,6 @@ class LDAPValidator(BaseValidator):
def validate(cls, validator_context): def validate(cls, validator_context):
""" Validates the LDAP connection. """ """ Validates the LDAP connection. """
config = validator_context.config config = validator_context.config
user = validator_context.user
user_password = validator_context.user_password
config_provider = validator_context.config_provider config_provider = validator_context.config_provider
init_scripts_location = validator_context.init_scripts_location init_scripts_location = validator_context.init_scripts_location