smart_proxy_container_gateway 4.0.2 → 4.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 271e1e6cb4519a3267a367bcfb454ff673031b470be686f4442906ff8d522326
-  data.tar.gz: b7d8d2610a9a7bb307b198bdc8e25e4d476fcee2c5e95e9d5d0aba35612448fa
+  metadata.gz: 4071f3495101c182650fbb5a894701d1d60d6a552eb43e4f1f7e07c558e75d7e
+  data.tar.gz: d7b251ba17c8e9360bc7fe88bbca8764be924f16ec41b061be0dc525604cebae
 SHA512:
-  metadata.gz: edadb66c3f7a9633d1e20f423d2d34a23dfac78085b1d23ed0add423bb1d1b564698e24401d3eeacf650a36d25f180d4a10158175f6590b1315d432dcf75c2ae
-  data.tar.gz: 880574aea904a3b8fe068b3c35250c47572ef47193be75687efdd4407c4d71dbc00a2e48b964746b5b3295f54f47858ea2c86a6c24ac107a078065690f44d068
+  metadata.gz: c6c2eede99c97f359b6a9803b94eeab8d74325b84e2fb381c71e7a1626a7248c7f098737a8bbf2fb4418f0f0b246bae7e6084d69d7b05404ae133f5b9b30cf64
+  data.tar.gz: 88d1890fcd6a3c2ca7724151175cc29badc8ae21b7a1e94a7f7098c20d18a777c133c874d25598c47fb7d2cf1435d50b1d0e6fd3ae9603c43ae10da0d715bd0b

data/README.md

@@ -30,7 +30,7 @@ The Container Gateway plugin requires a Pulp 3 instance to connect to.  Related
 ```
 :pulp_endpoint: 'https://your_pulp_3_server_here.com'
 :pulp_client_ssl_cert: 'Path to X509 certificate for authenticating with Pulp'
-:pulp_client_ssl_key: 'Path to RSA private key for the Pulp certificate'
+:pulp_client_ssl_key: 'Path to private key for the Pulp certificate'
 ```
 
 # Database information

data/lib/smart_proxy_container_gateway/container_gateway_api.rb

@@ -78,10 +78,19 @@ module Proxy
         if pulp_response.code.to_i >= 400
           status pulp_response.code.to_i
           body pulp_response.body
-        else
+        elsif [301, 302, 307].include?(pulp_response.code.to_i)
           redirection_uri = URI(pulp_response['location'])
           redirection_uri.host = URI(container_gateway_main.client_endpoint).host
           redirect(redirection_uri.to_s)
+        else
+          status pulp_response.code.to_i
+          digest = pulp_response['docker-content-digest']
+          content_type = pulp_response['content-type']
+          content_length = pulp_response['content-length']
+          response.headers['Docker-Content-Digest'] = digest if digest
+          response.headers['Content-Type'] = content_type if content_type
+          response.headers['Content-Length'] = content_length if content_length
+          body pulp_response.body
         end
       end
 
@@ -181,11 +190,11 @@ module Proxy
       get '/v2/token' do
         response.headers['Docker-Distribution-API-Version'] = 'registry/2.0'
 
-        # 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?
+        # 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?
           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/container_gateway_main.rb

@@ -19,9 +19,7 @@ module Proxy
         @client_endpoint = client_endpoint || pulp_endpoint
         @pulp_client_ssl_ca = pulp_client_ssl_ca
         @pulp_client_ssl_cert = OpenSSL::X509::Certificate.new(File.read(pulp_client_ssl_cert))
-        @pulp_client_ssl_key = OpenSSL::PKey::RSA.new(
-          File.read(pulp_client_ssl_key)
-        )
+        @pulp_client_ssl_key = OpenSSL::PKey.read(File.read(pulp_client_ssl_key))
       end
       # rubocop:enable Metrics/ParameterLists, Layout/LineLength
 

data/lib/smart_proxy_container_gateway/version.rb

@@ -1,5 +1,5 @@
 module Proxy
   module ContainerGateway
-    VERSION = '4.0.2'.freeze
+    VERSION = '4.0.4'.freeze
   end
 end

metadata

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