Merge branch 'master' into fix-auth-repo

.github/workflows/lint-unit.yml

@@ -52,6 +52,8 @@ jobs:
           --health-retries=3
 
     steps:
+      - name: Install dependencies
+        run: sudo apt-get install -y libsqlite3-dev
       - uses: actions/checkout@v4
 
       # Run bundle install and cache the installed gems
@@ -96,4 +98,4 @@ jobs:
         run: |
           echo "::group::Version verification checks"
           ruby ci/check-version-matches.rb
-          echo "::endgroup::"
+          echo "::endgroup::"

Gemfile.lock

@@ -115,7 +115,7 @@ GEM
     fuubar (2.5.1)
       rspec-core (~> 3.0)
       ruby-progressbar (~> 1.4)
-    gettext (3.4.9)
+    gettext (3.5.0)
       erubi
       locale (>= 2.0.5)
       prime
@@ -144,12 +144,12 @@ GEM
       concurrent-ruby (~> 1.0)
     json (2.3.1)
     jsonapi-renderer (0.2.2)
-    jwt (2.9.3)
+    jwt (2.10.1)
       base64
     listen (3.6.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    locale (2.1.3)
+    locale (2.1.4)
     loofah (2.23.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
@@ -172,7 +172,7 @@ GEM
     parallel (1.22.1)
     parser (3.1.2.1)
       ast (~> 2.4.1)
-    prime (0.1.2)
+    prime (0.1.3)
       forwardable
       singleton
     prometheus-client (4.2.3)
@@ -290,7 +290,7 @@ GEM
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
-    singleton (0.1.1)
+    singleton (0.3.0)
     spring (2.1.1)
     spring-commands-rspec (1.0.4)
       spring (>= 0.9.1)

app/controllers/api/connect/v3/systems/products_controller.rb

@@ -16,7 +16,7 @@ def show
     if @product.identifier.casecmp?('sles')
       # if system has SLE Micro
       # it should access to SLES products
-      sle_micro = @system.products.any? { |p| p.identifier.downcase.include?('sle-micro') }
+      sle_micro = @system.products.any? { |p| p.identifier.downcase.include?('micro') }
       sle_micro_same_arch = @system.products.pluck(:arch).include?(@product.arch) if sle_micro
     end
     if @system.products.include?(@product) || sle_micro_same_arch

engines/strict_authentication/app/controllers/strict_authentication/authentication_controller.rb

@@ -40,7 +40,7 @@ def all_allowed_paths(headers)
       all_product_versions = @system.products.map { |p| Product.where(identifier: p.identifier, arch: p.arch) }.flatten
       allowed_paths = all_product_versions.map { |prod| prod.repositories.pluck(:local_path) }.flatten
       # Allow SLE Micro to access all free SLES repositories
-      sle_micro = @system.products.any? { |p| p.identifier.downcase.include?('sle-micro') }
+      sle_micro = @system.products.any? { |p| p.identifier.downcase.include?('micro') }
       if sle_micro
         system_products_archs = @system.products.pluck(:arch)
         product_free_sles_modules_only = Product.where(
@@ -59,7 +59,7 @@ def all_allowed_paths(headers)
       manager_prod = @system.products.any? do |p|
         manager = p.identifier.downcase.include?('manager-server')
         # SUMA 5.0 must have access to SUMA 4.3, 4.2 and so on
-        micro = p.identifier.downcase.include?('sle-micro')
+        micro = p.identifier.downcase.include?('micro')
         instance_id_header = headers.fetch('X-Instance-Identifier', '').casecmp('suse-manager-server').zero?
         instance_version_header = headers.fetch('X-Instance-Version', '0').split('.')[0] >= '5'
         manager || (micro && instance_id_header && instance_version_header)

package/obs/rmt-server.changes

@@ -1,3 +1,10 @@
+Mon Dec 23 14:07:00 UTC 2024 - Luís Caparroz <lcaparroz@suse.com>
+
+- Version 2.21
+  * Allow users to configure the SUMA product tree base URL to download
+    'product_tree.json' from host other than 'scc.suse.com'. (bsc#1234844)
+  * Update Micro check due to Micro 6.0 and 6.1 identifier to keep bsc#1230419 in place
+
 -------------------------------------------------------------------
 Mon Dec 23 08:03:56 UTC 2024 - Parag Jain <parag.jain@suse.com>