katello 3.17.0 → 3.18.0

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-info.html

@@ -36,14 +36,29 @@
     <h4 translate>Sync Settings</h4>
     <dl class="dl-horizontal dl-horizontal-left">
       <span ng-show="repository.content_type === 'yum'" >
-        <dt translate>Restrict to architecture</dt>
-        <dd bst-edit-select="repository.arch==='noarch'?'Default':repository.arch"
+        <dt>
+          <span translate>Restrict to architecture</span>
+          <i class="pficon-info" title="{{ 'The repository will be enabled by default on content hosts with the selected architecture.' | translate }}"></i>
+        </dt>
+        <dd bst-edit-select="repository.arch==='noarch'?'No restriction':repository.arch"
             selector="repository.arch"
             options="architectures()"
             on-save="save(repository)">
         </dd>
       </span>
 
+      <span ng-show="repository.content_type === 'yum'" >
+        <dt>
+          <span translate>Restrict to <br />OS version</span>
+          <i class="pficon-info" title="{{ 'The repository will be enabled by default on content hosts with the selected OS version.' | translate }}"></i>
+        </dt>
+        <dd bst-edit-select="repository.os_versions.length ? formatOSVersions() : 'No restriction'"
+            selector="selectedOSVersion"
+            options="osVersionsOptions()"
+            on-save="save(repository)">
+        </dd>
+      </span>
+
       <dt ng-show="repository.content_type !== 'docker'" translate>Upstream URL</dt>
       <dt ng-show="repository.content_type === 'docker'" translate>Registry URL</dt>
       <dd bst-edit-text="repository.url"

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/new/new-repository.controller.js

@@ -17,6 +17,7 @@
  * @requires OstreeUpstreamSyncPolicy
  * @requires Architecture
  * @requires RepositoryTypesService
+ * @requires OSVersions
  * @requires YumContentUnits
  * #requires HttpProxyPolicy
  *
@@ -24,118 +25,121 @@
  *   Controls the creation of an empty Repository object for use by sub-controllers.
  */
 angular.module('Bastion.repositories').controller('NewRepositoryController',
-    ['$scope', '$sce', 'Repository', 'Product', 'ContentCredential', 'FormUtils', 'translate', 'Notification', 'ApiErrorHandler', 'BastionConfig', 'Checksum', 'YumContentUnits', 'DownloadPolicy', 'OstreeUpstreamSyncPolicy', 'Architecture', 'RepositoryTypesService', 'HttpProxy', 'HttpProxyPolicy',
-    function ($scope, $sce, Repository, Product, ContentCredential, FormUtils, translate, Notification, ApiErrorHandler, BastionConfig, Checksum, YumContentUnits, DownloadPolicy, OstreeUpstreamSyncPolicy, Architecture, RepositoryTypesService, HttpProxy, HttpProxyPolicy) {
-
-        function success() {
-            Notification.setSuccessMessage(translate('Repository %s successfully created.').replace('%s', $scope.repository.name));
-            $scope.transitionTo('product.repositories', {productId: $scope.$stateParams.productId});
-        }
-
-        function error(response) {
-            var foundError = false;
-            $scope.working = false;
-
-            angular.forEach($scope.repositoryForm, function (field) {
-                if ($scope.repositoryForm.hasOwnProperty(field) && field.hasOwnProperty('$modelValue')) {
-                    field.$setValidity('server', true);
-                    $scope.repositoryForm[field].$error.messages = [];
+    ['$scope', '$sce', 'Repository', 'Product', 'ContentCredential', 'FormUtils', 'translate', 'Notification', 'ApiErrorHandler', 'BastionConfig', 'Checksum', 'YumContentUnits', 'DownloadPolicy', 'OstreeUpstreamSyncPolicy', 'Architecture', 'RepositoryTypesService', 'HttpProxy', 'HttpProxyPolicy', 'OSVersions',
+        function ($scope, $sce, Repository, Product, ContentCredential, FormUtils, translate, Notification, ApiErrorHandler, BastionConfig, Checksum, YumContentUnits, DownloadPolicy, OstreeUpstreamSyncPolicy, Architecture, RepositoryTypesService, HttpProxy, HttpProxyPolicy, OSVersions) {
+
+            function success() {
+                Notification.setSuccessMessage(translate('Repository %s successfully created.').replace('%s', $scope.repository.name));
+                $scope.transitionTo('product.repositories', {productId: $scope.$stateParams.productId});
+            }
+
+            function error(response) {
+                var foundError = false;
+                $scope.working = false;
+
+                angular.forEach($scope.repositoryForm, function (field) {
+                    if ($scope.repositoryForm.hasOwnProperty(field) && field.hasOwnProperty('$modelValue')) {
+                        field.$setValidity('server', true);
+                        $scope.repositoryForm[field].$error.messages = [];
+                    }
+                });
+
+                angular.forEach(response.data.errors, function (errors, field) {
+                    if ($scope.repositoryForm.hasOwnProperty(field)) {
+                        foundError = true;
+                        $scope.repositoryForm[field].$setValidity('server', false);
+                        $scope.repositoryForm[field].$error.messages = errors;
+                    }
+                });
+
+                if (!foundError) {
+                    Notification.setErrorMessage(response.data.displayMessage);
                 }
+            }
+
+            $scope.page = {
+                error: false,
+                loading: true
+            };
+
+            $scope.repository = new Repository({'product_id': $scope.$stateParams.productId, unprotected: true,
+                'checksum_type': null, 'mirror_on_sync': true, 'verify_ssl_on_sync': true,
+                'download_policy': BastionConfig.defaultDownloadPolicy, 'arch': null,
+                'ostree_upstream_sync_policy': 'latest'});
+
+            $scope.product = Product.get({id: $scope.$stateParams.productId}, function () {
+                $scope.page.loading = false;
+            }, function (response) {
+                $scope.page.loading = false;
+                ApiErrorHandler.handleGETRequestErrors(response, $scope);
             });
 
-            angular.forEach(response.data.errors, function (errors, field) {
-                if ($scope.repositoryForm.hasOwnProperty(field)) {
-                    foundError = true;
-                    $scope.repositoryForm[field].$setValidity('server', false);
-                    $scope.repositoryForm[field].$error.messages = errors;
+            $scope.repositoryTypes = RepositoryTypesService.creatable();
+            $scope.repositoryTypes = _.sortBy($scope.repositoryTypes, 'name');
+
+            $scope.checksums = Checksum.checksums;
+            $scope.downloadPolicies = DownloadPolicy.downloadPolicies;
+            $scope.ostreeUpstreamSyncPolicies = OstreeUpstreamSyncPolicy.syncPolicies;
+            $scope.ignorableYumContentUnits = YumContentUnits.units;
+
+            $scope.$watch('repository.name', function () {
+                if ($scope.repositoryForm && $scope.repositoryForm.name) {
+                    $scope.repositoryForm.name.$setValidity('server', true);
+                    FormUtils.labelize($scope.repository);
                 }
             });
 
-            if (!foundError) {
-                Notification.setErrorMessage(response.data.displayMessage);
-            }
-        }
-
-        $scope.page = {
-            error: false,
-            loading: true
-        };
-
-        $scope.repository = new Repository({'product_id': $scope.$stateParams.productId, unprotected: true,
-            'checksum_type': null, 'mirror_on_sync': true, 'verify_ssl_on_sync': true,
-            'download_policy': BastionConfig.defaultDownloadPolicy, 'arch': null,
-            'ostree_upstream_sync_policy': 'latest'});
-
-        $scope.product = Product.get({id: $scope.$stateParams.productId}, function () {
-            $scope.page.loading = false;
-        }, function (response) {
-            $scope.page.loading = false;
-            ApiErrorHandler.handleGETRequestErrors(response, $scope);
-        });
-
-        $scope.repositoryTypes = RepositoryTypesService.creatable();
-        $scope.repositoryTypes = _.sortBy($scope.repositoryTypes, 'name');
-
-        $scope.checksums = Checksum.checksums;
-        $scope.downloadPolicies = DownloadPolicy.downloadPolicies;
-        $scope.ostreeUpstreamSyncPolicies = OstreeUpstreamSyncPolicy.syncPolicies;
-        $scope.ignorableYumContentUnits = YumContentUnits.units;
-
-        $scope.$watch('repository.name', function () {
-            if ($scope.repositoryForm && $scope.repositoryForm.name) {
-                $scope.repositoryForm.name.$setValidity('server', true);
-                FormUtils.labelize($scope.repository);
-            }
-        });
-
-        $scope.handleFiles = function (element) {
-            var reader = new FileReader();
-            reader.addEventListener("loadend", function() {
-                var data = reader.result;
-              /* eslint-disable camelcase */
-                $scope.repository.ansible_collection_requirements = data;
-                $scope.$apply();
-            });
-            reader.readAsText(element.files[0]);
-        };
-
-        ContentCredential.queryUnpaged(function (contentCredentials) {
-            $scope.contentCredentials = contentCredentials.results;
-        });
-
-        Architecture.queryUnpaged(function (architecture) {
-            var results = architecture.results;
-            var noarch = {
-                id: 'noarch',
-                name: translate('Default'),
-                value: null
+            $scope.handleFiles = function (element) {
+                var reader = new FileReader();
+                reader.addEventListener("loadend", function() {
+                    var data = reader.result;
+                    /* eslint-disable camelcase */
+                    $scope.repository.ansible_collection_requirements = data;
+                    $scope.$apply();
+                });
+                reader.readAsText(element.files[0]);
             };
-            results.map(function(i) {
-                i.id = i.name;
+
+            ContentCredential.queryUnpaged(function (contentCredentials) {
+                $scope.contentCredentials = contentCredentials.results;
             });
-            results.unshift(noarch);
-            $scope.architecture = results;
-            $scope.repository.arch = results[0].id;
-        });
-
-        $scope.save = function (repository) {
-            if (repository.content_type === 'ostree') {
-                repository.unprotected = false;
-            }
-            if (repository.content_type !== 'yum') {
-                repository['download_policy'] = '';
-            }
-            if (repository.arch === 'Default') {
-                repository.arch = null;
-            }
-            repository.$save(success, error);
-        };
 
-        $scope.repository['http_proxy_policy'] = HttpProxyPolicy.policies[0].label;
-        $scope.policies = HttpProxyPolicy.policies;
-        $scope.proxies = [];
+            Architecture.queryUnpaged(function (architecture) {
+                var results = architecture.results;
+                var noarch = {
+                    id: 'noarch',
+                    name: translate('No restriction'),
+                    value: null
+                };
+                results.map(function(i) {
+                    i.id = i.name;
+                });
+                results.unshift(noarch);
+                $scope.architecture = results;
+                $scope.repository.arch = results[0].id;
+            });
+
+            $scope.save = function (repository) {
+                if (repository.content_type === 'ostree') {
+                    repository.unprotected = false;
+                }
+                if (repository.content_type === 'yum') {
+                    repository.os_versions = $scope.osVersionsParam();
+                }
+                if (repository.content_type !== 'yum') {
+                    repository['download_policy'] = '';
+                }
+                if (repository.arch === 'No restriction') {
+                    repository.arch = null;
+                }
+                repository.$save(success, error);
+            };
+
+            $scope.repository['http_proxy_policy'] = HttpProxyPolicy.policies[0].label;
+            $scope.policies = HttpProxyPolicy.policies;
+            $scope.proxies = [];
 
-        $scope.collectionURLPopover = $sce.trustAsHtml("You can sync collections utilizing just the url:<br/>" +
+            $scope.collectionURLPopover = $sce.trustAsHtml("You can sync collections utilizing just the url:<br/>" +
           "<b>1. For all collections in Ansible Galaxy:</b><br/>" +
           "https://galaxy.ansible.com/api/v2/collections <br/>" +
           "<b>2. For specific collection with URL filtering:</b><br/>" +
@@ -143,18 +147,26 @@ angular.module('Bastion.repositories').controller('NewRepositoryController',
           "<b>3. For specific collections with Requirements.yml:</b><br/>" +
           "Use base URL https://galaxy.ansible.com/ and specify requirements.yml below to specify collections");
 
-        $scope.requirementPopover = $sce.trustAsHtml("To learn more about requirement.yml specification, visit <a href='https://docs.ansible.com/ansible/devel/dev_guide/collections_tech_preview.html#install-multiple-collections-with-a-requirements-file' target=\"_blank\">documentation </a>");
+            $scope.requirementPopover = $sce.trustAsHtml("To learn more about requirement.yml specification, visit <a href='https://docs.ansible.com/ansible/devel/dev_guide/collections_tech_preview.html#install-multiple-collections-with-a-requirements-file' target=\"_blank\">documentation </a>");
+
+            $scope.displayHttpProxyPolicyName = function (policy) {
+                return HttpProxyPolicy.displayHttpProxyPolicyName(policy);
+            };
+
+            $scope.displayHttpProxyName = function (proxyId) {
+                return HttpProxyPolicy.displayHttpProxyName($scope.proxies, proxyId);
+            };
+
+            HttpProxy.queryUnpaged(function (proxies) {
+                $scope.proxies = proxies.results;
+            });
 
-        $scope.displayHttpProxyPolicyName = function (policy) {
-            return HttpProxyPolicy.displayHttpProxyPolicyName(policy);
-        };
+            $scope.osVersionsOptions = OSVersions.getOSVersionsOptions($scope.repository);
+            $scope.repository.os_versions = $scope.osVersionsOptions[0]; // ensure that No restriction is selected initially
 
-        $scope.displayHttpProxyName = function (proxyId) {
-            return HttpProxyPolicy.displayHttpProxyName($scope.proxies, proxyId);
-        };
+            $scope.osVersionsParam = function () {
+                return OSVersions.osVersionsParam($scope.repository.os_versions);
+            };
 
-        HttpProxy.queryUnpaged(function (proxies) {
-            $scope.proxies = proxies.results;
-        });
-    }]
+        }]
 );

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/new/views/new-repository.html

@@ -50,10 +50,22 @@
                 ng-model="repository.arch"
                 ng-options="arch.id as arch.name for arch in architecture">
         </select>
-        <p class="help-block" translate>
-          Choose <b>Default</b> to enable the repository for all architectures
-        </p>
       </div>
+
+      <div
+        bst-form-group label="{{ 'Restrict to OS version' | translate }}"
+        ng-if="repository.content_type === 'yum'"
+      >
+       <select id="os_versions"
+               name="os_versions"
+               ng-model="repository.os_versions"
+               ng-options="tag as tag.name for tag in osVersionsOptions track by tag.id">
+       </select>
+       <p class="help-block" translate>
+         The repository will be enabled by default on content hosts with the selected OS version.
+       </p>
+      </div>
+
     </div>
     <div ng-show="repository.content_type !== undefined">
       <h4 translate> Sync Settings </h4>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/os-versions.service.js

@@ -0,0 +1,46 @@
+
+/**
+ * @ngdoc service
+ * @name  Bastion.products.details.repositories.service:OSVersions
+ *
+ * @description
+ *   Helper functions for repo osVersions.
+ */
+
+angular
+    .module('Bastion.repositories')
+    .service('OSVersions', function () {
+
+        this.getOSVersionsOptions = function () {
+            return [
+                { name: 'No restriction', id: '' },
+                { name: 'Red Hat Enterprise Linux 8 ', id: 'rhel-8' },
+                { name: 'Red Hat Enterprise Linux 7 ', id: 'rhel-7' },
+                { name: 'Red Hat Enterprise Linux 6 ', id: 'rhel-6' }
+            ];
+        };
+
+        // return an array of OS versions
+        this.osVersionsParam = function (osVersion) {
+            var param = osVersion;
+            if (osVersion && osVersion.hasOwnProperty('id')) {
+                param = osVersion.id;
+            }
+            // exclude null, undefined, and ''
+            return [param].filter(function (el) {
+                return el && el !== '';
+            });
+        };
+
+        // return the OS versions as comma-separated string
+        this.formatOSVersions = function (osVersionList) {
+            var individualVersions, versionStr;
+            individualVersions = this.osVersionsParam(osVersionList);
+            if (individualVersions) {
+                versionStr = individualVersions.join(",");
+            }
+            return versionStr;
+        };
+
+    }
+    );

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/repository-types.service.js

@@ -11,7 +11,6 @@
      *   current state of the application.
      */
     function RepositoryTypesService(repositoryTypes) {
-
         this.repositoryTypes = function () {
             return repositoryTypes;
         };
@@ -28,6 +27,14 @@
             });
             return angular.isDefined(found);
         };
+
+        this.pulp3Supported = function(desiredType) {
+            var found = _.find(repositoryTypes, function(type) {
+                return type.id === desiredType;
+            });
+
+            return found.pulp3_support;
+        };
     }
 
     angular

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/views/content-access-mode-banner.html

@@ -1,5 +1,5 @@
 <div id="content-access-mode-banner" bst-alert="info" ng-show="simpleContentAccessEnabled">
   <span translate>
-This organization has Simple Content Access enabled. Hosts can consume from all repositories in their Content View regardless of subscription status.
+This organization has Simple Content Access enabled.  Hosts are not required to have subscriptions attached to access repositories.
   </span>
 </div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/sync-plans/details/views/sync-plan-details.html

@@ -16,7 +16,7 @@
   <nav data-block="item-actions" bst-feature-flag="custom_products">
     <span select-action-dropdown>
       <ul class="dropdown-menu dropdown-menu-right" uib-dropdown-menu role="menu">
-        <li role="menuitem" ng-hide="denied('sync_products')">
+        <li role="menuitem" ng-hide="denied('sync_sync_plans')">
           <a ng-click="runSyncPlan()">
             <span translate>Run Sync Plan</span>
           </a>

data/lib/katello/engine.rb

@@ -178,6 +178,7 @@ module Katello
       ::SmartProxiesController.include Katello::Concerns::SmartProxiesControllerExtensions
       ::Foreman::Plugin.fact_importer_registry.register(Katello::RhsmFactName::FACT_TYPE, Katello::RhsmFactImporter)
       ::FactParser.register_fact_parser(Katello::RhsmFactName::FACT_TYPE, Katello::RhsmFactParser)
+      ::RegistrationController.include Katello::Concerns::RegistrationControllerExtensions
 
       #Helper Extensions
       ::SmartProxiesController.class_eval do
@@ -216,6 +217,7 @@ module Katello
       ::Api::V2::HostsController.include Katello::Concerns::Api::V2::HostsControllerExtensions
       ::Api::V2::HostgroupsController.include Katello::Concerns::Api::V2::HostgroupsControllerExtensions
       ::Api::V2::SmartProxiesController.include Katello::Concerns::Api::V2::SmartProxiesControllerExtensions
+      ::Api::V2::RegistrationController.prepend Katello::Concerns::Api::V2::RegistrationControllerExtensions
 
       ::HostsController.class_eval do
         helper Katello::Concerns::HostsAndHostgroupsHelperExtensions

data/lib/katello/permission_creator.rb

@@ -8,10 +8,10 @@ module Katello
       activation_keys_permissions
       capsule_content_permissions
       content_view_permissions
-      gpg_key_permissions
       content_credential_permissions
       host_collections_permissions
       lifecycle_environment_permissions
+      organization_permissions
       product_permissions
       subscription_permissions
       sync_plan_permissions
@@ -25,7 +25,8 @@ module Katello
                            'katello/api/v2/activation_keys' => [:index, :show, :available_host_collections, :available_releases,
                                                                 :product_content, :auto_complete_search]
                          },
-                         :resource_type => 'Katello::ActivationKey'
+                         :resource_type => 'Katello::ActivationKey',
+                         :finder_scope => :readable
       @plugin.permission :create_activation_keys,
                          {
                            'katello/api/v2/activation_keys' => [:create, :copy]
@@ -37,12 +38,14 @@ module Katello
                                                                 :add_subscriptions, :remove_subscriptions,
                                                                 :add_host_collections, :remove_host_collections]
                          },
-                         :resource_type => 'Katello::ActivationKey'
+                         :resource_type => 'Katello::ActivationKey',
+                         :finder_scope => :editable
       @plugin.permission :destroy_activation_keys,
                          {
                            'katello/api/v2/activation_keys' => [:destroy]
                          },
-                         :resource_type => 'Katello::ActivationKey'
+                         :resource_type => 'Katello::ActivationKey',
+                         :finder_scope => :deletable
     end
 
     def capsule_content_permissions
@@ -72,7 +75,8 @@ module Katello
                    'katello/api/v2/content_view_histories' => [:index, :auto_complete_search],
                    'katello/api/v2/content_view_puppet_modules' => [:index, :show, :auto_complete_search],
                    'katello/api/v2/content_view_repositories' => [:show_all],
-                   'katello/api/v2/content_view_versions' => [:index, :show, :auto_complete_search, :export_histories],
+                   'katello/api/v2/content_view_versions' => [:index, :show, :auto_complete_search],
+                   'katello/api/v2/content_exports' => [:api_status],
                    'katello/api/v2/content_view_components' => [:index, :show],
                    'katello/api/v2/packages' => [:index],
                    'katello/api/v2/package_groups' => [:index, :show, :auto_complete_search, :compare],
@@ -109,7 +113,8 @@ module Katello
                                                 :view_compare_puppet_modules,
                                                 :views]
                  },
-                 :resource_type => 'Katello::ContentView'
+                 :resource_type => 'Katello::ContentView',
+                 :finder_scope => :readable
       @plugin.permission :create_content_views,
                          {
                            'katello/api/v2/content_views' => [:create, :copy]
@@ -124,76 +129,68 @@ module Katello
                            'katello/api/v2/content_view_puppet_modules' => [:create, :update, :destroy],
                            'katello/api/v2/content_view_components' => [:add_components, :remove_components, :update]
                          },
-                         :resource_type => 'Katello::ContentView'
+                         :resource_type => 'Katello::ContentView',
+                         :finder_scope => :editable
       @plugin.permission :destroy_content_views,
                          {
                            'katello/api/v2/content_views' => [:destroy, :remove],
                            'katello/api/v2/content_view_versions' => [:destroy]
                          },
-                         :resource_type => 'Katello::ContentView'
+                         :resource_type => 'Katello::ContentView',
+                         :finder_scope => :deletable
       @plugin.permission :publish_content_views,
                          {
                            'katello/api/v2/content_views' => [:publish],
-                           'katello/api/v2/content_view_versions' => [:incremental_update, :republish_repositories, :import]
+                           'katello/api/v2/content_view_versions' => [:incremental_update, :republish_repositories],
+                           'katello/api/v2/content_imports' => [:version]
                          },
-                         :resource_type => 'Katello::ContentView'
+                         :resource_type => 'Katello::ContentView',
+                         :finder_scope => :publishable
       @plugin.permission :promote_or_remove_content_views,
                          {
                            'katello/api/v2/content_view_versions' => [:promote],
                            'katello/api/v2/content_views' => [:remove_from_environment, :remove, :republish_repositories]
                          },
-                         :resource_type => 'Katello::ContentView'
+                         :resource_type => 'Katello::ContentView',
+                         :finder_scope => :promotable_or_removable
       @plugin.permission :export_content_views,
                          {
-                           'katello/api/v2/content_view_versions' => [:export]
-                         },
-                         :resource_type => 'Katello::ContentView'
-    end
-
-    def gpg_key_permissions
-      @plugin.permission :view_gpg_keys,
-                         {
-                           'katello/api/v2/gpg_keys' => [:index, :show, :content, :auto_complete_search]
+                           'katello/api/v2/content_view_versions' => [:export],
+                           'katello/api/v2/content_exports' => [:version, :index, :api_status],
+                           'katello/api/v2/content_export_incrementals' => [:version]
                          },
-                         :resource_type => 'Katello::GpgKey'
-      @plugin.permission :create_gpg_keys,
-                         {
-                           'katello/api/v2/gpg_keys' => [:create]
-                         },
-                         :resource_type => 'Katello::GpgKey'
-      @plugin.permission :edit_gpg_keys,
-                         {
-                           'katello/api/v2/gpg_keys' => [:update, :set_content]
-                         },
-                         :resource_type => 'Katello::GpgKey'
-      @plugin.permission :destroy_gpg_keys,
-                         {
-                           'katello/api/v2/gpg_keys' => [:destroy]
-                         },
-                         :resource_type => 'Katello::GpgKey'
+                         :resource_type => 'Katello::ContentView',
+                         :finder_scope => :exportable
     end
 
     def content_credential_permissions
       @plugin.permission :view_content_credentials,
                          {
-                           'katello/api/v2/content_credentials' => [:index, :show, :content, :auto_complete_search]
+                           'katello/api/v2/content_credentials' => [:index, :show, :content, :auto_complete_search],
+                           'katello/api/v2/gpg_keys' => [:index, :show, :content, :auto_complete_search]
                          },
-                         :resource_type => 'Katello::GpgKey'
+                         :resource_type => 'Katello::GpgKey',
+                         :finder_scope => :readable
       @plugin.permission :create_content_credentials,
                          {
-                           'katello/api/v2/content_credentials' => [:create]
+                           'katello/api/v2/content_credentials' => [:create],
+                           'katello/api/v2/gpg_keys' => [:create]
                          },
                          :resource_type => 'Katello::GpgKey'
       @plugin.permission :edit_content_credentials,
                          {
-                           'katello/api/v2/content_credentials' => [:update, :set_content]
+                           'katello/api/v2/content_credentials' => [:update, :set_content],
+                           'katello/api/v2/gpg_keys' => [:update, :set_content]
                          },
-                         :resource_type => 'Katello::GpgKey'
+                         :resource_type => 'Katello::GpgKey',
+                         :finder_scope => :editable
       @plugin.permission :destroy_content_credentials,
                          {
-                           'katello/api/v2/content_credentials' => [:destroy]
+                           'katello/api/v2/content_credentials' => [:destroy],
+                           'katello/api/v2/gpg_keys' => [:destroy]
                          },
-                         :resource_type => 'Katello::GpgKey'
+                         :resource_type => 'Katello::GpgKey',
+                         :finder_scope => :deletable
     end
 
     def host_collections_permissions
@@ -201,22 +198,26 @@ module Katello
                          {
                            'katello/api/v2/host_collections' => [:index, :show, :auto_complete_search]
                          },
-                         :resource_type => 'Katello::HostCollection'
+                         :resource_type => 'Katello::HostCollection',
+                         :finder_scope => :readable
       @plugin.permission :create_host_collections,
                          {
                            'katello/api/v2/host_collections' => [:create, :copy]
                          },
-                         :resource_type => 'Katello::HostCollection'
+                         :resource_type => 'Katello::HostCollection',
+                         :finder_scope => :creatable
       @plugin.permission :edit_host_collections,
                          {
                            'katello/api/v2/host_collections' => [:update, :add_hosts, :remove_hosts]
                          },
-                         :resource_type => 'Katello::HostCollection'
+                         :resource_type => 'Katello::HostCollection',
+                         :finder_scope => :editable
       @plugin.permission :destroy_host_collections,
                          {
                            'katello/api/v2/host_collections' => [:destroy]
                          },
-                         :resource_type => 'Katello::HostCollection'
+                         :resource_type => 'Katello::HostCollection',
+                         :finder_scope => :deletable
     end
 
     def lifecycle_environment_permissions
@@ -225,26 +226,30 @@ module Katello
                            'katello/api/v2/environments' => [:index, :show, :paths, :repositories, :auto_complete_search],
                            'katello/api/rhsm/candlepin_proxies' => [:rhsm_index]
                          },
-                         :resource_type => 'Katello::KTEnvironment'
+                         :resource_type => 'Katello::KTEnvironment',
+                         :finder_scope => :readable
       @plugin.permission :create_lifecycle_environments,
                          {
                            'katello/api/v2/environments' => [:create]
                          },
-                         :resource_type => 'Katello::KTEnvironment'
+                         :resource_type => 'Katello::KTEnvironment',
+                         :finder_scope => :creatable
       @plugin.permission :edit_lifecycle_environments,
                          {
                            'katello/api/v2/environments' => [:update]
                          },
-                         :resource_type => 'Katello::KTEnvironment'
+                         :resource_type => 'Katello::KTEnvironment',
+                         :finder_scope => :editable
       @plugin.permission :destroy_lifecycle_environments,
                          {
                            'katello/api/v2/environments' => [:destroy]
                          },
-                         :resource_type => 'Katello::KTEnvironment'
-
+                         :resource_type => 'Katello::KTEnvironment',
+                         :finder_scope => :deletable
       @plugin.permission :promote_or_remove_content_views_to_environments,
                          {},
-                         :resource_type => 'Katello::KTEnvironment'
+                         :resource_type => 'Katello::KTEnvironment',
+                         :finder_scope => :promotable
     end
 
     def product_permissions # rubocop:disable Metrics/MethodLength
@@ -292,7 +297,8 @@ module Katello
                                                         :repo_puppet_modules,
                                                         :repo_compare_errata,
                                                         :repo_compare_packages,
-                                                        :repo_compare_puppet_modules]
+                                                        :repo_compare_puppet_modules],
+                           'katello/api/v2/repository_sets' => [:index, :show, :available_repositories, :auto_complete_search]
                          },
                          :resource_type => 'Katello::Product',
                          :finder_scope => :readable
@@ -301,14 +307,16 @@ module Katello
                            'katello/api/v2/products' => [:create],
                            'katello/api/v2/package_groups' => [:create]
                          },
-                         :resource_type => 'Katello::Product'
+                         :resource_type => 'Katello::Product',
+                         :finder_scope => :editable
       @plugin.permission :edit_products,
                          {
                            'katello/api/v2/products' => [:update],
                            'katello/api/v2/repositories' => [:create, :update, :remove_content, :import_uploads, :upload_content, :republish, :verify_checksum],
                            'katello/api/v2/products_bulk_actions' => [:update_sync_plans, :update_http_proxy, :verify_checksum_products],
                            'katello/api/v2/content_uploads' => [:create, :update, :destroy],
-                           'katello/api/v2/organizations' => [:repo_discover, :cancel_repo_discover]
+                           'katello/api/v2/organizations' => [:repo_discover, :cancel_repo_discover],
+                           'katello/api/v2/repository_sets' => [:enable, :disable]
                          },
                          :resource_type => 'Katello::Product',
                          :finder_scope => :editable
@@ -329,7 +337,6 @@ module Katello
                            'katello/api/v2/products_bulk_actions' => [:sync_products],
                            'katello/api/v2/repositories_bulk_actions' => [:sync_repositories],
                            'katello/api/v2/sync' => [:index],
-                           'katello/api/v2/sync_plans' => [:sync],
                            'katello/sync_management' => [:index, :sync_status, :product_status, :sync, :destroy]
                          },
                          :resource_type => 'Katello::Product',
@@ -342,11 +349,10 @@ module Katello
                          :finder_scope => :exportable
     end
 
-    def subscription_permissions # rubocop:disable Metrics/MethodLength
+    def subscription_permissions
       @plugin.permission :view_subscriptions,
                          {
-                           'katello/api/v2/subscriptions' => [:index, :show, :available, :manifest_history, :auto_complete_search],
-                           'katello/api/v2/repository_sets' => [:index, :show, :available_repositories, :auto_complete_search]
+                           'katello/api/v2/subscriptions' => [:index, :show, :available, :manifest_history, :auto_complete_search]
                          },
                          :resource_type => 'Katello::Subscription'
       @plugin.permission :attach_subscriptions,
@@ -361,8 +367,7 @@ module Katello
                          :resource_type => 'Katello::Subscription'
       @plugin.permission :import_manifest,
                          {
-                           'katello/api/v2/subscriptions' => [:upload, :refresh_manifest],
-                           'katello/api/v2/repository_sets' => [:enable, :disable]
+                           'katello/api/v2/subscriptions' => [:upload, :refresh_manifest]
                          },
                          :resource_type => 'Katello::Subscription'
       @plugin.permission :delete_manifest,
@@ -372,7 +377,7 @@ module Katello
                          :resource_type => 'Katello::Subscription'
       @plugin.permission :manage_subscription_allocations,
                          {
-                           'katello/api/v2/upstream_subscriptions' => [:index, :create, :destroy, :update, :ping, :enable_simple_content_access, :disable_simple_content_access]
+                           'katello/api/v2/upstream_subscriptions' => [:index, :create, :destroy, :update, :ping, :enable_simple_content_access, :disable_simple_content_access, :simple_content_access_eligible]
                          },
                          :resource_type => 'Katello::Subscription'
     end
@@ -380,25 +385,34 @@ module Katello
     def sync_plan_permissions
       @plugin.permission :view_sync_plans,
                          {
-                           'katello/api/v2/sync_plans' => [:index, :show, :add_products, :remove_products, :available_products, :auto_complete_search],
-                           'katello/api/v2/products' => [:index]
+                           'katello/api/v2/sync_plans' => [:index, :show, :add_products, :remove_products, :available_products, :auto_complete_search]
                          },
-                         :resource_type => 'Katello::SyncPlan'
+                         :resource_type => 'Katello::SyncPlan',
+                         :finder_scope => :readable
       @plugin.permission :create_sync_plans,
                          {
                            'katello/api/v2/sync_plans' => [:create]
                          },
-                         :resource_type => 'Katello::SyncPlan'
+                         :resource_type => 'Katello::SyncPlan',
+                         :finder_scope => :editable
       @plugin.permission :edit_sync_plans,
                          {
                            'katello/api/v2/sync_plans' => [:update]
                          },
-                         :resource_type => 'Katello::SyncPlan'
+                         :resource_type => 'Katello::SyncPlan',
+                         :finder_scope => :editable
       @plugin.permission :destroy_sync_plans,
                          {
                            'katello/api/v2/sync_plans' => [:destroy]
                          },
-                         :resource_type => 'Katello::SyncPlan'
+                         :resource_type => 'Katello::SyncPlan',
+                         :finder_scope => :deletable
+      @plugin.permission :sync_sync_plans,
+                         {
+                           'katello/api/v2/sync_plans' => [:sync]
+                         },
+                         :resource_type => 'Katello::SyncPlan',
+                         :finder_scope => :syncable
     end
 
     def user_permissions
@@ -408,5 +422,20 @@ module Katello
                          },
                          :public => true
     end
+
+    def organization_permissions
+      @plugin.permission :import_library_content,
+                         {
+                           'katello/api/v2/content_imports' => [:library]
+                         },
+                         :resource_type => 'Organization'
+
+      @plugin.permission :export_library_content,
+                         {
+                           'katello/api/v2/content_exports' => [:library],
+                           'katello/api/v2/content_export_incrementals' => [:library]
+                         },
+                         :resource_type => 'Organization'
+    end
   end
 end