oneaws 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b5cdbbf6859ec90de78c5452beeb47d7b7f55bbaaabfdedcd17db81e2c9f47b
-  data.tar.gz: a05a3d7470c4fe913c52568a820f0acffa551609c77f336d0194c7e2e788e325
+  metadata.gz: 4246492bb2bb3db3d687669b230897b097f2962c381822b7bbc5acd194d3af4b
+  data.tar.gz: 3e0a5e9de75af06e83671bc1bf89133ee6fdef8f68a367f7c520a0a9b89cfed2
 SHA512:
-  metadata.gz: 854fad5d4bd924fb013aace3d1ed0efeac8a225cde6210851f0abebee2eda0dfb643fb6570af33c5de53a694de9f848488d838d6fe29b5c0c540516475f6551c
-  data.tar.gz: b430d35a80808e8fba8ae98e87192bc2aa170dafbe27753df4343ca9f05ee3c784053770f922e7ed9b5f26e4b9ad010dde4caa10fa7aaa5f488243d050feb6d4
+  metadata.gz: 76c21fcd42010ad553aa036898f3b629f920409713dd494a02e18683794924c3d5989f03ae1f8243fb5b794d8d238945646915c9e5cc6d4d555041baeb1f173c
+  data.tar.gz: 3b7dba5bd0457b20273ab25f56f9ca3ec78b7ef4a0abe1ec8385ce801cc2ad378e95ed2c4edc7161d5929135172b8f522902c3b497a47985a5a31be03725198f

data/lib/oneaws/cli.rb

@@ -22,7 +22,7 @@ module Oneaws
       credential = client.issue_credential(params)
 
       if options["update_aws_credentials"]
-        credential_file = File.expand_path("~/.aws/credentials")
+        credential_file = File.expand_path(find_credentials)
         unless inifile = IniFile.load(credential_file)
           FileUtils.mkdir_p(File.dirname(credential_file))
           inifile = IniFile.new
@@ -51,5 +51,21 @@ module Oneaws
         EOS
       end
     end
+
+    private
+
+    # AWS の credential を以下の順番で存在チェックをする
+    # 1. ~/.aws/credentials
+    # 2. ~/.config/aws/credentials
+    # 存在しない場合は順番1つ目のものを用いる
+    def find_credentials
+      credentials = ["~/.aws/credentials", "~/.config/aws/credentials"]
+      credential = credentials.find{|c| File.exists? File.expand_path(c) }
+      if credential
+        credential
+      else
+        credentials.first
+      end
+    end
   end
 end

data/lib/oneaws/client.rb

@@ -1,5 +1,6 @@
 require 'onelogin'
 require 'aws-sdk-core'
+require 'io/console'
 
 module Oneaws
   class Client
@@ -32,13 +33,23 @@ module Oneaws
       mfa = response.mfa
 
       # sent push notification to OneLogin Protect
-      mfa_device = mfa.devices.select{|device| device.type == "OneLogin Protect"}&.first
+      mfa_device = mfa.devices.first
 
       if mfa_device.nil?
-        raise MfaDeviceNotFoundError.new("OneLogin Protect device not found.")
+        raise MfaDeviceNotFoundError.new("MFA device not found.")
       end
 
-      response = @onelogin.get_saml_assertion_verifying(app_id, mfa_device.id, mfa.state_token, nil, nil, false)
+      device_types_that_do_not_require_token = [
+        "OneLogin Protect"
+      ]
+
+      otp_token = unless device_types_that_do_not_require_token.include?(mfa_device.type)
+        print "input OTP of #{mfa_device.type}: "
+        STDIN.noecho(&:gets)
+      end
+
+      response = @onelogin.get_saml_assertion_verifying(app_id, mfa_device.id, mfa.state_token, otp_token, nil, false)
+      
       if response.nil?
         raise SamlRequestError.new("#{@onelogin.error} #{@onelogin.error_description}")
       end

data/lib/oneaws/version.rb

@@ -1,3 +1,3 @@
 module Oneaws
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oneaws
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Yuki Koya
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-07-15 00:00:00.000000000 Z
+date: 2023-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -93,7 +93,7 @@ metadata:
   homepage_uri: https://github.com/pepabo/oneaws
   source_code_uri: https://github.com/pepabo/oneaws
   changelog_uri: https://github.com/pepabo/oneaws
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -108,8 +108,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.3.26
+signing_key:
 specification_version: 4
 summary: Issue temporary credentials using OneLogin and AWS STS.
 test_files: []