awskeyring 1.9.1 → 1.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a30aa3b190aaf468207e6b79f4b2169561ddf4f5ceaad9f195d38a0cd1d4e1c8
-  data.tar.gz: e00232d1936ed6a99d5b7926a19a2d7b472ebce13b61d9bbd153a28c2bb2ef85
+  metadata.gz: 31da4ef422d59adf9c5963938ad2ffeaf6ca6457b5b5f8ca2fa3857290316ed3
+  data.tar.gz: 8fd51c42d7211c456ab6300561bce071a29acdbe90dea71a2b896f631cd29f07
 SHA512:
-  metadata.gz: 26193f4fb124fbcab81c96828a33a23f5ee19f00512a9e4ed458ed4e75dbec31992a92ad886c54e7e8d2f594fd169ac8349ff1a3b541f6b53fcce2b0b8c2c051
-  data.tar.gz: aa7d5787dc45b3b9b213bbf186b1531cd4b89d9684b3a4ac535f7fd5674b4251147a32fe4c2ec2944988a0b514acaa92b3052185f6e16acd5bd51dd775ed133f
+  metadata.gz: 7036e99a3e9ef4d171e0c71fbfd883cb9dbe3158a0f07c3457f380016503ac4e8876121ae4b82a0fd5a8f9b4c3266581041d66fd47f7a72ac3fc201a8d0d27e8
+  data.tar.gz: e5cb973a8903077a01bd83eda8ef3f0a00fc6ea7e42257cd3e71c8953258975b428020e0078a58c02672a1d92d1595dae5af5563647ca462f30c7f7c87554325

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2017-2021 Tristan Morgan
+Copyright (c) 2016-2022 Tristan Morgan
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -2,7 +2,7 @@
 
 ![Awskeyring](https://raw.githubusercontent.com/servian/awskeyring/main/awskeyring-144.png)
 
-* [![Build Status](https://travis-ci.com/servian/awskeyring.svg?branch=main)](https://travis-ci.com/servian/awskeyring)
+* [![Build Status](https://app.travis-ci.com/servian/awskeyring.svg?branch=main)](https://app.travis-ci.com/github/servian/awskeyring)
 * [![Gem Version](https://badge.fury.io/rb/awskeyring.svg)](https://badge.fury.io/rb/awskeyring)
 * [![license MIT](https://img.shields.io/badge/license-MIT-brightgreen.svg)](https://opensource.org/licenses/MIT)
 * [![All Downloads](https://ruby-gem-downloads-badge.herokuapp.com/awskeyring?type=total)](https://rubygems.org/gems/awskeyring)

data/awskeyring.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |spec|
   spec.homepage      = Awskeyring::HOMEPAGE
   spec.licenses      = ['MIT']
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^spec/|^\..*|C.*\.md|.*\.ronn|.*\.png}) }
+  spec.files         = %w[awskeyring.gemspec README.md LICENSE.txt] + Dir['exe/*', 'lib/**/*.rb', 'man/*.5', 'i18n/*']
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
@@ -26,6 +26,7 @@ Gem::Specification.new do |spec|
     'bug_tracker_uri' => "#{Awskeyring::HOMEPAGE}/issues",
     'changelog_uri' => "#{Awskeyring::HOMEPAGE}/blob/main/CHANGELOG.md",
     'documentation_uri' => "https://rubydoc.info/gems/#{spec.name}/#{Awskeyring::VERSION}",
+    'rubygems_mfa_required' => 'true',
     'source_code_uri' => "#{Awskeyring::HOMEPAGE}/tree/v#{Awskeyring::VERSION}",
     'wiki_uri' => "#{Awskeyring::HOMEPAGE}/wiki"
   }

data/lib/awskeyring/credential_provider.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require 'aws-sdk-core'
+require 'awskeyring'
+
+module Awskeyring
+  # Provide a credential provider for use as a library, eg.
+  #     require 'awskeyring/credential_provider'
+  #     client = Aws::STS::Client.new(
+  #       credentials: Awskeyring::CredentialProvider.new("company-acc")
+  #     )
+  class CredentialProvider
+    include Aws::CredentialProvider
+
+    attr_accessor :account
+
+    def initialize(account)
+      @account = account
+    end
+
+    # returns a new Aws::Credentials object
+    def credentials
+      cred = Awskeyring.get_valid_creds(account: account)
+      Aws::Credentials.new(cred[:key],
+                           cred[:secret],
+                           cred[:token])
+    end
+  end
+end

data/lib/awskeyring/validate.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'base64'
+
 # Awskeyring Module,
 # gives you an interface to access keychains and items.
 module Awskeyring
@@ -27,7 +29,11 @@ module Awskeyring
     #
     # @param [String] aws_secret_access_key The aws_secret_access_key
     def self.secret_access_key(aws_secret_access_key)
-      raise 'Secret Access Key is not 40 chars' if aws_secret_access_key.length != 40
+      begin
+        raise 'Invalid Secret Access Key' unless Base64.strict_decode64(aws_secret_access_key).length == 30
+      rescue ArgumentError
+        raise 'Invalid Secret Access Key'
+      end
 
       aws_secret_access_key
     end

data/lib/awskeyring/version.rb

@@ -6,7 +6,7 @@ require 'json'
 # Version const and query of latest.
 module Awskeyring
   # The Gem's version number
-  VERSION = '1.9.1'
+  VERSION = '1.9.4'
   # The Gem's homepage
   HOMEPAGE = 'https://github.com/servian/awskeyring'
 

data/lib/awskeyring.rb

@@ -52,6 +52,7 @@ module Awskeyring # rubocop:disable Metrics/ModuleLength
     prefs = {
       awskeyring: awskeyring,
       keyage: DEFAULT_KEY_AGE,
+      browser: DEFAULT_BROWSER_LIST,
       console: DEFAULT_CONSOLE_LIST
     }
     File.new(Awskeyring::PREFS_FILE, 'w').write JSON.dump(prefs)

data/lib/awskeyring_command.rb

@@ -133,7 +133,7 @@ class AwskeyringCommand < Thor # rubocop:disable Metrics/ClassLength
       key: cred[:key],
       secret: cred[:secret],
       token: cred[:token],
-      expiry: (expiry || Time.new + Awskeyring::Awsapi::ONE_HOUR).iso8601
+      expiry: (expiry || (Time.new + Awskeyring::Awsapi::ONE_HOUR)).iso8601
     )
   end
 
@@ -372,7 +372,7 @@ class AwskeyringCommand < Thor # rubocop:disable Metrics/ClassLength
         mfa: item_hash[:mfa],
         key: item_hash[:key],
         secret: item_hash[:secret],
-        user: ENV['USER']
+        user: ENV.fetch('USER', 'awskeyring')
       )
       Awskeyring.delete_token(account: account, message: '# Removing STS credentials')
     rescue Aws::Errors::ServiceError => e
@@ -415,7 +415,7 @@ class AwskeyringCommand < Thor # rubocop:disable Metrics/ClassLength
         secret: cred[:secret],
         token: cred[:token],
         path: path,
-        user: ENV['USER']
+        user: ENV.fetch('USER', 'awskeyring')
       )
     rescue Aws::Errors::ServiceError => e
       warn e.to_s
@@ -436,8 +436,8 @@ class AwskeyringCommand < Thor # rubocop:disable Metrics/ClassLength
   # autocomplete
   def autocomplete(curr, prev = nil)
     curr, prev = fix_args(curr, prev)
-    comp_line = ENV['COMP_LINE']
-    comp_point_str = ENV['COMP_POINT']
+    comp_line = ENV.fetch('COMP_LINE', nil)
+    comp_point_str = ENV.fetch('COMP_POINT', nil)
     unless comp_line && comp_point_str
       exec_name = File.basename($PROGRAM_NAME)
       warn I18n.t('message.awskeyring', path: $PROGRAM_NAME, bin: exec_name)
@@ -609,7 +609,7 @@ class AwskeyringCommand < Thor # rubocop:disable Metrics/ClassLength
     bundled_env = to_delete.map { |elem| elem[('BUNDLER_ORIG_'.length)..] }
     to_delete << 'BUNDLE_GEMFILE'
     bundled_env.each do |env_name|
-      ENV[env_name] = ENV["BUNDLER_ORIG_#{env_name}"]
+      ENV[env_name] = ENV.fetch("BUNDLER_ORIG_#{env_name}", nil)
       to_delete << env_name if ENV["BUNDLER_ORIG_#{env_name}"].start_with? 'BUNDLER_'
     end
     to_delete.each do |env_name|

data/man/awskeyring.5

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "AWSKEYRING" "5" "September 2021" "" ""
+.TH "AWSKEYRING" "5" "April 2022" "" ""
 .
 .SH "NAME"
 \fBAwskeyring\fR \- is a small tool to manage AWS account keys in the macOS Keychain

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awskeyring
 version: !ruby/object:Gem::Version
-  version: 1.9.1
+  version: 1.9.4
 platform: ruby
 authors:
 - Tristan Morgan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-09-03 00:00:00.000000000 Z
+date: 2022-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-iam
@@ -73,15 +73,14 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- Gemfile
 - LICENSE.txt
 - README.md
-- Rakefile
 - awskeyring.gemspec
 - exe/awskeyring
 - i18n/en.yml
 - lib/awskeyring.rb
 - lib/awskeyring/awsapi.rb
+- lib/awskeyring/credential_provider.rb
 - lib/awskeyring/input.rb
 - lib/awskeyring/validate.rb
 - lib/awskeyring/version.rb
@@ -93,8 +92,9 @@ licenses:
 metadata:
   bug_tracker_uri: https://github.com/servian/awskeyring/issues
   changelog_uri: https://github.com/servian/awskeyring/blob/main/CHANGELOG.md
-  documentation_uri: https://rubydoc.info/gems/awskeyring/1.9.1
-  source_code_uri: https://github.com/servian/awskeyring/tree/v1.9.1
+  documentation_uri: https://rubydoc.info/gems/awskeyring/1.9.4
+  rubygems_mfa_required: 'true'
+  source_code_uri: https://github.com/servian/awskeyring/tree/v1.9.4
   wiki_uri: https://github.com/servian/awskeyring/wiki
 post_install_message: 
 rdoc_options: []
@@ -111,7 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: Manages AWS credentials in the macOS keychain

data/Gemfile

@@ -1,20 +0,0 @@
-# frozen_string_literal: true
-
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in awskeyring.gemspec
-gemspec
-
-group :development do
-  gem 'github_changelog_generator'
-  gem 'rake'
-  gem 'ronn'
-  gem 'rspec'
-  gem 'rubocop'
-  gem 'rubocop-performance'
-  gem 'rubocop-rake'
-  gem 'rubocop-rspec'
-  gem 'rubocop-rubycw'
-  gem 'simplecov'
-  gem 'yard'
-end

data/Rakefile

@@ -1,63 +0,0 @@
-# frozen_string_literal: true
-
-require 'bundler/gem_tasks'
-require 'rubocop/rake_task'
-require 'ronn'
-require 'github_changelog_generator/task'
-require 'yard'
-
-GitHubChangelogGenerator::RakeTask.new :changelog do |config|
-  config.user = 'servian'
-  config.project = 'awskeyring'
-  config.future_release = "v#{Awskeyring::VERSION}"
-  config.since_tag = 'v0.10.0'
-end
-
-RuboCop::RakeTask.new do |rubocop|
-  rubocop.options = %w[-D --enable-pending-cops]
-  rubocop.requires << 'rubocop-performance'
-  rubocop.requires << 'rubocop-rake'
-  rubocop.requires << 'rubocop-rspec'
-  rubocop.requires << 'rubocop-rubycw'
-end
-
-desc 'Run RSpec code examples'
-task :spec do
-  puts 'Running RSpec...'
-  require 'rspec/core'
-  runner = RSpec::Core::Runner
-  xcode = runner.run(%w[--pattern spec/**{,/*/**}/*_spec.rb --order rand --format documentation --color])
-  abort 'RSpec failed' if xcode.positive?
-end
-
-desc 'Check filemode bits'
-task :filemode do
-  puts 'Running FileMode...'
-  files = Set.new(`git ls-files -z`.split("\x0"))
-  dirs = Set.new(files.map { |file| File.dirname(file) })
-  failure = []
-  files.merge(dirs).each do |file|
-    mode = File.stat(file).mode
-    print '.'
-    failure << file if (mode & 0x7) != (mode >> 3 & 0x7)
-  end
-  abort "\nError: Incorrect file mode found\n#{failure.join("\n")}" unless failure.empty?
-  print "\n"
-end
-
-desc 'generate manpage'
-task :ronn do
-  puts 'Running Ronn...'
-  doc = Ronn::Document.new('man/awskeyring.5.ronn')
-  doc.date = Time.parse(`git show -s --format=%ad --date=short`)
-  File.write('man/awskeyring.5', doc.to_roff)
-  puts "done\n\n"
-end
-
-YARD::Rake::YardocTask.new do |t|
-  t.options = ['--fail-on-warning', '--no-progress', '--files', '*.md']
-  t.stats_options = ['--list-undoc']
-end
-
-desc 'Run Linting, Tests and Documetation tasks'
-task default: %i[filemode rubocop spec ronn yard]