smart_proxy_container_gateway 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b4cb6e121153f6b5e5688c79f71d45a7c6b3787a1662df5481b965e8932b3e7f
-  data.tar.gz: b320254d5ff2858487a58dbd63defdfd20d0b9fb7a6d2fde8fe1028d2eb9cecb
+  metadata.gz: 4a911ad6150f04b74e216b6f23aa6ac56e95d40b9e356a9a10ff371910e3f417
+  data.tar.gz: d4555205824e57baadc3dbadb8e27a417dea5c473d9ad8523d48364a87bc3116
 SHA512:
-  metadata.gz: 3ad8f095b5450474a87a091b2c8e0807e0aa0a2780dec65e42c114bac24f3bc209d2aee7cf715983b87d91a4bac3767150cf91bbc03757943bd4748a920d3424
-  data.tar.gz: 18d5c87875083932ff68abe7095872487250cbe2e0e15637031766d8facd12f5d2eac443a6a377b724e3b378df89d5ffd73be056407f09855866ebf437cdb505
+  metadata.gz: dde5105d42b3b1c566f8713e2e0727dd8af35417266f44bc74b86ea06263c290272f92d2caaa023cc0a23cc7ca9551e2f5b1c7e7b57e1fc061ea13e53aca51ae
+  data.tar.gz: 2710e2eed201d458c22193ae9f06ccd78b3de6e9a669585de93970646d2cdeff2f1f88aee428d4b1c7f9c46108f00f61aa115b2dcfca7ed5b2ee2bb7fbd3aa88

data/lib/smart_proxy_container_gateway/container_gateway.rb

@@ -5,14 +5,23 @@ module Proxy
     class Plugin < ::Proxy::Plugin
       plugin 'container_gateway', Proxy::ContainerGateway::VERSION
 
-      default_settings :pulp_endpoint => "https://#{`hostname`.strip}",
-                       :katello_registry_path => '/v2/',
-                       :sqlite_db_path => '/var/lib/foreman-proxy/smart_proxy_container_gateway.db'
+      begin
+        SETTINGS = Proxy::Settings.initialize_global_settings
 
-      http_rackup_path File.expand_path('smart_proxy_container_gateway/container_gateway_http_config.ru',
-                                        File.expand_path('..', __dir__))
-      https_rackup_path File.expand_path('smart_proxy_container_gateway/container_gateway_http_config.ru',
-                                         File.expand_path('..', __dir__))
+        default_settings :pulp_endpoint => "https://#{`hostname`.strip}",
+                         :pulp_client_ssl_ca => SETTINGS.foreman_ssl_ca,
+                         :pulp_client_ssl_cert => SETTINGS.foreman_ssl_cert,
+                         :pulp_client_ssl_key => SETTINGS.foreman_ssl_key,
+                         :katello_registry_path => '/v2/',
+                         :sqlite_db_path => '/var/lib/foreman-proxy/smart_proxy_container_gateway.db'
+      rescue Errno::ENOENT
+        logger.warn("Default settings could not be loaded.  Default certs will not be set.")
+        default_settings :pulp_endpoint => "https://#{`hostname`.strip}",
+                         :katello_registry_path => '/v2/',
+                         :sqlite_db_path => '/var/lib/foreman-proxy/smart_proxy_container_gateway.db'
+      end
+
+      rackup_path File.join(__dir__, 'container_gateway_http_config.ru')
     end
   end
 end

data/lib/smart_proxy_container_gateway/container_gateway_main.rb

@@ -10,6 +10,7 @@ module Proxy
     class << self
       def pulp_registry_request(uri)
         http_client = Net::HTTP.new(uri.host, uri.port)
+        http_client.ca_file = pulp_ca
         http_client.cert = pulp_cert
         http_client.key = pulp_key
         http_client.use_ssl = true
@@ -116,13 +117,17 @@ module Proxy
         Sequel::Migrator.run(db_connection, "#{container_gateway_path}/smart_proxy_container_gateway/sequel_migrations")
       end
 
+      def pulp_ca
+        Proxy::ContainerGateway::Plugin.settings.pulp_client_ssl_ca
+      end
+
       def pulp_cert
-        OpenSSL::X509::Certificate.new(File.open(Proxy::ContainerGateway::Plugin.settings.pulp_client_ssl_cert, 'r').read)
+        OpenSSL::X509::Certificate.new(File.read(Proxy::ContainerGateway::Plugin.settings.pulp_client_ssl_cert))
       end
 
       def pulp_key
         OpenSSL::PKey::RSA.new(
-          File.open(Proxy::ContainerGateway::Plugin.settings.pulp_client_ssl_key, 'r').read
+          File.read(Proxy::ContainerGateway::Plugin.settings.pulp_client_ssl_key)
         )
       end
     end

data/lib/smart_proxy_container_gateway/version.rb

@@ -1,5 +1,5 @@
 module Proxy
   module ContainerGateway
-    VERSION = '1.0.1'.freeze
+    VERSION = '1.0.2'.freeze
   end
 end

data/settings.d/container_gateway.yml.example

@@ -1,6 +1,8 @@
 ---
 :enabled: true
 :pulp_endpoint: 'https://your_pulp_3_server_here.com'
+:pulp_client_ssl_ca: 'CA Cert for authenticating with Pulp'
 :pulp_client_ssl_cert: 'X509 certificate for authenticating with Pulp'
 :pulp_client_ssl_key: 'RSA private key for the Pulp certificate'
+:katello_registry_path: 'Katello container registry suffix, e.g., /v2/'
 :sqlite_db_path: '/var/lib/foreman-proxy/smart_proxy_container_gateway.db'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_container_gateway
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Ian Ballou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-26 00:00:00.000000000 Z
+date: 2021-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel