katello 3.2.0 → 3.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 983bb2638d8d7bda5fc1c721754d3783b51b2213
-  data.tar.gz: c9c271f48b0a3adc7d40d73a252dcaa16e656931
+  metadata.gz: e03e5aae1b2a39ce51d7e7747a5667d2ac7bd7fe
+  data.tar.gz: 4aeb37ebdb66b19eb1447ec81f89ee364957170d
 SHA512:
-  metadata.gz: 14384c56ad55ef1a681de20b03c977720fb6bbb34e677add158939666d3ebdfd1c2f9b3b09c5ef040fb944c913473645c9f323581c6f7dac2daf02e675672c5c
-  data.tar.gz: 3b076defead2957ad7a632275e5868484305dd4afd8d3d40b39b792d3d5ebd2f40b6b27d3993b3c89c09d458ac9d7c15e64d740e11e80ceb6a063f83a6cb9371
+  metadata.gz: ef2a411f01d495e018a9078cc6683d55a09ab1ea3d2e862b7054b8a37a644d4a7ea0e2ad2e2b441dae473067fa02ef499ce1666a26a24578120362b69ad700d3
+  data.tar.gz: 0399cb1ce7259e2667590c15422645631e634c9e8b2e0d5f7f9880e462b5dea4fe8c3294820620413505384cafa21ae36c86e2911806628f21699df07929fc7d

data/app/controllers/katello/api/rhsm/candlepin_proxies_controller.rb

@@ -249,8 +249,7 @@ module Katello
 
     def facts
       User.as_anonymous_admin do
-        sync_task(::Actions::Katello::Host::Update, @host, rhsm_params.except(:facts))
-        Katello::Host::SubscriptionFacet.update_facts(@host, rhsm_params[:facts]) unless rhsm_params[:facts].nil?
+        sync_task(::Actions::Katello::Host::Update, @host, rhsm_params)
         update_host_registered_through(@host, request.headers)
       end
       render :json => {:content => _("Facts successfully updated.")}, :status => 200

data/app/controllers/katello/api/v2/host_collections_controller.rb

@@ -87,7 +87,7 @@ module Katello
       host_ids = params[:host_ids].map(&:to_i)
 
       @hosts = ::Host::Managed.where(id: host_ids)
-      @editable_hosts = @hosts.authorized(:edit_host)
+      @editable_hosts = @hosts.authorized(:edit_hosts)
 
       already_added_host_ids = @host_collection.host_ids & host_ids
       unfound_host_ids = host_ids - @hosts.pluck(:id)
@@ -121,7 +121,7 @@ module Katello
       host_ids = params[:host_ids].map(&:to_i)
 
       @hosts = ::Host::Managed.where(id: host_ids)
-      @editable_hosts = @hosts.authorized(:edit_host)
+      @editable_hosts = @hosts.authorized(:edit_hosts)
 
       already_removed_host_ids = @hosts.pluck(:id) - @host_collection.host_ids
       unfound_host_ids = host_ids - @hosts.pluck(:id)

data/app/controllers/katello/api/v2/host_subscriptions_controller.rb

@@ -69,9 +69,8 @@ module Katello
     param :content_view_id, Integer, :desc => N_("Content View ID"), :required => true
     def create
       rhsm_params = params_to_rhsm_params
-      name = rhsm_params[:facts]['network.hostname']
 
-      host = Katello::Host::SubscriptionFacet.find_or_create_host(name, @content_view_environment.environment.organization, rhsm_params)
+      host = Katello::Host::SubscriptionFacet.find_or_create_host(@content_view_environment.environment.organization, rhsm_params)
       sync_task(::Actions::Katello::Host::Register, host, rhsm_params, @content_view_environment)
       host.reload
       ::Katello::Host::SubscriptionFacet.update_facts(host, rhsm_params[:facts]) unless rhsm_params[:facts].blank?

data/app/lib/actions/candlepin/consumer/create.rb

@@ -18,10 +18,14 @@ module Actions
 
         def run
           # we still keep the output interface the same for case there is other
-          # way how to check the ability to subscribe the system with the actiovation key
+          # way how to check the ability to subscribe the system with the activation key
           # or we have better support for rolling back in Dynflow
           output[:response] = input[:response]
         end
+
+        def finalize
+          input[:consumer_parameters][:facts] = 'TRIMMED'
+        end
       end
     end
   end

data/app/lib/actions/candlepin/consumer/update.rb

@@ -10,6 +10,10 @@ module Actions
         def run
           ::Katello::Resources::Candlepin::Consumer.update(input[:uuid], input[:consumer_params])
         end
+
+        def finalize
+          input[:consumer_params][:facts] = 'TRIMMED'
+        end
       end
     end
   end

data/app/lib/actions/katello/capsule_content/sync.rb

@@ -20,7 +20,7 @@ module Actions
 
           fail _("Action not allowed for the default capsule.") if capsule_content.default_capsule?
 
-          need_updates = repos_needing_updates(capsule_content, environment, content_view)
+          need_updates = repos_needing_updates(capsule_content, environment, content_view, repository)
           repository_ids = get_repository_ids(capsule_content, environment, content_view, repository)
           unless repository_ids.blank?
             sequence do
@@ -73,8 +73,12 @@ module Actions
           repository_ids
         end
 
-        def repos_needing_updates(capsule_content, environment, content_view)
-          repos = capsule_content.repos_available_to_capsule(environment, content_view)
+        def repos_needing_updates(capsule_content, environment, content_view, repository)
+          repos = if repository
+                    [repository]
+                  else
+                    capsule_content.repos_available_to_capsule(environment, content_view)
+                  end
           need_importer_update = ::Katello::Repository.needs_importer_updates(repos, capsule_content)
           need_distributor_update = ::Katello::Repository.needs_distributor_updates(repos, capsule_content)
           (need_distributor_update + need_importer_update).uniq

data/app/lib/actions/katello/repository/finish_upload.rb

@@ -5,7 +5,7 @@ module Actions
         def plan(repository, dependency = nil)
           plan_action(Katello::Repository::MetadataGenerate, repository, nil, dependency)
 
-          recent_range = 5.minutes.ago.iso8601
+          recent_range = 5.minutes.ago.utc.iso8601
           plan_action(Katello::Repository::FilteredIndexContent,
                       id: repository.id,
                       filter: {:association => {:created => {"$gt" => recent_range}}},

data/app/lib/actions/pulp/repository/sync.rb

@@ -66,7 +66,12 @@ module Actions
           end
 
           if sync_task && sync_task['state'] == 'finished' && sync_task[:result]
-            sync_task['result']['added_count'] > 0 || sync_task['result']['removed_count'] > 0 || sync_task['result']['updated_count'] > 0
+            if sync_task['result']['added_count'] > 0 || sync_task['result']['removed_count'] > 0 || sync_task['result']['updated_count'] > 0
+              true
+            else
+              repo = ::Katello::Repository.find_by(:pulp_id => sync_task['result']['repo_id'])
+              repo ? repo.pulp_counts_differ? : true
+            end
           else
             true #if we can't figure it out, assume something changed
           end

data/app/lib/katello/resources/candlepin.rb

@@ -639,7 +639,7 @@ module Katello
             ::Katello::Util::Data.array_with_indifferent_access products
           end
 
-          def _certificate_and_key(id, owner)
+          def product_certificate(id, owner)
             subscriptions_json = Candlepin::CandlepinResource.get("/candlepin/owners/#{owner}/subscriptions", self.default_headers).body
             subscriptions = JSON.parse(subscriptions_json)
 
@@ -655,11 +655,11 @@ module Katello
           end
 
           def certificate(id, owner)
-            self._certificate_and_key(id, owner).try :[], 'cert'
+            self.product_certificate(id, owner).try :[], 'cert'
           end
 
           def key(id, owner)
-            self._certificate_and_key(id, owner).try :[], 'key'
+            self.product_certificate(id, owner).try :[], 'key'
           end
 
           def destroy(product_id)

data/app/models/katello/activation_key.rb

@@ -98,7 +98,11 @@ module Katello
       if cp_pools
         pools = cp_pools.collect { |cp_pool| Pool.find_by(:cp_id => cp_pool['id']) }
         pools.each do |pool|
-          all_products << pool.subscription.products
+          if pool.subscription
+            all_products << pool.subscription.products
+          else
+            Rails.logger.error("Pool #{pool.id} is missing its subscription id.")
+          end
         end
       end
       all_products.flatten!

data/app/models/katello/authorization/pool.rb

@@ -6,7 +6,7 @@ module Katello
 
     module ClassMethods
       def readable
-        where(:subscription_id => Katello::Subscription.authorized(:view_subscription))
+        where(:subscription_id => Katello::Subscription.authorized(:view_subscriptions))
       end
     end
   end

data/app/models/katello/concerns/hostgroup_extensions.rb

@@ -5,7 +5,8 @@ module Katello
 
       included do
         before_save :add_organization_for_environment
-        belongs_to :kickstart_repository, :class_name => "::Katello::Repository", :foreign_key => :kickstart_repository_id
+        belongs_to :kickstart_repository, :class_name => "::Katello::Repository",
+                   :foreign_key => :kickstart_repository_id, :inverse_of => :kickstart_hostgroups
         belongs_to :content_source, :class_name => "::SmartProxy", :foreign_key => :content_source_id, :inverse_of => :hostgroups
         belongs_to :content_view, :inverse_of => :hostgroups, :class_name => "::Katello::ContentView"
         belongs_to :lifecycle_environment, :inverse_of => :hostgroups, :class_name => "::Katello::KTEnvironment"

data/app/models/katello/concerns/subscription_facet_host_extensions.rb

@@ -12,6 +12,8 @@ module Katello
           :unknown => Katello::SubscriptionStatus::UNKNOWN
         }.freeze
 
+        accepts_nested_attributes_for :subscription_facet, :update_only => true, :reject_if => lambda { |attrs| attrs.values.compact.empty? }
+
         has_one :subscription_facet, :class_name => '::Katello::Host::SubscriptionFacet', :foreign_key => :host_id, :inverse_of => :host, :dependent => :destroy
 
         has_many :activation_keys, :through => :subscription_facet

data/app/models/katello/content_view.rb

@@ -42,7 +42,7 @@ module Katello
     has_many :hosts,      :class_name => "::Host::Managed", :through => :content_facets,
                           :inverse_of => :content_view
     has_many :hostgroups, :class_name => "::Hostgroup", :foreign_key => :content_view_id,
-                          :inverse_of => :content_view, :dependent => :restrict_with_exception
+                          :inverse_of => :content_view, :dependent => :nullify
 
     validates_lengths_from_database :except => [:label]
     validates :label, :uniqueness => {:scope => :organization_id},

data/app/models/katello/content_view_erratum_filter.rb

@@ -26,8 +26,8 @@ module Katello
 
         unless start_date.blank? && end_date.blank?
           date_range = {}
-          date_range["$gte"] = start_date.to_time.as_json unless start_date.blank?
-          date_range["$lte"] = end_date.to_time.as_json unless end_date.blank?
+          date_range["$gte"] = start_date.to_time.utc.as_json unless start_date.blank?
+          date_range["$lte"] = end_date.to_time.utc.as_json unless end_date.blank?
           rule_clauses << { erratum_rules.first.pulp_date_type => date_range }
         end
         unless types.blank?

data/app/models/katello/glue/candlepin/product.rb

@@ -7,12 +7,14 @@ module Katello
       base.class_eval do
         lazy_accessor :productContent, :multiplier, :href, :attrs,
           :initializer => lambda { |_s| convert_from_cp_fields(Resources::Candlepin::Product.get(cp_id)[0]) }
-        # Entitlement Certificate for this product
-        lazy_accessor :certificate,
-          :initializer => lambda { |_s| Resources::Candlepin::Product.certificate(cp_id, self.organization.label) },
+        # Certificate for this product - used for SSL certificate and key
+        lazy_accessor :product_certificate,
+          :initializer => lambda { |_s| Resources::Candlepin::Product.product_certificate(cp_id, self.organization.label) },
           :unless => lambda { |_s| cp_id.nil? }
+        # Entitlement Certificate for this product
+        lazy_accessor :certificate, :initializer => lambda { |_s| product_certificate['cert'] if product_certificate }
         # Entitlement Key for this product
-        lazy_accessor :key, :initializer => lambda { |_s| Resources::Candlepin::Product.key(cp_id, self.organization.label) }, :unless => lambda { |_s| cp_id.nil? }
+        lazy_accessor :key, :initializer => lambda { |_s| product_certificate['key'] if product_certificate }
 
         # we must store custom logger object during product importing so we can log status
         # from various places like callbacks

data/app/models/katello/glue/pulp/repo.rb

@@ -54,7 +54,7 @@ module Katello
             else
               filename = file
             end
-            filename.include?("vmlinuz") || filename.include?("pxeboot")
+            filename.include?('vmlinuz') || filename.include?('pxeboot') || filename.include?('kernel.img') || filename.include?('initrd.img')
           end
         end
 
@@ -71,7 +71,7 @@ module Katello
           repos.select do |repo|
             repo_details = capsule ? capsule.pulp_repo_facts(repo.pulp_id) : repo.pulp_repo_facts
             next unless repo_details
-            !repo.distributors_match?(repo_details["distributors"], capsule)
+            !repo.distributors_match?(repo_details["distributors"], capsule.try(:capsule))
           end
         end
       end
@@ -113,6 +113,17 @@ module Katello
         find_distributor['config']['checksum_type'] if self.try(:yum?) && find_distributor
       end
 
+      def pulp_counts_differ?
+        pulp_counts = pulp_repo_facts[:content_unit_counts]
+        rpms.count != pulp_counts['rpm'].to_i ||
+          errata.count != pulp_counts['erratum'].to_i ||
+          package_groups.count != pulp_counts['package_group'].to_i ||
+          puppet_modules.count != pulp_counts['puppet_module'].to_i ||
+          docker_manifests.count != pulp_counts['docker_manifest'].to_i ||
+          docker_tags.count != pulp_counts['docker_tag'].to_i ||
+          ostree_branches.count != pulp_counts['ostree'].to_i
+      end
+
       def create_pulp_repo
         #if we are in library, no need for an distributor, but need to sync
         if self.environment.try(:library?)

data/app/models/katello/host/subscription_facet.rb

@@ -91,11 +91,20 @@ module Katello
       end
 
       def self.propose_name_from_facts(facts)
-        facts['network.fqdn'] || facts['network.hostname-override'] || facts['network.hostname']
+        setting_fact = Setting[:register_hostname_fact]
+        if !setting_fact.blank? && facts[setting_fact]
+          facts[setting_fact]
+        else
+          Rails.logger.warn(_("register_hostname_fact set for %s, but no fact found.") % setting_fact) unless setting_fact.blank?
+          facts['network.fqdn'] || facts['network.hostname-override'] || facts['network.hostname']
+        end
       end
 
       def self.propose_existing_hostname(facts)
-        if ::Host.where(:name => facts['network.hostname'].downcase).any?
+        setting_fact = Setting[:register_hostname_fact]
+        if !setting_fact.blank? && !facts[setting_fact].blank? && ::Host.where(:name => setting_fact.downcase).any?
+          name = facts[setting_fact]
+        elsif ::Host.where(:name => facts['network.hostname'].downcase).any?
           name = facts['network.hostname']
         elsif facts['network.fqdn'] && ::Host.where(:name => facts['network.fqdn'].downcase).any?
           name = facts['network.fqdn']

data/app/models/katello/repository.rb

@@ -67,6 +67,9 @@ module Katello
     has_many :kickstart_content_facets, :class_name => "Katello::Host::ContentFacet", :foreign_key => :kickstart_repository_id,
                           :inverse_of => :kickstart_repository, :dependent => :nullify
 
+    has_many :kickstart_hostgroups, :class_name => "::Hostgroup", :foreign_key => :kickstart_repository_id,
+             :inverse_of => :kickstart_repository, :dependent => :nullify
+
     # rubocop:disable HasAndBelongsToMany
     # TODO: change this into has_many :through association
     has_and_belongs_to_many :filters, :class_name => "Katello::ContentViewFilter",

data/app/models/katello/rhsm_fact_parser.rb

@@ -23,7 +23,7 @@ module Katello
       {
         'link' => true,
         'macaddress' => facts["net.interface.#{interface}.mac_address"],
-        'ipaddress' => facts["net.interface.#{interface}.ipv4_address"]
+        'ipaddress' => get_rhsm_ip(interface)
       }
     end
 
@@ -71,5 +71,12 @@ module Katello
 
     def ipmi_interface
     end
+
+    private
+
+    def get_rhsm_ip(interface)
+      ip = facts["net.interface.#{interface}.ipv4_address"]
+      Net::Validations.validate_ip(ip) ? ip : nil
+    end
   end
 end

data/app/models/katello/subscription.rb

@@ -32,5 +32,9 @@ module Katello
     def recently_expired?
       pools.any?(&:recently_expired?)
     end
+
+    def self.humanize_class_name(_name = nil)
+      _("Subscription")
+    end
   end
 end

data/app/models/setting/content.rb

@@ -3,6 +3,8 @@ class Setting::Content < Setting
   def self.load_defaults
     return unless super
 
+    BLANK_ATTRS << 'register_hostname_fact'
+
     self.transaction do
       [
         self.set('katello_default_provision', N_("Default provisioning template for new Operating Systems"), 'Katello Kickstart Default'),
@@ -29,7 +31,9 @@ class Setting::Content < Setting
         self.set('pulp_client_cert', N_("Path for ssl cert used for pulp server auth"), "/etc/pki/katello/certs/pulp-client.crt"),
         self.set('remote_execution_by_default', N_("If set to true, use the remote execution over katello-agent for remote actions"), false),
         self.set('use_pulp_oauth', N_("use oauth authentication for pulp instead of the default cert based authentication"), false),
-        self.set('unregister_delete_host', N_("When unregistering host via subscription-manager, also delete server-side host record"), false)
+        self.set('unregister_delete_host', N_("When unregistering host via subscription-manager, also delete server-side host record"), false),
+        self.set('register_hostname_fact', N_("When registering a host via subscription-manager, force use the specified fact (in the form of 'fact.fact')"),
+                  '', N_('Subscription manager name registration fact'), nil)
       ].each { |s| self.create! s.update(:category => "Setting::Content") }
     end
     true

data/app/services/katello/candlepin/consumer.rb

@@ -38,6 +38,10 @@ module Katello
         consumer_attributes[:entitlementStatus]
       end
 
+      def update(params)
+        ::Katello::Resources::Candlepin::Consumer.update(uuid, params)
+      end
+
       def filtered_pools(match_attached, match_host, match_installed, no_overlap)
         if match_host
           pools = self.available_pools

data/db/migrate/20161021072346_fix_subscription_permissions.rb

@@ -0,0 +1,11 @@
+class FixSubscriptionPermissions < ActiveRecord::Migration
+  def up
+    permission_names = [:view_subscriptions, :attach_subscriptions, :unattach_subscriptions, :import_manifest, :delete_manifest]
+    Permission.where(:resource_type => 'Organization', :name => permission_names).update_all(resource_type: 'Katello::Subscription')
+  end
+
+  def down
+    permission_names = [:view_subscriptions, :attach_subscriptions, :unattach_subscriptions, :import_manifest, :delete_manifest]
+    Permission.where(:resource_type => 'Katello::Subscription', :name => permission_names).update_all(resource_type: 'Organization')
+  end
+end

data/db/migrate/20161026191118_fix_invalid_interfaces.rb

@@ -0,0 +1,15 @@
+class FixInvalidInterfaces < ActiveRecord::Migration
+  class FakeNic < ActiveRecord::Base
+    self.table_name = 'nics'
+
+    def type
+      Nic::Base
+    end
+  end
+
+  def up
+    FakeNic.where(:ip => "Unknown").each do |nic|
+      nic.update_attributes(:ip => nil)
+    end
+  end
+end

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-provisioning-info.html

@@ -9,7 +9,7 @@
       <div class="detail">
         <span class="info-label" translate>Name</span>
         <span class="info-value">
-          <a href="/hosts/{{ contentHost.host.name }}">
+          <a href="/hosts/{{ host.name }}">
             {{ host.name }}
           </a>
         </span>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-subscriptions-list.html

@@ -60,7 +60,7 @@
         <tr class="grey-table-row" bst-table-row ng-repeat-end ng-repeat="subscription in subscriptions" row-select="subscription">
           <td bst-table-cell>{{ subscription.quantity_consumed }}</td>
           <td bst-table-cell>
-            <a ui-sref="subscriptions.details.info({subscriptionId: subscription.subscription_id})">
+            <a ui-sref="subscriptions.details.info({subscriptionId: subscription.id})">
               {{ subscription | subscriptionConsumedFilter }}
             </a>
           </td>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/deletion/content-view-version-deletion-activation-keys.controller.js

@@ -28,7 +28,14 @@ angular.module('Bastion.content-views').controller('ContentViewVersionDeletionAc
         nutupane = new Nutupane(ActivationKey, params);
 
         nutupane.searchTransform = function (term) {
-            var addition = "(environment_id:(" + $scope.selectedEnvironmentIds().join(" OR ") + "))";
+            var addition,
+                envClausses = [];
+
+            angular.forEach($scope.selectedEnvironmentNames(), function(env) {
+                envClausses.push("environment = " + env);
+            });
+            addition = '(' + envClausses.join(" OR ") + ')';
+            addition = addition + " AND content_view_id = " + $scope.contentView.id;
             if (term === "" || angular.isUndefined(term)) {
                 return addition;
             }

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/deletion/content-view-version-deletion.controller.js

@@ -109,6 +109,10 @@ angular.module('Bastion.content-views').controller('ContentViewVersionDeletionCo
             return _.pluck($scope.deleteOptions.environments, 'id');
         };
 
+        $scope.selectedEnvironmentNames = function () {
+            return _.map($scope.deleteOptions.environments, 'name');
+        };
+
         $scope.totalHostCount = function () {
             return _.reduce($scope.deleteOptions.environments, function (sum, env) {
                 return sum + env['host_count'];

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/errata/details/errata-content-hosts.controller.js

@@ -34,7 +34,7 @@ angular.module('Bastion.errata').controller('ErrataContentHostsController',
         $scope.detailsTable = nutupane.table;
         $scope.nutupane.searchTransform = function(term) {
             var addition = '( ' + $scope.errataSearchString($scope.restrictInstallable) + ' )';
-            if (angular.isDefined($scope.environment_id)) {
+            if (angular.isDefined($scope.environmentId)) {
                 addition = addition + ' and lifecycle_environment_id = ' + $scope.environmentId;
             }
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/errata/details/views/errata-details-content-hosts.html

@@ -38,7 +38,7 @@
         </div>
 
         <div class="col-md-1">
-          <a ng-show="environmentFilter" ng-click="selectEnvironment(null)">
+          <a ng-show="environmentFilter" ng-click="selectEnvironment(undefined)">
             <i class="fa fa-remove"></i>
           </a>
         </div>

data/lib/katello/engine.rb

@@ -168,8 +168,6 @@ module Katello
       # Model extensions
       ::Environment.send :include, Katello::Concerns::EnvironmentExtensions
       ::Host::Managed.send :include, Katello::Concerns::HostManagedExtensions
-      ::Host::Managed.send :include, ::Katello::Concerns::ContentFacetHostExtensions
-      ::Host::Managed.send :include, ::Katello::Concerns::SubscriptionFacetHostExtensions
       ::Hostgroup.send :include, Katello::Concerns::HostgroupExtensions
       ::Location.send :include, Katello::Concerns::LocationExtensions
       ::Redhat.send :include, Katello::Concerns::RedhatExtensions
@@ -177,7 +175,6 @@ module Katello
       ::Organization.send :include, Katello::Concerns::OrganizationExtensions
       ::User.send :include, Katello::Concerns::UserExtensions
       ::Setting.send :include, Katello::Concerns::SettingExtensions
-
       ::Container.send :include, Katello::Concerns::ContainerExtensions
       ::DockerContainerWizardState.send :include, Katello::Concerns::DockerContainerWizardStateExtensions
 
@@ -237,6 +234,7 @@ module Katello
       end
 
       ::Host::Managed.send :include, ::Katello::Concerns::SubscriptionFacetHostExtensions
+      ::Host::Managed.send :include, ::Katello::Concerns::ContentFacetHostExtensions
 
       #Api controller extensions
       ::Api::V2::HostsController.send :include, Katello::Concerns::Api::V2::HostsControllerExtensions

data/lib/katello/permissions/subscription_permissions.rb

@@ -6,17 +6,17 @@ Foreman::Plugin.find(:katello).security_block :subscriptions do
                'katello/api/v2/subscriptions' => [:index, :show, :available, :manifest_history, :auto_complete_search],
                'katello/api/v2/repository_sets' => [:index, :show, :available_repositories]
              },
-             :resource_type => 'Organization'
+             :resource_type => 'Katello::Subscription'
   permission :attach_subscriptions,
              {
                'katello/api/v2/subscriptions' => [:create]
              },
-             :resource_type => 'Organization'
+             :resource_type => 'Katello::Subscription'
   permission :unattach_subscriptions,
              {
                'katello/api/v2/subscriptions' => [:destroy]
              },
-             :resource_type => 'Organization'
+             :resource_type => 'Katello::Subscription'
   permission :import_manifest,
              {
                'katello/products' => [:available_repositories, :toggle_repository],
@@ -24,10 +24,10 @@ Foreman::Plugin.find(:katello).security_block :subscriptions do
                'katello/api/v2/subscriptions' => [:upload, :refresh_manifest],
                'katello/api/v2/repository_sets' => [:enable, :disable]
              },
-             :resource_type => 'Organization'
+             :resource_type => 'Katello::Subscription'
   permission :delete_manifest,
              {
                'katello/api/v2/subscriptions' => [:delete_manifest]
              },
-             :resource_type => 'Organization'
+             :resource_type => 'Katello::Subscription'
 end

data/lib/katello/tasks/upgrade_check.rake

@@ -14,6 +14,10 @@ namespace :katello do
     task_status = task_count > 0 ? fail : success
     puts "Checking for running tasks..."
     puts "[#{task_status}] - There are #{task_count} active tasks. "
-    puts "         Please wait for these to complete or cancel them from the Monitor tab.\n\n"
+    if task_count > 0
+      puts "         Please wait for these to complete or cancel them from the Monitor tab.\n\n"
+    else
+      puts "         You may proceed with the upgrade.\n\n"
+    end
   end
 end

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "3.2.0".freeze
+  VERSION = "3.2.1".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.2.1
 platform: ruby
 authors:
 - N/A
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-10 00:00:00.000000000 Z
+date: 2016-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -208,22 +208,16 @@ dependencies:
   name: bastion
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
         version: 3.3.4
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
         version: 3.3.4
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
@@ -1345,6 +1339,8 @@ files:
 - db/migrate/20160808002834_add_files.rb
 - db/migrate/20160906181923_add_puppet_path_to_smart_proxy.rb
 - db/migrate/20161003204325_add_user_to_katello_subscription_facets.rb
+- db/migrate/20161021072346_fix_subscription_permissions.rb
+- db/migrate/20161026191118_fix_invalid_interfaces.rb
 - db/migrate/20161028153131_sub_facet_user_index_not_uniq.rb
 - db/seeds.d/101-locations.rb
 - db/seeds.d/102-organizations.rb
@@ -1988,7 +1984,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.0
 signing_key: 
 specification_version: 4
 summary: ''