bits_service_client 4.0.0.pre.2 → 4.0.0.pre.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3e14006a7591b74626b0d7aae5f94271f4eba05
-  data.tar.gz: 3854d5007fc1c65ccc4a5c0b606305d52423f50f
+  metadata.gz: 7989da9bc76b9cbec050ebdfd1f1b332968ca6e2
+  data.tar.gz: 623775e563a40638d38b70ea929666c4880d239a
 SHA512:
-  metadata.gz: f49af55aeb784e73e317358225f25359ab44c4af38d8e3497328729f2d9e9f9d6317f36617fff375ce571496dbf3372c998cb37dc1204f93054ba4aa4cab5993
-  data.tar.gz: 7cf1eb8b1a977db52fb6fa9f21f10e0a10f8b290f34b2c9d9917291c5a523904475ed0aafc894815ca4a9eba6c2350a5782f75feef020df45e983c5fbd9d0fbf
+  metadata.gz: 2d0c573d721010471df62ad63a6b839cc7148c7fa2d202425cf6c7944fabbad6265a3d7069abd9d36a26311336238e9605601829f4e0aebaa9ab760f0a24489d
+  data.tar.gz: ab24fc0808182958a4ad45622c711ee1fb1a1aca5b1d2808699f3b1be41b6d65a7f2f1e9398a714da642159f11fa4fd57b8b84ae2567bc744e59218bd01eb57a

data/README.md

@@ -1,27 +1,3 @@
 # Bits-Service Client
 
 Ruby client for [bits-service](https://github.com/cloudfoundry-incubator/bits-service).
-
-# Changelog
-
-* 0.2.1:
-  - Update list of authors
-
-* 0.2.0:
-  - Add `vcap_request_id` to `BitsService::Client` and `BitsService::ResourcePool`
-  - Add `request_timeout_in_seconds` to `BitsService::ResourcePool`
-  - Move unit tests from CloudController to this gem
-
-* 0.1.0: Initial version
-
-# Bump
-
-The gem is automatically built and published to [rubygems.org](https://rubygems.org/gems/bits_service_client) in the [flintstone](https://flintstone.ci.cf-app.com) CI pipeline.
-
-In order to release a new version of the gem, the following steps should be taken:
-
-1. Update the change log above
-1. Update [`version.rb`](lib/bits_service_client/version.rb) with the new version
-1. Check in the changes and push them to `origin`.
-
-The pipeline will pick up the changes and will, if `version.rb` has changed, tag the release in git and publish the new version of the gem.

data/bits_service_client.gemspec

@@ -7,7 +7,7 @@ require 'bits_service_client/version'
 Gem::Specification.new do |spec|
   spec.name          = 'bits_service_client'
   spec.version       = BitsServiceClient::VERSION
-  spec.authors       = ['Rizwan Reza', 'Steffen Uhlig', 'Peter Goetz', 'Norman Sutorius','Tobias Zipfel']
+  spec.authors       = ['Rizwan Reza', 'Steffen Uhlig', 'Peter Goetz', 'Norman Sutorius', 'Tobias Zipfel']
   spec.email         = ['rizwanreza@gmail.com', 'steffen.uhlig@de.ibm.com', 'peter.gtz@gmail.com', 'norman.sutorius@de.ibm.com', 'tobias.zipfel@gmail.com']
 
   spec.summary       = 'Bits Services client for Cloud Foundry'

data/lib/bits_service_client/blob.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
+
 require 'util/signature_util'
 
 module BitsService
   class Blob
-
     include BitsService::SignatureUtil
 
     attr_reader :key
@@ -28,7 +28,7 @@ module BitsService
     end
 
     def public_download_url
-      signed_url = "#{@public_endpoint}#{self.sign_signature(resource_path(key), @signing_key_secret, @signing_key_id)}"
+      signed_url = "#{@public_endpoint}#{self.sign_signature('HEAD', resource_path(key), @signing_key_secret, @signing_key_id)}"
 
       response = @private_http_client.head(signed_url, @vcap_request_id)
       validate_response_code!([200, 302], response)
@@ -41,7 +41,7 @@ module BitsService
     end
 
     def public_upload_url
-      "#{@public_endpoint}#{self.sign_signature(resource_path(key), @signing_key_secret, @signing_key_id)}&async=true&verb=put"
+      "#{@public_endpoint}#{self.sign_signature('PUT',resource_path(key), @signing_key_secret, @signing_key_id)}&async=true&verb=put"
     end
 
     def internal_download_url

data/lib/bits_service_client/resource_pool.rb

@@ -1,17 +1,17 @@
 # frozen_string_literal: true
+
 require 'util/signature_util'
 
 module BitsService
   class ResourcePool
-
     include BitsService::SignatureUtil
 
     def initialize(bits_service_options:, request_timeout_in_seconds:, vcap_request_id: '')
-      @endpoint = URI.parse(bits_service_options[:private_endpoint])
-      @public_endpoint = bits_service_options[:public_endpoint]
+      @private_endpoint = URI.parse(bits_service_options[:private_endpoint])
+      @public_endpoint = URI.parse(bits_service_options[:public_endpoint])
       @request_timeout_in_seconds = request_timeout_in_seconds
-      @signed_key_secret = bits_service_options[:signing_key_secret]
-      @signed_key_id = bits_service_options[:signing_key_id]
+      @signed_key_secret = validated(bits_service_options, :signing_key_secret)
+      @signed_key_id = validated(bits_service_options, :signing_key_id)
       @vcap_request_id = vcap_request_id
       @logger = Steno.logger('cc.bits_service_client')
       @ca_cert_path = bits_service_options[:ca_cert_path]
@@ -24,10 +24,7 @@ module BitsService
     end
 
     def signed_matches_url
-      # "verb=post"
-      signed_url = "#{@public_endpoint}#{self.sign_signature("/app_stash/matches", @signed_key_secret, @signed_key_id)}"
-      @logger.debug("Created signed URL: #{signed_url}")
-      return signed_url
+      "#{@public_endpoint}#{self.sign_signature('POST','/app_stash/matches', @signed_key_secret, @signed_key_id)}"
     end
 
     def bundles(resources_json, entries_path)
@@ -49,7 +46,7 @@ module BitsService
 
     private
 
-    attr_reader :endpoint
+    attr_reader :private_endpoint
 
     def validate_response_code!(expected, response)
       return if expected.to_i == response.code.to_i
@@ -102,9 +99,9 @@ module BitsService
     end
 
     def http_client
-      @http_client ||= Net::HTTP.new(endpoint.host, endpoint.port).tap do |c|
+      @http_client ||= Net::HTTP.new(private_endpoint.host, private_endpoint.port).tap do |c|
         c.read_timeout = @request_timeout_in_seconds
-        enable_ssl(c, @ca_cert_path) if endpoint.scheme == 'https'
+        enable_ssl(c, @ca_cert_path) if private_endpoint.scheme == 'https'
       end
     end
 
@@ -118,5 +115,9 @@ module BitsService
       http_client.cert_store = cert_store
     end
 
+    def validated(bits_service_options, attribute)
+      raise ConfigurationError.new("Please provide #{attribute}") unless bits_service_options[attribute]
+      bits_service_options[attribute]
+    end
   end
 end

data/lib/bits_service_client/version.rb

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

data/lib/util/signature_util.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 module BitsService
   module SignatureUtil
-    def sign_signature(resource_path, key_secret, key_id)
+    def sign_signature(method, resource_path, key_secret, key_id)
       expires = seconds_since_the_unix_epoch_with_offset(3600)
-      "#{resource_path}?"+
-        "signature=#{OpenSSL::HMAC.hexdigest(OpenSSL::Digest::SHA256.new, key_secret, "#{expires}#{resource_path} #{key_secret}")}&"+
-        "expires=#{expires}&"+
+      "#{resource_path}?" \
+        "signature=#{OpenSSL::HMAC.hexdigest(OpenSSL::Digest::SHA256.new, key_secret, "#{method.upcase} #{resource_path} #{key_secret} #{expires}")}&" \
+        "expires=#{expires}&" \
         "AccessKeyId=#{key_id}"
     end
 

metadata

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