oneaws 0.5.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f54d58039f558feb418d69d9252d073333ac9a0fc6278f14d2e2589110908f2
-  data.tar.gz: 8185852f34183388ee1038aceade221dac8308cf0253d6ef37a8b4e911728a79
+  metadata.gz: 788200b7dc82c41386583de0d60c217089aff1f4626a41d2ab6258494fe5c191
+  data.tar.gz: 0ab327dab1fc9436aae74a499019465e057bc5cc8e489be8eed881502b5c1b4b
 SHA512:
-  metadata.gz: 44c212bffa35b64a4150a008b4755a08b3a817ccb91de8a9e8a41dcb93e9fe07187b2c0eeec961adb39e2a4b11a6a2d6a81b10ac94884871b86eb32302edb9a9
-  data.tar.gz: b46a0acaf73c53fb6bfec0dcf5e778bde1a58332233b6b476e2cfc53f232f6f2b9b70a5dab0b8341e9856e8f9b93f6259c105ce8f1c84db21f881ee1e3bac75d
+  metadata.gz: 4b7482679da2c5bdc073254a7f9684daf1410942a1c1e67bd3cde51e6138eef577a0ba43e1fb63bb390b65903eb983d4e10bed88e221181fcaff872ecebbe19e
+  data.tar.gz: b2b298391418345c48417c9a17353e01fe4d4c5dedabc51718337ee880725dd747057e3d72c3fa6ff07852149047271d12396bbf53dba79f47f98c4952ac685c

data/.github/workflows/gem_push.yml

@@ -0,0 +1,41 @@
+name: Publish gem to rubygems.org
+
+on:
+  push:
+    tags:
+      - 'v*'
+
+permissions:
+  contents: read
+
+jobs:
+  push:
+    if: github.repository == 'pepabo/oneaws'
+    runs-on: ubuntu-latest
+
+    environment:
+      name: rubygems.org
+      url: https://rubygems.org/gems/oneaws
+
+    permissions:
+      contents: write
+      id-token: write
+
+    steps:
+      # Set up
+      - name: Harden Runner
+        uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
+        with:
+          egress-policy: audit
+
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@fb404b9557c186e349162b0d8efb06e2bc36edea # v1.232.0
+        with:
+          bundler-cache: true
+          ruby-version: ruby
+
+      # Release
+      - name: Publish to RubyGems
+        uses: rubygems/release-gem@9e85cb11501bebc2ae661c1500176316d3987059 # v1

data/README.md

@@ -51,3 +51,5 @@ 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

@@ -20,7 +20,7 @@ module Oneaws
       )
     end
 
-    def issue_credential(options)
+    def issue_credential(options, otp = nil)
       username = options[:username]
       password = options[:password]
       app_id = options[:app_id]
@@ -31,29 +31,36 @@ module Oneaws
       end
 
       mfa = response.mfa
-      mfa_device = select_mfa_device(mfa)
-      
-      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
+      if mfa # mfa required
+        mfa_device = select_mfa_device(mfa)
+        
+        device_types_that_do_not_require_token = [
+          "OneLogin Protect"
+        ]
+
+        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
 
-      while response.type != "success" do
-        sleep 1
-        response = @onelogin.get_saml_assertion_verifying(app_id, mfa_device.id, mfa.state_token, nil, nil, true)
+        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
+
+        while response.type != "success" do
+          sleep 1
+          response = @onelogin.get_saml_assertion_verifying(app_id, mfa_device.id, mfa.state_token, nil, nil, true)
+          if response.nil?
+            raise SamlRequestError.new("#{@onelogin.error} #{@onelogin.error_description}")
+          end
+        end
       end
 
       saml_assertion = response.saml_response

data/lib/oneaws/version.rb

@@ -1,3 +1,3 @@
 module Oneaws
-  VERSION = "0.5.0"
+  VERSION = "0.7.0"
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: oneaws
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Yuki Koya
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-02-20 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core
@@ -102,6 +101,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/gem_push.yml"
 - ".gitignore"
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -121,7 +121,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
@@ -136,8 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key:
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Issue temporary credentials using OneLogin and AWS STS.
 test_files: []