miasma-aws 0.1.26 → 0.1.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e2b126709ec8b6eed394efa4132e8937bd58239b
-  data.tar.gz: c7337847d54b916534769749f7fd04b22a323487
+  metadata.gz: 07096224821dda2e08f3bda1532073082f12266d
+  data.tar.gz: 3c64010ced9c7dceb1f2c4202946538b76f8fe3d
 SHA512:
-  metadata.gz: 34e2134959017fdc2139cbc50d968c8976c2049cfee4446d43a191ca959df5f027ad2f9ad778f388154b7d5eca1cbc534145961758b05886ea6323a8fe587f0e
-  data.tar.gz: 4dde8df2ee26860791d52955b7ac1ad2a95a7086cbb6fce31c648b6519ac77ea3071f93a8c47179cef432a651d7dcea9164cd83bf0976391156cbd4cbf11e2ed
+  metadata.gz: f4cde26b9fce70ec6d900b823f7366018a0c075f6a891a0ee7aeddad68b11a1d65b5aa4c661d689d52a04fd4a444dc697f7c05817c35ee367f1a0881624ec995
+  data.tar.gz: bfe73ddbdc975d9f48ee3a01ed1bd7f2c2a1e4736693d21e67fee32bbd5585f1fd20d7054fdda5f910bc5f3d98c030f723578fec2016021edae68a59bb633813

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# v0.1.28
+* Fix STS usage when building new API connections from existing connections (#21 and #23)
+
+__Note:__ Thanks to @cixelsyd and @imbriaco for getting this sorted
+
 # v0.1.26
 * Fix broken S3 API interactions due to ordering in header modifications
 

data/lib/miasma-aws/version.rb

@@ -1,4 +1,4 @@
 module MiasmaAws
   # Current library version
-  VERSION = Gem::Version.new('0.1.26')
+  VERSION = Gem::Version.new('0.1.28')
 end

data/lib/miasma/contrib/aws.rb

@@ -383,7 +383,8 @@ module Miasma
           end
         end
 
-        # Allow loading credentials via local credentials file
+        # Provide custom setup functionality to support alternative
+        # credential loading.
         #
         # @param creds [Hash]
         # @return [TrueClass]
@@ -410,6 +411,21 @@ module Miasma
           true
         end
 
+        # Persist any underlying stored credential data that is not a
+        # defined attribute (things like STS information)
+        #
+        # @param creds [Hash]
+        # @return [TrueClass]
+        def after_setup(creds)
+          skip = self.class.attributes.keys.map(&:to_s)
+          creds.each do |k,v|
+            k = k.to_s
+            if(k.start_with?('aws_') && !skip.include?(k))
+              data[k] = v
+            end
+          end
+        end
+
         # Attempt to load credentials from instance metadata
         #
         # @param creds [Hash]
@@ -462,21 +478,23 @@ module Miasma
             creds[:aws_access_key_id_original] = creds[:aws_access_key_id]
             creds[:aws_secret_access_key_original] = creds[:aws_secret_access_key]
           end
-          sts = Miasma::Contrib::Aws::Api::Sts.new(
-            :aws_access_key_id => creds[:aws_access_key_id_original],
-            :aws_secret_access_key => creds[:aws_secret_access_key_original],
-            :aws_region => creds.fetch(:aws_sts_region, 'us-east-1'),
-            :aws_credentials_file => creds.fetch(:aws_credentials_file, aws_credentials_file),
-            :aws_config_file => creds.fetch(:aws_config_file, aws_config_file),
-            :aws_profile_name => creds[:aws_profile_name],
-            :aws_host => creds[:aws_host]
-          )
-          role_info = sts.assume_role(
-            creds[:aws_sts_role_arn],
-            :session_name => creds[:aws_sts_role_session_name],
-            :external_id => creds[:aws_sts_external_id]
-          )
-          creds.merge!(role_info)
+          if(sts_update_required?(creds))
+            sts = Miasma::Contrib::Aws::Api::Sts.new(
+              :aws_access_key_id => creds[:aws_access_key_id_original],
+              :aws_secret_access_key => creds[:aws_secret_access_key_original],
+              :aws_region => creds.fetch(:aws_sts_region, 'us-east-1'),
+              :aws_credentials_file => creds.fetch(:aws_credentials_file, aws_credentials_file),
+              :aws_config_file => creds.fetch(:aws_config_file, aws_config_file),
+              :aws_profile_name => creds[:aws_profile_name],
+              :aws_host => creds[:aws_host]
+            )
+            role_info = sts.assume_role(
+              creds[:aws_sts_role_arn],
+              :session_name => creds[:aws_sts_role_session_name],
+              :external_id => creds[:aws_sts_external_id]
+            )
+            creds.merge!(role_info)
+          end
           true
         end
 
@@ -611,6 +629,7 @@ module Miasma
             end
           end
           if(aws_sts_token)
+            sts_assume_role!(data) if sts_update_required?
             options.set(:headers, 'X-Amz-Security-Token', aws_sts_token)
           end
           signature = signer.generate(http_method, path, options)
@@ -619,6 +638,12 @@ module Miasma
           connection.auth(signature).send(http_method, dest, options)
         end
 
+        # @return [TrueClass, FalseClass]
+        def sts_update_required?(args={})
+          expiry = args.fetch(:aws_sts_token_expires, data[:aws_sts_token_expires])
+          expiry.nil? || expiry >= Time.now - 1
+        end
+
         # Simple callback to allow request option adjustments prior to
         # signature calculation
         #

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: miasma-aws
 version: !ruby/object:Gem::Version
-  version: 0.1.26
+  version: 0.1.28
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-01 00:00:00.000000000 Z
+date: 2015-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: miasma
@@ -134,9 +134,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Smoggy AWS API
 test_files: []
-has_rdoc: