From 75c1533aeccd68f0d1388370abb7ad52669237dc Mon Sep 17 00:00:00 2001 From: Evan Cordell Date: Wed, 12 Jul 2017 15:48:35 -0400 Subject: [PATCH] Revert "Only show signing UI when namespace is explicitly whitelisted" 85d382cd84f5eefb34e8ca8c368a05f1c4743684 --- config.py | 5 +---- static/directives/repo-view/repo-panel-settings.html | 2 +- static/js/directives/repo-view/repo-panel-settings.js | 4 ---- test/testconfig.py | 3 +-- 4 files changed, 3 insertions(+), 11 deletions(-) diff --git a/config.py b/config.py index 60d0e6e69..8ca7ea7d6 100644 --- a/config.py +++ b/config.py @@ -21,7 +21,7 @@ CLIENT_WHITELIST = ['SERVER_HOSTNAME', 'PREFERRED_URL_SCHEME', 'MIXPANEL_KEY', 'CONTACT_INFO', 'AVATAR_KIND', 'LOCAL_OAUTH_HANDLER', 'DOCUMENTATION_LOCATION', 'DOCUMENTATION_METADATA', 'SETUP_COMPLETE', 'DEBUG', 'MARKETO_MUNCHKIN_ID', 'STATIC_SITE_BUCKET', 'RECAPTCHA_SITE_KEY', 'CHANNEL_COLORS', - 'TAG_EXPIRATION_OPTIONS', 'SIGNING_NAMESPACE_WHITELIST'] + 'TAG_EXPIRATION_OPTIONS'] def frontend_visible_config(config_dict): @@ -262,9 +262,6 @@ class DefaultConfig(ImmutableConfig): # Feature Flag: Whether to enable support for App repositories. FEATURE_APP_REGISTRY = False - - # The namespaces which should have the ability to enable signing - SIGNING_NAMESPACE_WHITELIST = ['coreos', 'quay'] # The namespace to use for library repositories. # Note: This must remain 'library' until Docker removes their hard-coded namespace for libraries. diff --git a/static/directives/repo-view/repo-panel-settings.html b/static/directives/repo-view/repo-panel-settings.html index 1bfc8675a..1a34cbdae 100644 --- a/static/directives/repo-view/repo-panel-settings.html +++ b/static/directives/repo-view/repo-panel-settings.html @@ -19,7 +19,7 @@ -
+
diff --git a/static/js/directives/repo-view/repo-panel-settings.js b/static/js/directives/repo-view/repo-panel-settings.js index 8929cf418..d3edf91aa 100644 --- a/static/js/directives/repo-view/repo-panel-settings.js +++ b/static/js/directives/repo-view/repo-panel-settings.js @@ -90,10 +90,6 @@ angular.module('quay').directive('repoPanelSettings', function () { $scope.repository.is_public = newAccess == 'public'; }, ApiService.errorDisplay('Could not change visibility')); }; - - $scope.signingWhitelisted = function(repository) { - return Config.SIGNING_NAMESPACE_WHITELIST.indexOf(repository.namespace) !== -1; - }; } }; return directiveDefinitionObject; diff --git a/test/testconfig.py b/test/testconfig.py index 9aa94659a..e0d1e360f 100644 --- a/test/testconfig.py +++ b/test/testconfig.py @@ -66,8 +66,7 @@ class TestConfig(DefaultConfig): SECURITY_SCANNER_API_TIMEOUT_SECONDS = 1 FEATURE_SIGNING = True - SIGNING_NAMESPACE_WHITELIST = ['devtable'] - + SIGNING_ENGINE = 'gpg2' GPG2_PRIVATE_KEY_NAME = 'EEB32221'