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

Merge pull request #164 from coreos-inc/authsimplify

Browse source 
Remove ability to create Quay users from the Docker CLI
This commit is contained in:
josephschorr 2015-06-22 17:35:53 -04:00
commit 5c3804c0cf
2 changed files with 12 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
endpoints/index.py
View file

@ -110,39 +110,17 @@ def create_user():
abort(400, 'Invalid robot account or password.', abort(400, 'Invalid robot account or password.',
issue='robot-login-failure') issue='robot-login-failure')
if authentication.user_exists(username): (verified, error_message) = authentication.verify_user(username, password, basic_auth=True)
(verified, error_message) = authentication.verify_user(username, password, basic_auth=True) if verified:
if verified: # Mark that the user was logged in.
# Mark that the user was logged in. event = userevents.get_event(username)
event = userevents.get_event(username) event.publish_event_data('docker-cli', {'action': 'login'})
event.publish_event_data('docker-cli', {'action': 'login'}) return success
return success
else:
# Mark that the login failed.
event = userevents.get_event(username)
event.publish_event_data('docker-cli', {'action': 'loginfailure'})
abort(400, error_message, issue='login-failure')
elif not features.USER_CREATION:
abort(400, 'User creation is disabled. Please speak to your administrator.')
else: else:
# New user case # Mark that the login failed.
logger.debug('Creating user') event = userevents.get_event(username)
new_user = None event.publish_event_data('docker-cli', {'action': 'loginfailure'})
abort(400, error_message, issue='login-failure')
try:
new_user = model.create_user(username, password, user_data['email'])
except model.TooManyUsersException as ex:
abort(402, 'Seat limit has been reached for this license', issue='seat-limit')
logger.debug('Creating email code for user')
code = model.create_confirm_email_code(new_user)
logger.debug('Sending email code to user')
send_confirmation_email(new_user.username, new_user.email, code.code)
return make_response('Created', 201)
@index.route('/users', methods=['GET']) @index.route('/users', methods=['GET'])

4
test/specs.py
View file

@ -160,8 +160,8 @@ def build_index_specs():
IndexTestSpec(url_for('registry.put_image_json', image_id=FAKE_IMAGE_ID), IndexTestSpec(url_for('registry.put_image_json', image_id=FAKE_IMAGE_ID),
ORG_REPO, 403, 403, 403, 400).set_method('PUT'), ORG_REPO, 403, 403, 403, 400).set_method('PUT'),
IndexTestSpec(url_for('index.create_user'), NO_REPO, 201, 201, 201, IndexTestSpec(url_for('index.create_user'), NO_REPO, 400, 400, 400,
201).set_method('POST').set_data_from_obj(NEW_USER_DETAILS), 400).set_method('POST').set_data_from_obj(NEW_USER_DETAILS),
IndexTestSpec(url_for('index.get_user'), NO_REPO, 404, 200, 200, 200), IndexTestSpec(url_for('index.get_user'), NO_REPO, 404, 200, 200, 200),