foreman_maintain 1.7.9 → 1.7.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ef6daeffa7c5ac0f3f826b0cfadfd401989c2c0c07e55ff523cb517a558a167
-  data.tar.gz: 567bf5f018e6b059c65a3797469756d0fb86bd406831a075424782a8568c255f
+  metadata.gz: 4943a31799b110a35f93236554fbeb25969a145f316bd97445b6c8a88d4bd3cc
+  data.tar.gz: 4b8aeb1d31fdc7b79b90ee2407fb8fcd8c5e509150d017f78e7eed776884aea2
 SHA512:
-  metadata.gz: f302f2c42d28400e31dcd05af5d6123bdaca0b714424057dd67de57a8350af10fedc92a53e66df3b7ab9cf633f5eacea1f0483c2cd4affb196a1312b3f904e51
-  data.tar.gz: 919a172809a07aeab718e332f59bcc93ec773510779134b5af6208b7904a9384b8851cb4d284883969fb115c255864c047c5890f2c99ea76931a748096e3d602
+  metadata.gz: c92f1b9cb4b1a72efcfe395a0500b28687a2ffd554f9249131ea2ffde0dbb67e1897052c01b2ae042fe4c958978d1e95100fe96a8a676a2043563e866b1e5ea7
+  data.tar.gz: 4a4ae91c74d948e5cac7a663c59d2740b8b3e6d72786cca4632991b6cb9f2b71b2dddf2fe933d2b9a41aba3715b1f04c8db4a356c78c95f3932e7e1a2a38b198

data/definitions/checks/check_sha1_certificate_authority.rb

@@ -16,14 +16,33 @@ class Checks::CheckSha1CertificateAuthority < ForemanMaintain::Check
 
     return unless server_ca
 
-    certificate = OpenSSL::X509::Certificate.new(File.read(server_ca))
+    begin
+      certificates = load_fullchain(server_ca)
+    rescue OpenSSL::X509::CertificateError
+      assert(false, "Error reading server CA certificate #{server_ca}.")
+    else
+      msg = <<~MSG
+        Server CA certificate #{server_ca} signed with sha1 which will break on upgrade.
+        Update the server CA certificate with one signed with sha256 or
+        stronger then proceed with the upgrade.
+      MSG
 
-    msg = <<~MSG
-      Server CA certificate signed with sha1 which will break on upgrade.
-      Update the server CA certificate with one signed with sha256 or
-      stronger then proceed with the upgrade.
-    MSG
+      assert(
+        certificates.all? { |cert| cert.signature_algorithm != 'sha1WithRSAEncryption' },
+        msg
+      )
+    end
+  end
 
-    assert(certificate.signature_algorithm != 'sha1WithRSAEncryption', msg)
+  def load_fullchain(bundle_pem)
+    if OpenSSL::X509::Certificate.respond_to?(:load_file)
+      OpenSSL::X509::Certificate.load_file(bundle_pem)
+    else
+      # Can be removed when only Ruby with load_file support is supported
+      File.binread(bundle_pem).
+        lines.
+        slice_after(/END CERTIFICATE/).
+        map { |pem| OpenSSL::X509::Certificate.new(pem.join) }
+    end
   end
 end

data/definitions/features/pulpcore.rb

@@ -25,7 +25,14 @@ class Features::Pulpcore < ForemanMaintain::Feature
   end
 
   def running_tasks
-    cli('task list --state-in running --state-in canceling')
+    tasks = cli('task list --state-in running --state-in canceling')
+    # cli() uses parse_json() which swallows JSON::ParserError and returns nil
+    # but running_tasks should return an Array
+    if tasks.nil?
+      []
+    else
+      tasks
+    end
   rescue ForemanMaintain::Error::ExecutionError
     []
   end

data/lib/foreman_maintain/version.rb

@@ -1,3 +1,3 @@
 module ForemanMaintain
-  VERSION = '1.7.9'.freeze
+  VERSION = '1.7.11'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 1.7.9
+  version: 1.7.11
 platform: ruby
 authors:
 - Ivan Nečas
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-06 00:00:00.000000000 Z
+date: 2025-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -411,7 +411,7 @@ homepage: https://github.com/theforeman/foreman_maintain
 licenses:
 - GPL-3.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -430,7 +430,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.3.27
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Foreman maintenance tool belt
 test_files: []