ms_rest_azure 0.10.3 → 0.10.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 483dac03add06e63ad93053bb88692f614575e3f
-  data.tar.gz: c6cf1beb4e58fc828a4d15eeae6bb969ada259e2
+  metadata.gz: def20235f4da031c59b0b4639261aa3e46ba4e73
+  data.tar.gz: aed68ba54b3ae17b309edc3aa7bed16fd2aa4bd9
 SHA512:
-  metadata.gz: 0fa4f569bf9a17b6983aec5bf726829d50c1eadce4a39129629fd8138d1dfbb1d8a9dfb982ae3c3146eac15407b207dbe959f7e22721ab3eefe3a57a51905a57
-  data.tar.gz: 5c793cf9b2153eeb4d8c04e803ffcbf7a4ef0a5f56144dfac25d021f5ebc13e802d89670cb4f85978f1829e42ce911a0eea8a570e13301636823c20fe8a9eeac
+  metadata.gz: e13f97fdeb769da2e259c5634ad7caffc483c7d3d1bd7fe2a57d85ad9d818b58489b6b7577191cd04ea2fc9de25ea7b7d90169f0d96e158c022405566275f6a5
+  data.tar.gz: bcacd4fe74720998007fed9cadc8c7b25e02bc5771dbd224674cea6693dcfc2d0e930f148543d3284aaff370018094e36637fc55879ea35e8c92229984e9d879

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+##2018.04.04 ms_rest_azure version 0.10.4
+* Added IMDS Support for MSI Token Provider class. Refer [PR #1282](https://github.com/Azure/azure-sdk-for-ruby/pull/1282) for further details. 
+
 ##2018.02.06 ms_rest_azure version 0.10.3
 * Removed subscription_id check from configurable. Refer [PR# 1261](https://github.com/Azure/azure-sdk-for-ruby/pull/1261) for further details.
 

data/lib/ms_rest_azure/credentials/msi_token_provider.rb

@@ -14,6 +14,7 @@ module MsRestAzure
     REQUEST_BODY_PATTERN = 'resource={resource_uri}'
     USER_ASSIGNED_IDENTITY = '{id_type}={user_assigned_identity}'
     DEFAULT_SCHEME = 'Bearer'
+    IMDS_TOKEN_ACQUIRE_URL = 'http://169.254.169.254/metadata/identity/oauth2/token'
 
     # @return [MSIActiveDirectoryServiceSettings] settings.
     attr_accessor :settings
@@ -56,11 +57,10 @@ module MsRestAzure
     #  msi_id = {'msi_rest_id': 'resource id of user assigned identity'}
     # The above key,value pairs are mutually exclusive.
     def initialize(port = 50342, settings = ActiveDirectoryServiceSettings.get_azure_settings, msi_id = nil)
-      fail ArgumentError, 'Port cannot be nil' if port.nil?
-      fail ArgumentError, 'Port must be an Integer' unless port.is_a? Integer
       fail ArgumentError, 'Azure AD settings cannot be nil' if settings.nil?
       fail ArgumentError, 'msi_id must include either client_id, object_id or msi_res_id exclusively' if (!msi_id.nil? && msi_id.length > 1)
 
+      warn "The 'port' argument is no longer used, and will be removed in a future release" if port != 50342
       @port = port
       @settings = settings
       if !msi_id.nil?
@@ -78,12 +78,69 @@ module MsRestAzure
     #
     # @return [String] authentication headers.
     def get_authentication_header
-      acquire_token if token_expired
+      if !ENV['MSI_VM'].nil? && ENV['MSI_VM'].downcase == 'true'
+        acquire_token if token_expired
+      else
+        acquire_token_from_imds_with_retry if token_expired
+      end
       "#{token_type} #{token}"
     end
 
     private
 
+    def append_header(name, value)
+      "#{name}=#{value}"
+    end
+
+    def acquire_token_from_imds_with_retry
+      token_acquire_url = IMDS_TOKEN_ACQUIRE_URL.dup + "?" + append_header('resource', ERB::Util.url_encode(@settings.token_audience)) + '&' + append_header('api-version', '2018-02-01')
+      token_acquire_url = (token_acquire_url + '&' + append_header('client_id', @client_id)) unless @client_id.nil?
+      token_acquire_url = (token_acquire_url + '&' + append_header('object_id', @object_id)) unless @object_id.nil?
+      token_acquire_url = (token_acquire_url + '&' + append_header('msi_res_id', @msi_res_id)) unless @msi_res_id.nil?
+      url = URI.parse(token_acquire_url)
+
+      connection = Faraday.new(:url => url, :ssl => MsRest.ssl_options) do |builder|
+        builder.adapter Faraday.default_adapter
+      end
+
+      retry_value = 1
+      max_retry = 20
+      response = nil
+
+      slots = []
+      (0..max_retry-1).each do |i|
+        slots << (100 * ((2 << i) - 1) /1000.to_f)
+      end
+
+      while retry_value <= max_retry
+        response = connection.get do |request|
+          request.headers['Metadata'] = 'true'
+          request.headers['User-Agent'] = "Azure-SDK-For-Ruby/ms_rest_azure/#{MsRestAzure::VERSION}"
+        end
+
+        if response.status == 429
+          puts slots.inspect
+          wait = slots[0..retry_value].sample
+          wait = wait < 1 ? 3 : wait
+          sleep(wait)
+          retry_value += 1
+        elsif response.status != 200
+          fail AzureOperationError, "Couldn't acquire access token from Managed Service Identity, please verify your tenant id, port and settings"
+        else
+          break
+        end
+      end
+
+       if retry_value > max_retry
+         fail AzureOperationError, "MSI: Failed to acquire tokens after #{max_retry} times"
+       end
+
+      response_body = JSON.load(response.body)
+      @token = response_body['access_token']
+      @token_expires_on = Time.at(Integer(response_body['expires_on']))
+      @token_type = response_body['token_type']
+    end
+
     #
     # Checks whether token is about to expire.
     #
@@ -144,4 +201,5 @@ module MsRestAzure
     end
   end
 
-end
+end
+

data/lib/ms_rest_azure/version.rb

@@ -3,5 +3,5 @@
 # Licensed under the MIT License. See License.txt in the project root for license information.
 
 module MsRestAzure
-  VERSION = '0.10.3'
+  VERSION = '0.10.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ms_rest_azure
 version: !ruby/object:Gem::Version
-  version: 0.10.3
+  version: 0.10.4
 platform: ruby
 authors:
 - Microsoft Corporation
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-06 00:00:00.000000000 Z
+date: 2018-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -142,7 +142,7 @@ metadata:
   changelog_uri: https://github.com/Azure/azure-sdk-for-ruby/blob/master/runtime/ms_rest_azure/CHANGELOG.md
   documentation_uri: https://azure.microsoft.com/en-us/develop/ruby/
   homepage_uri: https://aka.ms/azure-sdk-for-ruby
-  source_code_uri: https://github.com/Azure/azure-sdk-for-ruby/tree/ms_rest_azure-v0.10.3
+  source_code_uri: https://github.com/Azure/azure-sdk-for-ruby/tree/ms_rest_azure-v0.10.4
 post_install_message: 
 rdoc_options: []
 require_paths: