foreman_rh_cloud 13.2.2 → 13.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dfa11165fb0df8c45bf5e18b6f2611b8e63fc771937efa1288adf0b7b3dce15f
-  data.tar.gz: a6f2ecf8a2a1de5aa57374535d3c974f6390d40439e0434f4267ce5e521fe05c
+  metadata.gz: 626ea42063dcd5c2b6ab1c8548b99039a64eb49570e828e416699a05e3fd8e4e
+  data.tar.gz: a1b14513544d7bf58ac8344364333e8517eaee6a444f57aab61a0b4efe8b6807
 SHA512:
-  metadata.gz: c590acf7aa733f22104dd673226a3f5652535e27fd6c6dbc2684e21d29adc30fe848db31b772112a0ee8889adb77f1c5795afae7144c9c8cab83106b5c4c052b
-  data.tar.gz: '02668725a8090ca3c1629e664ac296e716abe6f8da5b1f9dabd4eba297e4dc517f3125439ff9ac5825dfb1225c48b6f507ea0a0803ab1217eebcd87db9b95c2a'
+  metadata.gz: 9fc3cfd8db7340f6262802328a902ffe72fb68157ba2dbff2d85fa66c5e683144ac7fe38989e0e2fafbf2e2a39bd358723454438feec4699554e9e0985699082
+  data.tar.gz: 39c5017bb1d123f6e960e9cd7ed6578a4efe2cef613b9a808c4345a0aa89b6218c956de88175091417499f966bd06c950648442a887371cbee5f8ce4a34e05e5

data/app/services/foreman_rh_cloud/insights_api_forwarder.rb

@@ -224,14 +224,21 @@ module ForemanRhCloud
     def scope_request?(original_request, path)
       return nil unless original_request.get?
 
-      # Only consider patterns that define tag_name - this ensures patterns without
-      # tag_name (permission-only entries) cannot override tag-supporting patterns
-      matching_patterns = SCOPED_REQUESTS.select { |pattern| pattern[:tag_name] && pattern[:test].match?(path) }
+      # Find patterns that match this path AND are relevant for GET requests.
+      # A pattern is relevant if it either:
+      # - Has tag_name defined (supports scoping)
+      # - Has GET permissions defined (explicitly handles GET, even without tags)
+      # This ensures patterns like api/vulnerability/v1/cves/[^/]+$ (GET without tags)
+      # take precedence over general patterns, while POST-only patterns are ignored.
+      matching_patterns = SCOPED_REQUESTS.select do |pattern|
+        pattern[:test].match?(path) && (pattern[:tag_name] || pattern.dig(:permissions, 'GET'))
+      end
       return nil if matching_patterns.empty?
 
-      # Choose the most specific pattern by regex source length for consistency
-      # with required_permission_for behavior
+      # Choose the most specific pattern by regex source length
       request_pattern = matching_patterns.max_by { |pattern| pattern[:test].source.length }
+
+      # Return the tag_name (may be nil if the most specific pattern doesn't support tags)
       request_pattern[:tag_name]
     end
 

data/lib/foreman_inventory_upload.rb

@@ -1,10 +1,10 @@
 module ForemanInventoryUpload
   def self.base_folder
     # in production setup, where selinux is enabled, we only have rights to
-    # create folders under /ver/lib/foreman. If the folder does not exist, it's
-    # a dev setup, where we can use our current root
+    # create folders under /var/lib/foreman. If the folder does not exist, it's
+    # a dev setup, where we can use the parent of the current working directory
     @base_folder ||= File.join(
-      Dir.glob('/var/lib/foreman').first || Dir.getwd,
+      Dir.glob('/var/lib/foreman').first || File.dirname(Dir.getwd),
       'red_hat_inventory/'
     )
   end
@@ -30,11 +30,6 @@ module ForemanInventoryUpload
     File.join(ForemanInventoryUpload.done_folder, filename)
   end
 
-  def self.report_file_paths(organization_id)
-    filename = facts_archive_name(organization_id)
-    Dir[ForemanInventoryUpload.uploads_file_path(filename), ForemanInventoryUpload.done_file_path(filename)]
-  end
-
   def self.generated_reports_folder
     @generated_reports_folder ||= ensure_folder(
       File.join(
@@ -44,6 +39,26 @@ module ForemanInventoryUpload
     )
   end
 
+  def self.generated_reports_file_path(filename)
+    File.join(ForemanInventoryUpload.generated_reports_folder, filename)
+  end
+
+  def self.report_file_paths(organization_id)
+    filename = facts_archive_name(organization_id)
+    # Report files start in generated
+    # They are then MOVED (not copied) to uploads, then done.
+    # When they are moved to the new folder, they overwrite any file with the same name.
+    # If it's a generate-only, it will be in generated
+    # Failed or incomplete uploads will be in uploads
+    # Completed uploads will be in done
+    # The ordering here ensures we get the correct file path every time.
+    Dir[
+      ForemanInventoryUpload.generated_reports_file_path(filename),
+      ForemanInventoryUpload.uploads_file_path(filename),
+      ForemanInventoryUpload.done_file_path(filename),
+    ]
+  end
+
   def self.outputs_folder
     @outputs_folder ||= ensure_folder(File.join(ForemanInventoryUpload.base_folder, 'outputs/'))
   end

data/lib/foreman_rh_cloud/version.rb

@@ -1,3 +1,3 @@
 module ForemanRhCloud
-  VERSION = '13.2.2'.freeze
+  VERSION = '13.2.4'.freeze
 end

data/package.json

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_rh_cloud
 version: !ruby/object:Gem::Version
-  version: 13.2.2
+  version: 13.2.4
 platform: ruby
 authors:
 - Foreman Red Hat Cloud team