smart_proxy_container_gateway 1.0.5 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7f64eda929055e1dbf8e33f6f25797f5f01eaec99fc44c68b48cdbb54e3ac24
-  data.tar.gz: 3b82489df2523cc112474f8f88925959123db0ea34848462dcaa3a15aa2f01f0
+  metadata.gz: a8a19a855d3c656839dd81438ead966b638156c97a46ea09b450ba793936267d
+  data.tar.gz: 88aa70dba7e9cc07697e5bc1e6b0424037f32cf8f168eaf36f2794fef7021bac
 SHA512:
-  metadata.gz: 7275b37d4d4e2de7be47377f45790277df201752f429a3d1bea719a7f644b9a59e7b39a312f75d4b6c75d66c2ada8a21970cab2b6ee665ee11c45dfd739d2905
-  data.tar.gz: 0f12062658a3840ddccb627e1e2ef2602e3e53b03b218684ff2f6a733504107a49329237d56f6a0b5ed6669509b422622459f84dc2c66484ddb99f5ec10bfa71
+  metadata.gz: f0d9dedcf24be6bfb3e1137ab99560a036d72ef795cafdcd1de0ccac18ccc60e98404edad4ef77784daca290ed9d8b70e69d1167f52b615a147f7958424b2b0b
+  data.tar.gz: cf2b684b36369d5f3b8213d2d57289b2ce91c2870bf5e72711ec0ede30506cbf618cf09c63e6b289a1a413dfa955b3b43a77f3f00be9961862482e36bd705bd8

data/lib/smart_proxy_container_gateway/container_gateway_api.rb

@@ -25,18 +25,28 @@ module Proxy
         end
       end
 
-      get '/v2/:repository/manifests/:tag/?' do
-        handle_repo_auth(params, auth_header, request)
-        redirection_location = Proxy::ContainerGateway.manifests(params[:repository], params[:tag])
+      get '/v2/*/manifests/*/?' do
+        repository = params[:splat][0]
+        tag = params[:splat][1]
+        handle_repo_auth(repository, auth_header, request)
+        redirection_location = Proxy::ContainerGateway.manifests(repository, tag)
         redirect to(redirection_location)
       end
 
-      get '/v2/:repository/blobs/:digest/?' do
-        handle_repo_auth(params, auth_header, request)
-        redirection_location = Proxy::ContainerGateway.blobs(params[:repository], params[:digest])
+      get '/v2/*/blobs/*/?' do
+        repository = params[:splat][0]
+        digest = params[:splat][1]
+        handle_repo_auth(repository, auth_header, request)
+        redirection_location = Proxy::ContainerGateway.blobs(repository, digest)
         redirect to(redirection_location)
       end
 
+      get '/v2/*/tags/list/?' do
+        repository = params[:splat][0]
+        handle_repo_auth(repository, auth_header, request)
+        Proxy::ContainerGateway.tags(repository)
+      end
+
       get '/v1/search/?' do
         # Checks for podman client and issues a 404 in that case. Podman
         # examines the response from a /v1/search request. If the result
@@ -130,7 +140,7 @@ module Proxy
 
       private
 
-      def handle_repo_auth(params, auth_header, request)
+      def handle_repo_auth(repository, auth_header, request)
         user_token_is_valid = false
         # FIXME: Getting unauthenticated token here...
         if auth_header.present? && auth_header.valid_user_token?
@@ -139,7 +149,7 @@ module Proxy
         end
         username = request.params['account'] if username.nil?
 
-        return if Proxy::ContainerGateway.authorized_for_repo?(params[:repository], user_token_is_valid, username)
+        return if Proxy::ContainerGateway.authorized_for_repo?(repository, user_token_is_valid, username)
 
         redirect_authorization_headers
         halt 401, "unauthorized"

data/lib/smart_proxy_container_gateway/container_gateway_main.rb

@@ -41,6 +41,13 @@ module Proxy
         pulp_registry_request(uri)['location']
       end
 
+      def tags(repository)
+        uri = URI.parse(
+          "#{Proxy::ContainerGateway::Plugin.settings.pulp_endpoint}/pulpcore_registry/v2/#{repository}/tags/list"
+        )
+        pulp_registry_request(uri).body
+      end
+
       def v1_search(params = {})
         if params[:n].nil? || params[:n] == ""
           params[:n] = 25
@@ -92,6 +99,8 @@ module Proxy
         RepositoryUser.dataset.delete
         user_repo_maps['users'].each do |user_repo_map|
           user_repo_map.each do |user, repos|
+            next if repos.nil?
+
             repos.each do |repo|
               found_repo = Repository.find(name: repo['repository'],
                                            auth_required: repo['auth_required'].to_s.downcase == "true")

data/lib/smart_proxy_container_gateway/version.rb

@@ -1,5 +1,5 @@
 module Proxy
   module ContainerGateway
-    VERSION = '1.0.5'.freeze
+    VERSION = '1.0.7'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_container_gateway
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.7
 platform: ruby
 authors:
 - Ian Ballou
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-14 00:00:00.000000000 Z
+date: 2022-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -64,7 +64,7 @@ homepage: http://github.com/ianballou/smart_proxy_container_gateway
 licenses:
 - GPLv3
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -79,8 +79,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: Pulp 3 container registry support for Foreman/Katello Smart-Proxy
 test_files: []