awskeyring 0.7.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ebe6ee9bb5814b1566494d8be14c6b789b86721
-  data.tar.gz: 59be7211203c6a51d309b92c66ea83d83ee6b046
+  metadata.gz: 3ad1f180eac2ee0404c4c8d96eb0206d4e1812de
+  data.tar.gz: 431a1d18c5547c6ab5f6c7f8c3b3a15ab2ca2467
 SHA512:
-  metadata.gz: e2d948135aac4bc9b5e1b13899060934ed8333fe991587de39a50d0becb16f45c3fa53c0674e844ad6212e404f91354e0cb43dd7dbc3d3d7f3c81c2e025e436c
-  data.tar.gz: 83844924a2145ef993f60afba15130b7f1526611419b9854ddd9e30a3295f837471ec1d4a942e361d4482347fa0b0054cb60db9baa818cc5b8e44c4ad357433c
+  metadata.gz: dc88bb7611ca1fe6c391e21a099a964726e87093b78278c19f972909f22a259b97af373927917df6b5a4f61d67362265dc1033914b4ddf61d30d018d7d51268f
+  data.tar.gz: 83132abd48684e6b58593781494a7ff43ec9c061e467a3efdbf5b68d2b066d1626999681620dc51323e7bc9e11fd5f1b4bf2d6f06b8a6c225683f859de6aa647

data/CHANGELOG.md

@@ -1,5 +1,24 @@
 # Change Log
 
+## [v0.8.0](https://github.com/vibrato/awskeyring/tree/v0.8.0) (2018-12-19)
+[Full Changelog](https://github.com/vibrato/awskeyring/compare/v0.7.2...v0.8.0)
+
+**Implemented enhancements:**
+
+- Provide input feedback for secret fields. [\#41](https://github.com/vibrato/awskeyring/pull/41) ([tristanmorgan](https://github.com/tristanmorgan))
+
+**Fixed bugs:**
+
+- Cannot enter secret access key when adding new accounts in 0.7.0   [\#36](https://github.com/vibrato/awskeyring/issues/36)
+
+## [v0.7.2](https://github.com/vibrato/awskeyring/tree/v0.7.2) (2018-12-17)
+[Full Changelog](https://github.com/vibrato/awskeyring/compare/v0.7.1...v0.7.2)
+
+**Fixed bugs:**
+
+- Validate that account doesn't already exists. [\#40](https://github.com/vibrato/awskeyring/pull/40) ([tristanmorgan](https://github.com/tristanmorgan))
+- Check for COMMAND param to exec. [\#38](https://github.com/vibrato/awskeyring/pull/38) ([tristanmorgan](https://github.com/tristanmorgan))
+
 ## [v0.7.1](https://github.com/vibrato/awskeyring/tree/v0.7.1) (2018-12-03)
 [Full Changelog](https://github.com/vibrato/awskeyring/compare/v0.7.0...v0.7.1)
 

data/i18n/en.yml

@@ -68,6 +68,7 @@ en:
     delrole: '# Removing role %{role}'
     deltoken: '# Removing token for account %{account}'
     delexpired: '# Removing expired session credentials'
+    exec: '# COMMAND not provided'
     missing: '# Config missing, run `%{bin} initialise` to recreate.'
     rotate: '# You have two access keys for account %{account}'
     temporary: '# Using temporary session credentials.'

data/lib/awskeyring.rb

@@ -1,5 +1,6 @@
 require 'json'
 require 'keychain'
+require 'awskeyring/validate'
 
 # Awskeyring Module,
 # gives you an interface to access keychains and items.
@@ -284,8 +285,19 @@ module Awskeyring # rubocop:disable Metrics/ModuleLength
   #
   # @param [String] account_name the associated account name.
   def self.account_exists(account_name)
+    Awskeyring::Validate.account_name(account_name)
     raise 'Account does not exist' unless list_account_names.include?(account_name)
 
     account_name
   end
+
+  # Validate account does not exists
+  #
+  # @param [String] account_name the associated account name.
+  def self.account_not_exists(account_name)
+    Awskeyring::Validate.account_name(account_name)
+    raise 'Account already exists' if list_account_names.include?(account_name)
+
+    account_name
+  end
 end

data/lib/awskeyring/input.rb

@@ -0,0 +1,37 @@
+require 'io/console'
+
+# Awskeyring Module,
+module Awskeyring
+  # Input methods for Awskeyring
+  module Input
+    # Read a secret in without echoing the characters
+    #
+    # @param [String] prompt text to prompt user with.
+    def self.read_secret(prompt)
+      $stdout.print(prompt)
+      hide_input
+    end
+
+    private_class_method def self.hide_input # rubocop:disable Metrics/MethodLength
+      password = ''
+      loop do
+        character = $stdin.getch
+        break unless character
+
+        if ["\n", "\r"].include? character
+          puts ''
+          break
+        elsif ["\b", "\u007f"].include? character
+          password.chop!
+          print "\b\e[P"
+        elsif character == "\u0003"
+          exit 1
+        else
+          print '*'
+          password << character
+        end
+      end
+      password
+    end
+  end
+end

data/lib/awskeyring/version.rb

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

data/lib/awskeyring_command.rb

@@ -3,6 +3,7 @@ require 'thor'
 
 require 'awskeyring'
 require 'awskeyring/awsapi'
+require 'awskeyring/input'
 require 'awskeyring/validate'
 require 'awskeyring/version'
 
@@ -70,12 +71,7 @@ class AwskeyringCommand < Thor # rubocop:disable Metrics/ClassLength
       existing: account, message: I18n.t('message.account'), validator: Awskeyring.method(:account_exists)
     )
     cred = age_check_and_get(account: account, no_token: options['no-token'])
-    put_env_string(
-      account: cred[:account],
-      key: cred[:key],
-      secret: cred[:secret],
-      token: cred[:token]
-    )
+    put_env_string(cred)
   end
 
   desc 'json ACCOUNT', I18n.t('json.desc')
@@ -99,15 +95,20 @@ class AwskeyringCommand < Thor # rubocop:disable Metrics/ClassLength
   method_option 'no-token', type: :boolean, aliases: '-n', desc: I18n.t('method_option.notoken'), default: false
   # execute an external command with env set
   def exec(account, *command)
+    if command.empty?
+      warn I18n.t('message.exec')
+      exit 1
+    end
     cred = age_check_and_get(account: account, no_token: options['no-token'])
-    env_vars = env_vars(
-      account: cred[:account],
-      key: cred[:key],
-      secret: cred[:secret],
-      token: cred[:token]
-    )
-    pid = Process.spawn(env_vars, command.join(' '))
-    Process.wait pid
+    env_vars = env_vars(cred)
+    begin
+      pid = Process.spawn(env_vars, command.join(' '))
+      Process.wait pid
+      $CHILD_STATUS
+    rescue Errno::ENOENT => err
+      warn err.to_s
+      exit 1
+    end
   end
 
   desc 'add ACCOUNT', I18n.t('add.desc')
@@ -118,7 +119,7 @@ class AwskeyringCommand < Thor # rubocop:disable Metrics/ClassLength
   # Add an Account
   def add(account = nil) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
     account = ask_check(
-      existing: account, message: I18n.t('message.account'), validator: Awskeyring::Validate.method(:account_name)
+      existing: account, message: I18n.t('message.account'), validator: Awskeyring.method(:account_not_exists)
     )
     key = ask_check(
       existing: options[:key], message: I18n.t('message.key'), validator: Awskeyring::Validate.method(:access_key)
@@ -418,27 +419,27 @@ class AwskeyringCommand < Thor # rubocop:disable Metrics/ClassLength
       self.class.all_commands[command].options.values.map(&:switch_name)
   end
 
-  def env_vars(account:, key:, secret:, token:)
+  def env_vars(cred)
     env_var = {}
     env_var['AWS_DEFAULT_REGION'] = 'us-east-1' unless Awskeyring::Awsapi.region
-    env_var['AWS_ACCOUNT_NAME'] = account
-    env_var['AWS_ACCESS_KEY_ID'] = key
-    env_var['AWS_ACCESS_KEY'] = key
-    env_var['AWS_SECRET_ACCESS_KEY'] = secret
-    env_var['AWS_SECRET_KEY'] = secret
-    if token
-      env_var['AWS_SECURITY_TOKEN'] = token
-      env_var['AWS_SESSION_TOKEN'] = token
+    env_var['AWS_ACCOUNT_NAME'] = cred[:account]
+    env_var['AWS_ACCESS_KEY_ID'] = cred[:key]
+    env_var['AWS_ACCESS_KEY'] = cred[:key]
+    env_var['AWS_SECRET_ACCESS_KEY'] = cred[:secret]
+    env_var['AWS_SECRET_KEY'] = cred[:secret]
+    if cred[:token]
+      env_var['AWS_SECURITY_TOKEN'] = cred[:token]
+      env_var['AWS_SESSION_TOKEN'] = cred[:token]
     end
     env_var
   end
 
-  def put_env_string(account:, key:, secret:, token:)
-    env_var = env_vars(account: account, key: key, secret: secret, token: token)
+  def put_env_string(cred)
+    env_var = env_vars(cred)
     env_var.each { |var, value| puts "export #{var}=\"#{value}\"" }
 
-    puts 'unset AWS_SECURITY_TOKEN' unless token
-    puts 'unset AWS_SESSION_TOKEN' unless token
+    puts 'unset AWS_SECURITY_TOKEN' unless cred[:token]
+    puts 'unset AWS_SESSION_TOKEN' unless cred[:token]
   end
 
   def ask_check(existing:, message:, secure: false, optional: false, validator: nil)
@@ -461,7 +462,7 @@ class AwskeyringCommand < Thor # rubocop:disable Metrics/ClassLength
 
   def ask(message:, secure: false, optional: false)
     if secure
-      Thor::LineEditor.readline(message.rjust(20) + ': ', echo: false).strip
+      Awskeyring::Input.read_secret(message.rjust(20) + ': ')
     elsif optional
       Thor::LineEditor.readline((message + ' (optional)').rjust(20) + ': ')
     else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awskeyring
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.0
 platform: ruby
 authors:
 - Tristan Morgan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-03 00:00:00.000000000 Z
+date: 2018-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-iam
@@ -85,6 +85,7 @@ files:
 - i18n/en.yml
 - lib/awskeyring.rb
 - lib/awskeyring/awsapi.rb
+- lib/awskeyring/input.rb
 - lib/awskeyring/validate.rb
 - lib/awskeyring/version.rb
 - lib/awskeyring_command.rb