awskeyring 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c6053b960d27395acf21d82a71883cdcf5788959
-  data.tar.gz: 0f8efce2feb5af0a87d7be239a85733448eee90d
+  metadata.gz: b18067d6aad4daed7c723e3b67cdd3983d66ae67
+  data.tar.gz: 4975855826aadafe2631abcd7fa98658f15b0e18
 SHA512:
-  metadata.gz: 8449e554b6d4543d851d4caf488807965e5a5ee2cb656a4eb5535662254bc273ca457f76b1a8b0f435ecd771d7b5fb1cd6a8f1521fd6cca5c6d09b70f13246a1
-  data.tar.gz: 71d5d0e493329b3b6dc3c203175c79baf3a5caba618885863e9bc358c934f9d5215161fbe0a609b8c7cbc69d8f02aa6615960c6b1fde36e2c78f4fc37ea1332d
+  metadata.gz: c50766e6d2fe027102d49c8cf71b1974806f2a248e28083927f0fd4a709179a33649d1432fd14f96c18d2df9c4c05b3188e114fc6feaa34b85d32ca6bc3d8a57
+  data.tar.gz: 650c4c01e6202148a7ab063cc017739596bda2bffa9bc0b605a383d7fa211159abef6c61101d464d64d9878ea0abc69f24f59937af04bee8d7b438d23bfc1b06

data/.rubocop.yml

@@ -12,10 +12,10 @@ Metrics/BlockLength:
 Metrics/AbcSize:
   Max: 20
 
-Naming/FileName:
-  Exclude:
-    - Gemfile
-    - Rakefile
+Bundler/GemComment:
+   Enabled: false
+   Include:
+     - Gemfile
 
 AllCops:
   Exclude:

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Change Log
 
+## [v0.5.1](https://github.com/vibrato/awskeyring/tree/v0.5.1) (2018-09-13)
+[Full Changelog](https://github.com/vibrato/awskeyring/compare/v0.5.0...v0.5.1)
+
+**Implemented enhancements:**
+
+- Autocomplete flags too. [\#29](https://github.com/vibrato/awskeyring/pull/29) ([tristanmorgan](https://github.com/tristanmorgan))
+
 ## [v0.5.0](https://github.com/vibrato/awskeyring/tree/v0.5.0) (2018-09-10)
 [Full Changelog](https://github.com/vibrato/awskeyring/compare/v0.4.0...v0.5.0)
 

data/README.md

@@ -87,6 +87,10 @@ After checking out the repo, run `bundle update` to install dependencies. Then,
 
 To install this gem onto your local machine, run `bundle exec rake install`.
 
+## Security
+
+If you believe you have found a security issue in Awskeyring, please responsibly disclose by contacting me at [tristan@vibrato.com.au](mailto:tristan@vibrato.com.au). Awskeyring is a Ruby script and as such Ruby is whitelisted to access your "awskeyring" keychain. Use a strong password and keep the unlock time short.
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/vibrato/awskeyring. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.

data/exe/awskeyring

@@ -7,4 +7,9 @@ trap('SIGINT') do
   exit 1
 end
 
-AwskeyringCommand.start
+begin
+  AwskeyringCommand.start
+rescue Keychain::UserCancelledError => err
+  warn err.to_s
+  exit 1
+end

data/i18n/en.yml

@@ -40,10 +40,10 @@ en:
     duration: 'Session DURATION in seconds.'
     key: 'AWS account key id.'
     keychain: 'Name of KEYCHAIN to initialise.'
-    local: 'Only validate locally.'
     mfa: 'AWS virtual mfa arn.'
     noopen: 'Do not open the url.'
     notoken: 'Do not use saved token.'
+    noremote: 'Do not validate with remote api.'
     path: 'The service PATH to open.'
     role: 'The ROLE to assume.'
     secret: 'AWS account secret.'

data/lib/awskeyring/awsapi.rb

@@ -17,6 +17,9 @@ module Awskeyring
       }]
     }.to_json.freeze
 
+    # AWS Signin url
+    AWS_SIGNIN_URL = 'https://signin.aws.amazon.com/federation'.freeze
+
     # Twelve hours in seconds
     TWELVE_HOUR = (60 * 60 * 12)
     # One hour in seconds
@@ -122,9 +125,8 @@ module Awskeyring
     # @param [String] user The local username
     # @param [String] path within the Console to access
     # @return [String] login_url to access
-    def self.get_login_url(key:, secret:, token:, path:, user:) # rubocop:disable  Metrics/AbcSize, Metrics/MethodLength
+    def self.get_login_url(key:, secret:, token:, path:, user:) # rubocop:disable Metrics/MethodLength
       console_url = "https://console.aws.amazon.com/#{path}/home"
-      signin_url = 'https://signin.aws.amazon.com/federation'
 
       if token
         session_json = {
@@ -147,16 +149,20 @@ module Awskeyring
         }.to_json
       end
 
-      get_signin_token_url = signin_url + '?Action=getSigninToken' \
+      destination_param = '&Destination=' + CGI.escape(console_url)
+
+      AWS_SIGNIN_URL + '?Action=login' + token_param(session_json: session_json) + destination_param
+    end
+
+    # Get the signin token param
+    private_class_method def self.token_param(session_json:)
+      get_signin_token_url = AWS_SIGNIN_URL + '?Action=getSigninToken' \
                              '&Session=' + CGI.escape(session_json)
 
       returned_content = Net::HTTP.get(URI.parse(get_signin_token_url))
 
       signin_token = JSON.parse(returned_content)['SigninToken']
-      signin_token_param = '&SigninToken=' + CGI.escape(signin_token)
-      destination_param = '&Destination=' + CGI.escape(console_url)
-
-      signin_url + '?Action=login' + signin_token_param + destination_param
+      '&SigninToken=' + CGI.escape(signin_token)
     end
 
     # Get the current region

data/lib/awskeyring/version.rb

@@ -1,4 +1,4 @@
 module Awskeyring
   # The Gems version number
-  VERSION = '0.5.0'.freeze
+  VERSION = '0.5.1'.freeze
 end

data/lib/awskeyring_command.rb

@@ -13,6 +13,7 @@ class AwskeyringCommand < Thor # rubocop:disable Metrics/ClassLength
   I18n.backend.load_translations
 
   map %w[--version -v] => :__version
+  map %w[--help -h] => :help
   map ['init'] => :initialise
   map ['con'] => :console
   map ['ls'] => :list
@@ -114,7 +115,7 @@ class AwskeyringCommand < Thor # rubocop:disable Metrics/ClassLength
   method_option :key, type: :string, aliases: '-k', desc: I18n.t('method_option.key')
   method_option :secret, type: :string, aliases: '-s', desc: I18n.t('method_option.secret')
   method_option :mfa, type: :string, aliases: '-m', desc: I18n.t('method_option.mfa')
-  method_option :local, type: :boolean, aliases: '-l', desc: I18n.t('method_option.local'), default: false
+  method_option 'no-remote', type: :boolean, aliases: '-r', desc: I18n.t('method_option.noremote'), default: false
   # Add an Account
   def add(account = nil) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
     account = ask_check(
@@ -131,7 +132,7 @@ class AwskeyringCommand < Thor # rubocop:disable Metrics/ClassLength
       existing: options[:mfa], message: I18n.t('message.mfa'),
       optional: true, validator: Awskeyring::Validate.method(:mfa_arn)
     )
-    Awskeyring::Awsapi.verify_cred(key: key, secret: secret) unless options[:local]
+    Awskeyring::Awsapi.verify_cred(key: key, secret: secret) unless options['no-remote']
     Awskeyring.add_account(
       account: account,
       key: key,
@@ -144,7 +145,7 @@ class AwskeyringCommand < Thor # rubocop:disable Metrics/ClassLength
   desc 'update ACCOUNT', I18n.t('update.desc')
   method_option :key, type: :string, aliases: '-k', desc: I18n.t('method_option.key')
   method_option :secret, type: :string, aliases: '-s', desc: I18n.t('method_option.secret')
-  method_option :local, type: :boolean, aliases: '-l', desc: I18n.t('method_option.local'), default: false
+  method_option 'no-remote', type: :boolean, aliases: '-r', desc: I18n.t('method_option.noremote'), default: false
   # Update an Account
   def update(account = nil) # rubocop:disable Metrics/MethodLength
     account = ask_check(
@@ -157,7 +158,7 @@ class AwskeyringCommand < Thor # rubocop:disable Metrics/ClassLength
       existing: options[:secret], message: I18n.t('message.secret'),
       secure: true, validator: Awskeyring::Validate.method(:secret_access_key)
     )
-    Awskeyring::Awsapi.verify_cred(key: key, secret: secret) unless options[:local]
+    Awskeyring::Awsapi.verify_cred(key: key, secret: secret) unless options['no-remote']
     Awskeyring.update_account(
       account: account,
       key: key,
@@ -349,7 +350,18 @@ class AwskeyringCommand < Thor # rubocop:disable Metrics/ClassLength
       warn I18n.t('message.awskeyring', path: $PROGRAM_NAME, bin: exec_name)
       exit 1
     end
+
+    curr, comp_len, sub_cmd = comp_type(comp_line: comp_line, curr: curr, prev: prev)
+    print_auto_resp(curr, comp_len, sub_cmd)
+  end
+
+  private
+
+  def comp_type(comp_line:, curr:, prev:)
     comp_len = comp_line.split.index(prev)
+    sub_cmd = comp_line.split[1] if comp_len > 0
+
+    comp_len = 3 if curr.start_with?('-') && !sub_cmd.nil?
 
     case prev
     when 'help'
@@ -358,11 +370,9 @@ class AwskeyringCommand < Thor # rubocop:disable Metrics/ClassLength
       comp_len = 2
     end
 
-    print_auto_resp(curr, comp_len)
+    [curr, comp_len, sub_cmd]
   end
 
-  private
-
   def age_check_and_get(account:, no_token:)
     cred = Awskeyring.get_valid_creds(account: account, no_token: no_token)
 
@@ -373,21 +383,31 @@ class AwskeyringCommand < Thor # rubocop:disable Metrics/ClassLength
     cred
   end
 
-  def print_auto_resp(curr, len)
+  def print_auto_resp(curr, len, sub_cmd)
+    list = []
     case len
     when 0
-      puts list_commands.select { |elem| elem.start_with?(curr) }.sort.join("\n")
+      list = list_commands
     when 1
-      puts Awskeyring.list_account_names.select { |elem| elem.start_with?(curr) }.join("\n")
+      list = Awskeyring.list_account_names
     when 2
-      puts Awskeyring.list_role_names.select { |elem| elem.start_with?(curr) }.join("\n")
+      list = Awskeyring.list_role_names
+    when 3
+      list = list_arguments(command: sub_cmd)
     else
       exit 1
     end
+    puts list.select { |elem| elem.start_with?(curr) }.sort!.join("\n")
   end
 
   def list_commands
-    self.class.all_commands.keys.map { |elem| elem.tr('_', '-') }.reject { |elem| elem == 'awskeyring' }
+    self.class.all_commands.keys.map { |elem| elem.tr('_', '-') }.reject! { |elem| elem == 'awskeyring' }
+  end
+
+  def list_arguments(command:)
+    command = list_commands.find { |elem| elem.start_with?(command) }
+    self.class.all_commands[command].options.values.map(&:aliases).flatten! +
+      self.class.all_commands[command].options.values.map(&:switch_name)
   end
 
   def env_vars(account:, key:, secret:, token:)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awskeyring
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Tristan Morgan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-10 00:00:00.000000000 Z
+date: 2018-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-iam