foreman_rh_cloud 3.0.29 → 3.0.32

data/lib/foreman_inventory_upload/generators/fact_helpers.rb

@@ -104,7 +104,9 @@ module ForemanInventoryUpload
       end
 
       def obfuscate_ip(ip, ips_dict)
-        "10.230.230.#{ips_dict.count + 1}"
+        max_obfuscated = ips_dict.values.map { |v| IPAddr.new(v).to_i }.max || IPAddr.new('10.230.230.0').to_i
+
+        IPAddr.new(max_obfuscated + 1, Socket::AF_INET).to_s
       end
 
       def bios_uuid(host)

data/lib/foreman_inventory_upload/generators/tags.rb

@@ -13,7 +13,7 @@ module ForemanInventoryUpload
           organizations +
           content_data +
           satellite_server_data
-        ).reject { |key, value| value.empty? }
+        ).reject { |key, value| value.empty? }.map { |key, value| [key, truncated_value(value)] }
       end
 
       def generate_parameters
@@ -22,6 +22,7 @@ module ForemanInventoryUpload
         (@host.host_inherited_params_objects || [])
           .map { |item| [item.name, item.value] }
           .select { |_name, value| value.present? || value.is_a?(FalseClass) }
+          .map { |key, value| [key, truncated_value(value)] }
       end
 
       private
@@ -58,6 +59,12 @@ module ForemanInventoryUpload
           ['organization_id', @host.organization_id.to_s],
         ]
       end
+
+      def truncated_value(value)
+        return 'Original value exceeds 250 characters' if value.to_s.length > 250
+
+        value
+      end
     end
   end
 end

data/lib/foreman_rh_cloud/version.rb

@@ -1,3 +1,3 @@
 module ForemanRhCloud
-  VERSION = '3.0.29'.freeze
+  VERSION = '3.0.32'.freeze
 end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "foreman_rh_cloud",
-  "version": "3.0.29",
+  "version": "3.0.32",
   "description": "Inventory Upload =============",
   "main": "index.js",
   "scripts": {

data/test/unit/fact_helpers_test.rb

@@ -30,13 +30,13 @@ class FactHelpersTest < ActiveSupport::TestCase
   test 'obfuscates ips with insights-client data' do
     host = mock('host')
     @instance.expects(:fact_value).with(host, 'insights_client::ips').returns(
-      '[{"obfuscated": "10.230.230.1", "original": "224.0.0.1"}, {"obfuscated": "10.230.230.2", "original": "224.0.0.251"}]'
+      '[{"obfuscated": "10.230.230.1", "original": "224.0.0.1"}, {"obfuscated": "10.230.230.255", "original": "224.0.0.251"}]'
     )
 
     actual = @instance.obfuscated_ips(host)
 
     assert_equal '10.230.230.1', actual['224.0.0.1']
-    assert_equal '10.230.230.3', actual['224.0.0.2']
+    assert_equal '10.230.231.0', actual['224.0.0.2']
   end
 
   test 'obfuscates ips without insights-client data' do

data/test/unit/services/foreman_rh_cloud/cloud_request_forwarder_test.rb

@@ -139,4 +139,21 @@ class CloudRequestForwarderTest < ActiveSupport::TestCase
     )
     assert_equal params.merge(:branch_id => 74), @forwarder.prepare_forward_params(req, 74)
   end
+
+  test 'should forward content type correctly' do
+    user_agent = { :foo => :bar }
+    params = { :page => 5, :per_page => 42 }
+
+    req = ActionDispatch::Request.new(
+      'REQUEST_URI' => '/foo/bar',
+      'REQUEST_METHOD' => 'GET',
+      'HTTP_USER_AGENT' => user_agent,
+      'rack.input' => ::Puma::NullIO.new,
+      'action_dispatch.request.query_parameters' => params
+    )
+
+    actual = @forwarder.prepare_request_opts(req, 'TEST PAYLOAD', params, { cert: @cert1, key: OpenSSL::PKey::RSA.new(1024).to_pem })
+
+    assert_match /text\/html/, actual[:headers][:content_type]
+  end
 end

data/test/unit/tags_generator_test.rb

@@ -103,6 +103,21 @@ class TagsGeneratorTest < ActiveSupport::TestCase
     assert_equal 0, actual.count
   end
 
+  test 'truncates parameter tags' do
+    FactoryBot.create(:setting, :name => 'include_parameter_tags', :settings_type => "boolean", :category => "Setting::RhCloud", :default => false, :value => true)
+
+    @host.stubs(:host_inherited_params_objects).returns(
+      [
+        OpenStruct.new(name: 'str_param', value: 'a' * 251),
+      ]
+    )
+
+    generator = create_generator
+    actual = Hash[generator.generate_parameters]
+
+    assert_equal 'Original value exceeds 250 characters', actual['str_param']
+  end
+
   private
 
   def create_generator

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_rh_cloud
 version: !ruby/object:Gem::Version
-  version: 3.0.29
+  version: 3.0.32
 platform: ruby
 authors:
 - Foreman Red Hat Cloud team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-29 00:00:00.000000000 Z
+date: 2022-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: katello
@@ -188,6 +188,7 @@ files:
 - app/views/layouts/foreman_rh_cloud/application.html.erb
 - config/Gemfile.lock.gh_test
 - config/database.yml.example
+- config/package-lock.json
 - config/package-lock.json.gh_test
 - config/package-lock.json.plugin
 - config/routes.rb