fog-brightbox 0.14.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d4245d9ea64a448a89e941afe29357304a8d8898
-  data.tar.gz: 3a574da81873d44a1b27822e0d3d81ed5a290835
+SHA256:
+  metadata.gz: 826b4f7f6d48136ffaaf14d0425cc95d4b68de3cf9b6d20c299cb652d7712534
+  data.tar.gz: f912008723a966a900c88e628754eb73148ee6f0c860e160526ec2cfae6f4473
 SHA512:
-  metadata.gz: e0497c475d939b78328db6bdf7505390602221b878bd0137c344ae8297efbfdb51ab0b5d75877d7a9d4987c7053eedbbe4718f1de3768f20d8dddb5a4d7d2d32
-  data.tar.gz: fb519a8de1e1c2ba343ee99ae20f443633124e619464742317c176fddb864456bc3497fa04e3ec5d2106e626d6c9265dd5b60a7518e095e5e0ff7d51f528fd78
+  metadata.gz: be678b189da4225bb77a43e62717fb03ce64a462fd70852e8e631664ee6ed893f4993be15a95c02f3ad870bdf0711aa9085ca05ba9dd8b7adedd104dac8aae8e
+  data.tar.gz: 815fb87c8d71c39a461007d086e1990ee6074d6a73b941380324472469c7d2ffddf00d41eb0feaea9763d39c1e2f0227f6441325e48e05a32e362c68e7195dc2

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+### 0.15.0 / 2018-06-14
+
+Bug fixes:
+
+* Attempting to generate a temporary URL for a storage object would fail with
+  unclear message. Now a `Fog::Brightbox::Storage::ManagementUrlUnknown` is
+  raised instead. It must be either configured OR an authentication request
+  made before so the management URL is received from the server.
+* `:brightbox_storage_management_url` is now whitelisted to be passed in to the
+  configuration to avoid the authentication previously required.
+
 ### 0.14.0 / 2017-10-30
 
 Enhancements:

data/fog-brightbox.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "fog-core", "~> 1.22"
   spec.add_dependency "fog-json"
   spec.add_dependency "inflecto", "~> 0.0.2"
+  spec.add_dependency "mime-types"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "minitest"

data/lib/fog/brightbox/requests/storage/get_object_https_url.rb

@@ -15,63 +15,6 @@ module Fog
         def get_object_https_url(container, object, expires, options = {})
           create_temp_url(container, object, expires, "GET", options.merge(:scheme => "https"))
         end
-
-        # creates a temporary url
-        #
-        # @param container [String] Name of container containing object
-        # @param object [String] Name of object to get expiring url for
-        # @param expires_at [Time] An expiry time for this url
-        # @param method [String] The method to use for accessing the object (GET, PUT, HEAD)
-        # @param options [Hash] An optional options hash
-        # @option options [String] :scheme The scheme to use (http, https)
-        # @option options [String] :port A non standard port to use
-        #
-        # @return [String] url for object
-        #
-        # @raise [ArgumentError] if +storage_temp_key+ is not set in configuration
-        # @raise [ArgumentError] if +method+ is not valid
-        #
-        # @see http://docs.rackspace.com/files/api/v1/cf-devguide/content/Create_TempURL-d1a444.html
-        #
-        def create_temp_url(container, object, expires_at, method, options = {})
-          raise ArgumentError, "Storage must be instantiated with the :brightbox_temp_url_key option" if @config.storage_temp_key.nil?
-
-          # POST not allowed
-          allowed_methods = %w(GET PUT HEAD)
-          unless allowed_methods.include?(method)
-            raise ArgumentError.new("Invalid method '#{method}' specified. Valid methods are: #{allowed_methods.join(", ")}")
-          end
-
-          # This assumes we have access to the management URL at this point
-          destination_url = management_url.dup
-          object_path = destination_url.path
-
-          destination_url.scheme = options[:scheme] if options[:scheme]
-          destination_url.port = options[:port] if options[:port]
-
-          object_path_escaped = "#{object_path}/#{Fog::Storage::Brightbox.escape(container)}/#{Fog::Storage::Brightbox.escape(object, "/")}"
-          object_path_unescaped = "#{object_path}/#{Fog::Storage::Brightbox.escape(container)}/#{object}"
-
-          expiry_timestamp = expires_at.to_i
-          string_to_sign = [method, expiry_timestamp, object_path_unescaped].join("\n")
-
-          hmac = Fog::HMAC.new("sha1", @config.storage_temp_key)
-          sig = sig_to_hex(hmac.sign(string_to_sign))
-
-          destination_url.path = object_path_escaped
-          destination_url.query = URI.encode_www_form(:temp_url_sig => sig, :temp_url_expires => expiry_timestamp)
-          destination_url.to_s
-        end
-
-        private
-
-        def sig_to_hex(str)
-          str.unpack("C*").map { |c|
-            c.to_s(16)
-          }.map { |h|
-            h.size == 1 ? "0#{h}" : h
-          }.join
-        end
       end
     end
   end

data/lib/fog/brightbox/storage.rb

@@ -6,7 +6,8 @@ module Fog
       recognizes :persistent, :brightbox_service_name,
                  :brightbox_storage_url,
                  :brightbox_service_type, :brightbox_tenant,
-                 :brightbox_region, :brightbox_temp_url_key
+                 :brightbox_region, :brightbox_temp_url_key,
+                 :brightbox_storage_management_url
 
       model_path "fog/brightbox/models/storage"
       model :directory
@@ -123,8 +124,67 @@ module Fog
           url.path.split("/")[2]
         end
 
+        # creates a temporary url
+        #
+        # @param container [String] Name of container containing object
+        # @param object [String] Name of object to get expiring url for
+        # @param expires_at [Time] An expiry time for this url
+        # @param method [String] The method to use for accessing the object (GET, PUT, HEAD)
+        # @param options [Hash] An optional options hash
+        # @option options [String] :scheme The scheme to use (http, https)
+        # @option options [String] :port A non standard port to use
+        #
+        # @return [String] url for object
+        #
+        # @raise [ArgumentError] if +storage_temp_key+ is not set in configuration
+        # @raise [ArgumentError] if +method+ is not valid
+        #
+        # @see http://docs.rackspace.com/files/api/v1/cf-devguide/content/Create_TempURL-d1a444.html
+        #
+        def create_temp_url(container, object, expires_at, method, options = {})
+          raise ArgumentError, "Storage must be instantiated with the :brightbox_temp_url_key option" if @config.storage_temp_key.nil?
+
+          # POST not allowed
+          allowed_methods = %w(GET PUT HEAD)
+          unless allowed_methods.include?(method)
+            raise ArgumentError.new("Invalid method '#{method}' specified. Valid methods are: #{allowed_methods.join(", ")}")
+          end
+
+          if management_url.nil?
+            message = "Storage must be instantiated with the :brightbox_storage_management_url or you must authenticate first"
+            raise Fog::Brightbox::Storage::ManagementUrlUnknown, message
+          end
+
+          destination_url = management_url.dup
+          object_path = destination_url.path
+
+          destination_url.scheme = options[:scheme] if options[:scheme]
+          destination_url.port = options[:port] if options[:port]
+
+          object_path_escaped = "#{object_path}/#{Fog::Storage::Brightbox.escape(container)}/#{Fog::Storage::Brightbox.escape(object, "/")}"
+          object_path_unescaped = "#{object_path}/#{Fog::Storage::Brightbox.escape(container)}/#{object}"
+
+          expiry_timestamp = expires_at.to_i
+          string_to_sign = [method, expiry_timestamp, object_path_unescaped].join("\n")
+
+          hmac = Fog::HMAC.new("sha1", @config.storage_temp_key)
+          sig = sig_to_hex(hmac.sign(string_to_sign))
+
+          destination_url.path = object_path_escaped
+          destination_url.query = URI.encode_www_form(:temp_url_sig => sig, :temp_url_expires => expiry_timestamp)
+          destination_url.to_s
+        end
+
         private
 
+        def sig_to_hex(str)
+          str.unpack("C*").map { |c|
+            c.to_s(16)
+          }.map { |h|
+            h.size == 1 ? "0#{h}" : h
+          }.join
+        end
+
         def update_config_from_auth_response(response)
           @config.update_tokens(response.access_token)
 

data/lib/fog/brightbox/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Brightbox
-    VERSION = "0.14.0"
+    VERSION = "0.15.0"
   end
 end

data/spec/fog/storage/brightbox_spec.rb

@@ -317,4 +317,26 @@ describe Fog::Storage::Brightbox do
         service.create_temp_url(container, object, expiry_time, request_method, :scheme => "http", :port => 401)
     end
   end
+
+  describe "when initialised without management URL" do
+    before { skip unless RUBY_VERSION > "1.9.3" }
+    let(:temp_url_key) { "1234567890" }
+    let(:settings) do
+      {
+        :brightbox_client_id => "cli-12345",
+        :brightbox_secret => "12345",
+        :brightbox_temp_url_key => temp_url_key
+      }
+    end
+    let(:container) { "container" }
+    let(:object) { "file.ext" }
+    let(:expiry_time) { Time.utc(2012) }
+    let(:request_method) { "GET" }
+
+    it "raises an error" do
+      assert_raises Fog::Brightbox::Storage::ManagementUrlUnknown do
+        service.create_temp_url(container, object, expiry_time, request_method, :scheme => "https")
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-brightbox
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.15.0
 platform: ruby
 authors:
 - Paul Thornthwaite
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-30 00:00:00.000000000 Z
+date: 2018-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.2
+- !ruby/object:Gem::Dependency
+  name: mime-types
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -460,7 +474,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.2
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: This library can be used as a module for `fog` or as standalone provider