brightbox-cli 2.10.0 → 2.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 91e149ba9690fe26c97b144bb44335ad61bb1d4b618dc40cf25d67db0ce2125f
-  data.tar.gz: 671a10236bb00873715e7efbb833517bdada9fa473b53ae59ada833c5f213e0c
+  metadata.gz: 1f74c6d5e07fe744f3217182b736dd66ad18c849032f6be610d65af2bc8362f3
+  data.tar.gz: 9b5764ee9444858f285efb15720a640d32bb4d3519f495725ec6445c315ee538
 SHA512:
-  metadata.gz: 32983783ff888dbd51d1b3e2354e39d2958e9c88e44058e1a9e0f6e3eb660379fcb1b40d7b1a6b98a0911fbb95005fdd06d846b253efde60cf2da94abe42989e
-  data.tar.gz: 9f8b40a4566056cb001c6370e6f0b9b801e1955124610f0a993d6d3b6725c86643ee7452765c532e297b6be3886b081c22165ba7b2bca90a1ea664c1f636e4c9
+  metadata.gz: 254847110a72093c3f32200b01a2f565f8a97cb3ae591e6a97a78966bdc959826944da0ef4e8a7127d52c07cbe90dbe1631a99e6c641a9b3be5a504edf7de3bb
+  data.tar.gz: e43d2bc0e2b47f369186d441688fec4f9021b6aa1df6c2735edc1826518630bb9a611b072c8eb3f2f7f1c8524d203adf8df1f08bb97fdc5c272e7d4048f5f8fa

data/.travis.yml

@@ -1,5 +1,6 @@
 language: ruby
 sudo: false
+
 rvm:
   - 1.9
   - 2.0
@@ -7,4 +8,4 @@ rvm:
   - 2.2
   - 2.3
   - 2.4
-  - 2.5
+  - 2.6

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+### v2.11.0 / 2019-06-06
+
+[Full Changelog](https://github.com/brightbox/brightbox-cli/compare/v2.10.0...v2.11.0)
+
+Enhancements:
+
+* Prompts for 2FA token if set up on a user account being used to authenticate.
+
 ### v2.10.0 / 2019-03-20
 
 [Full Changelog](https://github.com/brightbox/brightbox-cli/compare/v2.9.3...v2.10.0)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    brightbox-cli (2.10.0)
+    brightbox-cli (2.11.0)
       fog-brightbox (>= 0.16.0, < 1.0)
       fog-core (< 2.0)
       gli (~> 2.12.0)
@@ -81,4 +81,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   1.16.2
+   1.16.6

data/lib/brightbox-cli/commands/login.rb

@@ -32,6 +32,8 @@ module Brightbox
       end
       raise "You must specify your Brightbox password." if password.empty?
 
+      password = Brightbox.config.extend_with_two_factor_pin(password)
+
       section_options = {
         :client_name => config_name,
         :alias => config_name,

data/lib/brightbox-cli/config.rb

@@ -14,6 +14,7 @@ module Brightbox
     include Brightbox::Config::Cache
     include Brightbox::Config::GpgEncryptedPasswords
     include Brightbox::Config::PasswordHelper
+    include Brightbox::Config::TwoFactorAuth
     include Brightbox::Config::AuthenticationTokens
     include Brightbox::Config::Accounts
     include Brightbox::Config::Clients

data/lib/brightbox-cli/config/authentication_tokens.rb

@@ -193,6 +193,8 @@ module Brightbox
         password ||= password_helper_password
         password ||= prompt_for_password
 
+        password = extend_with_two_factor_pin(password)
+
         # FIXME: options are required to work
         options = {
           :client_id => client_name,

data/lib/brightbox-cli/config/two_factor_auth.rb

@@ -0,0 +1,31 @@
+module Brightbox
+  module Config
+    module TwoFactorAuth
+
+      def extend_with_two_factor_pin(password)
+        if two_factor_enabled
+          suffix = "+" + two_factor_pin
+          password += suffix unless password.end_with?(suffix)
+        end
+        password
+      end
+
+      private
+
+      def two_factor_enabled
+        return config[client_name]["two_factor"] == "true" unless client_name.nil?
+      end
+
+      def two_factor_pin
+        @two_factor_pin ||= prompt_for_two_factor_pin if two_factor_enabled
+      end
+
+      def prompt_for_two_factor_pin
+        require "highline"
+        highline = HighLine.new
+        # FIXME: Capture interupts if user aborts
+        highline.ask("Enter your two factor pin : ")
+      end
+    end
+  end
+end

data/lib/brightbox-cli/version.rb

@@ -1,3 +1,3 @@
 module Brightbox
-  VERSION = "2.10.0" unless defined?(Brightbox::VERSION)
+  VERSION = "2.11.0" unless defined?(Brightbox::VERSION)
 end

data/lib/brightbox_cli.rb

@@ -72,6 +72,7 @@ require_relative "brightbox-cli/api"
 require_relative "brightbox-cli/config/cache"
 require_relative "brightbox-cli/config/gpg_encrypted_passwords"
 require_relative "brightbox-cli/config/password_helper"
+require_relative "brightbox-cli/config/two_factor_auth"
 require_relative "brightbox-cli/config/authentication_tokens"
 require_relative "brightbox-cli/config/accounts"
 require_relative "brightbox-cli/config/clients"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brightbox-cli
 version: !ruby/object:Gem::Version
-  version: 2.10.0
+  version: 2.11.0
 platform: ruby
 authors:
 - John Leach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-20 00:00:00.000000000 Z
+date: 2019-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-brightbox
@@ -363,6 +363,7 @@ files:
 - lib/brightbox-cli/config/section_name_deduplicator.rb
 - lib/brightbox-cli/config/sections.rb
 - lib/brightbox-cli/config/to_fog.rb
+- lib/brightbox-cli/config/two_factor_auth.rb
 - lib/brightbox-cli/config/user_application.rb
 - lib/brightbox-cli/connection_manager.rb
 - lib/brightbox-cli/database_server.rb