Don't add a "password required" notification for non-database auth via OIDC

This commit is contained in:
Joseph Schorr 2017-11-10 16:49:32 -05:00
parent d32139292b
commit 503cff8f0c
6 changed files with 30 additions and 1 deletions

View file

@ -174,6 +174,12 @@ class UserAuthentication(object):
"""
return self.state.federated_service
@property
def requires_distinct_cli_password(self):
""" Returns whether this auth system requires a distinct CLI password to be created,
in-system, before the CLI can be used. """
return self.state.requires_distinct_cli_password
@property
def supports_encrypted_credentials(self):
""" Returns whether this auth system supports using encrypted credentials. """

View file

@ -13,6 +13,11 @@ class DatabaseUsers(object):
def supports_encrypted_credentials(self):
return True
@property
def requires_distinct_cli_password(self):
# Since the database stores its own password.
return True
def verify_credentials(self, username_or_email, password):
""" Simply delegate to the model implementation. """
result = model.user.verify_user(username_or_email, password)

View file

@ -28,6 +28,11 @@ class FederatedUsers(object):
def supports_encrypted_credentials(self):
return True
@property
def requires_distinct_cli_password(self):
# Since the federated auth provides a password which works on the CLI.
return False
def get_user(self, username_or_email):
""" Retrieves the user with the given username or email, returning a tuple containing
a UserInformation (if success) and the error message (on failure).

View file

@ -29,6 +29,11 @@ class OIDCInternalAuth(object):
def federated_service(self):
return None
@property
def requires_distinct_cli_password(self):
# Since the "password" is the generated ID token.
return False
@property
def supports_encrypted_credentials(self):
# Since the "password" is already a signed JWT.

View file

@ -105,9 +105,10 @@ def _conduct_oauth_login(auth_system, login_service, lid, lusername, lemail, met
new_username = valid
break
requires_password = auth_system.requires_distinct_cli_password
prompts = model.user.get_default_user_prompts(features)
user_obj = model.user.create_federated_user(new_username, lemail, service_id, lid,
set_password_notification=True,
set_password_notification=requires_password,
metadata=metadata or {},
prompts=prompts,
email_required=features.MAILING)

View file

@ -73,6 +73,10 @@ def test_new_account_via_database(login_service):
federated_login = model.user.lookup_federated_login(new_user, login_service.service_id())
assert federated_login is not None
# Ensure that a notification was created.
assert list(model.notification.list_notifications(result.user_obj,
kind_name='password_required'))
@pytest.mark.parametrize('open_creation, invite_only, has_invite, expect_success', [
# Open creation -> Success!
(True, False, False, True),
@ -173,6 +177,9 @@ def test_new_account_via_ldap(binding_field, lid, lusername, lemail, expected_er
else:
assert internal_login is None
# Ensure that no notification was created.
assert not list(model.notification.list_notifications(result.user_obj,
kind_name='password_required'))
else:
# Ensure that no addtional users were created.
assert current_user_count == existing_user_count