oneaws 0.4.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af998829b0bd0674ee923e173025684f16c92be665ebccbad6064627ba8d90d7
-  data.tar.gz: c6710c75bf309c0d9dc1d4208815eebff4c01e5f3e057cee07a41ecf08626fac
+  metadata.gz: 4703d2dc9224791ac0371ddd739ab899e62920749111148b46c3a664c7952e77
+  data.tar.gz: 2b34d7a1278a18d71409754fdbc303781f29f440610108c138a02cfbf75e42b2
 SHA512:
-  metadata.gz: 9053ce65d3d2f182e7c0a9c704fcf605cae97785779733c2820d1b171681c847d542a87ddd8c736e8c967faa33f0e8177525f65603c167a2e6a53c5c3071eb2a
-  data.tar.gz: e1030899f630dd449337bca924dbb878f8a64950539c9cb94b2f5152779c9e6a29b4b58c482ace512e406155a9ed3651389dc5abec0e7f7d85dc06f1fb90afd1
+  metadata.gz: cbbb5ac0988de0813939b348f79aaa97fba800d9ac0ec38faf39e56a6410c780cf95824eb9f018cd7fb6c83a8aacd720f9f6ed00dd3a05b183243cc3a8c5bd23
+  data.tar.gz: db5971dde56056811590806fdc4fa5133e99830f3f76e3afeb1bb6b780ce6ebe1f657fdafc0e52f70db0100746fced72398c77729196e659a125a8ba2f7f25f9

data/README.md

@@ -37,3 +37,19 @@ oneaws
 ```
 
 `-u` オプションをつけていると `~/.aws/credentials` に追記されます(default: true)。
+
+### ONEAWS_MFA_DEVICE
+
+MFA デバイスを複数登録している場合、以下のようにデバイスの選択を求められます。
+
+```
+Available MFA devices:
+1. OneLogin Protect (ID: ***)
+2. OneLogin Auth (ID: ***)
+
+Select MFA device (1-2):
+```
+
+デバイスの選択が面倒な場合は、環境変数 `ONEAWS_MFA_DEVICE` を指定することで、指定した番号のデバイスを自動で選択できます。上記を例にすると、`1. OneLogin Protect` を選ぶ場合は `ONEAWS_MFA_DEVICE=1` と指定します。
+
+ワンタイムパスワードが必要なデバイスを選択した場合、 `--otp` オプションでワンタイムパスワードを指定することができます。

data/lib/oneaws/cli.rb

@@ -10,6 +10,7 @@ module Oneaws
     option :update_aws_credentials, aliases: "-u", type: :boolean, default: true
     option :profile, aliases: "-p", type: :string, default: "oneaws"
     option :eval, type: :string, enum: ["bash", "fish"]
+    option :otp, type: :string
     def getkey
       client = Client.new
 
@@ -19,7 +20,7 @@ module Oneaws
         app_id: ENV['ONELOGIN_APP_ID'],
         subdomain: ENV['ONELOGIN_SUBDOMAIN'],
       }
-      credential = client.issue_credential(params)
+      credential = client.issue_credential(params, options[:otp])
 
       if options["update_aws_credentials"]
         credential_file = File.expand_path(find_credentials)
@@ -52,6 +53,11 @@ module Oneaws
       end
     end
 
+    desc 'version', 'Show version'
+    def version
+      puts Oneaws::VERSION
+    end
+
     private
 
     # AWS の credential を以下の順番で存在チェックをする

data/lib/oneaws/client.rb

@@ -15,12 +15,12 @@ module Oneaws
       })
 
       @aws = Aws::STS::Client.new(
-        credentials: Aws::AssumeRoleCredentials,
+        credentials: nil,
         region: ENV['AWS_REGION'] || 'ap-northeast-1',
       )
     end
 
-    def issue_credential(options)
+    def issue_credential(options, otp = nil)
       username = options[:username]
       password = options[:password]
       app_id = options[:app_id]
@@ -31,30 +31,17 @@ module Oneaws
       end
 
       mfa = response.mfa
+      mfa_device = select_mfa_device(mfa)
       
-      if mfa.devices.length == 1
-        mfa_device = mfa.devices.first
-      else
-        puts "\nAvailable MFA devices:"
-        mfa.devices.each_with_index do |device, index|
-          puts "#{index + 1}. #{device.type} (ID: #{device.id})"
-        end
-
-        print "\nSelect MFA device (1-#{mfa.devices.length}): "
-        selection = STDIN.gets.chomp.to_i
-
-        if selection < 1 || selection > mfa.devices.length
-          raise MfaDeviceNotFoundError.new("Invalid device selection.")
-        end
-
-        mfa_device = mfa.devices[selection - 1]
-      end
-
       device_types_that_do_not_require_token = [
         "OneLogin Protect"
       ]
 
-      otp_token = unless device_types_that_do_not_require_token.include?(mfa_device.type)
+      otp_token = if device_types_that_do_not_require_token.include?(mfa_device.type)
+        nil
+      elsif otp
+        otp
+      else
         print "input OTP of #{mfa_device.type}: "
         STDIN.noecho(&:gets)
       end
@@ -83,5 +70,36 @@ module Oneaws
       }
       @aws.assume_role_with_saml(params)[:credentials]
     end
+
+    private
+
+    def select_mfa_device(mfa)
+      if mfa.devices.length == 1
+        return mfa.devices.first
+      end
+
+      if selection = ENV["ONEAWS_MFA_DEVICE"] &.to_i
+        if selection <= 0
+          warn "ONEAWS_MFA_DEVICE must be >= 1"
+          exit 1
+        end
+
+        return mfa.devices[selection - 1]
+      end
+
+      puts "\nAvailable MFA devices:"
+      mfa.devices.each_with_index do |device, index|
+        puts "#{index + 1}. #{device.type} (ID: #{device.id})"
+      end
+
+      print "\nSelect MFA device (1-#{mfa.devices.length}): "
+      selection = STDIN.gets.chomp.to_i
+
+      if selection < 1 || selection > mfa.devices.length
+        raise MfaDeviceNotFoundError.new("Invalid device selection.")
+      end
+
+      mfa.devices[selection - 1]
+    end
   end
 end

data/lib/oneaws/version.rb

@@ -1,3 +1,3 @@
 module Oneaws
-  VERSION = "0.4.0"
+  VERSION = "0.6.0"
 end

data/oneaws.gemspec

@@ -24,8 +24,10 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'aws-sdk-core', '~> 3.206.0'
+  spec.add_dependency 'aws-sdk-core'
   spec.add_dependency 'inifile'
   spec.add_dependency 'onelogin', '~> 1.6'
   spec.add_dependency 'thor'
+  spec.add_dependency 'base64'
+  spec.add_dependency 'logger'
 end

metadata

@@ -1,29 +1,28 @@
 --- !ruby/object:Gem::Specification
 name: oneaws
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Yuki Koya
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-11-07 00:00:00.000000000 Z
+date: 2025-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.206.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.206.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: inifile
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +65,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: base64
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Issue temporary credentials using OneLogin and AWS STS.
 email:
 - ykky@pepabo.com
@@ -93,7 +120,6 @@ 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:
 rdoc_options: []
 require_paths:
 - lib
@@ -108,8 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.16
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Issue temporary credentials using OneLogin and AWS STS.
 test_files: []