katello 3.1.0.1 → 3.2.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 35fea87feca745a663c99cfee8c423caa5fbea9f
-  data.tar.gz: 35ead4a4f11f53b7074e49df15d07870c5b409ee
+  metadata.gz: 996910969d6d4ff148a675b6b33a47798743ba85
+  data.tar.gz: 51a18935709cc696fe29b52ad02acbf2478f530e
 SHA512:
-  metadata.gz: 91d46c94fbf1850d9815a988286be141c062bec7b04b99694b77fc9b506b477950193ce336870d78c36c32c3e45e86262ec21349bc0552ef13a4576a16618025
-  data.tar.gz: f02a8e8f1bd40272f0ec90ae03bebf6e1cec45a3170af7a45311ab8af4d0581ad4741d46820634afababdc8d9705544147458e34419916d4f4bc81bc1c7f4359
+  metadata.gz: 99084c79da2747ace8491c61e5878abc7b157bd1091df4b68808f905e44eabd9faa0b8ba10c04bcf2263f8f5e158fa4f6b9f37c21d5e8c15ae3524d0eae96615
+  data.tar.gz: 4dad440d277ac638c6ef7809c8f981c1528a9eed57695bc1751cffd54dbcea8f00a0ec79dd3c84371d00f7113519a7444e4566b95b43506da19d490c35fe056d

data/README.md

@@ -1,6 +1,10 @@
-# Katello [![Dependency Status](https://gemnasium.com/Katello/katello.svg)](https://gemnasium.com/Katello/katello)
+# Katello
 
-Full documentation is at http://katello.github.io/katello
+[![Build Status](http://ci.theforeman.org/buildStatus/icon?job=test_katello)](http://ci.theforeman.org/job/test_katello)
+[![Code Climate](https://codeclimate.com/github/Katello/katello/badges/gpa.svg)](https://codeclimate.com/github/Katello/katello)
+[![Dependency Status](https://gemnasium.com/Katello/katello.svg)](https://gemnasium.com/Katello/katello)
+
+Full documentation is at http://www.katello.org
 
 ## About
 
@@ -66,54 +70,11 @@ See the [developer documentation](http://www.katello.org/developers/index.html).
 ## Contact & Resources
 
  * [Katello.org](http://katello.org)
- * [Wiki](https://fedorahosted.org/katello/wiki)
  * [Foreman User Mailing List](https://groups.google.com/forum/?fromgroups#!forum/foreman-users)
  * [Foreman Developer mailing list](https://groups.google.com/forum/?fromgroups#!forum/foreman-dev)
  * [IRC Freenode](http://freenode.net/using_the_network.shtml): #theforeman-dev
- * [Twitter](https://twitter.com/Katello_Project)
 
 ## Documentation
 
-Documentation is generated with [YARD](http://yardoc.org/) and hosted at <http://katello.github.io/katello/>.
-This documentation is intended for developers, user documentation can be found on
-[wiki](https://fedorahosted.org/katello/). Developer documentation contains:
-
--   code documentation
--   high level guides to architectures and implementation details
--   how-tos
-
-*Note: older developer guides can be found on our wiki, they are being migrated.*
-
-### How to
-
--   to see YARD documentation start Katello server and find the link on "About" page or go directly to
-    <http://path.to.katello/url_prefix/yard/docs/katello/frames>
-
-    -   if it fails run `bundle exec yard doc --no-cache` first, which will rebuild whole documentation
-
--   see {file:doc/YARDDocumentation.md}
-
-## Current documentation
-
--   {file:doc/YARDDocumentation.md}
--   {file:doc/Graphs.md}
-
-### Debugging
-
--   {file:doc/how_to/add_praise.md Enabling Praise} - raise/exception investigation
-
-### Packaging
-
--   {file:doc/how_to/package_new_gem.md How to package new gem}
-
-### Other
-
--   {file:doc/katellodb.html DB schema documentation}
--   Original Rails generated README {file:doc/RailsReadme}, we may do certain things differently
-
-    -   we use `doc` directory for storing markdown guides instead of a generated documentation
-
-### Source
-
--   {Katello::Configuration}
--   {Notifications}
+Most of our documentation (both for users and developers) can be found at
+[Katello.org](http://www.katello.org).

data/app/assets/javascripts/katello/common/index.js

@@ -3,5 +3,4 @@
 //= require "katello/common/katello"
 //= require "katello/common/menu"
 //= require "katello/common/spin.min"
-//= require "katello/common/jquery.jeditable.custominputs"
 //= require "katello/common/katello_object"

data/app/assets/javascripts/katello/providers/redhat/index.js

@@ -1,4 +1,3 @@
 //= require "katello/jquery.treeTable"
-//= require "katello/widgets/jquery.jeditable.helpers"
 //= require "katello/widgets/tabs"
 //= require "katello/providers/provider_redhat"

data/app/assets/stylesheets/katello/_katello_colors.scss

@@ -68,8 +68,6 @@ $global_permission_color:   #f6891f;
 
 $path-border_color:         #d3d3d3;
 
-$jScrollPane-bar_color:     #8B8B9F;
-
 $border_color:              #d7d7d7;
 $table-border_color:        $border_color;
 

data/app/assets/stylesheets/katello/katello.scss

@@ -4,14 +4,12 @@
 
 @import "katello/fancyqueries";
 @import "katello/widgets/chosen";
-@import "katello/widgets/scrollpane";
 @import "katello/widgets/tabs";
 @import "katello/katello_sprites";
 
 @import "katello/jquery.loadmask";
 @import "katello/jquery-ui-1.8.11.custom";
 @import "katello/jquery.treeTable";
-@import "katello/jquery.jscrollpane";
 @import "katello/ui.spinner";
 
 @import "katello/contents";

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

@@ -2,26 +2,26 @@ module Katello
   class Api::Rhsm::CandlepinProxiesController < Api::V2::ApiController
     include Katello::Authentication::ClientAuthentication
 
-    before_filter :disable_strong_params
+    before_action :disable_strong_params
 
     wrap_parameters false
 
-    around_filter :repackage_message
-    before_filter :find_host, :only => [:consumer_show, :consumer_destroy, :consumer_checkin, :enabled_repos,
+    around_action :repackage_message
+    before_action :find_host, :only => [:consumer_show, :consumer_destroy, :consumer_checkin, :enabled_repos,
                                         :upload_package_profile, :regenerate_identity_certificates, :facts,
                                         :available_releases, :serials]
-    before_filter :authorize, :only => [:consumer_create, :list_owners, :rhsm_index]
-    before_filter :authorize_client_or_user, :only => [:consumer_show, :upload_package_profile, :regenerate_identity_certificates]
-    before_filter :authorize_client_or_admin, :only => [:hypervisors_update]
-    before_filter :authorize_proxy_routes, :only => [:get, :post, :put, :delete]
-    before_filter :authorize_client, :only => [:consumer_destroy, :consumer_checkin,
+    before_action :authorize, :only => [:consumer_create, :list_owners, :rhsm_index]
+    before_action :authorize_client_or_user, :only => [:consumer_show, :upload_package_profile, :regenerate_identity_certificates]
+    before_action :authorize_client_or_admin, :only => [:hypervisors_update]
+    before_action :authorize_proxy_routes, :only => [:get, :post, :put, :delete]
+    before_action :authorize_client, :only => [:consumer_destroy, :consumer_checkin,
                                                :enabled_repos, :facts, :available_releases]
 
-    before_filter :add_candlepin_version_header
+    before_action :add_candlepin_version_header
 
-    before_filter :proxy_request_path, :proxy_request_body
-    before_filter :set_organization_id, :except => :hypervisors_update
-    before_filter :find_hypervisor_environment_and_content_view, :only => [:hypervisors_update]
+    before_action :proxy_request_path, :proxy_request_body
+    before_action :set_organization_id, :except => :hypervisors_update
+    before_action :find_hypervisor_organization, :only => [:hypervisors_update]
 
     def repackage_message
       yield
@@ -113,8 +113,9 @@ module Katello
     def hypervisors_update
       login = User.consumer? ? User.anonymous_api_admin.login : User.current.login
       task = User.as(login) do
-        sync_task(::Actions::Katello::Host::Hypervisors, @environment, @content_view,
-                            params.except(:controller, :action, :format))
+        params['owner'] = @organization.label #override owner label if
+        params['env'] = nil #hypervisors don't need an environment
+        sync_task(::Actions::Katello::Host::Hypervisors, params.except(:controller, :action, :format))
       end
       render :json => task.output[:results]
     end
@@ -182,7 +183,6 @@ module Katello
 
       result = nil
       User.as_anonymous_admin do
-        @host.content_host.save_bound_repos_by_path!(paths.compact)
         result = @host.content_facet.update_repositories_by_paths(paths.compact)
       end
 
@@ -195,9 +195,11 @@ module Katello
       host = Katello::Host::SubscriptionFacet.find_or_create_host(params[:facts]['network.hostname'],
                  content_view_environment.environment.organization, rhsm_params)
 
-      sync_task(::Actions::Katello::Host::Register, host, System.new, rhsm_params, content_view_environment)
+      sync_task(::Actions::Katello::Host::Register, host, rhsm_params, content_view_environment)
       host.reload
 
+      update_host_registered_through(host, request.headers)
+
       render :json => Resources::Candlepin::Consumer.get(host.subscription_facet.uuid)
     end
 
@@ -205,7 +207,11 @@ module Katello
     #param :id, String, :desc => N_("UUID of the consumer"), :required => true
     def consumer_destroy
       User.as_anonymous_admin do
-        sync_task(::Actions::Katello::Host::Unregister, @host)
+        if Setting['unregister_delete_host']
+          sync_task(::Actions::Katello::Host::Destroy, @host)
+        else
+          sync_task(::Actions::Katello::Host::Unregister, @host)
+        end
       end
       render :text => _("Deleted consumer '%s'") % params[:id], :status => 204
     end
@@ -221,7 +227,9 @@ module Katello
       host = Katello::Host::SubscriptionFacet.find_or_create_host(params[:facts]['network.hostname'],
                                     activation_keys.first.organization, rhsm_params)
 
-      sync_task(::Actions::Katello::Host::Register, host, System.new, rhsm_params, nil, activation_keys)
+      sync_task(::Actions::Katello::Host::Register, host, rhsm_params, nil, activation_keys)
+
+      update_host_registered_through(host, request.headers)
       host.reload
 
       render :json => Resources::Candlepin::Consumer.get(host.subscription_facet.uuid)
@@ -243,8 +251,9 @@ module Katello
 
     def facts
       User.as_anonymous_admin do
-        sync_task(::Actions::Katello::Host::Update, @host, rhsm_params)
+        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?
+        update_host_registered_through(@host, request.headers)
       end
       render :json => {:content => _("Facts successfully updated.")}, :status => 200
     end
@@ -255,6 +264,12 @@ module Katello
       render :json => Katello::Resources::Candlepin::Consumer.serials(@host.subscription_facet.uuid)
     end
 
+    def get_parent_host(headers)
+      hostnames = headers["HTTP_X_FORWARDED_SERVER"]
+      host = hostnames.split(",")[0] if hostnames
+      host || Facter.value(:fqdn) || SETTINGS[:fqdn]
+    end
+
     private
 
     def disable_strong_params
@@ -297,31 +312,14 @@ module Katello
       environment
     end
 
-    # Hypervisors are restricted to the content host's environment and content view
-    def find_hypervisor_environment_and_content_view
+    def find_hypervisor_organization
       if User.consumer?
-        @host = find_host(User.current.uuid)
-        @organization = @host.content_facet.content_view.organization
-        @environment = @host.content_facet.lifecycle_environment
-        @content_view = @host.content_facet.content_view
-        params[:owner] = @organization.label
-        params[:env] = @content_view.cp_environment_label(@environment)
-      else
+        host = find_host(User.current.uuid)
+        @organization = host.organization
+      elsif params[:owner]
         @organization = Organization.find_by(:label => params[:owner])
-        deny_access unless @organization
-        if params[:env] == 'Library'
-          @environment = @organization.library
-          deny_access unless @environment && @environment.readable?
-          @content_view = @environment.default_content_view
-          deny_access unless @content_view && @content_view.readable?
-        else
-          (env_name, cv_name) = params[:env].split('/')
-          @environment = @organization.kt_environments.find_by(:label => env_name)
-          deny_access unless @environment && @environment.readable?
-          @content_view = @environment.content_views.find_by(:label => cv_name)
-          deny_access unless @content_view && @content_view.readable?
-        end
       end
+      deny_access unless @organization
     end
 
     def find_organization
@@ -347,7 +345,7 @@ module Katello
     def find_activation_keys
       organization = find_organization
 
-      if ak_names = params[:activation_keys]
+      if (ak_names = params[:activation_keys])
         ak_names        = ak_names.split(",")
         activation_keys = ak_names.map do |ak_name|
           activation_key = organization.activation_keys.find_by(:name => ak_name)
@@ -432,6 +430,11 @@ module Katello
       authorized
     end
 
+    def update_host_registered_through(host, headers)
+      parent_host = get_parent_host(headers)
+      host.subscription_facet.update_attribute(:registered_through, parent_host)
+    end
+
     # rubocop:disable MethodLength
     def authorize_proxy_routes
       deny_access unless (authenticate || authenticate_client)

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

@@ -2,15 +2,15 @@ module Katello
   class Api::V2::ActivationKeysController < Api::V2::ApiController
     include Katello::Concerns::FilteredAutoCompleteSearch
 
-    before_filter :verify_presence_of_organization_or_environment, :only => [:index]
-    before_filter :find_environment, :only => [:index, :create, :update]
-    before_filter :find_optional_organization, :only => [:index, :create, :show]
-    before_filter :find_content_view, :only => [:index]
-    before_filter :find_activation_key, :only => [:show, :update, :destroy, :available_releases, :copy, :product_content,
+    before_action :verify_presence_of_organization_or_environment, :only => [:index]
+    before_action :find_environment, :only => [:index, :create, :update]
+    before_action :find_optional_organization, :only => [:index, :create, :show]
+    before_action :find_content_view, :only => [:index]
+    before_action :find_activation_key, :only => [:show, :update, :destroy, :available_releases, :copy, :product_content,
                                                   :available_host_collections, :add_host_collections, :remove_host_collections,
                                                   :content_override, :add_subscriptions, :remove_subscriptions,
                                                   :subscriptions]
-    before_filter :authorize
+    before_action :authorize
 
     wrap_parameters :include => (ActivationKey.attribute_names + %w(host_collection_ids service_level auto_attach content_view_environment))
 
@@ -103,7 +103,7 @@ module Katello
       respond_for_show(:resource => @new_activation_key)
     end
 
-    api :GET, "/activation_keys/:id/host_collections/available", N_("List host collections the system does not belong to")
+    api :GET, "/activation_keys/:id/host_collections/available", N_("List host collections the activation key does not belong to")
     param_group :search, Api::V2::ApiController
     param :name, String, :desc => N_("host collection name to filter by")
     def available_host_collections
@@ -216,18 +216,6 @@ module Katello
       activation_keys
     end
 
-    api :GET, "/activation_keys/:id/subscriptions", N_("List an activation key's subscriptions")
-    param :activation_key_id, String, :desc => N_("Activation key ID"), :required => true
-    def subscriptions
-      subscriptions = @activation_key.get_key_pools.map { |sub| ActivationKeySubscriptionPresenter.new(sub) }
-      collection = subscriptions.map(&:subscription)
-      @collection = { :results => collection,
-                      :total => collection.count,
-                      :page => 1,
-                      :per_page => collection.count,
-                      :subtotal => collection.count }
-    end
-
     def find_activation_key
       @activation_key = ActivationKey.find(params[:id])
       fail HttpErrors::NotFound, _("Couldn't find activation key '%s'") % params[:id] if @activation_key.nil?

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

@@ -8,7 +8,7 @@ module Katello
     # support for session (thread-local) variables must be the last filter in this class
     include Foreman::ThreadSession::Cleaner
 
-    skip_before_filter :setup_has_many_params # TODO: get this working #8862
+    skip_before_action :setup_has_many_params # TODO: get this working #8862
 
     resource_description do
       api_version 'v2'
@@ -20,7 +20,7 @@ module Katello
       param :page, :number, :desc => N_("Page number, starting at 1")
       param :per_page, :number, :desc => N_("Number of results per page to return")
       param :order, String, :desc => N_("Sort field and order, eg. 'name DESC'")
-      param :full_results, :bool, :desc => N_("Whether or not to show all results")
+      param :full_result, :bool, :desc => N_("Whether or not to show all results")
       param :sort, Hash, :desc => N_("Hash version of 'order' param") do
         param :by, String, :desc => N_("Field to sort the results on")
         param :order, String, :desc => N_("How to order the sorted results (e.g. ASC for ascending)")
@@ -68,7 +68,7 @@ module Katello
       query = query.order("#{query.table_name}.id DESC") unless group #secondary order to ensure sort is deterministic
       query = query.includes(includes) if includes.length > 0
 
-      if params[:full_result]
+      if ::Foreman::Cast.to_bool(params[:full_result])
         params[:per_page] = total
       else
         query = query.paginate(paginate_options)

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

@@ -4,9 +4,9 @@ module Katello
       api_base_url "/katello/api"
     end
 
-    before_filter :find_capsule
-    before_filter :find_environment, :only => [:add_lifecycle_environment, :remove_lifecycle_environment]
-    before_filter :find_optional_organization, :only => [:sync_status]
+    before_action :find_capsule
+    before_action :find_environment, :only => [:add_lifecycle_environment, :remove_lifecycle_environment]
+    before_action :find_optional_organization, :only => [:sync_status]
 
     def_param_group :lifecycle_environments do
       param :id, Integer, :desc => N_('Id of the capsule'), :required => true

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

@@ -1,7 +1,7 @@
 module Katello
   class Api::V2::ContentUploadsController < Api::V2::ApiController
-    before_filter :find_repository
-    skip_before_filter :check_content_type, :only => [:update]
+    before_action :find_repository
+    skip_before_action :check_content_type, :only => [:update]
 
     include ::Foreman::Controller::FilterParameters
     filter_parameters :content

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

@@ -1,7 +1,7 @@
 module Katello
   class Api::V2::ContentViewFilterRulesController < Api::V2::ApiController
-    before_filter :find_filter
-    before_filter :find_rule, :except => [:index, :create]
+    before_action :find_filter
+    before_action :find_rule, :except => [:index, :create]
 
     api :GET, "/content_view_filters/:content_view_filter_id/rules", N_("List filter rules")
     param :content_view_filter_id, :identifier, :desc => N_("filter identifier"), :required => true
@@ -19,7 +19,7 @@ module Katello
     api :POST, "/content_view_filters/:content_view_filter_id/rules",
         N_("Create a filter rule. The parameters included should be based upon the filter type.")
     param :content_view_filter_id, :identifier, :desc => N_("filter identifier"), :required => true
-    param :name, String, :desc => N_("package or package group: name")
+    param :name, [String, Array], :desc => N_("package and package group names")
     param :version, String, :desc => N_("package: version")
     param :min_version, String, :desc => N_("package: minimum version")
     param :max_version, String, :desc => N_("package: maximum version")
@@ -32,19 +32,23 @@ module Katello
     def create
       rule_clazz = ContentViewFilter.rule_class_for(@filter)
 
-      if rule_params.key?(:errata_ids)
-        rules = []
-        rule_params[:errata_ids].each do |errata_id|
-          rules << rule_clazz.create!({:errata_id => errata_id}.merge(:filter => @filter))
-        end
-      else
-        rule = rule_clazz.create!(rule_params.merge(:filter => @filter))
+      rules = (rule_params[:name] || []).map do |name|
+        rule_clazz.create!(rule_params.except(:name).merge(:filter => @filter, name: name))
+      end
+
+      rules += (rule_params[:errata_ids] || []).map do |errata_id|
+        rule_clazz.create!(rule_params.except(:errata_ids)
+          .merge(filter:  @filter, errata_id: errata_id))
       end
 
-      if rules && rule.nil?
+      if rules.empty?
+        rules = [rule_clazz.create!(rule_params.merge(:filter => @filter))]
+      end
+
+      if rules.many?
         respond_for_index(:collection => {:results => rules}, :template => 'index')
       else
-        respond :resource => rule
+        respond resource: rules.first
       end
     end
 
@@ -69,6 +73,7 @@ module Katello
     param :types, Array, :desc => N_("erratum: types (enhancement, bugfix, security)")
     def update
       update_params = rule_params
+      update_params[:name] = update_params[:name].first if update_params[:name]
 
       if @rule.filter.content_type == ContentViewPackageFilter::CONTENT_TYPE
         update_params[:version] = "" unless rule_params[:version]
@@ -100,15 +105,21 @@ module Katello
     end
 
     def rule_params
-      if params[:content_view_filter_rule][:errata_ids].is_a?(Hash)
-        ids = process_errata_ids(params[:content_view_filter_rule][:errata_ids])
-        params[:content_view_filter_rule][:errata_ids] = ids
+      unless @rule_params
+        if params[:content_view_filter_rule][:errata_ids].is_a?(Hash)
+          ids = process_errata_ids(params[:content_view_filter_rule][:errata_ids])
+          params[:content_view_filter_rule][:errata_ids] = ids
+        end
+
+        if params[:name]
+          params[:content_view_filter_rule][:name] = params[:name] = [params[:name]].flatten
+        end
       end
 
-      params.fetch(:content_view_filter_rule, {}).
-            permit(:uuid, :name, :version, :min_version, :max_version,
+      @rule_params ||= params.fetch(:content_view_filter_rule, {}).
+            permit(:uuid, :version, :min_version, :max_version,
                     :errata_id, :start_date, :end_date, :date_type,
-                    :types => [], :errata_ids => [])
+                    :types => [], :errata_ids => [], name: [])
     end
 
     def process_errata_ids(select_all_params)