smart_proxy_container_gateway 4.0.1 → 4.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a01a1e754296f18b28317601696673a14cc92a659075bdbee7110f0ece741fde
-  data.tar.gz: f7a2cee7c0614ae57c40feceb763cdc90418a65cb3f46abba6a3e737069d7839
+  metadata.gz: 51be06cfca565b2e088e6f96c24d4b8eacb5818b0a8a9c8696910864302e7eaa
+  data.tar.gz: 3b166dc90aef6c94cf45f5846cebbf67a89398600043db1065dd8ea1d367b0ce
 SHA512:
-  metadata.gz: 74b6d9ccba0abfd033aafa58ebf24b2184e5fc30c56806e2daad4a6c8b77d83de216ae3c40a3a88d5a15403aa5f9058d589ae3a1ab93453f531cf2a9c2f7e452
-  data.tar.gz: 116df0b2b7104833188841b42ea21b541a288af99be1b3538c41fad7c1c6d45b049ff05704e9df0088a0fcb9ca678eee08e9692a40c043302046335364379f0b
+  metadata.gz: 115ddb179a2f0c07e956fc104a93e2d9b09c96ff79c32cc5ce4559a6880c58ea3318b6df7e91b146d74f2bad38a26a8346a97633cb4fa4f08a5ac183b34ea71f
+  data.tar.gz: '08b1fcac07ae9a2ecc9186f70fceac3369080035775a49966638c4d4f41fdd6db2cdc2230d0de9a24690a2e1870c673baffeba30b1c73e1f23c6fc771f7ac09a'

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'
 
-        # 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/sequel_migrations/006_bigint_ids.rb

@@ -0,0 +1,69 @@
+# rubocop:disable Metrics/BlockLength
+Sequel.migration do
+  up do
+    # SQLite's INTEGER type already supports 64-bit integers, skip for SQLite
+    # database_type returns the database adapter type (e.g., :sqlite, :postgres, :mysql)
+    unless database_type.to_s.include?('sqlite')
+      alter_table(:repositories) do
+        set_column_type :id, :bigint
+      end
+
+      alter_table(:users) do
+        set_column_type :id, :bigint
+      end
+
+      alter_table(:hosts) do
+        set_column_type :id, :bigint
+      end
+
+      alter_table(:authentication_tokens) do
+        set_column_type :id, :bigint
+        set_column_type :user_id, :bigint
+      end
+
+      alter_table(:repositories_users) do
+        set_column_type :repository_id, :bigint
+        set_column_type :user_id, :bigint
+      end
+
+      alter_table(:hosts_repositories) do
+        set_column_type :host_id, :bigint
+        set_column_type :repository_id, :bigint
+      end
+    end
+  end
+
+  down do
+    # SQLite's INTEGER type already supports 64-bit integers, skip for SQLite
+    # database_type returns the database adapter type (e.g., :sqlite, :postgres, :mysql)
+    unless database_type.to_s.include?('sqlite')
+      alter_table(:hosts_repositories) do
+        set_column_type :host_id, :integer
+        set_column_type :repository_id, :integer
+      end
+
+      alter_table(:repositories_users) do
+        set_column_type :repository_id, :integer
+        set_column_type :user_id, :integer
+      end
+
+      alter_table(:authentication_tokens) do
+        set_column_type :user_id, :integer
+        set_column_type :id, :integer
+      end
+
+      alter_table(:hosts) do
+        set_column_type :id, :integer
+      end
+
+      alter_table(:users) do
+        set_column_type :id, :integer
+      end
+
+      alter_table(:repositories) do
+        set_column_type :id, :integer
+      end
+    end
+  end
+end
+# rubocop:enable Metrics/BlockLength

data/lib/smart_proxy_container_gateway/version.rb

@@ -1,5 +1,5 @@
 module Proxy
   module ContainerGateway
-    VERSION = '4.0.1'.freeze
+    VERSION = '4.0.3'.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.1
+  version: 4.0.3
 platform: ruby
 authors:
 - Ian Ballou
@@ -96,6 +96,7 @@ files:
 - lib/smart_proxy_container_gateway/sequel_migrations/003_authorization_reorg.rb
 - lib/smart_proxy_container_gateway/sequel_migrations/004_users_repositories_cascade_delete.rb
 - lib/smart_proxy_container_gateway/sequel_migrations/005_host_repositories.rb
+- lib/smart_proxy_container_gateway/sequel_migrations/006_bigint_ids.rb
 - lib/smart_proxy_container_gateway/version.rb
 - settings.d/container_gateway.yml.example
 homepage: https://github.com/Katello/smart_proxy_container_gateway