smart_proxy_pulp 3.2.0 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ed75491dd5597b9032d38132676920c2d1ddfc5e52b9462bec134a8188719f4
-  data.tar.gz: a7994ef607521731efa8e2c815825fb3b68227bb0439cd755bf0119d5f59e4bc
+  metadata.gz: 0dc738e9e4af81c22244e4daef6f5f9bc0b46ff8365e80b55013b7adadddb823
+  data.tar.gz: e2cb04bedb9fed3c5dbd180c7f90d0782dc47b6e9f56c501941a78b54b3046cf
 SHA512:
-  metadata.gz: 90a817e0ee2c6b583e907c048ea6f1178777532463a6df2fc4ef3a8fc050e3f119f8711cd23e0a69672f274d811a896d6791556dcd6fdfc53a9a2b1383b9af6b
-  data.tar.gz: 3781082d3bf8644f9cb32c777bcf88d1642a4d77d3acb4ec3fa137cc6ec4a7493c66b2be758c4b19b8e7afefe94af21f0b8b50887796fa0f970f8b6e69ac6178
+  metadata.gz: 4556a56d00efc823d3a149510021c1e52da6cb1aab0225cae0ad90055edf38084ea5903f8873ed1676bac8a0c814b57ac9b6add83edebe87eef4180237384c98
+  data.tar.gz: 7c37ab16f56ab8cb74305fd43434de35a675e8e00d47262835141001c31727a358e269502541aed98717485dd91b561b92f79e91836e5c8414f8e9eeff29147e

data/Gemfile

@@ -1,9 +1,20 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 gemspec
 
-group :development do
-  gem 'smart_proxy', :git => 'https://github.com/theforeman/smart-proxy', :branch => 'develop'
+group :rubocop do
+  gem 'rubocop', '~> 1.28.0'
+  gem 'rubocop-performance'
+  gem 'rubocop-rake'
 end
 
-gem 'sinatra'
-gem 'rack', '>= 1.1'
+group :test do
+  gem 'ci_reporter_test_unit'
+  gem 'mocha', '~> 1'
+  gem 'rack-test'
+  gem 'rake', '~> 13'
+  gem 'smart_proxy', :git => 'https://github.com/theforeman/smart-proxy', :branch => 'develop'
+  gem 'test-unit', '~> 3'
+  gem 'webmock', '~> 3'
+end

data/bundler.d/pulp.rb

@@ -1 +1,3 @@
-gem 'smart_proxy_pulp'
+# frozen_string_literal: true
+
+gem 'smart_proxy_pulp'

data/lib/smart_proxy_pulp.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 require 'smart_proxy_pulp_plugin/version'
 require 'smart_proxy_pulp_plugin/pulpcore_plugin'

data/lib/smart_proxy_pulp_plugin/pulpcore_api.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'sinatra'
 require 'smart_proxy_pulp_plugin/pulpcore_client'
 
@@ -10,6 +12,7 @@ module PulpProxy
       begin
         result = PulpcoreClient.get("/pulp/api/v3/status/")
         return result.body if result.is_a?(Net::HTTPSuccess)
+
         log_halt result.code, "Pulp server at #{PulpcoreClient.pulp_url} returned an error: '#{result.message}'"
       rescue SocketError, Errno::ECONNREFUSED => e
         log_halt 503, "Communication error with '#{URI.parse(PulpcoreClient.pulp_url).host}': #{e.message}"

data/lib/smart_proxy_pulp_plugin/pulpcore_client.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'net/http'
 require 'net/https'
 require 'uri'
@@ -7,15 +9,15 @@ module PulpProxy
   class PulpcoreClient
     def self.get(path)
       uri = URI.parse(pulp_url)
-      req = Net::HTTP::Get.new(URI.join(uri.to_s.chomp('/') + '/', path))
+      req = Net::HTTP::Get.new(URI.join("#{uri.to_s.chomp('/')}/", path))
       req.add_field('Accept', 'application/json')
-      self.http.request(req)
+      http.request(req)
     end
 
     def self.capabilities
       body = JSON.parse(get("/pulp/api/v3/status/").body)
-      body['versions'].map{|item| item['component'] }
-    rescue => e
+      body['versions'].map { |item| item['component'] }
+    rescue StandardError => e
       logger.error("Could not fetch capabilities: #{e.message}")
       []
     end
@@ -25,9 +27,13 @@ module PulpProxy
     end
 
     def self.http
+      ssl_ca = ::PulpProxy::PulpcorePlugin.settings.ssl_ca ||
+               ::Proxy::SETTINGS.foreman_ssl_ca ||
+               ::Proxy::SETTINGS.ssl_ca_file
       uri = URI.parse(pulp_url)
       http = Net::HTTP.new(uri.host, uri.port)
       http.use_ssl = uri.scheme == 'https'
+      http.ca_file = ssl_ca if http.use_ssl? && ssl_ca && !ssl_ca.empty?
       http
     end
 

data/lib/smart_proxy_pulp_plugin/pulpcore_http_config.ru

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'smart_proxy_pulp_plugin/pulpcore_api'
 
 map "/pulpcore" do

data/lib/smart_proxy_pulp_plugin/pulpcore_plugin.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'smart_proxy_pulp_plugin/validators'
 
 module PulpProxy
@@ -16,6 +18,7 @@ module PulpProxy
     validate :content_app_url, :url => true
     validate :client_authentication, :include => AUTH_TYPES
     validate :rhsm_url, :url => true
+    validate :ssl_ca, :file_readable => true
 
     expose_setting :pulp_url
     expose_setting :mirror

data/lib/smart_proxy_pulp_plugin/validators.rb

@@ -1,14 +1,15 @@
+# frozen_string_literal: true
+
 module PulpProxy
   module Validators
     class Include < ::Proxy::PluginValidators::Base
       def validate!(settings)
         setting_value = settings[@setting_name]
+        return true if (setting_value - @params).empty?
 
-        unless (setting_value - @params).empty?
-          raise ::Proxy::Error::ConfigurationError, "Parameter '#{@setting_name}' is expected to be one or more of #{@params}"
-        else
-          true
-        end
+        # rubocop:disable Layout/LineLength
+        raise ::Proxy::Error::ConfigurationError, "Parameter '#{@setting_name}' is expected to be one or more of #{@params}"
+        # rubocop:enable Layout/LineLength
       end
     end
   end

data/lib/smart_proxy_pulp_plugin/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module PulpProxy
-  VERSION = "3.2.0"
+  VERSION = "3.4.0"
 end

data/settings.d/pulpcore.yml.example

@@ -7,3 +7,4 @@
 #:mirror: false
 #:client_authentication: ['password', 'client_certificate']
 #:rhsm_url: https://localhost/rhsm
+#:ssl_ca: /etc/ssl/certs/custom_ca.crt

metadata

@@ -1,86 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_pulp
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.4.0
 platform: ruby
 authors:
 - Dmitri Dolguikh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-02 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: test-unit
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3'
-- !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
-- !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3'
-- !ruby/object:Gem::Dependency
-  name: rack-test
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13'
-description: "    Basic Pulp support for Foreman Smart-Proxy\n"
+date: 2024-10-14 00:00:00.000000000 Z
+dependencies: []
+description: Basic Pulp support for Foreman Smart-Proxy
 email:
 - dmitri@redhat.com
 executables: []
@@ -108,16 +38,19 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: '2.7'
+  - - "<"
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.5.16
 signing_key:
 specification_version: 4
 summary: Basic Pulp support for Foreman Smart-Proxy