aws-sdk-core 3.130.2 → 3.136.0

data/lib/aws-sdk-core/sso_token_provider.rb

@@ -0,0 +1,134 @@
+# frozen_string_literal: true
+
+module Aws
+  class SSOTokenProvider
+
+    include TokenProvider
+    include RefreshingToken
+
+    # @api private
+    SSO_REQUIRED_OPTS = [:sso_region, :sso_session].freeze
+
+    # @api private
+    SSO_LOGIN_GUIDANCE = 'The SSO session associated with this profile has '\
+    'expired or is otherwise invalid. To refresh this SSO session run '\
+    'aws sso login with the corresponding profile.'.freeze
+
+    # @option options [required, String] :sso_region The AWS region where the
+    #   SSO directory for the given sso_start_url is hosted.
+    #
+    # @option options [required, String] :sso_session The SSO Session used to
+    #   for fetching this token.
+    #
+    # @option options [SSOOIDC::Client] :client Optional `SSOOIDC::Client`.  If not
+    #   provided, a client will be constructed.
+    #
+    # @option options [Callable] before_refresh Proc called before
+    #   credentials are refreshed. `before_refresh` is called
+    #   with an instance of this object when
+    #   AWS credentials are required and need to be refreshed.
+    def initialize(options = {})
+
+      missing_keys = SSO_REQUIRED_OPTS.select { |k| options[k].nil? }
+      unless missing_keys.empty?
+        raise ArgumentError, "Missing required keys: #{missing_keys}"
+      end
+
+      @sso_session = options.delete(:sso_session)
+      @sso_region = options.delete(:sso_region)
+
+      options[:region] = @sso_region
+      options[:credentials] = nil
+      @client = options[:client] || Aws::SSOOIDC::Client.new(options)
+
+      super
+    end
+
+    # @return [SSO::Client]
+    attr_reader :client
+
+    private
+
+    def refresh
+      # token is valid and not in refresh window - do not refresh it.
+      return if @token && @token.expiration && !near_expiration?
+
+      # token may not exist or is out of the expiration window
+      # attempt to refresh from disk first (another process/application may have refreshed already)
+      token_json = read_cached_token
+      @token = Token.new(token_json['accessToken'], token_json['expiresAt'])
+      return if @token && @token.expiration && !near_expiration?
+
+      # The token is expired and needs to be refreshed
+      if can_refresh_token?(token_json)
+        begin
+          current_time = Time.now
+          resp = @client.create_token(
+            grant_type: 'refresh_token',
+            client_id: token_json['clientId'],
+            client_secret: token_json['client_secret'],
+            refresh_token: token_json['refreshToken']
+          )
+          token_json['accessToken'] = resp.access_token
+          token_json['expiresAt'] = current_time + resp.expires_in
+          @token = Token.new(token_json['accessToken'], token_json['expiresAt'])
+
+          if resp.refresh_token
+            token_json['refreshToken'] = resp.refresh_token
+          else
+            token_json.delete('refreshToken')
+          end
+
+          update_token_cache(token_json)
+        rescue
+          # refresh has failed, continue attempting to use the token if its not hard expired
+        end
+      end
+
+      if !@token.expiration || @token.expiration < Time.now
+        # Token is hard expired, raise an exception
+        raise Errors::InvalidSSOToken, 'Token is invalid and failed to refresh.'
+      end
+    end
+
+    def read_cached_token
+      cached_token = Json.load(File.read(sso_cache_file))
+      # validation
+      unless cached_token['accessToken'] && cached_token['expiresAt']
+        raise ArgumentError, 'Missing required field(s)'
+      end
+      cached_token['expiresAt'] = Time.parse(cached_token['expiresAt'])
+      cached_token
+    rescue Errno::ENOENT, Aws::Json::ParseError, ArgumentError
+      raise Errors::InvalidSSOToken, SSO_LOGIN_GUIDANCE
+    end
+
+    def update_token_cache(token_json)
+      cached_token = token_json.dup
+      cached_token['expiresAt'] = cached_token['expiresAt'].iso8601
+      File.write(sso_cache_file, Json.dump(cached_token))
+    end
+
+    def sso_cache_file
+      sso_session_sha1 = OpenSSL::Digest::SHA1.hexdigest(@sso_session.encode('utf-8'))
+      File.join(Dir.home, '.aws', 'sso', 'cache', "#{sso_session_sha1}.json")
+    rescue ArgumentError
+      # Dir.home raises ArgumentError when ENV['home'] is not set
+      raise ArgumentError, "Unable to load sso_cache_file: ENV['HOME'] is not set."
+    end
+
+    # return true if all required fields are present
+    # return false if registrationExpiresAt exists and is later than now
+    def can_refresh_token?(token_json)
+      if token_json['clientId'] &&
+        token_json['clientSecret'] &&
+        token_json['refreshToken']
+
+        return !token_json['registrationExpiresAt'] ||
+          Time.parse(token_json['registrationExpiresAt']) > Time.now
+      else
+        false
+      end
+    end
+  end
+end

data/lib/aws-sdk-core/static_token_provider.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Aws
+  class StaticTokenProvider
+
+    include TokenProvider
+
+    # @param [String] token
+    # @param [Time] expiration
+    def initialize(token, expiration=nil)
+      @token = Token.new(token, expiration)
+    end
+  end
+end

data/lib/aws-sdk-core/structure.rb

@@ -28,18 +28,20 @@ module Aws
     # in stdlib Struct.
     #
     # @return [Hash]
-    def to_h(obj = self)
+    def to_h(obj = self, options = {})
       case obj
       when Struct
         obj.each_pair.with_object({}) do |(member, value), hash|
-          hash[member] = to_hash(value) unless value.nil?
+          member = member.to_s if options[:as_json]
+          hash[member] = to_hash(value, options) unless value.nil?
         end
       when Hash
         obj.each.with_object({}) do |(key, value), hash|
-          hash[key] = to_hash(value)
+          key = key.to_s if options[:as_json]
+          hash[key] = to_hash(value, options)
         end
       when Array
-        obj.collect { |value| to_hash(value) }
+        obj.collect { |value| to_hash(value, options) }
       else
         obj
       end

data/lib/aws-sdk-core/token.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module Aws
+  class Token
+
+    # @param [String] token
+    # @param [Time] expiration
+    def initialize(token, expiration=nil)
+      @token = token
+      @expiration = expiration
+    end
+
+    # @return [String, nil]
+    attr_reader :token
+
+    # @return [Time, nil]
+    attr_reader :expiration
+
+    # @return [Boolean] Returns `true` if token is set
+    def set?
+      !token.nil? && !token.empty?
+    end
+
+    # Removing the token from the default inspect string.
+    # @api private
+    def inspect
+      "#<#{self.class.name} token=[FILTERED]> expiration=#{expiration}>"
+    end
+
+  end
+end

data/lib/aws-sdk-core/token_provider.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Aws
+  module TokenProvider
+
+    # @return [Token]
+    attr_reader :token
+
+    # @return [Boolean]
+    def set?
+      !!token && token.set?
+    end
+
+  end
+end

data/lib/aws-sdk-core/token_provider_chain.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+module Aws
+  # @api private
+  class TokenProviderChain
+    def initialize(config = nil)
+      @config = config
+    end
+
+    # @return [TokenProvider, nil]
+    def resolve
+      providers.each do |method_name, options|
+        provider = send(method_name, options.merge(config: @config))
+        return provider if provider && provider.set?
+      end
+      nil
+    end
+
+    private
+
+    def providers
+      [
+        [:static_profile_sso_token, {}],
+        [:sso_token, {}]
+      ]
+    end
+
+    def static_profile_sso_token(options)
+      if Aws.shared_config.config_enabled? && options[:config] && options[:config].profile
+        Aws.shared_config.sso_token_from_config(
+          profile: options[:config].profile
+        )
+      end
+    end
+
+
+    def sso_token(options)
+      profile_name = determine_profile_name(options)
+      if Aws.shared_config.config_enabled?
+        Aws.shared_config.sso_token_from_config(profile: profile_name)
+      end
+    rescue Errors::NoSuchProfileError
+      nil
+    end
+
+    def determine_profile_name(options)
+      (options[:config] && options[:config].profile) || ENV['AWS_PROFILE'] || ENV['AWS_DEFAULT_PROFILE'] || 'default'
+    end
+
+  end
+end

data/lib/aws-sdk-core/xml/error_handler.rb

@@ -24,6 +24,7 @@ module Aws
         else
           code, message, data = extract_error(body, context)
         end
+        context[:request_id] = request_id(body)
         errors_module = context.client.class.errors_module
         error_class = errors_module.error_class(code).new(context, message, data)
         error_class
@@ -94,6 +95,12 @@ module Aws
         end
       end
 
+      def request_id(body)
+        if matches = body.match(/<RequestId>(.+?)<\/RequestId>/m)
+          matches[1]
+        end
+      end
+
       def unescape(str)
         CGI.unescapeHTML(str)
       end

data/lib/aws-sdk-core.rb

@@ -20,6 +20,15 @@ require_relative 'aws-sdk-core/shared_credentials'
 require_relative 'aws-sdk-core/process_credentials'
 require_relative 'aws-sdk-core/sso_credentials'
 
+# tokens and token providers
+require_relative 'aws-sdk-core/token'
+require_relative 'aws-sdk-core/token_provider'
+require_relative 'aws-sdk-core/static_token_provider'
+require_relative 'aws-sdk-core/refreshing_token'
+require_relative 'aws-sdk-core/sso_token_provider'
+require_relative 'aws-sdk-core/token_provider_chain'
+require_relative 'aws-sdk-core/plugins/bearer_authorization'
+
 # client modules
 
 require_relative 'aws-sdk-core/client_stubs'
@@ -99,6 +108,7 @@ require_relative 'aws-sdk-sts'
 
 # aws-sdk-sso is included to support Aws::SSOCredentials
 require_relative 'aws-sdk-sso'
+require_relative 'aws-sdk-ssooidc'
 
 module Aws
 

data/lib/aws-sdk-sso/client.rb

@@ -358,11 +358,13 @@ module Aws::SSO
     #   The friendly name of the role that is assigned to the user.
     #
     # @option params [required, String] :account_id
-    #   The identifier for the AWS account that is assigned to the user.
+    #   The identifier for the Amazon Web Services account that is assigned to
+    #   the user.
     #
     # @option params [required, String] :access_token
     #   The token issued by the `CreateToken` API call. For more information,
-    #   see [CreateToken][1] in the *AWS SSO OIDC API Reference Guide*.
+    #   see [CreateToken][1] in the *Amazon Web Services SSO OIDC API
+    #   Reference Guide*.
     #
     #
     #
@@ -396,7 +398,8 @@ module Aws::SSO
       req.send_request(options)
     end
 
-    # Lists all roles that are assigned to the user for a given AWS account.
+    # Lists all roles that are assigned to the user for a given Amazon Web
+    # Services account.
     #
     # @option params [String] :next_token
     #   The page token from the previous response output when you request
@@ -407,14 +410,16 @@ module Aws::SSO
     #
     # @option params [required, String] :access_token
     #   The token issued by the `CreateToken` API call. For more information,
-    #   see [CreateToken][1] in the *AWS SSO OIDC API Reference Guide*.
+    #   see [CreateToken][1] in the *Amazon Web Services SSO OIDC API
+    #   Reference Guide*.
     #
     #
     #
     #   [1]: https://docs.aws.amazon.com/singlesignon/latest/OIDCAPIReference/API_CreateToken.html
     #
     # @option params [required, String] :account_id
-    #   The identifier for the AWS account that is assigned to the user.
+    #   The identifier for the Amazon Web Services account that is assigned to
+    #   the user.
     #
     # @return [Types::ListAccountRolesResponse] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
     #
@@ -448,10 +453,11 @@ module Aws::SSO
       req.send_request(options)
     end
 
-    # Lists all AWS accounts assigned to the user. These AWS accounts are
-    # assigned by the administrator of the account. For more information,
-    # see [Assign User Access][1] in the *AWS SSO User Guide*. This
-    # operation returns a paginated response.
+    # Lists all Amazon Web Services accounts assigned to the user. These
+    # Amazon Web Services accounts are assigned by the administrator of the
+    # account. For more information, see [Assign User Access][1] in the
+    # *Amazon Web Services SSO User Guide*. This operation returns a
+    # paginated response.
     #
     #
     #
@@ -466,7 +472,8 @@ module Aws::SSO
     #
     # @option params [required, String] :access_token
     #   The token issued by the `CreateToken` API call. For more information,
-    #   see [CreateToken][1] in the *AWS SSO OIDC API Reference Guide*.
+    #   see [CreateToken][1] in the *Amazon Web Services SSO OIDC API
+    #   Reference Guide*.
     #
     #
     #
@@ -504,12 +511,33 @@ module Aws::SSO
       req.send_request(options)
     end
 
-    # Removes the client- and server-side session that is associated with
-    # the user.
+    # Removes the locally stored SSO tokens from the client-side cache and
+    # sends an API call to the Amazon Web Services SSO service to invalidate
+    # the corresponding server-side Amazon Web Services SSO sign in session.
+    #
+    # <note markdown="1"> If a user uses Amazon Web Services SSO to access the AWS CLI, the
+    # user’s Amazon Web Services SSO sign in session is used to obtain an
+    # IAM session, as specified in the corresponding Amazon Web Services SSO
+    # permission set. More specifically, Amazon Web Services SSO assumes an
+    # IAM role in the target account on behalf of the user, and the
+    # corresponding temporary Amazon Web Services credentials are returned
+    # to the client.
+    #
+    #  After user logout, any existing IAM role sessions that were created by
+    # using Amazon Web Services SSO permission sets continue based on the
+    # duration configured in the permission set. For more information, see
+    # [User authentications][1] in the *Amazon Web Services SSO User Guide*.
+    #
+    #  </note>
+    #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/singlesignon/latest/userguide/authconcept.html
     #
     # @option params [required, String] :access_token
     #   The token issued by the `CreateToken` API call. For more information,
-    #   see [CreateToken][1] in the *AWS SSO OIDC API Reference Guide*.
+    #   see [CreateToken][1] in the *Amazon Web Services SSO OIDC API
+    #   Reference Guide*.
     #
     #
     #
@@ -545,7 +573,7 @@ module Aws::SSO
         params: params,
         config: config)
       context[:gem_name] = 'aws-sdk-core'
-      context[:gem_version] = '3.130.2'
+      context[:gem_version] = '3.136.0'
       Seahorse::Client::Request.new(handlers, context)
     end
 

data/lib/aws-sdk-sso/types.rb

@@ -10,18 +10,21 @@
 module Aws::SSO
   module Types
 
-    # Provides information about your AWS account.
+    # Provides information about your Amazon Web Services account.
     #
     # @!attribute [rw] account_id
-    #   The identifier of the AWS account that is assigned to the user.
+    #   The identifier of the Amazon Web Services account that is assigned
+    #   to the user.
     #   @return [String]
     #
     # @!attribute [rw] account_name
-    #   The display name of the AWS account that is assigned to the user.
+    #   The display name of the Amazon Web Services account that is assigned
+    #   to the user.
     #   @return [String]
     #
     # @!attribute [rw] email_address
-    #   The email address of the AWS account that is assigned to the user.
+    #   The email address of the Amazon Web Services account that is
+    #   assigned to the user.
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/sso-2019-06-10/AccountInfo AWS API Documentation
@@ -48,13 +51,14 @@ module Aws::SSO
     #   @return [String]
     #
     # @!attribute [rw] account_id
-    #   The identifier for the AWS account that is assigned to the user.
+    #   The identifier for the Amazon Web Services account that is assigned
+    #   to the user.
     #   @return [String]
     #
     # @!attribute [rw] access_token
     #   The token issued by the `CreateToken` API call. For more
-    #   information, see [CreateToken][1] in the *AWS SSO OIDC API Reference
-    #   Guide*.
+    #   information, see [CreateToken][1] in the *Amazon Web Services SSO
+    #   OIDC API Reference Guide*.
     #
     #
     #
@@ -118,8 +122,8 @@ module Aws::SSO
     #
     # @!attribute [rw] access_token
     #   The token issued by the `CreateToken` API call. For more
-    #   information, see [CreateToken][1] in the *AWS SSO OIDC API Reference
-    #   Guide*.
+    #   information, see [CreateToken][1] in the *Amazon Web Services SSO
+    #   OIDC API Reference Guide*.
     #
     #
     #
@@ -127,7 +131,8 @@ module Aws::SSO
     #   @return [String]
     #
     # @!attribute [rw] account_id
-    #   The identifier for the AWS account that is assigned to the user.
+    #   The identifier for the Amazon Web Services account that is assigned
+    #   to the user.
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/sso-2019-06-10/ListAccountRolesRequest AWS API Documentation
@@ -179,8 +184,8 @@ module Aws::SSO
     #
     # @!attribute [rw] access_token
     #   The token issued by the `CreateToken` API call. For more
-    #   information, see [CreateToken][1] in the *AWS SSO OIDC API Reference
-    #   Guide*.
+    #   information, see [CreateToken][1] in the *Amazon Web Services SSO
+    #   OIDC API Reference Guide*.
     #
     #
     #
@@ -224,8 +229,8 @@ module Aws::SSO
     #
     # @!attribute [rw] access_token
     #   The token issued by the `CreateToken` API call. For more
-    #   information, see [CreateToken][1] in the *AWS SSO OIDC API Reference
-    #   Guide*.
+    #   information, see [CreateToken][1] in the *Amazon Web Services SSO
+    #   OIDC API Reference Guide*.
     #
     #
     #
@@ -259,7 +264,8 @@ module Aws::SSO
     # @!attribute [rw] access_key_id
     #   The identifier used for the temporary security credentials. For more
     #   information, see [Using Temporary Security Credentials to Request
-    #   Access to AWS Resources][1] in the *AWS IAM User Guide*.
+    #   Access to Amazon Web Services Resources][1] in the *Amazon Web
+    #   Services IAM User Guide*.
     #
     #
     #
@@ -268,8 +274,9 @@ module Aws::SSO
     #
     # @!attribute [rw] secret_access_key
     #   The key that is used to sign the request. For more information, see
-    #   [Using Temporary Security Credentials to Request Access to AWS
-    #   Resources][1] in the *AWS IAM User Guide*.
+    #   [Using Temporary Security Credentials to Request Access to Amazon
+    #   Web Services Resources][1] in the *Amazon Web Services IAM User
+    #   Guide*.
     #
     #
     #
@@ -278,8 +285,9 @@ module Aws::SSO
     #
     # @!attribute [rw] session_token
     #   The token used for temporary credentials. For more information, see
-    #   [Using Temporary Security Credentials to Request Access to AWS
-    #   Resources][1] in the *AWS IAM User Guide*.
+    #   [Using Temporary Security Credentials to Request Access to Amazon
+    #   Web Services Resources][1] in the *Amazon Web Services IAM User
+    #   Guide*.
     #
     #
     #
@@ -308,7 +316,8 @@ module Aws::SSO
     #   @return [String]
     #
     # @!attribute [rw] account_id
-    #   The identifier of the AWS account assigned to the user.
+    #   The identifier of the Amazon Web Services account assigned to the
+    #   user.
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/sso-2019-06-10/RoleInfo AWS API Documentation

data/lib/aws-sdk-sso.rb

@@ -50,6 +50,6 @@ require_relative 'aws-sdk-sso/customizations'
 # @!group service
 module Aws::SSO
 
-  GEM_VERSION = '3.130.2'
+  GEM_VERSION = '3.136.0'
 
 end