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

Revert inmemoryprov, skip local storage validation

Browse source
This commit is contained in:
Sam Chow 2018-06-25 15:23:30 -04:00
parent f32bbf1fdc
commit 7619ab44e5
9 changed files with 35 additions and 115 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -16,6 +16,7 @@ from data.runmigration import run_alembic_migration
from util.config.configutil import add_enterprise_config_defaults
from util.config.database import sync_database_with_config
from util.config.validator import validate_service_for_config, ValidatorContext, is_valid_config_upload_filename
from util.config.validators import LocalStorageConfigValidationException
logger = logging.getLogger(__name__)
@ -293,16 +294,14 @@ class SuperUserConfigValidate(ApiResource):
# Note: This method is called to validate the database configuration before super users exists,
# so we also allow it to be called if there is no valid registry configuration setup. Note that
# this is also safe since this method does not access any information not given in the request.
if not config_provider.config_exists():
config = request.get_json()['config']
validator_context = ValidatorContext.from_app(app, config, request.get_json().get('password', ''),
instance_keys=instance_keys,
ip_resolver=ip_resolver,
config_provider=config_provider)
return validate_service_for_config(service, validator_context)
config = request.get_json()['config']
validator_context = ValidatorContext.from_app(app, config, request.get_json().get('password', ''),
instance_keys=instance_keys,
ip_resolver=ip_resolver,
config_provider=config_provider)
return validate_service_for_config(service, validator_context)
abort(403)
@resource('/v1/superuser/config/file/<filename>')