smart_proxy_container_gateway 3.5.1 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6313f6d79e13c64566f5a38e8a0ec438a25d97c758a087b2f9d35e7e05474617
-  data.tar.gz: 62cfd803827187877f6f186fda48e298431fc1c04052e6990a3e9a91e2c9222a
+  metadata.gz: 9fcdcfa36eed1f6e070503c159281e5c72e07cfd2b78c7fd08fc67e852b2eadb
+  data.tar.gz: 834e6422b299d6e434c0cddd2923c3fa2d548109655221d8f259ff45e3becb0f
 SHA512:
-  metadata.gz: 1e293529abd32590aaf6876f6db0155fc46c53fd04d1b736ebe9557acb2cc39f54b9e4a98251c7fb9177502ed7ab4dca941058e167a6f4abaea90d45d37cd09e
-  data.tar.gz: c20e07a5add224865098a8ef079ab384f965eb6c60ee24e663719b3f8e6544ed28f365dc74e3431fd9d65ef6725cbfab08e247c6b2013fab9a951b9e38b9c065
+  metadata.gz: 7ef2a0fe40e712fa60e3222a707cac996b279efab0410763191cf69e24679f6cfff5ea2c07263bcb5d7bdefc196706e502d67e52c5411411bf7172a446736634
+  data.tar.gz: 622dacf9d030aec24a60d3581bcb2dbf769bc9beb6d42a2544d0068dd70c10cddc176afe1241df22a8a34cfa29bc6db98b6a8bee650969678af2364c56786e77

data/lib/smart_proxy_container_gateway/container_gateway.rb

@@ -5,8 +5,7 @@ module Proxy
     class Plugin < ::Proxy::Plugin
       plugin 'container_gateway', Proxy::ContainerGateway::VERSION
 
-      default_settings :pulp_endpoint => "https://#{`hostname`.strip}",
-                       :katello_registry_path => '/v2/',
+      default_settings :katello_registry_path => '/v2/',
                        :sqlite_timeout => 30_000,
                        :db_max_connections => 30,
                        :db_pool_timeout => 30

data/lib/smart_proxy_container_gateway/container_gateway_api.rb

@@ -181,11 +181,11 @@ module Proxy
       get '/v2/token' do
         response.headers['Docker-Distribution-API-Version'] = 'registry/2.0'
 
-        # Some clients (e.g. Flatpak, Cincinnati) do not include the account
-        # query parameter in the token request. Extract the username from the
-        # Base64-encoded Basic Authorization header and use it as the account
-        # param when inserting a new token record.
-        if request.params['account'].nil? && auth_header.raw_header.present?
+        # Flatpak client requests do not contain the account param that podman relies on.
+        # It contains Base64 encoded username in the Authorization header.
+        # We need to extract the username from the Authorization header and
+        # set it as the account param to be used when inserting new token record.
+        if flatpak_client? && auth_header.raw_header.present?
           encoded_string = auth_header.raw_header&.split(' ')&.[](1)
           decoded_string = Base64.decode64(encoded_string) if encoded_string.present?
           username = decoded_string.split(':')[0] if decoded_string.present?

data/lib/smart_proxy_container_gateway/version.rb

@@ -1,5 +1,5 @@
 module Proxy
   module ContainerGateway
-    VERSION = '3.5.1'.freeze
+    VERSION = '4.0.0'.freeze
   end
 end

data/settings.d/container_gateway.yml.example

@@ -1,7 +1,7 @@
 ---
 :enabled: true
 
-#:pulp_endpoint: 'https://pulp3.example.com'
+:pulp_endpoint: 'https://pulp3.example.com'
 #:pulp_client_ssl_ca: '/path/to/ca.pem'
 #:pulp_client_ssl_cert: '/path/to/cert.pem'
 #:pulp_client_ssl_key: '/path/to/key.pem'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_container_gateway
 version: !ruby/object:Gem::Version
-  version: 3.5.1
+  version: 4.0.0
 platform: ruby
 authors:
 - Ian Ballou