diff --git a/config.py b/config.py index 8ca7ea7d6..60d0e6e69 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'] + 'TAG_EXPIRATION_OPTIONS', 'SIGNING_NAMESPACE_WHITELIST'] def frontend_visible_config(config_dict): @@ -262,6 +262,9 @@ 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 1a34cbdae..1bfc8675a 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 d3edf91aa..8929cf418 100644 --- a/static/js/directives/repo-view/repo-panel-settings.js +++ b/static/js/directives/repo-view/repo-panel-settings.js @@ -90,6 +90,10 @@ 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 e0d1e360f..9aa94659a 100644 --- a/test/testconfig.py +++ b/test/testconfig.py @@ -66,7 +66,8 @@ class TestConfig(DefaultConfig): SECURITY_SCANNER_API_TIMEOUT_SECONDS = 1 FEATURE_SIGNING = True - + SIGNING_NAMESPACE_WHITELIST = ['devtable'] + SIGNING_ENGINE = 'gpg2' GPG2_PRIVATE_KEY_NAME = 'EEB32221'