foreman_rh_cloud 1.0.7 → 2.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf631b63f0110a4a5d39aa664905fef695e8b402d458fe20704db84880bdf33f
-  data.tar.gz: ac49f7073bf0e2828964587434f84275029ca0aef285f963d00ddc7e569b8197
+  metadata.gz: 4b4d5750b4b0ff6361c7694fb3808a4c33d5ff12e37bd5d946c1baa454b805a1
+  data.tar.gz: 5e18ea289049d0525a82adb8f7cbeec66d5ac4abf2cae5867aa18c3aab753640
 SHA512:
-  metadata.gz: 9d9015a4931ab563c5d56cc38c1ea9ba54df04ebf9305f4077d5b88284b84b78da02f9dfed267192a8ce7ed49e98bf4b89e884eda8eae08a68fe8699771a9f69
-  data.tar.gz: 45a135ff52da1cedacb37b84a70b3f73347d741e62beb95a96e0fed7cf022928649ca470b6d9242c9bfe55b790e28f2fb734f76fa0524f6548351fcc81d7b580
+  metadata.gz: 7e9b9c292ed88641c954bc79d665c7f3e77a0c04e426bde5e12d92e25d53b72ef7ade25a69b08da5f20442c3a4a41a7d8854dac529108376eae49b188c1eb839
+  data.tar.gz: 94998762071b568f438dd03c37f22c969a55cc2c71410bf60c2b4e21ebda259e1e20a85d6a821324014d98683f1b928cce4fe94e39a0a4f8f34dd338237252ed

data/README.md

@@ -11,6 +11,14 @@ for how to install Foreman plugins
 
 *Usage here*
 
+### In Satellite
+
+Normally you run it via UI in RH Cloud -> Inventory Upload -> Restart, but if you need to run from command-line for some reason:
+
+    export organization_id=1
+    export target=/var/lib/foreman/red_hat_inventory/generated_reports/
+    /usr/sbin/foreman-rake foreman_inventory_upload:report:generate
+
 ## TODO
 
 *Todo list here*

data/app/controllers/foreman_inventory_upload/accounts_controller.rb

@@ -22,6 +22,7 @@ module ForemanInventoryUpload
 
       render json: {
         autoUploadEnabled: Setting[:allow_auto_inventory_upload],
+        hostObfuscationEnabled: Setting[:obfuscate_inventory_hostnames],
         accounts: accounts,
       }, status: :ok
     end

data/app/controllers/foreman_inventory_upload/uploads_controller.rb

@@ -26,13 +26,32 @@ module ForemanInventoryUpload
 
     def auto_upload
       Setting[:allow_auto_inventory_upload] = auto_upload_params
-      render json: {
-        autoUploadEnabled: Setting[:allow_auto_inventory_upload],
-      }
+      render_setting(:autoUploadEnabled, :allow_auto_inventory_upload)
+    end
+
+    def show_auto_upload
+      render_setting(:autoUploadEnabled, :allow_auto_inventory_upload)
     end
 
     def auto_upload_params
       ActiveModel::Type::Boolean.new.cast(params.require(:value))
     end
+
+    def host_obfuscation
+      Setting[:obfuscate_inventory_hostnames] = host_obfuscation_params
+      render_setting(:hostObfuscationEnabled, :obfuscate_inventory_hostnames)
+    end
+
+    def host_obfuscation_params
+      ActiveModel::Type::Boolean.new.cast(params.require(:value))
+    end
+
+    private
+
+    def render_setting(node_name, setting)
+      render json: {
+        node_name => Setting[setting],
+      }
+    end
   end
 end

data/app/controllers/foreman_rh_cloud/react_controller.rb

@@ -4,5 +4,8 @@ module ForemanRhCloud
 
     def inventory_upload
     end
+
+    def insights_cloud
+    end
   end
 end

data/app/controllers/insights_cloud/tasks_controller.rb

@@ -0,0 +1,8 @@
+module InsightsCloud
+  class TasksController < ::ApplicationController
+    def create
+      selected_org = Organization.current
+      InsightsCloud::Async::InsightsFullSync.perform_now(selected_org)
+    end
+  end
+end

data/app/helpers/foreman_inventory_upload_host_helper.rb

@@ -0,0 +1,11 @@
+module ForemanInventoryUploadHostHelper
+  def hits_counts
+    @hits_counts ||= InsightsHit.where(host_id: @hosts).group(:host_id).count
+  end
+
+  def hits_counts_cell(host)
+    host_hits = hits_counts[host.id]
+    content = n_('One recommendation', '%{hits} recommendations', host_hits) % { hits: host_hits } if host_hits
+    tag.td content, class: ['hidden-xs', 'ellipsis']
+  end
+end

data/app/models/insights_facet.rb

@@ -0,0 +1,3 @@
+class InsightsFacet < HostFacets::Base
+  has_many :hits, foreign_key: :host_id, primary_key: :host_id, class_name: 'InsightsHit'
+end

data/app/models/insights_hit.rb

@@ -0,0 +1,6 @@
+class InsightsHit < ApplicationRecord
+  has_one :host
+  # since the facet is one-to-one association with a host, we can connect
+  # through host_id column on both this model and facet.
+  has_one :insights_facet, foreign_key: 'host_id', primary_key: 'host_id'
+end

data/app/models/setting/rh_cloud.rb

@@ -5,6 +5,7 @@ class Setting::RhCloud < Setting
     [
       set('allow_auto_inventory_upload', N_('Allow automatic upload of the host inventory to the Red Hat cloud'), true),
       set('obfuscate_inventory_hostnames', N_('Obfuscate host names sent to Red Hat cloud'), false),
+      set('rh_cloud_token', N_('Authentication token to Red Hat cloud services. Used to authenticate requests to cloud APIs'), 'DEFAULT', N_('Red Hat Cloud token'), nil, encrypted: true),
     ]
   end
 

data/app/overrides/hosts_list.rb

@@ -0,0 +1,13 @@
+Deface::Override.new(
+  virtual_path: 'hosts/_list',
+  name: 'insights_hits_header',
+  insert_before: 'thead tr th.hidden-xs:first-of-type',
+  text: '<th class="hidden-xs" width="10%"><%= _("Insights")%></th>'
+)
+
+Deface::Override.new(
+  virtual_path: 'hosts/_list',
+  name: 'insights_hits_cells',
+  insert_before: 'tbody tr td.hidden-xs:first-of-type',
+  text: '<%= hits_counts_cell(host) %>'
+)

data/app/views/foreman_rh_cloud/react/insights_cloud.html.erb

@@ -0,0 +1 @@
+<%= mount_react_component('InsightsCloudSync', '#ForemanRhCloudReactRoot') %>

data/config/routes.rb

@@ -5,10 +5,17 @@ Rails.application.routes.draw do
     get ':organization_id/uploads/last', to: 'uploads#last', constraints: { organization_id: %r{[^\/]+} }
     get ':organization_id/uploads/file', to: 'uploads#download_file', constraints: { organization_id: %r{[^\/]+} }
     get 'accounts', to: 'accounts#index'
+    get 'auto_upload', to: 'uploads#show_auto_upload'
     post 'auto_upload', to: 'uploads#auto_upload'
+    post 'host_obfuscation', to: 'uploads#host_obfuscation'
+  end
+
+  namespace :insights_cloud do
+    resources :tasks, only: [:create]
   end
 
   namespace :foreman_rh_cloud do
     get 'inventory_upload', to: 'react#inventory_upload'
+    get 'insights_cloud', to: 'react#insights_cloud'
   end
 end

data/db/migrate/20191215104806_create_insights_hits.foreman_inventory_upload.rb

@@ -0,0 +1,14 @@
+class CreateInsightsHits < ActiveRecord::Migration[5.2]
+  def change
+    create_table :insights_hits do |t|
+      t.references :host, foreign_key: true, null: false
+      t.datetime :last_seen
+      t.string :title
+      t.string :solution_url
+      t.integer :total_risk
+      t.integer :likelihood
+      t.datetime :publish_date
+      t.string :results_url
+    end
+  end
+end

data/db/migrate/20191216062008_create_insights_facets.foreman_inventory_upload.rb

@@ -0,0 +1,7 @@
+class CreateInsightsFacets < ActiveRecord::Migration[5.2]
+  def change
+    create_table :insights_facets do |t|
+      t.references :host, foreign_key: true, null: false
+    end
+  end
+end

data/lib/foreman_inventory_upload/async/upload_report_job.rb

@@ -37,11 +37,7 @@ module ForemanInventoryUpload
       end
 
       def http_proxy_string
-        @http_proxy_string ||= begin
-          if Setting[:content_default_http_proxy]
-            HttpProxy.unscoped.find_by(name: Setting[:content_default_http_proxy])&.full_url
-          end
-        end
+        @http_proxy_string ||= HttpProxy.default_global_content_proxy&.full_url
       end
 
       def rh_credentials

data/lib/foreman_inventory_upload/generators/fact_helpers.rb

@@ -67,7 +67,7 @@ module ForemanInventoryUpload
       end
 
       def obfuscate_fqdn(fqdn)
-        Base64.urlsafe_encode64(Digest::SHA1.digest(fqdn), padding: false)
+        Digest::SHA1.hexdigest(fqdn)
       end
     end
   end

data/lib/foreman_inventory_upload/generators/slice.rb

@@ -157,6 +157,7 @@ module ForemanInventoryUpload
         @stream.simple_field('distribution_version', fact_value(host, 'distribution::version'))
         @stream.simple_field('satellite_instance_id', Foreman.try(:instance_id))
         @stream.simple_field('is_simple_content_access', golden_ticket?(host.organization))
+        @stream.simple_field('is_hostname_obfuscated', !!obfuscate_hostname?(host))
         @stream.simple_field('organization_id', host.organization_id, :last)
       end
 

data/lib/foreman_inventory_upload/notifications/manifest_import_success_notification_override.rb

@@ -0,0 +1,19 @@
+module ForemanInventoryUpload
+  module Notifications
+    module ManifestImportSuccessNotificationOverride
+      extend ActiveSupport::Concern
+
+      def actions
+        {
+          :links => [
+            {
+              :href => Rails.application.routes.url_helpers.foreman_rh_cloud_inventory_upload_path,
+              :title => _('Enable inventory upload'),
+              :external => false,
+            },
+          ],
+        }
+      end
+    end
+  end
+end

data/lib/foreman_rh_cloud/engine.rb

@@ -26,17 +26,21 @@ module ForemanRhCloud
 
     initializer 'foreman_rh_cloud.register_plugin', :before => :finisher_hook do |_app|
       Foreman::Plugin.register :foreman_rh_cloud do
-        requires_foreman '~> 1.24.0'
+        requires_foreman '> 1.24'
 
         # Add permissions
         security_block :foreman_rh_cloud do
-          permission(:generate_foreman_rh_cloud, :'foreman_inventory_upload/reports' => [:generate])
-          permission(:view_foreman_rh_cloud,
-                     'foreman_inventory_upload/accounts': [:index],
-                     'foreman_inventory_upload/reports': [:last],
-                     'foreman_inventory_upload/uploads': [:auto_upload, :download_file, :last],
-                     'foreman_rh_cloud/react': [:inventory_upload]
-                    )
+          permission(
+            :generate_foreman_rh_cloud,
+            'foreman_inventory_upload/reports': [:generate]
+          )
+          permission(
+            :view_foreman_rh_cloud,
+            'foreman_inventory_upload/accounts': [:index],
+            'foreman_inventory_upload/reports': [:last],
+            'foreman_inventory_upload/uploads': [:auto_upload, :show_auto_upload, :download_file, :last],
+            'foreman_rh_cloud/react': [:inventory_upload]
+          )
         end
 
         plugin_permissions = [:view_foreman_rh_cloud, :generate_foreman_rh_cloud]
@@ -49,10 +53,18 @@ module ForemanRhCloud
                                          Role::SYSTEM_ADMIN => plugin_permissions
 
         # Adding a sub menu after hosts menu
-        sub_menu :top_menu, :foreman_rh_cloud, :caption => N_('RH Cloud'), :icon => 'fa fa-cloud-upload' do
-          menu :top_menu, :level1, :caption => N_('Inventory Upload'), :url_hash => { controller: :'foreman_rh_cloud/react', :action => :inventory_upload}
+        divider :top_menu, caption: N_('RH Cloud'), parent: :configure_menu
+        menu :top_menu, :inventory_upload, :caption => N_('Inventory Upload'), :url_hash => { controller: :'foreman_rh_cloud/react', :action => :inventory_upload}, parent: :configure_menu
+        menu :top_menu, :insights_hits_import, :caption => N_('Insights'), :url_hash => { controller: :'foreman_rh_cloud/react', :action => :insights_cloud }, parent: :configure_menu
+
+        register_facet InsightsFacet, :insights do
+          configure_host
         end
+
+        register_global_js_file 'subscriptions_extension'
       end
+
+      ::Katello::UINotifications::Subscriptions::ManifestImportSuccess.include ForemanInventoryUpload::Notifications::ManifestImportSuccessNotificationOverride if defined?(Katello)
     end
 
     initializer "foreman_rh_cloud.set_dynflow.config.on_init", :before => :finisher_hook do |_app|

data/lib/foreman_rh_cloud/version.rb

@@ -1,3 +1,3 @@
 module ForemanRhCloud
-  VERSION = '1.0.7'.freeze
+  VERSION = '2.0.8'.freeze
 end

data/lib/insights_cloud.rb

@@ -0,0 +1,15 @@
+module InsightsCloud
+  def self.base_url
+    # for testing set ENV to 'https://ci.cloud.redhat.com'
+    @base_url ||= ENV['SATELLITE_INSIGHTS_CLOUD_URL'] || 'https://cloud.redhat.com'
+  end
+
+  def self.authentication_url
+    # https://sso.redhat.com/auth/realms/redhat-external/protocol/openid-connect/token
+    @authentication_url ||= ENV['SATELLITE_INSIGHTS_CLOUD_SSO_URL'] || 'https://sso.redhat.com/auth/realms/redhat-external/protocol/openid-connect/token'
+  end
+
+  def self.hits_export_url
+    base_url + '/api/insights/v1/export/hits/'
+  end
+end

data/lib/insights_cloud/async/insights_full_sync.rb

@@ -0,0 +1,92 @@
+require 'rest-client'
+
+module InsightsCloud
+  module Async
+    class InsightsFullSync < ::ApplicationJob
+      def perform(organization)
+        @organization = organization
+
+        hits = query_insights_hits
+
+        host_names = hits.map { |hit| hit['hostname'] }.uniq
+        setup_host_names(host_names)
+
+        replace_hits_data(hits)
+      end
+
+      def logger
+        Foreman::Logging.logger('background')
+      end
+
+      def rh_credentials
+        @rh_credentials ||= query_refresh_token
+      end
+
+      private
+
+      def query_insights_hits
+        hits_response = RestClient::Request.execute(
+          method: :get,
+          url: InsightsCloud.hits_export_url,
+          verify_ssl: ENV['SATELLITE_INSIGHTS_CLOUD_URL'] ? OpenSSL::SSL::VERIFY_NONE : OpenSSL::SSL::VERIFY_PEER,
+          headers: {
+            Authorization: "Bearer #{rh_credentials}",
+          }
+        )
+
+        JSON.parse(hits_response)
+      end
+
+      def query_refresh_token
+        token_response = RestClient::Request.execute(
+          method: :post,
+          url: InsightsCloud.authentication_url,
+          verify_ssl: ENV['SATELLITE_INSIGHTS_CLOUD_URL'] ? OpenSSL::SSL::VERIFY_NONE : OpenSSL::SSL::VERIFY_PEER,
+          payload: {
+            grant_type: 'refresh_token',
+            client_id: 'rhsm-api',
+            refresh_token: Setting[:rh_cloud_token],
+          }
+        )
+
+        JSON.parse(token_response)['access_token']
+      rescue RestClient::ExceptionWithResponse => e
+        Foreman::Logging.exception('Unable to authenticate using rh_cloud_token setting', e)
+        raise ::Foreman::WrappedException.new(e, N_('Unable to authenticate using rh_cloud_token setting'))
+      end
+
+      def setup_host_names(host_names)
+        @host_ids = Hash[
+          Host.where(name: host_names).pluck(:name, :id)
+        ]
+      end
+
+      def host_id(host_name)
+        @host_ids[host_name]
+      end
+
+      def replace_hits_data(hits)
+        InsightsHit.transaction do
+          InsightsHit.delete_all
+          InsightsHit.create(hits.map { |hits_hash| to_model_hash(hits_hash) })
+          # create new facets for hosts that are missing one
+          hosts_with_existing_facets = InsightsFacet.where(host_id: @host_ids.values).pluck(:host_id)
+          InsightsFacet.create((@host_ids.values - hosts_with_existing_facets).map { |id| {host_id: id} })
+        end
+      end
+
+      def to_model_hash(hit_hash)
+        {
+          host_id: host_id(hit_hash['hostname']),
+          last_seen: DateTime.parse(hit_hash['last_seen']),
+          publish_date: DateTime.parse(hit_hash['publish_date']),
+          title: hit_hash['title'],
+          solution_url: hit_hash['solution_url'],
+          total_risk: hit_hash['total_risk'].to_i,
+          likelihood: hit_hash['likelihood'].to_i,
+          results_url: hit_hash['results_url'],
+        }
+      end
+    end
+  end
+end

data/package.json

@@ -4,14 +4,14 @@
   "description": "Inventory Upload =============",
   "main": "index.js",
   "scripts": {
-    "lint": "./node_modules/.bin/eslint -c .eslintrc webpack/",
-    "test": "node node_modules/.bin/jest --no-cache",
-    "test:watch": "node node_modules/.bin/jest --watchAll",
-    "test:current": "node node_modules/.bin/jest --watch",
-    "coveralls": "cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js",
-    "storybook": "start-storybook -p 6006",
-    "storybook:build": "node --max_old_space_size=2048 ./node_modules/.bin/build-storybook --config-dir .storybook --output-dir .storybook-dist",
-    "storybook:deploy": "surge --project .storybook-dist"
+    "lint": "tfm-lint --plugin -d /webpack",
+    "test": "tfm-test --plugin",
+    "test:watch": "tfm-test --plugin --watchAll",
+    "test:current": "tfm-test --plugin --watch",
+    "publish-coverage": "tfm-publish-coverage",
+    "stories": "tfm-stories --plugin",
+    "stories:build": "tfm-build-stories --plugin",
+    "stories:deploy": "surge --project .storybook-dist"
   },
   "repository": {
     "type": "git",
@@ -20,106 +20,26 @@
   "bugs": {
     "url": "http://projects.theforeman.org/projects/foreman_rh_cloud/issues"
   },
-  "optionalDependencies": {
-    "babel-plugin-module-resolver": "^3.2.0"
+  "peerDependencies": {
+    "@theforeman/vendor": ">= 4.0.2"
   },
   "devDependencies": {
-    "@storybook/addon-actions": "^5.0.1",
-    "@storybook/addon-knobs": "^5.0.1",
-    "@storybook/react": "^5.0.1",
-    "babel-cli": "^6.10.1",
-    "babel-core": "^6.26.3",
-    "babel-eslint": "^8.2.3",
-    "babel-jest": "^23.6.0",
-    "babel-loader": "^7.1.1",
-    "babel-plugin-dynamic-import-node": "^2.0.0",
-    "babel-plugin-lodash": "^3.3.4",
-    "babel-plugin-syntax-dynamic-import": "^6.18.0",
-    "babel-plugin-transform-class-properties": "^6.24.1",
-    "babel-plugin-transform-object-assign": "^6.8.0",
-    "babel-plugin-transform-object-rest-spread": "^6.8.0",
-    "babel-preset-env": "^1.7.0",
-    "babel-preset-react": "^6.5.0",
-    "coveralls": "^3.0.0",
-    "enzyme": "^3.4.0",
-    "enzyme-adapter-react-16": "^1.4.0",
-    "enzyme-to-json": "^3.2.1",
-    "eslint": "^4.10.0",
-    "eslint-import-resolver-babel-module": "^4.0.0",
-    "eslint-plugin-patternfly-react": "0.2.0",
-    "identity-obj-proxy": "^3.0.0",
-    "jed": "^1.1.1",
-    "jest-cli": "^23.6.0",
-    "jest-prop-type-error": "^1.1.0",
-    "node-sass": "^4.5.0",
-    "patternfly": "^3.58.0",
+    "@babel/core": "^7.7.0",
+    "@theforeman/builder": "^4.0.2",
+    "@theforeman/stories": "^4.0.2",
+    "@theforeman/test": "^4.0.2",
+    "@theforeman/vendor-dev": "^4.0.2",
+    "@theforeman/eslint-plugin-foreman": "^4.0.2",
+    "babel-eslint": "^10.0.0",
+    "eslint": "^6.7.2",
     "prettier": "^1.13.5",
     "raf": "^3.4.0",
-    "react-redux-test-utils": "^0.1.1",
-    "react-remarkable": "^1.1.3",
-    "sass-loader": "^6.0.7",
     "stylelint": "^9.3.0",
     "stylelint-config-standard": "^18.0.0",
     "surge": "^0.20.3"
   },
   "dependencies": {
-    "babel-polyfill": "^6.26.0",
-    "classnames": "^2.2.5",
-    "lodash": "^4.17.10",
-    "patternfly-react": "^2.19.1",
-    "prop-types": "^15.6.0",
-    "react": "^16.4.0",
-    "react-dom": "^16.4.0",
-    "react-intl": "^2.8.0",
-    "react-redux": "^5.0.6",
-    "redux": "^3.6.0",
-    "redux-thunk": "^2.2.0",
-    "reselect": "^3.0.1",
-    "seamless-immutable": "^7.1.2",
-    "urijs": "^1.18.10",
-    "uuid": "^3.0.1"
-  },
-  "jest": {
-    "automock": true,
-    "verbose": true,
-    "testMatch": [
-      "**/*.test.js"
-    ],
-    "testURL": "http://localhost/",
-    "collectCoverage": true,
-    "collectCoverageFrom": [
-      "webpack/**/*.js",
-      "!webpack/index.js",
-      "!webpack/test_setup.js",
-      "!webpack/**/bundle*",
-      "!webpack/stories/**",
-      "!webpack/**/*stories.js"
-    ],
-    "coverageReporters": [
-      "lcov"
-    ],
-    "unmockedModulePathPatterns": [
-      "webpack/",
-      "react",
-      "node_modules/"
-    ],
-    "moduleNameMapper": {
-      "^.+\\.(png|gif|css|scss)$": "identity-obj-proxy"
-    },
-    "globals": {
-      "__testing__": true
-    },
-    "transform": {
-      "^.+\\.js$": "babel-jest"
-    },
-    "moduleDirectories": [
-      "node_modules",
-      "webpack"
-    ],
-    "setupFiles": [
-      "raf/polyfill",
-      "jest-prop-type-error",
-      "./webpack/test_setup.js"
-    ]
+    "jed": "^1.1.1",
+    "react-intl": "^2.8.0"
   }
 }