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

Create download modal following setup completion

Browse source
This commit is contained in:
Sam Chow 2018-06-27 13:49:54 -04:00
parent aa93d698b2
commit 2d0a599aab
12 changed files with 142 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

60
config_app/config_endpoints/api/suconfig.py
View file

@ -65,44 +65,40 @@ class SuperUserConfig(ApiResource):
""" Updates the config override file. """
# Note: This method is called to set the database configuration before super users exists,
# so we also allow it to be called if there is no valid registry configuration setup.
if not config_provider.config_exists():
config_object = request.get_json()['config']
hostname = request.get_json()['hostname']
config_object = request.get_json()['config']
hostname = request.get_json()['hostname']
# Add any enterprise defaults missing from the config.
add_enterprise_config_defaults(config_object, app.config['SECRET_KEY'], hostname)
# Add any enterprise defaults missing from the config.
add_enterprise_config_defaults(config_object, app.config['SECRET_KEY'], hostname)
# Write the configuration changes to the config override file.
config_provider.save_config(config_object)
# Write the configuration changes to the config override file.
config_provider.save_config(config_object)
# If the authentication system is federated, link the superuser account to the
# the authentication system chosen.
service_name = get_federated_service_name(config_object['AUTHENTICATION_TYPE'])
if service_name is not None:
current_user = get_authenticated_user()
if current_user is None:
abort(401)
# If the authentication system is federated, link the superuser account to the
# the authentication system chosen.
service_name = get_federated_service_name(config_object['AUTHENTICATION_TYPE'])
if service_name is not None:
current_user = get_authenticated_user()
if current_user is None:
abort(401)
if not model.has_federated_login(current_user.username, service_name):
# Verify the user's credentials and retrieve the user's external username+email.
handler = get_users_handler(config_object, config_provider, OVERRIDE_CONFIG_DIRECTORY)
(result, err_msg) = handler.verify_credentials(current_user.username,
request.get_json().get('password', ''))
if not result:
logger.error('Could not save configuration due to external auth failure: %s', err_msg)
abort(400)
service_name = get_federated_service_name(config_object['AUTHENTICATION_TYPE'])
if not model.has_federated_login(current_user.username, service_name):
# Verify the user's credentials and retrieve the user's external username+email.
handler = get_users_handler(config_object, config_provider, OVERRIDE_CONFIG_DIRECTORY)
(result, err_msg) = handler.verify_credentials(current_user.username,
request.get_json().get('password', ''))
if not result:
logger.error('Could not save configuration due to external auth failure: %s', err_msg)
abort(400)
# Link the existing user to the external user.
model.attach_federated_login(current_user.username, service_name, result.username)
return {
'exists': True,
'config': config_object
}
abort(403)
# Link the existing user to the external user.
model.attach_federated_login(current_user.username, service_name, result.username)
return {
'exists': True,
'config': config_object
}
@resource('/v1/superuser/registrystatus')

5
config_app/config_endpoints/api/tar_config_loader.py
View file

@ -37,15 +37,14 @@ class TarConfigLoader(ApiResource):
if os.path.isfile('quay-config.tar.gz'):
os.remove('quay-config.tar.gz')
tar = tarfile.open('quay-config.tar.gz', mode="w:gz")
tar = tarfile.open('quay-config.tar.gz', mode="w|gz")
for name in os.listdir(config_path):
tar.add(os.path.join(config_path, name), filter=tarinfo_filter)
tar.close()
return send_file('quay-config.tar.gz', mimetype='application/gzip',
as_attachment=True, attachment_filename='quay-config.tar.gz')
return send_file('quay-config.tar.gz', mimetype='application/gzip')
@nickname('scUploadTarballConfig')
def put(self):