docker_registry2 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 923c330d2d2ca5572b95045747d9a3b4225a3a8d
-  data.tar.gz: 7e8f2c73a181ffaf00a9d4702a055460923e9027
+  metadata.gz: ef04c903f6bb8dba1bfc577438ce0f9cb089c3bd
+  data.tar.gz: 2091e8b03ea16e4031fb57a4af74475689c7c07d
 SHA512:
-  metadata.gz: 95bd7ccfed87e8b026014d0f40f03158b8091513b21c12391dae4c76dbafb805f547a55c90751a6cea80d5005e16972d84a896849649d87a45db2459825dfbbb
-  data.tar.gz: dc89367f9f05456c82efb6050219c2c6ea00245f52725d3b9b738933adf81057efdf3e06c2d75d3fea21a646bd13371821cd0ec98b2e9d3222ecace1dd681c9e
+  metadata.gz: 57d618d30acabc7e70119fbe117db816b6b9680caffc0964acd0896f498ab5fa5fe332eb73fa15af46b879e7e7d3cd8a379fb4c9571905317be720e27641cdf9
+  data.tar.gz: ce03cf1323138987eb55b9a93edea4abe8006531b915398c539a8d87b9298c65ea9c018c096669eed30cc4fe18303ae7329045c29b638383de6984c633b2dd24

data/README.md

@@ -118,6 +118,7 @@ MIT License.
 ## Contribution
 
 Developed by Avi Deitcher http://github.com/deitch 
+Contributors Jonathan Hurter https://github.com/johnsudaar
 Contributions courtesy of TraderTools, Inc. http://tradertools.com
 
 

data/docker_registry2.gemspec

@@ -6,7 +6,7 @@ require 'registry/version'
 Gem::Specification.new do |spec|
   spec.name          = 'docker_registry2'
   spec.version       = DockerRegistry::VERSION
-  spec.authors       = ['Avi Deitcher']
+  spec.authors       = ['Avi Deitcher https://github.com/deitch', 'Jonathan Hurter https://github.com/johnsudaar']
   spec.summary       = 'Docker v2 registry HTTP API client'
   spec.description   = 'Docker v2 registry HTTP API client with support for token authentication'
   spec.homepage      = 'https://github.com/deitch/docker_registry2'

data/lib/registry/registry.rb

@@ -14,34 +14,53 @@ class DockerRegistry::Registry
     # make a ping connection
     ping
   end
-  
-  def doget(url, token=nil)
+
+  def doget(url)
     begin
-      # do we already have a token to authenticate?
-      if token.nil?
-        response = RestClient.get @base_uri+url
-      else
-        response = RestClient.get @base_uri+url, Authorization: 'Bearer '+token
-      end
+      response = RestClient.get @base_uri+url
     rescue SocketError
       raise DockerRegistry::RegistryUnknownException
     rescue RestClient::Unauthorized => e
-      # unauthorized
-      # did we already try for this realm and service and scope and have insufficient privileges?
-      if token.nil?
-        token = authenticate e.response.headers[:www_authenticate]
-        # go do whatever you were going to do again
-        response = doget url, token
+      header = e.response.headers[:www_authenticate]
+      method = header.downcase.split(' ')[0]
+      case method
+      when 'basic'
+        response = do_basic_get(url)
+      when 'bearer'
+        response = do_bearer_get(url, header)
       else
-        throw DockerRegistry::RegistryAuthorizationException
+        raise DockerRegistry::RegistryUnknownException
       end
-    rescue RestClient::ResourceNotFound
+    end
+    return response
+  end
+
+  def do_basic_get(url)
+    begin
+      res = RestClient::Resource.new( @base_uri+url, @user, @password)
+      response = res.get
+    rescue SocketError
+      raise DockerRegistry::RegistryUnknownException
+    rescue RestClient::Unauthorized
+      raise DockerRegistry::RegistryAuthenticationException
+    end
+    return response
+  end
+
+  def do_bearer_get(url, header)
+    token = authenticate_bearer(header)
+    begin
+      response = RestClient.get @base_uri+url, Authorization: 'Bearer '+token
+    rescue SocketError
       raise DockerRegistry::RegistryUnknownException
+    rescue RestClient::Unauthorized
+      raise DockerRegistry::RegistryAuthenticationException
     end
+
     return response
   end
-  
-  def authenticate(header)
+
+  def authenticate_bearer(header)
     # get the parts we need
     target = split_auth_header(header)
     # did we have a username and password?
@@ -61,7 +80,7 @@ class DockerRegistry::Registry
     # now save the web token
     return JSON.parse(response)["token"]
   end
-  
+
   def split_auth_header(header = '')
     h = Hash.new
     h = {params: {}}
@@ -81,7 +100,7 @@ class DockerRegistry::Registry
   def ping
     response = doget '/v2/'
   end
-  
+
   def search(query = '')
     response = doget "/v2/_catalog"
     # parse the response
@@ -98,4 +117,4 @@ class DockerRegistry::Registry
     # parse the response
     JSON.parse response
   end
-end
+end

data/lib/registry/version.rb

@@ -1,3 +1,3 @@
 module DockerRegistry
-  VERSION = '0.1.1'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,10 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: docker_registry2
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
-- Avi Deitcher
+- Avi Deitcher https://github.com/deitch
+- Jonathan Hurter https://github.com/johnsudaar
 autorequire: 
 bindir: bin
 cert_chain: []