azure-storage 0.10.2.preview → 0.11.0.preview

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 31054294abe6fc2b3f0dcb87d286291e9dfe0766
-  data.tar.gz: 0d4555ce667aabb5dfd2f1d49d7d28b09ff0bd7b
+  metadata.gz: 8eb09fd448c403c8f348d9d50f1edd4f3824876e
+  data.tar.gz: 86f0661c191d66ea65a979e145aea7ef76d97414
 SHA512:
-  metadata.gz: b3bdddb9899c6ad7f4680a8350b6351ddcf4a7ae29dace4cd1daf5ca27053a19e1503881b521ac364d08be1b6c5b1b97c275378e12dd5655c00b020a2d6077ef
-  data.tar.gz: a473487c90bad59cac0a335e3d58df1405da2c70ee816cf717295f0ae09cf4061e0fb2789dc46da37e7fc9ddab529047b5bd0d0f1e9ffa35d93f6d4d4680147a
+  metadata.gz: 213bd465a59e3f6cdfbd24bc20e572f386d2d7e7f7d9f6661dd0058d6012f03920160f3d86b5c6b2fa124b484d4e823036e1ae8ae0066498ba16d35d7e53e7b2
+  data.tar.gz: e543a1360919133f26f822c8ae76bca7ec72467805a7ee2aa11cc6a66b2f0b5d4d2f4df0f315ba5f3663754ec652852b5465ec4eb0e56bfe1b2a14a772e281cb

data/lib/azure/storage/autoload.rb

@@ -66,4 +66,4 @@ module Azure
     end
 
   end
-end
+end

data/lib/azure/storage/blob/blob_service.rb

@@ -22,6 +22,7 @@
 # THE SOFTWARE.
 #--------------------------------------------------------------------------
 require 'base64'
+require 'azure/storage/core/auth/shared_key'
 require 'azure/storage/blob/container'
 require 'azure/storage/blob/blob'
 require 'azure/storage/blob/block'
@@ -37,7 +38,9 @@ module Azure::Storage
       include Azure::Storage::Blob::Container
       
       def initialize(options = {})
-        super(nil, nil, options)
+        client_config = options[:client] || Azure::Storage
+        signer = options[:signer] || Azure::Storage::Core::Auth::SharedKey.new(client_config.storage_account_name, client_config.storage_access_key)
+        super(signer, client_config.storage_account_name, options)
         @host = client.storage_blob_host
       end
       

data/lib/azure/storage/client.rb

@@ -87,20 +87,20 @@ module Azure::Storage
 
     # Azure Blob service client configured from this Azure Storage client instance
     # @return [Azure::Storage::Blob::BlobService]
-    def blobClient(options = {})
-      @blobClient ||= Azure::Storage::Blob::BlobService.new(default_client(options))
+    def blob_client(options = {})
+      @blob_client ||= Azure::Storage::Blob::BlobService.new(default_client(options))
     end
 
     # Azure Queue service client configured from this Azure Storage client instance
     # @return [Azure::Storage::Queue::QueueService]
-    def queueClient(options = {})
-      @queueClient ||= Azure::Storage::Queue::QueueService.new(default_client(options))
+    def queue_client(options = {})
+      @queue_client ||= Azure::Storage::Queue::QueueService.new(default_client(options))
     end
 
     # Azure Table service client configured from this Azure Storage client instance
     # @return [Azure::Storage::Table::TableService]
-    def tableClient(options = {})
-      @tableClient ||= Azure::Storage::Table::TableService.new(default_client(options))
+    def table_client(options = {})
+      @table_client ||= Azure::Storage::Table::TableService.new(default_client(options))
     end
 
     class << self
@@ -187,4 +187,4 @@ module Azure::Storage
     end
 
   end
-end
+end

data/lib/azure/storage/client_options.rb

@@ -230,6 +230,18 @@ module Azure::Storage
       rescue InvalidOptionsError => e
       end
 
+      # P6 - account name and key or sas with explicit hosts
+      begin
+        results = validated_options(opts,
+                                    :required => [:storage_account_name],
+                                    :only_one => [:storage_access_key, :storage_sas_token],
+                                    :at_least_one => [:storage_blob_host, :storage_table_host, :storage_file_host, :storage_queue_host])
+        results[:use_path_style_uri] = results.key?(:use_path_style_uri)
+        normalize_hosts(results)
+        return results
+      rescue InvalidOptionsError => e
+      end
+
       raise InvalidOptionsError,"options provided are not valid set: #{opts}" # wrong opts if move to this line
     end
 
@@ -331,4 +343,4 @@ module Azure::Storage
 
   end
 
-end
+end

data/lib/azure/storage/configurable.rb

@@ -53,7 +53,8 @@ module Azure::Storage
 
     attr_accessor :storage_access_key,
                   :storage_account_name,
-                  :storage_connection_string
+                  :storage_connection_string,
+                  :storage_sas_token
 
     attr_writer :storage_table_host,
                 :storage_blob_host,
@@ -67,6 +68,7 @@ module Azure::Storage
           :storage_access_key,
           :storage_account_name,
           :storage_connection_string,
+          :storage_sas_token,
           :storage_table_host,
           :storage_blob_host,
           :storage_queue_host

data/lib/azure/storage/core/auth/shared_access_signature.rb

@@ -25,4 +25,4 @@
 require 'azure/storage/core/auth/shared_access_signature_generator'
 require 'azure/storage/core/auth/shared_access_signature_signer'
 
-include Azure::Storage::Auth
+include Azure::Storage::Core::Auth

data/lib/azure/storage/core/auth/shared_access_signature_generator.rb

@@ -29,7 +29,7 @@ require 'time'
 require 'uri'
 
 # @see https://msdn.microsoft.com/library/azure/dn140255.aspx for more information on construction
-module Azure::Storage
+module Azure::Storage::Core
   module Auth
     class SharedAccessSignature
 
@@ -38,12 +38,32 @@ module Azure::Storage
         version: Azure::Storage::Default::STG_VERSION
       }
 
-      KEY_MAPPINGS = {
+      SERVICE_TYPE_MAPPING = {
+        b: Azure::Storage::ServiceType::BLOB,
+        t: Azure::Storage::ServiceType::TABLE,
+        q: Azure::Storage::ServiceType::QUEUE,
+        f: Azure::Storage::ServiceType::FILE
+      }
+
+      ACCOUNT_KEY_MAPPINGS = {
+        version:              :sv,
+        service:              :ss,
+        resource:             :srt,
+        permissions:          :sp,
+        start:                :st,
+        expiry:               :se,
+        protocol:             :spr,
+        ip_range:             :sip
+      }
+
+      SERVICE_KEY_MAPPINGS = {
         version:              :sv,
         permissions:          :sp,
         start:                :st,
         expiry:               :se,
-        identifier:           :si
+        identifier:           :si,
+        protocol:             :spr,
+        ip_range:             :sip
       }
 
       BLOB_KEY_MAPPINGS = {
@@ -56,14 +76,16 @@ module Azure::Storage
       }
 
       TABLE_KEY_MAPPINGS = {
-        tablename:            :tn,
+        table_name:           :tn,
         startpk:              :spk,
         endpk:                :epk,
         startrk:              :srk,
         endrk:                :erk
       }
 
-      OPTIONAL_QUERY_PARAMS = [:sp, :si, :rscc, :rscd, :rsce, :rscl, :rsct, :spk, :srk, :epk, :erk]
+      SERVICE_OPTIONAL_QUERY_PARAMS = [:sp, :si, :sip, :spr, :rscc, :rscd, :rsce, :rscl, :rsct, :spk, :srk, :epk, :erk]
+
+      ACCOUNT_OPTIONAL_QUERY_PARAMS = [:st, :sip, :spr]
 
       attr :account_name
 
@@ -76,132 +98,234 @@ module Azure::Storage
         @signer = Azure::Core::Auth::Signer.new(access_key)
       end
 
-      # Shared Access Signature for the given path and options
-      # @param path     [String] Path of the URI
+      # Service Shared Access Signature Token for the given path and options
+      # @param path     [String] Path of the URI or the table name
       # @param options  [Hash]
       #
       # ==== Options
       #
-      # * +:permissions+  - String. Combination of 'r','w','d','l' (container only) in this order. Default 'r'
-      # * +:start+        - String. UTC Date/Time in ISO8601 format. Optional.
-      # * +:expiry+       - String. UTC Date/Time in ISO8601 format. Optional. Default now + 30 minutes.
-      # * +:identifier+   - String. Identifier for stored access policy. Optional
+      # * +:service+             - String. Required. Service type. 'b' (blob) or 'q' (queue) or 't' (table) or 'f' (file).
+      # * +:resource+            - String. Required. Resource type, 'b' (blob) or 'c' (container) or 'f' (file) or 's' (share).
+      # * +:permissions+         - String. Optional. Combination of 'r', 'a', 'c', w','d','l' in this order for a container.
+      #                                              Combination of 'r', 'a', 'c', 'w', 'd' in this order for a blob.
+      #                                              Combination of 'r', 'c', 'w', 'd', 'l' in this order for a share.
+      #                                              Combination of 'r', 'c', 'w', 'd' in this order for a file.
+      #                                              Combination of 'r', 'a', 'u', 'p' in this order for a queue.
+      #                                              Combination of 'r', 'a', 'u', 'd' in this order for a table.
+      #                                              This option must be omitted if it has been specified in an associated stored access policy.
+      # * +:start+               - String. Optional. UTC Date/Time in ISO8601 format. 
+      # * +:expiry+              - String. Optional. UTC Date/Time in ISO8601 format. Default now + 30 minutes.
+      # * +:identifier+          - String. Optional. Identifier for stored access policy.
+      # * +:protocol+            - String. Optional. Permitted protocols.
+      # * +:ip_range+            - String. Optional. An IP address or a range of IP addresses from which to accept requests.
       #
-      # Below options for Blob only
-      # * +:resource+            - String. Resource type, either 'b' (blob) or 'c' (container). Default 'b'
-      # * +:cache_control+       - String. Response header override. Optional.
-      # * +:content_disposition+ - String. Response header override. Optional.
-      # * +:content_encoding+    - String. Response header override. Optional.
-      # * +:content_language+    - String. Response header override. Optional.
-      # * +:content_type+        - String. Response header override. Optional.
+      # Below options for blob serivce only
+      # * +:cache_control+       - String. Optional. Response header override.
+      # * +:content_disposition+ - String. Optional. Response header override.
+      # * +:content_encoding+    - String. Optional. Response header override.
+      # * +:content_language+    - String. Optional. Response header override.
+      # * +:content_type+        - String. Optional. Response header override.
       #
-      # Below options for table only
-      # * +:startpk+             - String. The start partition key of a specified partition key range. Optional but startpk must accompany startrk.
-      # * +:endpk+               - String. The end partition key of a specified partition key range. Optional but endpk must accompany endrk.
-      # * +:startrk+             - String. The start row key of a specified row key range. Optional.
-      # * +:endrk+               - String. The end row key of a specified row key range. Optional.
-      def generate(path, options={})
-        service_type = options[:service_type] || Azure::Storage::ServiceType::BLOB
-        options.delete(:service_type) if options.key?(:service_type)
-
-        options[:start] = Time.parse(options[:start]).utc.iso8601 if options[:start] 
-        options[:expiry] = Time.parse(options[:expiry]).utc.iso8601 if options[:expiry] 
-        options[:expiry] ||= (Time.now + 60*30).utc.iso8601
+      # Below options for table service only
+      # * +:startpk+             - String. Optional but must accompany startrk. The start partition key of a specified partition key range.
+      # * +:endpk+               - String. Optional but must accompany endrk. The end partition key of a specified partition key range.
+      # * +:startrk+             - String. Optional. The start row key of a specified row key range.
+      # * +:endrk+               - String. Optional. The end row key of a specified row key range.
+      def generate_service_sas_token(path, options={})
+        if options.key?(:service)
+          service_type = SERVICE_TYPE_MAPPING[options[:service].to_sym]
+          options.delete(:service)
+        end
 
-        raise InvalidOptionsError,"SAS version cannot be set" if options[:version]
+        raise Azure::Storage::InvalidOptionsError,"SAS version cannot be set" if options[:version]
 
         options = DEFAULTS.merge(options)
-        valid_mappings = KEY_MAPPINGS
+        valid_mappings = SERVICE_KEY_MAPPINGS
         if service_type == Azure::Storage::ServiceType::BLOB
-          options.merge!(resource: 'b')
+          if options[:resource]
+            options.merge!(resource: options[:resource])
+          else
+            options.merge!(resource: 'b')
+          end
           valid_mappings.merge!(BLOB_KEY_MAPPINGS)
         elsif service_type == Azure::Storage::ServiceType::TABLE
-          options.merge!(tablename: path)
+          options.merge!(table_name: path)
           valid_mappings.merge!(TABLE_KEY_MAPPINGS)
         end
 
         invalid_options = options.reject { |k,v| valid_mappings.key?(k) }
-        raise InvalidOptionsError,"invalid options #{invalid_options} provided for SAS token generate" if invalid_options.length > 0
+        raise Azure::Storage::InvalidOptionsError,"invalid options #{invalid_options} provided for SAS token generate" if invalid_options.length > 0
+
+        canonicalize_time(options)
 
-        query_hash = Hash[options.map { |k, v| [KEY_MAPPINGS[k], v] }]
-        .reject { |k, v| OPTIONAL_QUERY_PARAMS.include?(k) && v.to_s == '' }
-        .merge( sig: @signer.sign(signable_string(service_type, path, options)) )
+        query_hash = Hash[options.map { |k, v| [SERVICE_KEY_MAPPINGS[k], v] }]
+        .reject { |k, v| SERVICE_OPTIONAL_QUERY_PARAMS.include?(k) && v.to_s == '' }
+        .merge( sig: @signer.sign(signable_string_for_service(service_type, path, options)) )
         
         sas_params = URI.encode_www_form(query_hash)
       end
-      
+
       # Construct the plaintext to the spec required for signatures
       # @return [String]
-      def signable_string(service_type, path, options)
+      def signable_string_for_service(service_type, path, options)
         # Order is significant
         # The newlines from empty strings here are required
-        options[:start] = Time.parse(options[:start]).utc.iso8601 if options[:start]
-        options[:expiry] = Time.parse(options[:expiry]).utc.iso8601 if options[:expiry]
-        
-        signable_string =
+        signable_fields =
         [
           options[:permissions],
           options[:start],
           options[:expiry],
           canonicalized_resource(service_type, path),
           options[:identifier],
-          Azure::Storage::Default::STG_VERSION,
+          options[:ip_range],
+          options[:protocol],
+          Azure::Storage::Default::STG_VERSION
+        ]
+
+        signable_fields.concat [
           options[:cache_control],
           options[:content_disposition],
           options[:content_encoding],
           options[:content_language],
           options[:content_type]
+        ] if service_type == Azure::Storage::ServiceType::BLOB
+
+        signable_fields.concat [
+          options[:startpk],
+          options[:startrk],
+          options[:endpk],
+          options[:endrk]
+        ] if service_type == Azure::Storage::ServiceType::TABLE
+
+        signable_fields.join "\n"
+      end
+
+      # Account Shared Access Signature Token for the given options
+      # @param account_name     [String] storage account name
+      # @param options          [Hash]
+      #
+      # ==== Options
+      #
+      # * +:service+             - String. Required. Accessible services. Combination of 'b' (blob), 'q' (queue), 't' (table), 'f' (file).
+      # * +:resource+            - String. Required. Accessible resource types. Combination of 's' (service), 'c' (container-level), 'o'(object-level).
+      # * +:permissions+         - String. Required. Permissions. Combination of 'r' (read), 'w' (write), 'd'(delete), 'l'(list), 'a'(add),
+      #                                              'c'(create), 'u'(update), 'p'(process). Permissions are only valid if they match 
+      #                                              the specified signed resource type; otherwise they are ignored.
+      # * +:start+               - String. Optional. UTC Date/Time in ISO8601 format.
+      # * +:expiry+              - String. Optional. UTC Date/Time in ISO8601 format. Default now + 30 minutes.
+      # * +:protocol+            - String. Optional. Permitted protocols.
+      # * +:ip_range+            - String. Optional. An IP address or a range of IP addresses from which to accept requests. 
+      #                                    When specifying a range, note that the range is inclusive.
+      def generate_account_sas_token(options={})
+        raise Azure::Storage::InvalidOptionsError,"SAS version cannot be set" if options[:version]
+
+        options = DEFAULTS.merge(options)
+        valid_mappings = ACCOUNT_KEY_MAPPINGS
+
+        invalid_options = options.reject { |k,v| valid_mappings.key?(k) }
+        raise Azure::Storage::InvalidOptionsError,"invalid options #{invalid_options} provided for SAS token generate" if invalid_options.length > 0
+
+        canonicalize_time(options)
+
+        query_hash = Hash[options.map { |k, v| [ACCOUNT_KEY_MAPPINGS[k], v] }]
+        .reject { |k, v| ACCOUNT_OPTIONAL_QUERY_PARAMS.include?(k) && v.to_s == '' }
+        .merge( sig: @signer.sign(signable_string_for_account(options)) )
+        
+        sas_params = URI.encode_www_form(query_hash)
+      end
+
+      # Construct the plaintext to the spec required for signatures
+      # @return [String]
+      def signable_string_for_account(options)
+        # Order is significant
+        # The newlines from empty strings here are required
+        signable_string =
+        [
+          @account_name,
+          options[:permissions],
+          options[:service],
+          options[:resource],
+          options[:start],
+          options[:expiry],
+          options[:ip_range],
+          options[:protocol],
+          Azure::Storage::Default::STG_VERSION,
+          ''
         ].join("\n")
       end
-      
+
       # Return the cononicalized resource representation of the blob resource
       # @return [String]
       def canonicalized_resource(service_type, path)
         "/#{service_type}/#{account_name}#{path.start_with?('/') ? '' : '/'}#{path}"
       end
 
+      def canonicalize_time(options)
+        options[:start] = Time.parse(options[:start]).utc.iso8601 if options[:start]
+        options[:expiry] = Time.parse(options[:expiry]).utc.iso8601 if options[:expiry]
+        options[:expiry] ||= (Time.now + 60*30).utc.iso8601
+      end
+
       # A customised URI reflecting options for the resource signed with Shared Access Signature
-      # @param uri      [URI] uri to resource including query options
-      # @param options  [Hash]
+      # @param uri                [URI] uri to resource including query options
+      # @param use_account_sas    [Boolean] Whether uses account SAS
+      # @param options            [Hash]
       #
       # ==== Options
       #
-      # * +:permissions+  - String. Combination of 'r','w','d','l' (container only) in this order. Default 'r'
-      # * +:start+        - String. UTC Date/Time in ISO8601 format. Optional.
-      # * +:expiry+       - String. UTC Date/Time in ISO8601 format. Optional. Default now + 30 minutes.
-      # * +:identifier+   - String. Identifier for stored access policy. Optional
+      # * +:start+                - String. Optional. UTC Date/Time in ISO8601 format.
+      # * +:expiry+               - String. Optional. UTC Date/Time in ISO8601 format. Default now + 30 minutes.
+      # * +:protocol+             - String. Optional. Permitted protocols.
+      # * +:ip_range+             - String. Optional. An IP address or a range of IP addresses from which to accept requests. 
+      #                                     When specifying a range, note that the range is inclusive.
+      #
+      # Below options for account SAS only
+      # * +:service+              - String. Required. Accessible services. Combination of 'b' (blob), 'q' (queue), 't' (table), 'f' (file).
+      # * +:resource+             - String. Required. Accessible resource types. Combination of 's' (service), 'c' (container-level), 'o'(object-level).
+      # * +:permissions+          - String. Required. Permissions. Combination of 'r' (read), 'w' (write), 'd'(delete), 'l'(list), 'a'(add),
+      #                                               'c'(create), 'u'(update), 'p'(process). Permissions are only valid if they match
+      #                                               the specified signed resource type; otherwise they are ignored.
+      #
+      # Below options for service SAS only
+      # * +:service+              - String. Required. Service type. 'b' (blob) or 'q' (queue) or 't' (table) or 'f' (file).
+      # * +:resource+             - String. Required. Resource type, 'b' (blob) or 'c' (container) or 'f' (file) or 's' (share).
+      # * +:identifier+           - String. Optional. Identifier for stored access policy.
+      # * +:permissions+          - String. Optional. Combination of 'r', 'a', 'c', w','d','l' in this order for a container.
+      #                                               Combination of 'r', 'a', 'c', 'w', 'd' in this order for a blob.
+      #                                               Combination of 'r', 'c', 'w', 'd', 'l' in this order for a share.
+      #                                               Combination of 'r', 'c', 'w', 'd' in this order for a file.
+      #                                               Combination of 'r', 'a', 'u', 'p' in this order for a queue.
+      #                                               Combination of 'r', 'a', 'u', 'd' in this order for a table.
       #
-      # Below options for Blob only
-      # * +:resource+            - String. Resource type, either 'b' (blob) or 'c' (container). Default 'b'
-      # * +:cache_control+       - String. Response header override. Optional.
-      # * +:content_disposition+ - String. Response header override. Optional.
-      # * +:content_encoding+    - String. Response header override. Optional.
-      # * +:content_language+    - String. Response header override. Optional.
-      # * +:content_type+        - String. Response header override. Optional.
+      # Below options for Blob service only
+      # * +:cache_control+        - String. Optional. Response header override.
+      # * +:content_disposition+  - String. Optional. Response header override.
+      # * +:content_encoding+     - String. Optional. Response header override.
+      # * +:content_language+     - String. Optional. Response header override.
+      # * +:content_type+         - String. Optional. Response header override.
       #
-      # Below options for table only
-      # * +:tablename+           - String. Table name for SAS
-      # * +:startpk+             - String. The start partition key of a specified partition key range. Optional but startpk must accompany startrk.
-      # * +:endpk+               - String. The end partition key of a specified partition key range. Optional but endpk must accompany endrk.
-      # * +:startrk+             - String. The start row key of a specified row key range. Optional.
-      # * +:endrk+               - String. The end row key of a specified row key range. Optional.
-      def signed_uri(uri, options)
+      # Below options for Table service only
+      # * +:table_name+           - String. Required. Table name for SAS.
+      # * +:startpk+              - String. Optional but must accompany startrk. The start partition key of a specified partition key range.
+      # * +:endpk+                - String. Optional but must accompany endrk. The end partition key of a specified partition key range.
+      # * +:startrk+              - String. Optional. The start row key of a specified row key range.
+      # * +:endrk+                - String. Optional. The end row key of a specified row key range.
+      def signed_uri(uri, use_account_sas, options)
         parsed_query = CGI::parse(uri.query || '').inject({}){|memo,(k,v)| memo[k.to_sym] = v; memo}
-        
-        if parsed_query.has_key?(:restype)
-          options[:resource] = parsed_query[:restype].first == 'container' ? 'c' : 'b'
-        end
 
         if options[:service_type] == nil and uri.host != nil
           host_splits = uri.host.split('.')
-          options[:service_type] = host_splits[1] if host_splits.length > 1 && host_splits[0] == account_name
+          options[:service_type] = host_splits[1] if host_splits.length > 1 && host_splits[0] == @account_name
         end
 
-        sas_params = generate(uri.path, options)
+        sas_params = if use_account_sas
+                       generate_account_sas_token(options)
+                     else
+                       generate_service_sas_token(uri.path, options)
+                     end
 
-        URI.parse(uri.to_s + (uri.query.nil? ? '?' : '&') + sas_params)
+        result = URI.parse(uri.to_s + (uri.query.nil? ? '?' : '&') + sas_params)
       end
-
     end
   end
 end

data/lib/azure/storage/core/auth/shared_access_signature_signer.rb

@@ -24,7 +24,7 @@
 
 require 'azure/core/auth/signer'
 
-module Azure::Storage
+module Azure::Storage::Core
   module Auth
     class SharedAccessSignatureSigner < Azure::Core::Auth::Signer
 
@@ -40,8 +40,7 @@ module Azure::Storage
       end
 
       def sign_request(req)
-        ori_uri = req.uri
-        URI.parse(ori_uri.to_s + (ori_uri.query.nil? ? '?' : '&') + sas_token.sub(/^\?/,'') + '&api-version=' + Azure::Storage::Default::STG_VERSION)
+        req.uri = URI.parse(req.uri.to_s + (req.uri.query.nil? ? '?' : '&') + sas_token.sub(/^\?/,'') + '&api-version=' + Azure::Storage::Default::STG_VERSION)
       end
 
     end

data/lib/azure/storage/core/auth/shared_key.rb

@@ -23,6 +23,7 @@
 #--------------------------------------------------------------------------
 require 'cgi'
 require 'azure/core/auth/signer'
+require 'azure/core/auth/shared_key'
 
 module Azure::Storage::Core
   module Auth

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

@@ -32,6 +32,8 @@ module Azure
       
       module Auth
         autoload :SharedKey,                    'azure/storage/core/auth/shared_key.rb'
+        autoload :SharedAccessSignature,        'azure/storage/core/auth/shared_access_signature_generator.rb'
+        autoload :SharedAccessSignatureSigner,  'azure/storage/core/auth/shared_access_signature_signer.rb'
       end
       
       module Filter

data/lib/azure/storage/default.rb

@@ -98,6 +98,12 @@ module Azure::Storage
         ENV['AZURE_STORAGE_CONNECTION_STRING']
       end
 
+      # Default storage shared access signature token
+      # @return [String]
+      def storage_sas_token
+        ENV['AZURE_STORAGE_SAS_TOKEN']
+      end
+
       # Default storage table host
       # @return [String]
       def storage_table_host
@@ -124,7 +130,7 @@ module Azure::Storage
     end
   end
 
-  # ServiceType prefix to suffix
+  # Service Types
   module ServiceType
     BLOB = 'blob'
     QUEUE = 'queue'
@@ -1074,4 +1080,4 @@ module Azure::Storage
     NOT_IMPLEMENTED = 'NotImplemented'
   end
 
-end
+end

data/lib/azure/storage/queue/queue_service.rb

@@ -21,6 +21,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 #--------------------------------------------------------------------------
+require 'azure/storage/core/auth/shared_key'
 require 'azure/storage/service/storage_service'
 require 'azure/storage/queue/serialization'
 
@@ -30,7 +31,9 @@ module Azure::Storage
     class QueueService < StorageService
 
       def initialize(options = {})
-        super(nil, nil, options)
+        client_config = options[:client] || Azure::Storage
+        signer = options[:signer] || Azure::Storage::Core::Auth::SharedKey.new(client_config.storage_account_name, client_config.storage_access_key)
+        super(signer, client_config.storage_account_name, options)
         @host = @client.storage_queue_host
       end
 

data/lib/azure/storage/service/cors.rb

@@ -33,4 +33,4 @@ module Azure::Storage
       attr_accessor :cors_rules
     end
   end
-end
+end

data/lib/azure/storage/service/cors_rule.rb

@@ -43,4 +43,4 @@ module Azure::Storage
       attr_accessor :allowed_headers
     end
   end
-end
+end

data/lib/azure/storage/service/storage_service.rb

@@ -34,14 +34,17 @@ module Azure::Storage
       #
       # @param signer         [Azure::Core::Auth::Signer] An implementation of Signer used for signing requests.
       # (optional, Default=Azure::Storage::Auth::SharedKey.new)
-      # @param account_name   [String] The account name (optional, Default=Azure.config.storage_account_name)
+      # @param account_name   [String] The account name (optional, Default=Azure::Storage.storage_account_name)
       # @param options        [Azure::Storage::Configurable] the client configuration context
       def initialize(signer=nil, account_name=nil, options = {})
         options[:client] = Azure::Storage if options[:client] == nil
         client_config = options[:client]
         signer = signer || Azure::Storage::Core::Auth::SharedKey.new(
           client_config.storage_account_name,
-          client_config.storage_access_key)
+          client_config.storage_access_key) if client_config.storage_access_key
+        signer = signer || Azure::Storage::Core::Auth::SharedAccessSignatureSigner.new(
+          client_config.storage_account_name,
+          client_config.storage_sas_token)
         super(signer, account_name, options)
       end
 

data/lib/azure/storage/table/batch.rb

@@ -21,7 +21,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 #--------------------------------------------------------------------------
-require 'uuid'
+require 'securerandom'
 
 require 'azure/core/http/http_error'
 require 'azure/storage/table/serialization'
@@ -63,9 +63,8 @@ module Azure::Storage
         @operations = []
         @entity_keys = []
         @table_service = Azure::Storage::Table::TableService.new
-        uuid = UUID.new
-        @batch_id = "batch_" + uuid.generate
-        @changeset_id = "changeset_" + uuid.generate
+        @batch_id = "batch_" + SecureRandom.uuid
+        @changeset_id = "changeset_" + SecureRandom.uuid
 
         self.instance_eval(&block) if block_given?
       end

data/lib/azure/storage/table/table_service.rb

@@ -310,7 +310,9 @@ module Azure::Storage
         query = { }
         query["timeout"] = options[:timeout].to_s if options[:timeout]
 
-        uri = entities_uri(table_name, entity_values["PartitionKey"], entity_values["RowKey"], query)
+        uri = entities_uri(table_name, 
+          entity_values[:PartitionKey] || entity_values['PartitionKey'],
+          entity_values[:RowKey] || entity_values["RowKey"], query)
 
         headers = {}
         headers["If-Match"] = if_match || "*" unless options[:create_if_not_exists]
@@ -348,7 +350,9 @@ module Azure::Storage
         query = { }
         query["timeout"] = options[:timeout].to_s if options[:timeout]
 
-        uri = entities_uri(table_name, entity_values["PartitionKey"], entity_values["RowKey"], query)
+        uri = entities_uri(table_name, 
+          entity_values[:PartitionKey] || entity_values['PartitionKey'],
+          entity_values[:RowKey] || entity_values['RowKey'], query)
 
         headers = { "X-HTTP-Method"=> "MERGE" }
         headers["If-Match"] = if_match || "*" unless options[:create_if_not_exists]

data/lib/azure/storage/version.rb

@@ -27,8 +27,8 @@ module Azure
     class Version
       # Fields represent the parts defined in http://semver.org/
       MAJOR = 0 unless defined? MAJOR
-      MINOR = 10 unless defined? MINOR
-      UPDATE = 2 unless defined? UPDATE
+      MINOR = 11 unless defined? MINOR
+      UPDATE = 0 unless defined? UPDATE
       PRE = 'preview' unless defined? PRE
 
       class << self
@@ -43,4 +43,4 @@ module Azure
       end
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: azure-storage
 version: !ruby/object:Gem::Version
-  version: 0.10.2.preview
+  version: 0.11.0.preview
 platform: ruby
 authors:
 - Microsoft Corporation
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-30 00:00:00.000000000 Z
+date: 2016-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -136,20 +136,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.19'
-- !ruby/object:Gem::Dependency
-  name: uuid
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: dotenv
   requirement: !ruby/object:Gem::Requirement
@@ -297,7 +283,6 @@ files:
 - lib/azure/storage/service/storage_service.rb
 - lib/azure/storage/service/storage_service_properties.rb
 - lib/azure/storage/table/auth/shared_key.rb
-- lib/azure/storage/table/auth/shared_key_lite.rb
 - lib/azure/storage/table/batch.rb
 - lib/azure/storage/table/batch_response.rb
 - lib/azure/storage/table/edmtype.rb
@@ -327,9 +312,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Official Ruby client library to consume Azure Storage services
 test_files: []
-has_rdoc: 

data/lib/azure/storage/table/auth/shared_key_lite.rb

@@ -1,53 +0,0 @@
-#-------------------------------------------------------------------------
-# # 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/storage/table/auth/shared_key'
-
-module Azure::Storage
-  module Table
-    module Auth
-      class SharedKeyLite < SharedKey
-        # Public: The name of the strategy.
-        #
-        # Returns a String.
-        def name
-          'SharedKeyLite'
-        end
-
-        # Generate the string to sign.
-        #
-        # verb       - The HTTP request method.
-        # uri        - The URI of the request we're signing.
-        # headers    - A Hash of HTTP request headers.
-        #
-        # Returns a plain text string.
-        def signable_string(method, uri, headers)
-          [
-            headers.fetch('Date') { headers.fetch('x-ms-date') },
-            canonicalized_resource(uri)
-          ].join("\n")
-        end
-      end
-    end
-  end
-end