docker-remote 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fbe61af8e8709e3a11eb1df8bc561477d38c3540ce2d216bc81dc999d31822cf
-  data.tar.gz: 65a9d5336374a275246dc6ba950c3a4288823286ae1884f43f5a5bb748348c50
+  metadata.gz: 6cfe49856e12add82e0b4fa76a42381640b46ab0810a08db03cbd4e6619fa8d5
+  data.tar.gz: d5d7ab9eb55c7d2189ab5127e5b9c03a5e3c2c53a16241e540907cce3158fc72
 SHA512:
-  metadata.gz: 6d04a849e0fe6fda791f19be79f7664a95f3c24c7b6a38c7b2f0831a9af09690c825c54b3a62c8477da65ac06902bb9bce712427c62dfbe8b619d4a9d24ad098
-  data.tar.gz: e927985c4d0a6b767941ce5ac77647c8e1c5e6c45446221fd3f237cfbf4f29754a54cf9eb08db6597aa694fb3f2eb8611d9660280771a8819fe82446c93568b5
+  metadata.gz: 046f4aa7357778f0ded105562fd8ec55e25dc4d012e1c9fcfd01ee4bda47670b26cb83a9fc1bb5f3b4ed625a248af8ea541effceb93e284984c1219baabe634e
+  data.tar.gz: 38cd75b59a2a12e2339fff98a492f97851d28068184dc7b354ef080f70a7e65baf09a5ffe6fc0495d64158e74d58e4826ceec90da75a2ca28535cbbb6d2a8ffd

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.4.0
+* Support redirection when making HTTP requests.
+
 ## 0.3.0
 * Support registries with no auth.
 * Raise errors upon receiving unexpected response codes during auth flow.

data/lib/docker/remote/client.rb

@@ -21,22 +21,19 @@ module Docker
       end
 
       def tags
-        request = auth.make_get("/v2/#{repo}/tags/list")
-        response = registry_http.request(request)
+        response = get("/v2/#{repo}/tags/list")
         potentially_raise_error!(response)
         JSON.parse(response.body)['tags']
       end
 
       def manifest_for(reference)
-        request = auth.make_get("/v2/#{repo}/manifests/#{reference}")
-        response = registry_http.request(request)
+        response = get("/v2/#{repo}/manifests/#{reference}")
         potentially_raise_error!(response)
         JSON.parse(response.body)
       end
 
       def catalog
-        request = auth.make_get("/v2/_catalog")
-        response = registry_http.request(request)
+        response = get("/v2/_catalog")
         potentially_raise_error!(response)
         JSON.parse(response.body)
       end
@@ -45,8 +42,7 @@ module Docker
 
       def auth
         @auth ||= begin
-          request = Net::HTTP::Get.new('/v2/')
-          response = registry_http.request(request)
+          response = get('/v2/', use_auth: nil)
 
           case response.code
             when '200'
@@ -87,15 +83,47 @@ module Docker
         end
       end
 
+      def get(path, http: registry_http, use_auth: auth, limit: 5)
+        if limit == 0
+          raise DockerRemoteError, 'too many redirects'
+        end
+
+        request = if use_auth
+          use_auth.make_get(path)
+        else
+          Net::HTTP::Get.new(path)
+        end
+
+        response = http.request(request)
+
+        case response
+          when Net::HTTPRedirection
+            redirect_uri = URI.parse(response['location'])
+            redirect_http = make_http(redirect_uri)
+            return get(
+              redirect_uri.path, {
+                http: redirect_http,
+                use_auth: use_auth,
+                limit: limit - 1
+              }
+            )
+        end
+
+        response
+      end
+
       def registry_uri
         @registry_uri ||= URI.parse(registry_url)
       end
 
+      def make_http(uri)
+        Net::HTTP.new(uri.host, uri.port).tap do |http|
+          http.use_ssl = true if uri.scheme == 'https'
+        end
+      end
+
       def registry_http
-        @registry_http ||=
-          Net::HTTP.new(registry_uri.host, registry_uri.port).tap do |http|
-            http.use_ssl = true if registry_uri.scheme == 'https'
-          end
+        @registry_http ||= make_http(registry_uri)
       end
     end
   end

data/lib/docker/remote/version.rb

@@ -1,5 +1,5 @@
 module Docker
   module Remote
-    VERSION = '0.3.0'
+    VERSION = '0.4.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docker-remote
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Cameron Dutro
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-29 00:00:00.000000000 Z
+date: 2020-11-02 00:00:00.000000000 Z
 dependencies: []
 description: A Ruby client for communicating with the Docker registry API v2.
 email: