bits_service_client 4.0.0.pre.1 → 4.0.0.pre.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3fd02832b61746287f81c5d06ef2002cb97fb33b
-  data.tar.gz: 80e5101938d38d36dbcc0e1f1ff54b36019eaf33
+  metadata.gz: b3e14006a7591b74626b0d7aae5f94271f4eba05
+  data.tar.gz: 3854d5007fc1c65ccc4a5c0b606305d52423f50f
 SHA512:
-  metadata.gz: 39246c058170ffbf73192359b7afa6d065cf109258d1bcf5dd65a40e95daca3388cb719d304f6bafd9ca7a1033fd94823e1352a7293034946eac89e18d766d2d
-  data.tar.gz: 033f7d52d78390765856053892bef6a369a56345600f4cbed9b61420e012359b0319bee5730ddeec50ee1e182d8b7be2b333f71a960cdbb226dbae33561d00d7
+  metadata.gz: f49af55aeb784e73e317358225f25359ab44c4af38d8e3497328729f2d9e9f9d6317f36617fff375ce571496dbf3372c998cb37dc1204f93054ba4aa4cab5993
+  data.tar.gz: 7cf1eb8b1a977db52fb6fa9f21f10e0a10f8b290f34b2c9d9917291c5a523904475ed0aafc894815ca4a9eba6c2350a5782f75feef020df45e983c5fbd9d0fbf

data/lib/bits_service_client/blob.rb

@@ -28,32 +28,23 @@ module BitsService
     end
 
     def public_download_url
-      signed_url(key)
-    end
+      signed_url = "#{@public_endpoint}#{self.sign_signature(resource_path(key), @signing_key_secret, @signing_key_id)}"
 
-    def public_upload_url
-      signed_url(key, verb: 'put') + '&async=true'
-    end
+      response = @private_http_client.head(signed_url, @vcap_request_id)
+      validate_response_code!([200, 302], response)
 
-    def internal_download_url
-      generate_private_url(key)
-    end
-
-    private
-
-    def signed_url(key, verb: nil)
-      query = if verb.nil?
-        ''
+      if response.code.to_i == 302
+        response['location']
       else
-        "&verb=#{verb}"
+        signed_url
       end
+    end
 
-      signed_url = "#{@public_endpoint}#{self.sign_signature(resource_path(key), @signing_key_secret, @signing_key_id)}#{query}"
-      logger.debug( "Created signed URL: #{signed_url}")
-      return signed_url
+    def public_upload_url
+      "#{@public_endpoint}#{self.sign_signature(resource_path(key), @signing_key_secret, @signing_key_id)}&async=true&verb=put"
     end
 
-    def generate_private_url(key)
+    def internal_download_url
       path = resource_path(key)
 
       @private_http_client.head(path, @vcap_request_id).tap do |response|
@@ -63,6 +54,22 @@ module BitsService
       File.join(@private_endpoint.to_s, path)
     end
 
+    private
+
+    def validate_response_code!(expected_codes, response)
+      return if Array(expected_codes).include?(response.code.to_i)
+
+      error = {
+        response_code: response.code,
+        response_body: response.body,
+        response: response
+      }.to_json
+
+      logger.error("UnexpectedResponseCode: expected '#{expected_codes}' got #{response.code}")
+
+      fail BlobstoreError.new(error)
+    end
+
     def resource_path(key)
       prefix = @resource_type == :buildpack_cache ? 'buildpack_cache/entries/' : @resource_type
       File.join('/', prefix.to_s, key.to_s)

data/lib/bits_service_client/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module BitsServiceClient
-  VERSION = '4.0.0.pre.1'
+  VERSION = '4.0.0.pre.2'
 end

data/lib/util/signature_util.rb

@@ -2,12 +2,10 @@ module BitsService
   module SignatureUtil
     def sign_signature(resource_path, key_secret, key_id)
       expires = seconds_since_the_unix_epoch_with_offset(3600)
-      signature_parts = "#{expires}#{resource_path}#{' '}#{key_secret}"
-      digest = OpenSSL::Digest::SHA256.new
-      hmac = OpenSSL::HMAC.new(key_secret, digest)
-      signature=OpenSSL::HMAC.hexdigest(digest, key_secret, signature_parts)
-      signed_path = "#{resource_path}?signature=#{signature}&expires=#{expires}&AccessKeyId=#{key_id}"
-      return signed_path
+      "#{resource_path}?"+
+        "signature=#{OpenSSL::HMAC.hexdigest(OpenSSL::Digest::SHA256.new, key_secret, "#{expires}#{resource_path} #{key_secret}")}&"+
+        "expires=#{expires}&"+
+        "AccessKeyId=#{key_id}"
     end
 
     def seconds_since_the_unix_epoch_with_offset(offset)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bits_service_client
 version: !ruby/object:Gem::Version
-  version: 4.0.0.pre.1
+  version: 4.0.0.pre.2
 platform: ruby
 authors:
 - Rizwan Reza
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-22 00:00:00.000000000 Z
+date: 2019-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport