azure 0.6.4 → 0.7.0.pre

data/lib/azure/base_management/serialization.rb

@@ -16,6 +16,7 @@
 module Azure
   module BaseManagement
     module Serialization
+      extend Azure::Core::Utility
       def self.locations_from_xml(locationXML)
         location_objs = []
         xml = locationXML.css('Locations Location')

data/lib/azure/blob/auth/shared_access_signature.rb

@@ -0,0 +1,141 @@
+#-------------------------------------------------------------------------
+# # Copyright (c) Microsoft and contributors. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#--------------------------------------------------------------------------
+
+# TODO: extract common SAS logic, add support for the other SAS types
+
+require "azure/core/configuration"
+require "azure/core/auth/signer"
+
+# This will break if used against API version prior to 2013-08-15 as the format
+# changed
+# See https://msdn.microsoft.com/library/azure/dn140255.aspx for more information on construction
+module Azure
+  module Blob
+    module Auth
+      class SharedAccessSignature < Core::Auth::Signer
+        DEFAULTS = {
+          resource: 'b',
+          permissions: 'r',
+          version: '2013-08-15'
+        }
+
+        KEY_MAPPINGS = {
+          permissions:         :sp,
+          start:               :st,
+          expiry:              :se,
+          resource:            :sr,
+          identifier:          :si,
+          version:             :sv,
+          cache_control:       :rscc,
+          content_disposition: :rscd,
+          content_encoding:    :rsce,
+          content_language:    :rscl,
+          content_type:        :rsct
+        }
+
+        OPTIONAL_QUERY_PARAMS = [:sp, :si, :rscc, :rscd, :rsce, :rscl, :rsct]
+
+        attr :path
+        attr :options
+        attr :account_name
+
+        # Public: Initialize the Signer.
+        #
+        # ==== Attributes
+        #
+        # * +path+         - the container or blob path
+        # * +options+      - Hash. Required and optional parameters
+        # * +account_name+ - The account name. Defaults to the one in the
+        #                    global configuration.
+        # * +access_key+   - The access_key encoded in Base64. Defaults to the
+        #                    one in the global configuration.
+        #
+        # ==== Options
+        #
+        # * +:resource+     - String. Resource type, either 'b' (blob) or 'c' (container). Default 'b'
+        # * +: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. Required.
+        # * +:identifier+   - String. Identifier for stored access policy. Optional
+        # * +:version+      - String. API version. Default '2013-08-15'
+        #
+        # * +: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.
+        def initialize(path, options, account_name=Azure.config.storage_account_name, access_key=Azure.config.storage_access_key)
+          @path = path
+          @account_name = account_name
+          @options = DEFAULTS.merge(options)
+
+          super(access_key)
+        end
+
+        # Public: Construct the plaintext to the spec required for signatures
+        def signable_string
+          # Order is significant
+          # The newlines from empty strings here are required
+          [
+            options[:permissions],
+            options[:start],
+            options[:expiry],
+            canonicalized_resource,
+            options[:identifier],
+
+            options[:version],
+
+            options[:cache_control],
+            options[:content_disposition],
+            options[:content_encoding],
+            options[:content_language],
+            options[:content_type]
+          ].join("\n")
+        end
+
+        def canonicalized_resource
+          "/#{account_name}/#{path}"
+        end
+
+        # Public: A customised URI reflecting options for the resource signed with the Shared Access Signature
+        def signed_uri
+          query_params = URI.encode_www_form(query_hash)
+          "https://#{account_name}.blob.core.windows.net/#{path}?#{query_params}"
+        end
+
+        def to_s
+          signed_uri
+        end
+
+        private
+
+        def signature
+          sign(signable_string)
+        end
+
+        def query_hash
+          Hash[options.map { |k, v|
+            [KEY_MAPPINGS[k], v]
+          }].reject { |k,v|
+            OPTIONAL_QUERY_PARAMS.include?(k) && v.to_s == ''
+          }.merge(
+            sig: signature
+          )
+        end
+
+      end
+    end
+  end
+end

data/lib/azure/blob/blob_service.rb

@@ -14,6 +14,7 @@
 #--------------------------------------------------------------------------
 require 'azure/service/storage_service'
 require 'azure/blob/serialization'
+require 'azure/blob/auth/shared_access_signature'
 require 'base64'
 
 module Azure
@@ -29,25 +30,25 @@ module Azure
       #
       # ==== Attributes
       #
-      # * +options+       - Hash. Optional parameters. 
+      # * +options+       - Hash. Optional parameters.
       #
       # ==== Options
       #
       # Accepted key/value pairs in options parameter are:
-      # * +:prefix+       - String. Filters the results to return only containers 
+      # * +:prefix+       - String. Filters the results to return only containers
       #   whose name begins with the specified prefix. (optional)
       #
-      # * +:marker+       - String. An identifier the specifies the portion of the 
+      # * +:marker+       - String. An identifier the specifies the portion of the
       #   list to be returned. This value comes from the property
-      #   Azure::Service::EnumerationResults.continuation_token when there 
-      #   are more containers available than were returned. The 
+      #   Azure::Service::EnumerationResults.continuation_token when there
+      #   are more containers available than were returned. The
       #   marker value may then be used here to request the next set
       #   of list items. (optional)
       #
-      # * +:max_results+  - Integer. Specifies the maximum number of containers to return. 
-      #   If max_results is not specified, or is a value greater than 
-      #   5,000, the server will return up to 5,000 items. If it is set 
-      #   to a value less than or equal to zero, the server will return 
+      # * +:max_results+  - Integer. Specifies the maximum number of containers to return.
+      #   If max_results is not specified, or is a value greater than
+      #   5,000, the server will return up to 5,000 items. If it is set
+      #   to a value less than or equal to zero, the server will return
       #   status code 400 (Bad Request). (optional)
       #
       # * +:metadata+     - Boolean. Specifies whether or not to return the container metadata.
@@ -56,16 +57,16 @@ module Azure
       # * +:timeout+      - Integer. A timeout in seconds.
       #
       # NOTE: Metadata requested with the :metadata parameter must have been stored in
-      # accordance with the naming restrictions imposed by the 2009-09-19 version of the Blob 
-      # service. Beginning with that version, all metadata names must adhere to the naming 
+      # accordance with the naming restrictions imposed by the 2009-09-19 version of the Blob
+      # service. Beginning with that version, all metadata names must adhere to the naming
       # conventions for C# identifiers.
       #
-      # See: http://msdn.microsoft.com/en-us/library/aa664670(VS.71).aspx 
+      # See: http://msdn.microsoft.com/en-us/library/aa664670(VS.71).aspx
       #
-      # Any metadata with invalid names which were previously stored, will be returned with the 
+      # Any metadata with invalid names which were previously stored, will be returned with the
       # key "x-ms-invalid-name" in the metadata hash. This may contain multiple values and be an
       # Array (vs a String if it only contains a single value).
-      # 
+      #
       # Returns an Azure::Service::EnumerationResults
       def list_containers(options={})
         query = { }
@@ -76,19 +77,19 @@ module Azure
           query["include"] = "metadata" if options[:metadata] == true
           query["timeout"] = options[:timeout].to_s if options[:timeout]
         end
-        
+
         uri = containers_uri(query)
         response = call(:get, uri)
 
         Serialization.container_enumeration_results_from_xml(response.body)
       end
 
-      # Public: Create a new container 
+      # Public: Create a new container
       #
       # ==== Attributes
       #
       # * +name+          - String. The name of the container
-      # * +options+       - Hash. Optional parameters. 
+      # * +options+       - Hash. Optional parameters.
       #
       # ==== Options
       #
@@ -97,7 +98,7 @@ module Azure
       # * +:public_access_level+ - String. One of "container" or "blob" (optional)
       # * +:timeout+             - Integer. A timeout in seconds.
       #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/dd179468.aspx
+      # See http://msdn.microsoft.com/en-us/library/azure/dd179468.aspx
       #
       # Returns a Container
       def create_container(name, options={})
@@ -106,7 +107,7 @@ module Azure
 
         uri = container_uri(name, query)
 
-        headers = { }
+        headers = service_properties_headers
 
         add_metadata_to_headers(options[:metadata], headers) if options[:metadata]
 
@@ -125,14 +126,14 @@ module Azure
       # ==== Attributes
       #
       # * +name+       - String. The name of the container
-      # * +options+    - Hash. Optional parameters. 
+      # * +options+    - Hash. Optional parameters.
       #
       # ==== Options
       #
       # Accepted key/value pairs in options parameter are:
       # * +:timeout+   - Integer. A timeout in seconds.
       #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/dd179408.aspx
+      # See http://msdn.microsoft.com/en-us/library/azure/dd179408.aspx
       #
       # Returns nil on success
       def delete_container(name, options={})
@@ -148,14 +149,14 @@ module Azure
       # ==== Attributes
       #
       # * +name+       - String. The name of the container
-      # * +options+    - Hash. Optional parameters. 
+      # * +options+    - Hash. Optional parameters.
       #
       # ==== Options
       #
       # Accepted key/value pairs in options parameter are:
       # * +:timeout+   - Integer. A timeout in seconds.
       #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/dd179370.aspx
+      # See http://msdn.microsoft.com/en-us/library/azure/dd179370.aspx
       #
       # Returns a Container
       def get_container_properties(name, options={})
@@ -174,14 +175,14 @@ module Azure
       # ==== Attributes
       #
       # * +name+       - String. The name of the container
-      # * +options+    - Hash. Optional parameters. 
+      # * +options+    - Hash. Optional parameters.
       #
       # ==== Options
       #
       # Accepted key/value pairs in options parameter are:
       # * +:timeout+   - Integer. A timeout in seconds.
       #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/ee691976.aspx
+      # See http://msdn.microsoft.com/en-us/library/azure/ee691976.aspx
       #
       # Returns a Container
       def get_container_metadata(name, options={})
@@ -195,20 +196,20 @@ module Azure
         container
       end
 
-      # Public: Gets the access control list (ACL) and any container-level access policies 
+      # Public: Gets the access control list (ACL) and any container-level access policies
       # for the container.
       #
       # ==== Attributes
       #
       # * +name+       - String. The name of the container
-      # * +options+    - Hash. Optional parameters. 
+      # * +options+    - Hash. Optional parameters.
       #
       # ==== Options
       #
       # Accepted key/value pairs in options parameter are:
       # * +:timeout+   - Integer. A timeout in seconds.
       #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/dd179469.aspx
+      # See http://msdn.microsoft.com/en-us/library/azure/dd179469.aspx
       #
       # Returns a tuple of (container, signed_identifiers)
       #   container           - A Azure::Entity::Blob::Container instance
@@ -234,15 +235,15 @@ module Azure
       #
       # * +name+                         - String. The name of the container
       # * +public_access_level+          - String. The container public access level
-      # * +options+                      - Hash. Optional parameters. 
+      # * +options+                      - Hash. Optional parameters.
       #
       # ==== Options
       #
       # Accepted key/value pairs in options parameter are:
-      # * +:signed_identifiers+          - Array. A list of Azure::Entity::SignedIdentifier instances (optional) 
+      # * +:signed_identifiers+          - Array. A list of Azure::Entity::SignedIdentifier instances (optional)
       # * +:timeout+                     - Integer. A timeout in seconds.
       # 
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/dd179391.aspx
+      # See http://msdn.microsoft.com/en-us/library/azure/dd179391.aspx
       #
       # Returns a tuple of (container, signed_identifiers)
       # * +container+           - A Azure::Entity::Blob::Container instance
@@ -253,14 +254,14 @@ module Azure
         query["timeout"] = options[:timeout].to_s if options[:timeout]
         uri =container_uri(name, query)
 
-        headers = { }
+        headers = service_properties_headers
         headers["x-ms-blob-public-access"] = public_access_level if public_access_level && public_access_level.to_s.length > 0
 
         signed_identifiers = nil
         signed_identifiers = options[:signed_identifiers] if options[:signed_identifiers]
 
         body = nil
-        body = Serialization.signed_identifiers_to_xml(signed_identifiers) if signed_identifiers && headers["x-ms-blob-public-access"] == "container"
+        body = Serialization.signed_identifiers_to_xml(signed_identifiers) if signed_identifiers
 
         response = call(:put, uri, body, headers)
 
@@ -278,21 +279,21 @@ module Azure
       #
       # * +name+      - String. The name of the container
       # * +metadata+  - Hash. A Hash of the metadata values
-      # * +options+   - Hash. Optional parameters. 
+      # * +options+   - Hash. Optional parameters.
       #
       # ==== Options
       #
       # Accepted key/value pairs in options parameter are:
       # * +:timeout+  - Integer. A timeout in seconds.
       #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/dd179362.aspx
+      # See http://msdn.microsoft.com/en-us/library/azure/dd179362.aspx
       #
       # Returns nil on success
       def set_container_metadata(name, metadata, options={})
         query = { "comp" => "metadata" }
         query["timeout"] = options[:timeout].to_s if options[:timeout]
 
-        headers = { }
+        headers = service_properties_headers
         add_metadata_to_headers(metadata, headers) if metadata
 
         call(:put, container_uri(name, query), nil, headers)
@@ -303,54 +304,54 @@ module Azure
       #
       # ==== Attributes
       #
-      # * +name+              - String. The name of the container to list blobs for. 
-      # * +options+           - Hash. Optional parameters. 
+      # * +name+              - String. The name of the container to list blobs for.
+      # * +options+           - Hash. Optional parameters.
       #
       # ==== Options
       #
       # Accepted key/value pairs in options parameter are:
-      # * +:prefix+           - String. Filters the results to return only blobs 
+      # * +:prefix+           - String. Filters the results to return only blobs
       #   whose name begins with the specified prefix. (optional)
-      # * +:delimiter+        - String. When the request includes this parameter, the operation 
-      #   returns a BlobPrefix element in the response body that acts as a 
-      #   placeholder for all blobs whose names begin with the same substring 
-      #   up to the appearance of the delimiter character. The delimiter may 
+      # * +:delimiter+        - String. When the request includes this parameter, the operation
+      #   returns a BlobPrefix element in the response body that acts as a
+      #   placeholder for all blobs whose names begin with the same substring
+      #   up to the appearance of the delimiter character. The delimiter may
       #   be a single character or a string.
-      # * +:marker+           - String. An identifier that specifies the portion of the 
+      # * +:marker+           - String. An identifier that specifies the portion of the
       #   list to be returned. This value comes from the property
-      #   Azure::Service::EnumerationResults.continuation_token when 
-      #   there are more blobs available than were returned. The 
+      #   Azure::Service::EnumerationResults.continuation_token when
+      #   there are more blobs available than were returned. The
       #   marker value may then be used here to request the next set
       #   of list items. (optional)
-      # * +:max_results+      - Integer. Specifies the maximum number of blobs to return. 
-      #   If max_results is not specified, or is a value greater than 
-      #   5,000, the server will return up to 5,000 items. If it is set 
-      #   to a value less than or equal to zero, the server will return 
+      # * +:max_results+      - Integer. Specifies the maximum number of blobs to return.
+      #   If max_results is not specified, or is a value greater than
+      #   5,000, the server will return up to 5,000 items. If it is set
+      #   to a value less than or equal to zero, the server will return
       #   status code 400 (Bad Request). (optional)
       # * +:metadata+         - Boolean. Specifies whether or not to return the blob metadata.
       #   (optional, Default=false)
-      # * +:snapshots+        - Boolean. Specifies that snapshots should be included in the 
-      #   enumeration. Snapshots are listed from oldest to newest in the 
+      # * +:snapshots+        - Boolean. Specifies that snapshots should be included in the
+      #   enumeration. Snapshots are listed from oldest to newest in the
       #   response. (optional, Default=false)
-      # * +:uncomittedblobs+  - Boolean. Specifies that blobs for which blocks have been uploaded, 
+      # * +:uncomittedblobs+  - Boolean. Specifies that blobs for which blocks have been uploaded,
       #   but which have not been committed using put_block_list, be included
       #   in the response. (optional, Default=false)
-      # * +:copy+             - Boolean. Specifies that metadata related to any current or previous 
-      #   copy_blob operation should be included in the response. 
+      # * +:copy+             - Boolean. Specifies that metadata related to any current or previous
+      #   copy_blob operation should be included in the response.
       #   (optional, Default=false)
       # * +:timeout+          - Integer. A timeout in seconds.
       #
       # NOTE: Metadata requested with the :metadata parameter must have been stored in
-      # accordance with the naming restrictions imposed by the 2009-09-19 version of the Blob 
-      # service. Beginning with that version, all metadata names must adhere to the naming 
+      # accordance with the naming restrictions imposed by the 2009-09-19 version of the Blob
+      # service. Beginning with that version, all metadata names must adhere to the naming
       # conventions for C# identifiers.
       #
-      # See: http://msdn.microsoft.com/en-us/library/windowsazure/dd135734.aspx
+      # See: http://msdn.microsoft.com/en-us/library/azure/dd135734.aspx
       #
-      # Any metadata with invalid names which were previously stored, will be returned with the 
+      # Any metadata with invalid names which were previously stored, will be returned with the
       # key "x-ms-invalid-name" in the metadata hash. This may contain multiple values and be an
       # Array (vs a String if it only contains a single value).
-      # 
+      #
       # Returns an Azure::Service::EnumerationResults
       def list_blobs(name, options={})
         query = { "comp" => "list" }
@@ -376,13 +377,13 @@ module Azure
 
       # Public: Creates a new page blob. Note that calling create_page_blob to create a page
       # blob only initializes the blob. To add content to a page blob, call create_blob_pages method.
-      # 
+      #
       # ==== Attributes
       #
       # * +container+ - String. The container name.
       # * +blob+      - String. The blob name.
       # * +length+    - Integer. Specifies the maximum size for the page blob, up to 1 TB. The page blob size must be aligned to a 512-byte boundary.
-      # * +options+   - Hash. Optional parameters. 
+      # * +options+   - Hash. Optional parameters.
       #
       # ==== Options
       #
@@ -401,7 +402,7 @@ module Azure
       # * +:sequence_number+       - Integer. The sequence number is a user-controlled value that you can use to track requests. The value of the sequence number must be between 0 and 2^63 - 1.The default value is 0.
       # * +:timeout+               - Integer. A timeout in seconds.
       #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/dd179451.aspx
+      # See http://msdn.microsoft.com/en-us/library/azure/dd179451.aspx
       #
       # Returns a Blob
       def create_page_blob(container, blob, length, options={})
@@ -410,7 +411,7 @@ module Azure
 
         uri = blob_uri(container, blob, query)
 
-        headers = { }
+        headers = service_properties_headers
 
         # set x-ms-blob-type to PageBlob
         headers["x-ms-blob-type"] = "PageBlob"
@@ -418,7 +419,7 @@ module Azure
         # ensure content-length is 0 and x-ms-blob-content-length is the blob length
         headers["Content-Length"] = 0.to_s
         headers["x-ms-blob-content-length"] = length.to_s
-        
+
         # set x-ms-sequence-number from options (or default to 0)
         headers["x-ms-sequence-number"] = (options[:sequence_number] || 0).to_s
 
@@ -469,7 +470,7 @@ module Azure
       # * +:if_none_match+          - An ETag value. Specify an ETag value for this conditional header to write the page only if the blob's ETag value does not match the value specified. If the values are identical, the Blob service returns status code 412 (Precondition Failed).
       # * +:timeout+                - Integer. A timeout in seconds.
       # 
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/ee691975.aspx
+      # See http://msdn.microsoft.com/en-us/library/azure/ee691975.aspx
       #
       # Returns Blob
       def create_blob_pages(container, blob, start_range, end_range, content, options={})
@@ -477,7 +478,7 @@ module Azure
         query["timeout"] = options[:timeout].to_s if options[:timeout]
 
         uri = blob_uri(container, blob, query)
-        headers = { }
+        headers = service_properties_headers
         headers["x-ms-range"] = "bytes=#{start_range}-#{end_range}"
         headers["x-ms-page-write"] = "update"
 
@@ -511,14 +512,14 @@ module Azure
       # * +blob+         - String. Name of blob.
       # * +start_range+  - Integer. Position of first byte of first page.
       # * +end_range+    - Integer. Position of last byte of of last page.
-      # * +options+      - Hash. Optional parameters. 
+      # * +options+      - Hash. Optional parameters.
       #
       # ==== Options
       #
       # Accepted key/value pairs in options parameter are:
       # * +:timeout+     - Integer. A timeout in seconds.
       #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/ee691975.aspx
+      # See http://msdn.microsoft.com/en-us/library/azure/ee691975.aspx
       #
       # Returns Blob
       def clear_blob_pages(container, blob, start_range, end_range, options={})
@@ -527,7 +528,7 @@ module Azure
 
         uri = blob_uri(container, blob, query)
 
-        headers = { }
+        headers = service_properties_headers
         headers["x-ms-range"] = "bytes=#{start_range}-#{end_range}"
         headers["x-ms-page-write"] = "clear"
 
@@ -543,7 +544,7 @@ module Azure
       end
 
       # Public: Creates a new block blob or updates the content of an existing block blob.
-      # 
+      #
       # Updating an existing block blob overwrites any existing metadata on the blob
       # Partial updates are not supported with create_block_blob the content of the
       # existing blob is overwritten with the content of the new blob. To perform a
@@ -557,7 +558,7 @@ module Azure
       # * +container+   - String. The container name.
       # * +blob+        - String. The blob name.
       # * +content+     - IO or String. The content of the blob.
-      # * +options+      - Hash. Optional parameters. 
+      # * +options+      - Hash. Optional parameters.
       #
       # ==== Options
       #
@@ -575,7 +576,7 @@ module Azure
       # * +:metadata+              - Hash. Custom metadata values to store with the blob.
       # * +:timeout+               - Integer. A timeout in seconds.
       #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/dd179451.aspx
+      # See http://msdn.microsoft.com/en-us/library/azure/dd179451.aspx
       #
       # Returns a Blob
       def create_block_blob(container, blob, content, options={})
@@ -583,8 +584,8 @@ module Azure
         query["timeout"] = options[:timeout].to_s if options[:timeout]
 
         uri = blob_uri(container, blob, query)
-        
-        headers = { }
+
+        headers = service_properties_headers
 
         # set x-ms-blob-type to BlockBlob
         headers["x-ms-blob-type"] = "BlockBlob"
@@ -601,6 +602,7 @@ module Azure
         headers["x-ms-blob-content-language"] = options[:blob_content_language] if options[:blob_content_language]
         headers["x-ms-blob-content-md5"] = options[:blob_content_md5] if options[:blob_content_md5]
         headers["x-ms-blob-cache-control"] = options[:blob_cache_control] if options[:blob_cache_control]
+        headers["x-ms-blob-content-disposition"] = options[:blob_content_disposition] if options[:blob_content_disposition]
 
         add_metadata_to_headers(options[:metadata], headers) if options[:metadata]
 
@@ -621,7 +623,7 @@ module Azure
       # * +blob+        - String. The blob name.
       # * +block_id+    - String. The block id. Note: this should be the raw block id, not Base64 encoded.
       # * +content+     - IO or String. The content of the blob.
-      # * +options+      - Hash. Optional parameters. 
+      # * +options+      - Hash. Optional parameters.
       #
       # ==== Options
       #
@@ -629,7 +631,7 @@ module Azure
       # * +:content_md5+           - String. Content MD5 for the request contents.
       # * +:timeout+               - Integer. A timeout in seconds.
       #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/dd135726.aspx
+      # See http://msdn.microsoft.com/en-us/library/azure/dd135726.aspx
       #
       # Returns the MD5 of the uploaded block (as calculated by the server)
       def create_blob_block(container, blob, block_id, content, options={})
@@ -639,7 +641,7 @@ module Azure
 
         uri = blob_uri(container, blob, query)
 
-        headers = { }
+        headers = service_properties_headers
         headers["Content-MD5"] = options[:content_md5] if options[:content_md5]
 
         response = call(:put, uri, content, headers)
@@ -648,27 +650,27 @@ module Azure
       end
 
       # Public: Commits existing blob blocks to a blob.
-      #  
+      #
       # This method writes a blob by specifying the list of block IDs that make up the
-      # blob. In order to be written as part of a blob, a block must have been 
+      # blob. In order to be written as part of a blob, a block must have been
       # successfully written to the server in a prior create_blob_block method.
-      # 
-      # You can call Put Block List to update a blob by uploading only those blocks 
-      # that have changed, then committing the new and existing blocks together. 
-      # You can do this by specifying whether to commit a block from the committed 
+      #
+      # You can call Put Block List to update a blob by uploading only those blocks
+      # that have changed, then committing the new and existing blocks together.
+      # You can do this by specifying whether to commit a block from the committed
       # block list or from the uncommitted block list, or to commit the most recently
       # uploaded version of the block, whichever list it may belong to.
-      # 
+      #
       # ==== Attributes
       #
       # * +container+   - String. The container name.
       # * +blob+        - String. The blob name.
-      # * +block_list+  - Array. A ordered list of lists in the following format: 
+      # * +block_list+  - Array. A ordered list of lists in the following format:
       #   [ ["block_id1", :committed], ["block_id2", :uncommitted], ["block_id3"], ["block_id4", :committed]... ]
-      #   The first element of the inner list is the block_id, the second is optional 
-      #   and can be either :committed or :uncommitted to indicate in which group of blocks 
+      #   The first element of the inner list is the block_id, the second is optional
+      #   and can be either :committed or :uncommitted to indicate in which group of blocks
       #   the id should be looked for. If it is omitted, the latest of either group will be used.
-      # * +options+     - Hash. Optional parameters. 
+      # * +options+     - Hash. Optional parameters.
       #
       # ==== Options
       #
@@ -682,8 +684,8 @@ module Azure
       # * +:metadata+              - Hash. Custom metadata values to store with the blob.
       # * +:timeout+               - Integer. A timeout in seconds.
       #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/dd179467.aspx 
-      # 
+      # See http://msdn.microsoft.com/en-us/library/azure/dd179467.aspx 
+      #
       # Returns nil on success
       def commit_blob_blocks(container, blob, block_list, options={})
         query = { "comp" => "blocklist" }
@@ -691,7 +693,7 @@ module Azure
 
         uri = blob_uri(container, blob, query)
 
-        headers = { }
+        headers = service_properties_headers
         unless options.empty?
           headers["Content-MD5"] = options[:content_md5] if options[:content_md5]
           headers["x-ms-blob-content-type"] = options[:blob_content_type] if options[:blob_content_type]
@@ -699,6 +701,7 @@ module Azure
           headers["x-ms-blob-content-language"] = options[:blob_content_language] if options[:blob_content_language]
           headers["x-ms-blob-content-md5"] = options[:blob_content_md5] if options[:blob_content_md5]
           headers["x-ms-blob-cache-control"] = options[:blob_cache_control] if options[:blob_cache_control]
+          headers["x-ms-blob-content-disposition"] = options[:blob_content_disposition] if options[:blob_content_disposition]
 
           add_metadata_to_headers(options[:metadata], headers) if options[:metadata]
         end
@@ -709,30 +712,30 @@ module Azure
       end
 
       # Public: Retrieves the list of blocks that have been uploaded as part of a block blob.
-      # 
+      #
       # There are two block lists maintained for a blob:
-      # 1) Committed Block List: The list of blocks that have been successfully 
+      # 1) Committed Block List: The list of blocks that have been successfully
       #    committed to a given blob with commitBlobBlocks.
       # 2) Uncommitted Block List: The list of blocks that have been uploaded for a 
       #    blob using Put Block (REST API), but that have not yet been committed. 
-      #    These blocks are stored in Windows Azure in association with a blob, but do
+      #    These blocks are stored in Microsoft Azure in association with a blob, but do
       #    not yet form part of the blob.
       #
       # ==== Attributes
       #
       # * +container+       - String. The container name.
       # * +blob+            - String. The blob name.
-      # * +options+         - Hash. Optional parameters. 
+      # * +options+         - Hash. Optional parameters.
       #
       # ==== Options
       #
       # Accepted key/value pairs in options parameter are:
       # * +:blocklist_type+ - Symbol. One of :all, :committed, :uncommitted. Defaults to :all (optional)
-      # * +:snapshot+       - String. An opaque DateTime value that specifies the blob snapshot to 
+      # * +:snapshot+       - String. An opaque DateTime value that specifies the blob snapshot to
       #   retrieve information from. (optional)
       # * +:timeout+        - Integer. A timeout in seconds.
       #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/dd179400.aspx
+      # See http://msdn.microsoft.com/en-us/library/azure/dd179400.aspx
       #
       # Returns a list of Azure::Entity::Blob::Block instances
       def list_blob_blocks(container, blob, options={})
@@ -757,16 +760,16 @@ module Azure
       #
       # * +container+      - String. The container name.
       # * +blob+           - String. The blob name.
-      # * +options+        - Hash. Optional parameters. 
+      # * +options+        - Hash. Optional parameters.
       #
       # ==== Options
       #
       # Accepted key/value pairs in options parameter are:
-      # * +:snapshot+      - String. An opaque DateTime value that specifies the blob snapshot to 
+      # * +:snapshot+      - String. An opaque DateTime value that specifies the blob snapshot to
       #   retrieve information from.
       # * +:timeout+       - Integer. A timeout in seconds.
       #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/dd179394.aspx
+      # See http://msdn.microsoft.com/en-us/library/azure/dd179394.aspx
       #
       # Returns a Blob
       def get_blob_properties(container, blob, options={})
@@ -792,16 +795,16 @@ module Azure
       #
       # * +container+      - String. The container name.
       # * +blob+           - String. The blob name.
-      # * +options+        - Hash. Optional parameters. 
+      # * +options+        - Hash. Optional parameters.
       #
       # ==== Options
       #
       # Accepted key/value pairs in options parameter are:
-      # * +:snapshot+      - String. An opaque DateTime value that specifies the blob snapshot to 
+      # * +:snapshot+      - String. An opaque DateTime value that specifies the blob snapshot to
       #   retrieve information from.
       # * +:timeout+       - Integer. A timeout in seconds.
       #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/dd179350.aspx
+      # See http://msdn.microsoft.com/en-us/library/azure/dd179350.aspx
       #
       # Returns a Blob
       def get_blob_metadata(container, blob, options={})
@@ -821,25 +824,25 @@ module Azure
         result
       end
 
-      # Public: Returns a list of active page ranges for a page blob. Active page ranges are 
+      # Public: Returns a list of active page ranges for a page blob. Active page ranges are
       # those that have been populated with data.
       #
       # ==== Attributes
       #
       # * +container+       - String. The container name.
       # * +blob+            - String. The blob name.
-      # * +options+         - Hash. Optional parameters. 
+      # * +options+         - Hash. Optional parameters.
       #
       # ==== Options
       #
       # Accepted key/value pairs in options parameter are:
       # * +:start_range+    - Integer. Position of first byte of first page. (optional)
       # * +:end_range+      - Integer. Position of last byte of of last page. (optional)
-      # * +:snapshot+       - String. An opaque DateTime value that specifies the blob snapshot to 
+      # * +:snapshot+       - String. An opaque DateTime value that specifies the blob snapshot to
       #   retrieve information from. (optional)
       # * +:timeout+        - Integer. A timeout in seconds.
       #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/ee691973.aspx
+      # See http://msdn.microsoft.com/en-us/library/azure/ee691973.aspx
       #
       # Returns a list of page ranges in the format [ [start, end], [start, end], ... ]
       #
@@ -854,7 +857,7 @@ module Azure
 
         options[:start_range] = 0 if options[:end_range] and not options[:start_range]
 
-        headers = { }
+        headers = service_properties_headers
         headers = { "x-ms-range" =>  "bytes=#{options[:start_range]}-#{options[:end_range]}" } if options[:start_range]
 
         response = call(:get, uri, nil, headers)
@@ -869,7 +872,7 @@ module Azure
       #
       # * +container+      - String. The container name.
       # * +blob+           - String. The blob name.
-      # * +options+         - Hash. Optional parameters. 
+      # * +options+         - Hash. Optional parameters.
       #
       # ==== Options
       #
@@ -879,33 +882,33 @@ module Azure
       # * +:content_language+         - String. Content language for the blob. Will be saved with blob.
       # * +:content_md5+              - String. Content MD5 for the blob. Will be saved with blob.
       # * +:cache_control+            - String. Cache control for the blob. Will be saved with blob.
-      # * +:content_length+           - Integer. Resizes a page blob to the specified size. If the specified 
-      #   value is less than the current size of the blob, then all pages above 
-      #   the specified value are cleared. This property cannot be used to change 
-      #   the size of a block blob. Setting this property for a block blob returns 
+      # * +:content_length+           - Integer. Resizes a page blob to the specified size. If the specified
+      #   value is less than the current size of the blob, then all pages above
+      #   the specified value are cleared. This property cannot be used to change
+      #   the size of a block blob. Setting this property for a block blob returns
       #   status code 400 (Bad Request).
-      # * +:sequence_number_action+   - Symbol. This property indicates how the service should modify the sequence 
-      #   number for the blob. Required if :sequence_number is used. This property 
+      # * +:sequence_number_action+   - Symbol. This property indicates how the service should modify the sequence
+      #   number for the blob. Required if :sequence_number is used. This property
       #   applies to page blobs only.
       #
       #   Specify one of the following options for this property:
       #
-      #   * +:max+        - Sets the sequence number to be the higher of the value included with 
+      #   * +:max+        - Sets the sequence number to be the higher of the value included with
       #     the request and the value currently stored for the blob.
       #   * +:update+     - Sets the sequence number to the value included with the request.
-      #   * +:increment+  - Increments the value of the sequence number by 1. If specifying this 
+      #   * +:increment+  - Increments the value of the sequence number by 1. If specifying this
       #     option, do not include the sequence_number option; doing so will return
       #     status code 400 (Bad Request).
-      # * +:sequence_number+          - Integer. This property sets the blob's sequence number. The sequence number is a 
-      #   user-controlled property that you can use to track requests and manage concurrency 
-      #   issues. Required if the :sequence_number_action option is set to :max or :update. 
+      # * +:sequence_number+          - Integer. This property sets the blob's sequence number. The sequence number is a
+      #   user-controlled property that you can use to track requests and manage concurrency
+      #   issues. Required if the :sequence_number_action option is set to :max or :update.
       #   This property applies to page blobs only.
       #
-      #   Use this together with the :sequence_number_action to update the blob's sequence 
-      #   number, either to the specified value or to the higher of the values specified with 
+      #   Use this together with the :sequence_number_action to update the blob's sequence
+      #   number, either to the specified value or to the higher of the values specified with
       #   the request or currently stored with the blob.
       #
-      #   This header should not be specified if :sequence_number_action is set to :increment; 
+      #   This header should not be specified if :sequence_number_action is set to :increment;
       #   in this case the service automatically increments the sequence number by one.
       #
       #   To set the sequence number to a value of your choosing, this property must be specified
@@ -917,27 +920,27 @@ module Azure
       # The semantics for updating a blob's properties are as follows:
       #
       # * A page blob's sequence number is updated only if the request meets either of the following conditions:
-      # 
+      #
       #     * The :sequence_number_action property is set to :max or :update, and a value for :sequence_number is also set.
       #     * The :sequence_number_action property is set to :increment, indicating that the service should increment
       #       the sequence number by one.
-      # 
+      #
       # * The size of the page blob is modified only if a value for :content_length is specified.
       #
       # * If :sequence_number and/or :content_length are the only properties specified, then the other properties of the blob
       #   will NOT be modified.
-      # 
+      #
       # * If any one or more of the following properties are set, then all of these properties are set together. If a value is
       #   not provided for a given property when at least one of the properties listed below is set, then that property will be
       #   cleared for the blob.
-      # 
+      #
       #     * :cache_control
       #     * :content_type
       #     * :content_md5
       #     * :content_encoding
       #     * :content_language
       #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/ee691966.aspx
+      # See http://msdn.microsoft.com/en-us/library/azure/ee691966.aspx
       #
       # Returns nil on success.
       def set_blob_properties(container, blob, options={})
@@ -945,7 +948,7 @@ module Azure
         query["timeout"] = options[:timeout].to_s if options[:timeout]
         uri = blob_uri(container, blob, query)
 
-        headers = { }
+        headers = service_properties_headers
 
         unless options.empty?
           headers["x-ms-blob-content-type"] = options[:blob_content_type] if options[:blob_content_type]
@@ -956,6 +959,7 @@ module Azure
           headers["x-ms-blob-content-length"] = options[:blob_content_length].to_s if options[:blob_content_length]
           headers["x-ms-blob-sequence-number-action"] = options[:sequence_number_action].to_s if options[:sequence_number_action]
           headers["x-ms-blob-sequence-number"] = options[:sequence_number].to_s if options[:sequence_number]
+          headers["x-ms-blob-content-disposition"] = options[:blob_content_disposition] if options[:blob_content_disposition]
         end
 
         call(:put, uri, nil, headers)
@@ -969,14 +973,14 @@ module Azure
       # * +container+      - String. The container name.
       # * +blob+           - String. The blob name.
       # * +metadata+       - Hash. The custom metadata.
-      # * +options+        - Hash. Optional parameters. 
+      # * +options+        - Hash. Optional parameters.
       #
       # ==== Options
       #
       # Accepted key/value pairs in options parameter are:
       # * +:timeout+       - Integer. A timeout in seconds.
       #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/dd179414.aspx
+      # See http://msdn.microsoft.com/en-us/library/azure/dd179414.aspx
       #
       # Returns nil on success.
       def set_blob_metadata(container, blob, metadata, options={})
@@ -984,7 +988,7 @@ module Azure
         query["timeout"] = options[:timeout].to_s if options[:timeout]
         uri = blob_uri(container, blob, query)
 
-        headers = { }
+        headers = service_properties_headers
 
         add_metadata_to_headers(metadata, headers) if metadata
 
@@ -998,20 +1002,20 @@ module Azure
       #
       # * +container+        - String. The container name.
       # * +blob+             - String. The blob name.
-      # * +options+          - Hash. Optional parameters. 
+      # * +options+          - Hash. Optional parameters.
       #
       # ==== Options
       #
       # Accepted key/value pairs in options parameter are:
       # * +:start_range+     - Integer. Position of first byte of first page. (optional)
       # * +:end_range+       - Integer. Position of last byte of of last page. (optional)
-      # * +:snapshot+        - String. An opaque DateTime value that specifies the blob snapshot to 
+      # * +:snapshot+        - String. An opaque DateTime value that specifies the blob snapshot to
       #   retrieve information from. (optional)
       # * +:get_content_md5+ - Boolean. Return the MD5 hash for the range. This option only valid if
       #   start_range and end_range are specified. (optional)
       # * +:timeout+         - Integer. A timeout in seconds.
       #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/dd179440.aspx
+      # See http://msdn.microsoft.com/en-us/library/azure/dd179440.aspx
       #
       # Returns a blob and the blob body
       def get_blob(container, blob, options={})
@@ -1020,7 +1024,7 @@ module Azure
         query["timeout"] = options[:timeout].to_s if options[:timeout]
         uri = blob_uri(container, blob, query)
 
-        headers = { }
+        headers = service_properties_headers
         options[:start_range] = 0 if options[:end_range] and not options[:start_range]
         if options[:start_range]
           headers["x-ms-range"] = "bytes=#{options[:start_range]}-#{options[:end_range]}"
@@ -1039,23 +1043,23 @@ module Azure
       #
       # * +container+          - String. The container name.
       # * +blob+               - String. The blob name.
-      # * +options+            - Hash. Optional parameters. 
+      # * +options+            - Hash. Optional parameters.
       #
       # ==== Options
       #
       # Accepted key/value pairs in options parameter are:
-      # * +:snapshot+          - String. An opaque DateTime value that specifies the blob snapshot to 
+      # * +:snapshot+          - String. An opaque DateTime value that specifies the blob snapshot to
       #   retrieve information from. (optional)
       # * +:delete_snapshots+  - Symbol. Used to specify the scope of the delete operation for snapshots.
-      #   This parameter is ignored if a blob does not have snapshots, or if a 
+      #   This parameter is ignored if a blob does not have snapshots, or if a
       #   snapshot is specified in the snapshot parameter. (optional)
-      # 
-      #   Possible values include:  
+      #
+      #   Possible values include:
       #   * +:only+     - Deletes only the snapshots for the blob, but leaves the blob
       #   * +:include+  - Deletes the blob and all of the snapshots for the blob
       # * +:timeout+           - Integer. A timeout in seconds.
       #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/dd179440.aspx
+      # See http://msdn.microsoft.com/en-us/library/azure/dd179440.aspx
       #
       # Returns nil on success
       def delete_blob(container, blob, options={})
@@ -1067,7 +1071,7 @@ module Azure
 
         options[:delete_snapshots] = :include if !options[:delete_snapshots]
 
-        headers = { }
+        headers = service_properties_headers
         headers["x-ms-delete-snapshots"] = options[:delete_snapshots].to_s if options[:delete_snapshots] && options[:snapshot] == nil
 
         call(:delete, uri, nil, headers)
@@ -1080,28 +1084,28 @@ module Azure
       #
       # * +container+       - String. The container name.
       # * +blob+            - String. The blob name.
-      # * +options+         - Hash. Optional parameters. 
+      # * +options+         - Hash. Optional parameters.
       #
       # ==== Options
       #
       # Accepted key/value pairs in options parameter are:
       # * +:metadata+                 - Hash. Custom metadata values to store with the blob snapshot.
-      # * +:if_modified_since+        - A DateTime value. Specify this option to write the page only if the blob has been 
-      #   modified since the specified date/time. If the blob has not been modified, the 
+      # * +:if_modified_since+        - A DateTime value. Specify this option to write the page only if the blob has been
+      #   modified since the specified date/time. If the blob has not been modified, the
       #   Blob service returns status code 412 (Precondition Failed).
-      # * +:if_unmodified_since+      - A DateTime value. Specify this option to write the page only if the blob has not 
-      #   been modified since the specified date/time. If the blob has been modified, the 
+      # * +:if_unmodified_since+      - A DateTime value. Specify this option to write the page only if the blob has not
+      #   been modified since the specified date/time. If the blob has been modified, the
       #   Blob service returns status code 412 (Precondition Failed).
-      # * +:if_match+                 - An ETag value. Specify an ETag value to write the page only if the blob's ETag 
-      #   value matches the value specified. If the values do not match, the Blob service 
+      # * +:if_match+                 - An ETag value. Specify an ETag value to write the page only if the blob's ETag
+      #   value matches the value specified. If the values do not match, the Blob service
       #   returns status code 412 (Precondition Failed).
-      # * +:if_none_match+            - An ETag value. Specify an ETag value to write the page only if the blob's ETag 
-      #   value does not match the value specified. If the values are identical, the Blob 
+      # * +:if_none_match+            - An ETag value. Specify an ETag value to write the page only if the blob's ETag
+      #   value does not match the value specified. If the values are identical, the Blob
       #   service returns status code 412 (Precondition Failed).
       # * +:timeout+                  - Integer. A timeout in seconds.
       #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/ee691971.aspx
-      # 
+      # See http://msdn.microsoft.com/en-us/library/azure/ee691971.aspx
+      #
       # Returns the snapshot DateTime value
       def create_blob_snapshot(container, blob, options={})
         query = { "comp" => "snapshot" }
@@ -1109,7 +1113,7 @@ module Azure
 
         uri = blob_uri(container, blob, query)
 
-        headers = { }
+        headers = service_properties_headers
         unless options.empty?
           add_metadata_to_headers(options[:metadata], headers) if options[:metadata]
 
@@ -1125,65 +1129,65 @@ module Azure
       end
 
       # Public: Copies a source blob to a destination blob within the same storage account.
-      # 
+      #
       # ==== Attributes
       #
       # * +source_container+      - String. The destination container name to copy to.
       # * +source_blob+           - String. The destination blob name to copy to.
       # * +destination_container+ - String. The source container name to copy from.
       # * +destination_blob+      - String. The source blob name to copy from.
-      # * +options+               - Hash. Optional parameters. 
+      # * +options+               - Hash. Optional parameters.
       #
       # ==== Options
       #
       # Accepted key/value pairs in options parameter are:
       # * +:source_snapshot+            - String. A snapshot id for the source blob
-      # * +:metadata+                   - Hash. Custom metadata values to store with the copy. If this parameter is not 
-      #   specified, the operation will copy the source blob metadata to the destination 
-      #   blob. If this parameter is specified, the destination blob is created with the 
+      # * +:metadata+                   - Hash. Custom metadata values to store with the copy. If this parameter is not
+      #   specified, the operation will copy the source blob metadata to the destination
+      #   blob. If this parameter is specified, the destination blob is created with the
       #   specified metadata, and metadata is not copied from the source blob.
-      # * +:source_if_modified_since+   - A DateTime value. Specify this option to write the page only if the source blob 
-      #   has been modified since the specified date/time. If the blob has not been 
+      # * +:source_if_modified_since+   - A DateTime value. Specify this option to write the page only if the source blob
+      #   has been modified since the specified date/time. If the blob has not been
       #   modified, the Blob service returns status code 412 (Precondition Failed).
       # * +:source_if_unmodified_since+ - A DateTime value. Specify this option to write the page only if the source blob
-      #   has not been modified since the specified date/time. If the blob has been 
+      #   has not been modified since the specified date/time. If the blob has been
       #   modified, the Blob service returns status code 412 (Precondition Failed).
-      # * +:source_if_match+            - An ETag value. Specify an ETag value to write the page only if the source blob's 
-      #   ETag value matches the value specified. If the values do not match, the Blob 
+      # * +:source_if_match+            - An ETag value. Specify an ETag value to write the page only if the source blob's
+      #   ETag value matches the value specified. If the values do not match, the Blob
       #   service returns status code 412 (Precondition Failed).
-      # * +:source_if_none_match+       - An ETag value. Specify an ETag value to write the page only if the source blob's 
-      #   ETag value does not match the value specified. If the values are identical, the 
+      # * +:source_if_none_match+       - An ETag value. Specify an ETag value to write the page only if the source blob's
+      #   ETag value does not match the value specified. If the values are identical, the
       #   Blob service returns status code 412 (Precondition Failed).
-      # * +:dest_if_modified_since+     - A DateTime value. Specify this option to write the page only if the destination 
-      #   blob has been modified since the specified date/time. If the blob has not been 
+      # * +:dest_if_modified_since+     - A DateTime value. Specify this option to write the page only if the destination
+      #   blob has been modified since the specified date/time. If the blob has not been
       #   modified, the Blob service returns status code 412 (Precondition Failed).
-      # * +:dest_if_unmodified_since+   - A DateTime value. Specify this option to write the page only if the destination 
-      #   blob has not been modified since the specified date/time. If the blob has been 
+      # * +:dest_if_unmodified_since+   - A DateTime value. Specify this option to write the page only if the destination
+      #   blob has not been modified since the specified date/time. If the blob has been
       #   modified, the Blob service returns status code 412 (Precondition Failed).
-      # * +:dest_if_match+              - An ETag value. Specify an ETag value to write the page only if the destination 
-      #   blob's ETag value matches the value specified. If the values do not match, the 
+      # * +:dest_if_match+              - An ETag value. Specify an ETag value to write the page only if the destination
+      #   blob's ETag value matches the value specified. If the values do not match, the
       #   Blob service returns status code 412 (Precondition Failed).
-      # * +:dest_if_none_match+         - An ETag value. Specify an ETag value to write the page only if the destination 
-      #   blob's ETag value does not match the value specified. If the values are 
+      # * +:dest_if_none_match+         - An ETag value. Specify an ETag value to write the page only if the destination
+      #   blob's ETag value does not match the value specified. If the values are
       #   identical, the Blob service returns status code 412 (Precondition Failed).
       # * +:timeout+                    - Integer. A timeout in seconds.
       #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/dd894037.aspx
+      # See http://msdn.microsoft.com/en-us/library/azure/dd894037.aspx
       #
-      # Returns a tuple of (copy_id, copy_status). 
+      # Returns a tuple of (copy_id, copy_status).
       #
-      # * +copy_id+     - String identifier for this copy operation. Use with get_blob or get_blob_properties to check 
+      # * +copy_id+     - String identifier for this copy operation. Use with get_blob or get_blob_properties to check
       #   the status of this copy operation, or pass to abort_copy_blob to abort a pending copy.
       # * +copy_status+ - String. The state of the copy operation, with these values:
       #   "success" - The copy completed successfully.
-      #   "pending" - The copy is in progress. 
+      #   "pending" - The copy is in progress.
       #
       def copy_blob(destination_container, destination_blob, source_container, source_blob, options={})
         query = { }
         query["timeout"] = options[:timeout].to_s if options[:timeout]
 
         uri = blob_uri(destination_container, destination_blob, query)
-        headers = { }
+        headers = service_properties_headers
         headers["x-ms-copy-source"] = blob_uri(source_container, source_blob, options[:source_snapshot] ? { "snapshot" => options[:source_snapshot] } : {}).to_s
 
         unless options.empty?
@@ -1209,21 +1213,21 @@ module Azure
       # ==== Attributes
       #
       # * +container+          - String. The container name.
-      # * +blob+               - String. The blob name.     
-      # * +options+            - Hash. Optional parameters. 
+      # * +blob+               - String. The blob name.
+      # * +options+            - Hash. Optional parameters.
       #
       # ==== Options
       #
-      # Accepted key/value pairs in options parameter are: 
-      # * +:duration+          - Integer. Default -1. Specifies the duration of the lease, in seconds, or negative one (-1) 
+      # Accepted key/value pairs in options parameter are:
+      # * +:duration+          - Integer. Default -1. Specifies the duration of the lease, in seconds, or negative one (-1)
       #   for a lease that never expires. A non-infinite lease can be between 15 and 60 seconds. (optional)
       # * +:proposed_lease_id+ - String. Proposed lease ID, in a GUID string format. The Blob service returns 400 (Invalid request)
       #   if the proposed lease ID is not in the correct format. (optional)
       # * +:timeout+           - Integer. A timeout in seconds.
       #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/ee691972.aspx
+      # See http://msdn.microsoft.com/en-us/library/azure/ee691972.aspx
       #
-      # Returns a String of the new unique lease id. While the lease is active, you must include the lease ID with any request 
+      # Returns a String of the new unique lease id. While the lease is active, you must include the lease ID with any request
       # to write to the blob, or to renew, change, or release the lease. A successful renew operation also returns the lease id
       # for the active lease.
       #
@@ -1236,7 +1240,7 @@ module Azure
         duration = -1
         duration = options[:duration] if options[:duration]
 
-        headers = { }
+        headers = service_properties_headers
         headers["x-ms-lease-action"] = "acquire"
         headers["x-ms-lease-duration"] = duration.to_s if duration
         headers["x-ms-proposed-lease-id"] = options[:proposed_lease_id] if options[:proposed_lease_id]
@@ -1245,9 +1249,9 @@ module Azure
         response.headers["x-ms-lease-id"]
       end
 
-      # Public: Renews the lease. The lease can be renewed if the lease ID specified on the request matches that 
-      # associated with the blob. Note that the lease may be renewed even if it has expired as long as the blob 
-      # has not been modified or leased again since the expiration of that lease. When you renew a lease, the 
+      # Public: Renews the lease. The lease can be renewed if the lease ID specified on the request matches that
+      # associated with the blob. Note that the lease may be renewed even if it has expired as long as the blob
+      # has not been modified or leased again since the expiration of that lease. When you renew a lease, the
       # lease duration clock resets.
       #
       # ==== Attributes
@@ -1255,14 +1259,14 @@ module Azure
       # * +container+         - String. The container name.
       # * +blob+              - String. The blob name.
       # * +lease+             - String. The lease id
-      # * +options+           - Hash. Optional parameters. 
+      # * +options+           - Hash. Optional parameters.
       #
       # ==== Options
       #
-      # Accepted key/value pairs in options parameter are: 
+      # Accepted key/value pairs in options parameter are:
       # * +:timeout+          - Integer. A timeout in seconds.
       #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/ee691972.aspx
+      # See http://msdn.microsoft.com/en-us/library/azure/ee691972.aspx
       #
       # Returns the renewed lease id
       def renew_lease(container, blob, lease, options={})
@@ -1271,7 +1275,7 @@ module Azure
 
         uri = blob_uri(container, blob, query)
 
-        headers = { }
+        headers = service_properties_headers
         headers["x-ms-lease-action"] = "renew"
         headers["x-ms-lease-id"] = lease
 
@@ -1279,8 +1283,8 @@ module Azure
         response.headers["x-ms-lease-id"]
       end
 
-      # Public: Releases the lease. The lease may be released if the lease ID specified on the request matches that 
-      # associated with the blob. Releasing the lease allows another client to immediately acquire the lease for 
+      # Public: Releases the lease. The lease may be released if the lease ID specified on the request matches that
+      # associated with the blob. Releasing the lease allows another client to immediately acquire the lease for
       # the blob as soon as the release is complete.
       #
       # ==== Attributes
@@ -1288,14 +1292,14 @@ module Azure
       # * +container+         - String. The container name.
       # * +blob+              - String. The blob name.
       # * +lease+             - String. The lease id.
-      # * +options+           - Hash. Optional parameters. 
+      # * +options+           - Hash. Optional parameters.
       #
       # ==== Options
       #
-      # Accepted key/value pairs in options parameter are: 
+      # Accepted key/value pairs in options parameter are:
       # * +:timeout+          - Integer. A timeout in seconds.
       #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/ee691972.aspx
+      # See http://msdn.microsoft.com/en-us/library/azure/ee691972.aspx
       #
       # Returns nil on success
       def release_lease(container, blob, lease, options={})
@@ -1304,7 +1308,7 @@ module Azure
 
         uri = blob_uri(container, blob, query)
 
-        headers = { }
+        headers = service_properties_headers
         headers["x-ms-lease-action"] = "release"
         headers["x-ms-lease-id"] = lease
 
@@ -1312,38 +1316,38 @@ module Azure
         nil
       end
 
-      # Public: Breaks the lease, if the blob has an active lease. Once a lease is broken, it cannot be renewed. Any 
-      # authorized request can break the lease; the request is not required to specify a matching lease ID. When a 
-      # lease is broken, the lease break period is allowed to elapse, during which time no lease operation except 
-      # break and release can be performed on the blob. When a lease is successfully broken, the response indicates 
+      # Public: Breaks the lease, if the blob has an active lease. Once a lease is broken, it cannot be renewed. Any
+      # authorized request can break the lease; the request is not required to specify a matching lease ID. When a
+      # lease is broken, the lease break period is allowed to elapse, during which time no lease operation except
+      # break and release can be performed on the blob. When a lease is successfully broken, the response indicates
       # the interval in seconds until a new lease can be acquired.
       #
-      # A lease that has been broken can also be released, in which case another client may immediately acquire the 
+      # A lease that has been broken can also be released, in which case another client may immediately acquire the
       # lease on the blob.
       #
       # ==== Attributes
       #
       # * +container+         - String. The container name.
       # * +blob+              - String. The blob name.
-      # * +options+           - Hash. Optional parameters. 
+      # * +options+           - Hash. Optional parameters.
       #
       # ==== Options
       #
-      # Accepted key/value pairs in options parameter are: 
-      # * +:break_period+     - Integer. The proposed duration of seconds that the lease should continue before it is 
-      #   broken, between 0 and 60 seconds. This break period is only used if it is shorter than 
-      #   the time remaining on the lease. If longer, the time remaining on the lease is used. A 
-      #   new lease will not be available before the break period has expired, but the lease may 
+      # Accepted key/value pairs in options parameter are:
+      # * +:break_period+     - Integer. The proposed duration of seconds that the lease should continue before it is
+      #   broken, between 0 and 60 seconds. This break period is only used if it is shorter than
+      #   the time remaining on the lease. If longer, the time remaining on the lease is used. A
+      #   new lease will not be available before the break period has expired, but the lease may
       #   be held for longer than the break period.
       #
-      #   If this option is not used, a fixed-duration lease breaks after the remaining lease 
+      #   If this option is not used, a fixed-duration lease breaks after the remaining lease
       #   period elapses, and an infinite lease breaks immediately.
       # * +:timeout+          - Integer. A timeout in seconds.
       #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/ee691972.aspx
+      # See http://msdn.microsoft.com/en-us/library/azure/ee691972.aspx
       #
-      # Returns an Integer of the remaining lease time. This value is the approximate time remaining in the lease 
-      # period, in seconds. This header is returned only for a successful request to break the lease. If the break 
+      # Returns an Integer of the remaining lease time. This value is the approximate time remaining in the lease
+      # period, in seconds. This header is returned only for a successful request to break the lease. If the break
       # is immediate, 0 is returned.
       def break_lease(container, blob, options={})
         query = { "comp" => "lease" }
@@ -1351,7 +1355,7 @@ module Azure
 
         uri = blob_uri(container, blob, query)
 
-        headers = { }
+        headers = service_properties_headers
         headers["x-ms-lease-action"] = "break"
         headers["x-ms-lease-break-period"] = options[:break_period].to_s if options[:break_period]