azure-storage-common 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 418e60c16c692153cda5d8d21039e1107cfe4f79
-  data.tar.gz: a4a277709da3afd50f6de5160d7a4840829a51e4
+  metadata.gz: 1d3118c38760c68874586862f6d0ff3144f140d2
+  data.tar.gz: 86c0b9fa3ac4e07c761985354daa89b7b36fb5aa
 SHA512:
-  metadata.gz: d666a2c7c2bbf4968832ccc45016e1a01e8ef23bb3d02d0ff0eb065788047516b11f7d737b94c5a60254b8f7ee60d226a5c00016cb6e33d1ab193de76fb98e89
-  data.tar.gz: e6fce018e142c87ee59370e4a773ba03d835906e8b49e43f39541968c0b59fd894e2fbb58d42bf7679e16a2ae68637d19817e38b5599161d0c3fbdd267e56612
+  metadata.gz: b785d7399791a4d2e2f7a1b673064ebdf1382038f58d7b90ef01a0a5117322e7335801cd04bccbe4c25ad9856dda825a7edf0b75eb0c95301be325aab8b35c4d
+  data.tar.gz: 3f4105bb14a56a1c16c6e285215ea1a2604357ea6df7bd5d423d398ef6b3206dbee7185445a7dcff2449ec5482f8258008248bffed27440aff71264ac6dd9959

data/lib/azure/storage/common/client.rb

@@ -103,6 +103,9 @@ module Azure::Storage::Common
       # * +:default_endpoints_protocol+     - String. http or https
       # * +:use_path_style_uri+             - String. Whether use path style URI for specified endpoints
       # * +:ca_file+                        - String. File path of the CA file if having issue with SSL
+      # * +:ssl_version+                    - Symbol. The ssl version to be used, sample: :TLSv1_1, :TLSv1_2, for the details, see https://github.com/ruby/openssl/blob/master/lib/openssl/ssl.rb
+      # * +:ssl_min_version+                - Symbol. The min ssl version supported, only supported in Ruby 2.5+
+      # * +:ssl_max_version+                - Symbol. The max ssl version supported, only supported in Ruby 2.5+
       # * +:user_agent_prefix+              - String. The user agent prefix that can identify the application calls the library
       #
       # The valid set of options include:

data/lib/azure/storage/common/client_options.rb

@@ -30,7 +30,7 @@ require "azure/storage/common/core/auth/anonymous_signer"
 
 module Azure::Storage::Common
   module ClientOptions
-    attr_accessor :ca_file
+    attr_accessor :ca_file, :ssl_version, :ssl_min_version, :ssl_max_version
 
     # Public: Reset options for [Azure::Storage::Common::Client]
     #
@@ -55,6 +55,9 @@ module Azure::Storage::Common
     # * +:default_endpoints_protocol+     - String. http or https
     # * +:use_path_style_uri+             - String. Whether use path style URI for specified endpoints
     # * +:ca_file+                        - String. File path of the CA file if having issue with SSL
+    # * +:ssl_version+                    - Symbol. The ssl version to be used, sample: :TLSv1_1, :TLSv1_2, for the details, see https://github.com/ruby/openssl/blob/master/lib/openssl/ssl.rb
+    # * +:ssl_min_version+                - Symbol. The min ssl version supported, only supported in Ruby 2.5+
+    # * +:ssl_max_version+                - Symbol. The max ssl version supported, only supported in Ruby 2.5+
     #
     # The valid set of options include:
     # * Storage Emulator: +:use_development_storage+ required, +:development_storage_proxy_uri+ optionally
@@ -85,6 +88,9 @@ module Azure::Storage::Common
       options = load_env if options.length == 0
 
       @ca_file = options.delete(:ca_file)
+      @ssl_version = options.delete(:ssl_version)
+      @ssl_min_version = options.delete(:ssl_min_version)
+      @ssl_max_version = options.delete(:ssl_max_version)
       @options = filter(options)
       self.send(:reset_config!, @options) if self.respond_to?(:reset_config!)
       self
@@ -203,7 +209,7 @@ module Azure::Storage::Common
         begin
           results = validated_options(opts,
                                       required: [:storage_account_name],
-                                      only_one: [:storage_access_key, :storage_sas_token],
+                                      only_one: [:storage_access_key, :storage_sas_token, :signer],
                                       optional: [:default_endpoints_protocol, :storage_dns_suffix])
           protocol = results[:default_endpoints_protocol] ||= StorageServiceClientConstants::DEFAULT_PROTOCOL
           suffix = results[:storage_dns_suffix] ||= StorageServiceClientConstants::DEFAULT_ENDPOINT_SUFFIX
@@ -312,7 +318,8 @@ module Azure::Storage::Common
           storage_file_host: is_url,
           storage_dns_suffix: is_url,
           default_endpoints_protocol: lambda { |i| ["http", "https"].include? i.downcase },
-          use_path_style_uri: is_true
+          use_path_style_uri: is_true,
+          signer: lambda { |i| i.is_a? Azure::Core::Auth::Signer} 
         }
 
         valid_options = required + at_least_one + only_one + optional

data/lib/azure/storage/common/core/auth/token_signer.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+#-------------------------------------------------------------------------
+# # Copyright (c) Microsoft and contributors. All rights reserved.
+#
+# The MIT License(MIT)
+
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files(the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and / or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions :
+
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#--------------------------------------------------------------------------
+
+module Azure::Storage::Common::Core
+  module Auth
+    class TokenSigner < Azure::Core::Auth::Signer
+      # Public: Initialize the Token Signer
+      def initialize(token_credential)
+        @credential = token_credential
+        # Use mock key to initialize super class
+        super(Base64.strict_encode64("accesstoken"))
+      end
+
+      def sign_request(req)
+        req.headers['Authorization'] = "Bearer #{@credential.token}"
+        req
+      end
+    end
+  end
+end

data/lib/azure/storage/common/core/autoload.rb

@@ -32,11 +32,14 @@ module Azure
         autoload :Utility,                        "azure/storage/common/core/utility"
         autoload :Logger,                         "azure/storage/common/core/utility"
         autoload :Error,                          "azure/storage/common/core/error"
+        autoload :TokenCredential,                "azure/storage/common/core/token_credential.rb"
 
         module Auth
           autoload :SharedKey,                    "azure/storage/common/core/auth/shared_key.rb"
           autoload :SharedAccessSignature,        "azure/storage/common/core/auth/shared_access_signature_generator.rb"
           autoload :SharedAccessSignatureSigner,  "azure/storage/common/core/auth/shared_access_signature_signer.rb"
+          autoload :AnonymousSigner,              "azure/storage/common/core/auth/anonymous_signer.rb"
+          autoload :TokenSigner,                  "azure/storage/common/core/auth/token_signer.rb"
         end
 
         module Filter

data/lib/azure/storage/common/core/filter/retry_filter.rb

@@ -149,7 +149,7 @@ module Azure::Storage::Common::Core::Filter
 
     # Adjust the retry parameter and wait for retry
     def wait_for_retry
-      sleep @retry_interval
+      sleep @retry_interval if @retry_interval > 0
     end
 
     # Adjust the retry request
@@ -184,7 +184,8 @@ module Azure::Storage::Common::Core::Filter
           0
         else
           since_last_attempt = Time.now - lastAttemptTime
-          retry_data[:interval] - since_last_attempt
+          remainder = retry_data[:interval] - since_last_attempt
+          remainder > 0 ? remainder : 0
         end
     end
 
@@ -212,7 +213,9 @@ module Azure::Storage::Common::Core::Filter
       # If a request sent to the secondary location fails with 404 (Not Found), it is possible
       # that the resource replication is not finished yet. So, in case of 404 only in the secondary
       # location, the failure should still be retryable.
-      retry_data[:secondary_not_found] = (retry_data[:current_location] === Azure::Storage::Common::StorageLocation::SECONDARY) && response.status_code === 404;
+      retry_data[:secondary_not_found] = 
+        ((retry_data[:current_location] === Azure::Storage::Common::StorageLocation::SECONDARY) && 
+        response.status_code === 404);
 
       if retry_data[:secondary_not_found]
         retry_data[:status_code] = 500
@@ -238,11 +241,6 @@ module Azure::Storage::Common::Core::Filter
           retry_data[:retryable] = false;
         end
 
-        if (retry_data[:status_code] == 404)
-          retry_data[:retryable] = true;
-          return true;
-        end
-
         # When absorb_conditional_errors_on_retry is set (for append blob)
         if (@request_options[:absorb_conditional_errors_on_retry])
           if (retry_data[:status_code] == 412)

data/lib/azure/storage/common/core/http_client.rb

@@ -48,6 +48,10 @@ module Azure::Storage::Common::Core
       def build_http(uri)
         ssl_options = {}
         if uri.is_a?(URI) && uri.scheme.downcase == "https"
+          ssl_options[:version] = self.ssl_version if self.ssl_version
+          # min_version and max_version only supported in ruby 2.5
+          ssl_options[:min_version] = self.ssl_min_version if self.ssl_min_version
+          ssl_options[:max_version] = self.ssl_max_version if self.ssl_max_version
           ssl_options[:ca_file] = self.ca_file if self.ca_file
           ssl_options[:verify] = true
         end

data/lib/azure/storage/common/core/token_credential.rb

@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+#-------------------------------------------------------------------------
+# # Copyright (c) Microsoft and contributors. All rights reserved.
+#
+# The MIT License(MIT)
+
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files(the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and / or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions :
+
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#--------------------------------------------------------------------------
+require "azure/core"
+
+module Azure::Storage::Common::Core
+  class TokenCredential
+
+    # Public: Initializes an instance of [Azure::Storage::Common::Core::TokenCredential]
+    #
+    # ==== Attributes
+    #
+    # * +token+                           - String. The initial access token.
+    #
+    def initialize(token)
+      @token = token
+      @mutex = Mutex.new
+    end
+
+    # Public: Gets the access token
+    #
+    # Note: Providing this getter under the protect of a mutex
+    #
+    def token
+      @mutex.synchronize do
+        @token
+      end
+    end
+
+    # Public: Renews the access token
+    #
+    # ==== Attributes
+    #
+    # * +new_token+                       - String. The new access token.
+    #
+    def renew_token(new_token)
+      @mutex.synchronize do
+        @token = new_token
+      end
+    end
+  end
+end

data/lib/azure/storage/common/default.rb

@@ -30,7 +30,7 @@ require "azure/storage/common/version"
 module Azure::Storage::Common
   module Default
     # Default REST service (STG) version number. This is used only for SAS generator.
-    STG_VERSION = "2016-05-31"
+    STG_VERSION = "2017-11-09"
 
     # The number of default concurrent requests for parallel operation.
     DEFAULT_PARALLEL_OPERATION_THREAD_COUNT = 1

data/lib/azure/storage/common/version.rb

@@ -30,8 +30,8 @@ module Azure
       class Version
         # Fields represent the parts defined in http://semver.org/
         MAJOR = 1 unless defined? MAJOR
-        MINOR = 0 unless defined? MINOR
-        UPDATE = 1 unless defined? UPDATE
+        MINOR = 1 unless defined? MINOR
+        UPDATE = 0 unless defined? UPDATE
 
         class << self
           # @return [String]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: azure-storage-common
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Microsoft Corporation
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-17 00:00:00.000000000 Z
+date: 2018-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: azure-core
@@ -166,6 +166,7 @@ files:
 - lib/azure/storage/common/core/auth/shared_access_signature_generator.rb
 - lib/azure/storage/common/core/auth/shared_access_signature_signer.rb
 - lib/azure/storage/common/core/auth/shared_key.rb
+- lib/azure/storage/common/core/auth/token_signer.rb
 - lib/azure/storage/common/core/autoload.rb
 - lib/azure/storage/common/core/error.rb
 - lib/azure/storage/common/core/filter/exponential_retry_filter.rb
@@ -173,6 +174,7 @@ files:
 - lib/azure/storage/common/core/filter/retry_filter.rb
 - lib/azure/storage/common/core/http_client.rb
 - lib/azure/storage/common/core/sr.rb
+- lib/azure/storage/common/core/token_credential.rb
 - lib/azure/storage/common/core/utility.rb
 - lib/azure/storage/common/default.rb
 - lib/azure/storage/common/service/access_policy.rb