one_pass 0.1.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7774961c176b2d6ebc5729b68030132c93d9d9df
-  data.tar.gz: 1e670ffa2e34cd27a9db1b1b947eac101a67763a
+  metadata.gz: 0cc1151fd6e205e25446f3ccc96ea2ade11ae65f
+  data.tar.gz: 38a4224636c6cdd21c05bb4e468b95326ebbe271
 SHA512:
-  metadata.gz: 1026704202367e43c49d6da76355dc65c48b5559b17097ab39482b60d7c99fe7bdc2556878a32021f81831cb946e91d6c7f211d38ca45629bc3e6ea0b4e10c37
-  data.tar.gz: 9c5d4b84d154cb5013b1839b946665c1dd445be8b379ad294922c4879b038acb5cff4845a12300922506c596b75ca10bdb6c111091644b2aeec0696f098c012f
+  metadata.gz: 4b8ecca56031bbfc20f1f59be2386f52ba18cf57cf9067738498b7fccf1f0fda6c68071719f2d4c9b3b4efada10f137bd08f04aead0948ba91400d3fb1522c27
+  data.tar.gz: c24eed919126dae1d4dd16f763d29690f2a4cd2dd5d2e1e87b1a10ac6202709f9e5a2be3c1bc3a4bee8b8fb5922c31cdbe562adc66a20e1e158de632f5c40cc7

data/.gitignore

@@ -6,3 +6,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+*.gem

data/Gemfile.lock

@@ -1,19 +1,16 @@
 PATH
   remote: .
   specs:
-    one_pass (0.1.0)
-      dispel (~> 0.0)
+    one_pass (0.3.0)
       thor (~> 0.19)
+      ttyname (~> 1.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
     bump (0.5.3)
     coderay (1.1.1)
-    curses (1.0.2)
     diff-lcs (1.2.5)
-    dispel (0.0.7)
-      curses
     method_source (0.8.2)
     pry (0.10.3)
       coderay (~> 1.1.0)
@@ -35,6 +32,7 @@ GEM
     rspec-support (3.4.1)
     slop (3.6.0)
     thor (0.19.1)
+    ttyname (1.0.0)
 
 PLATFORMS
   ruby

data/README.markdown

@@ -26,3 +26,8 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/sethvo
 ## License
 
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
+
+## Todo
+
+* [ ] Check for prerequisite external applications before calling them (pinentry, pbcopy)
+* [ ] Detect OS to use appropriate clipboard utility

data/exe/one-pass

@@ -5,3 +5,5 @@ require 'OnePass'
 require 'OnePass/cli'
 
 app = OnePass::CLI.start ARGV
+
+trap("SIGINT") { exit }

data/lib/OnePass/application.rb

@@ -1,5 +1,3 @@
-require 'dispel'
-
 module OnePass
   # OnePass Application
   class Application
@@ -9,85 +7,22 @@ module OnePass
       @vault_path = get_vault vault_path
       @vault = OpVault.new @vault_path
 
-      @vault.unlock password_entry
-      @vault.load_items
-    end
-
-    def password_entry
-      accumulator = []
-      Dispel::Screen.open do |screen|
-        map = Dispel::StyleMap.new(screen.lines)
-        config = {
-          map: map,
-          width: screen.columns,
-          height: screen.lines,
-          mode: :password
-        }
-        screen.draw *draw_password_box(accumulator.length, config)
-
-        Dispel::Keyboard.output do |key|
-          case key
-          when :enter
-            case config[:mode]
-            when :cancel
-              raise 'Cancel'
-            else
-              break
-            end
-          when :backspace
-            accumulator.pop
-          when :down
-            config[:mode] = config[:mode] == :password ? :ok : config[:mode]
-          when :up
-            config[:mode] = :password
-          when :left
-            config[:mode] = config[:mode] == :password ? config[:mode] : :ok
-          when :right
-            config[:mode] = config[:mode] == :password ? config[:mode] : :cancel
-          else
-            accumulator.push key if config[:mode] == :password
-          end
-          screen.draw *draw_password_box(accumulator.length, config)
+      error_message = nil
+      prompter = OnePass::Password.new(vault_path: @vault_path)
+      loop do
+        password = prompter.prompt error_message
+        exit if password.nil? # cancelled
+        begin
+          @vault.unlock password
+          @vault.load_items
+          break
+        rescue => error
+          error_message = error.message
+          next
         end
       end
-      accumulator.join
-    end
-
-    def draw_password_box(pw_length, config)
-      message = 'Please enter your 1Password master password for the following vault:'
-      min_width = [message, @vault_path].max_by(&:length).length
-      prefix = 'Master Password: '
-
-      offset_left = (config[:width] - (min_width + 4)) / 2
-      offset_top = (config[:height] - 8) / 2
-      left = ' ' * offset_left
-      third = min_width / 3
-
-      password_string = ("*" * pw_length).ljust(min_width - prefix.length, '_')
-      buttons = '<OK>'.center(third) + ' ' * (min_width - (third * 2)) + '<Cancel>'.center(third)
-
-      box  = ("\n" * offset_top)
-      box += "#{left}┏#{'━' * (min_width + 2)}┓\n"
-      box += "#{left}┃ #{message.ljust(min_width)} ┃\n"
-      box += "#{left}┃ #{@vault_path.ljust(min_width)} ┃\n"
-      box += "#{left}┃ #{' ' * min_width} ┃\n"
-      box += "#{left}┃ #{prefix}#{password_string} ┃\n"
-      box += "#{left}┃#{' ' * (min_width + 2)}┃\n"
-      box += "#{left}┃ #{buttons} ┃\n"
-      box += "#{left}┗#{'━' * (min_width + 2)}┛\n"
-
-      cursor_top = offset_top + (config[:mode] == :password ? 4 : 6)
-      cursor_left = offset_left
-      case config[:mode]
-      when :ok
-        cursor_left += third / 2
-      when :cancel
-        cursor_left += min_width - third + third / 2 - 2
-      else
-        cursor_left += prefix.length + pw_length + 2
-      end
-
-      [box, config[:map], [cursor_top, cursor_left]]
+    ensure
+      prompter.done
     end
 
     def get_vault(vault_path = nil)

data/lib/OnePass/cli.rb

@@ -2,14 +2,21 @@ require 'io/console'
 require 'thor'
 
 require 'OnePass/application'
+require 'OnePass/password'
 
 module OnePass
   # OnePass CLI
   class CLI < Thor
     SHOW_OPTIONS = %w( all username password url uuid title )
 
+    map %w[--version -v] => :__version
+    desc "--version, -v", "Print the current version"
+    def __version
+      puts "#{File.basename $0} version #{OnePass::VERSION}"
+    end
+
     desc 'login', 'Save a 1Password vault and verify password'
-    option :vault, aliases: '-v', type: :string, banner: 'Specify a vault path'
+    option :vault, aliases: '-v', type: :string, banner: 'Specify a vault path', required: true
     def login
       OnePass::Application.save options.vault
     end
@@ -39,7 +46,12 @@ module OnePass
       app = OnePass::Application.new
       reply_type = type.keys.first.to_sym
       reply = app.show name, reply_type
-      puts reply_type == :all ? JSON.pretty_generate(reply) : reply
+      if options.clip
+        IO.popen('pbcopy', 'w') { |f| f << (reply_type == :all ? JSON.generate(reply) : reply) }
+      else
+        print reply_type == :all ? JSON.pretty_generate(reply) : reply
+        puts if $stdout.isatty
+      end
     end
 
     desc 'search QUERY', 'Perform fuzzy search for items in your vault, shows uuid, title and username'

data/lib/OnePass/op_vault.rb

@@ -64,6 +64,10 @@ module OnePass
       raise 'Incorrect password'
     end
 
+    def unlocked?
+      !!@master_key && !!@overview_key
+    end
+
     def lock
       @master_key = @master_mac_key = nil
     end

data/lib/OnePass/password.rb

@@ -0,0 +1,80 @@
+require 'ttyname'
+
+module OnePass
+  # Fork out to `pinentry` for password
+  class Password
+    DESCRIPTION = 'Please enter your 1Password master password for the following vault:'
+    DEFAULT = {
+      title: '1Password CLI',
+      prompt: 'Master Password: '
+    }
+
+    def initialize(opts = {})
+      @config = OpenStruct.new DEFAULT.merge(opts)
+      @config.description ||= "#{DESCRIPTION}%0a#{@config.vault_path}" if @config.vault_path
+    end
+
+    def prompt(error_message = nil)
+      @config.error = error_message
+      @pipe = IO.popen 'pinentry', 'r+'
+      check
+      send_settings
+      get_password
+      @password
+    end
+
+    def done
+      send 'BYE'
+      @pipe.close
+    end
+
+    private
+
+    def send_settings
+      command 'SETTITLE', @config.title
+      command 'SETPROMPT', @config.prompt
+      command 'SETERROR', @config.error if @config.error
+      command 'SETDESC', @config.description
+
+      option 'ttytype', ENV['TERM']
+      option 'ttyname', $stdin.ttyname
+      option 'display', ENV['DISPLAY']
+    end
+
+    def get_password
+      @password = ''
+      send 'GETPIN'
+      while true
+        case response = @pipe.gets
+        when /^D .*/
+          @password = response[2..-1].chomp
+        when /^OK/
+          break
+        else
+          @password = nil
+          break
+        end
+      end
+    rescue Interrupt
+      @password = nil
+    end
+
+    def command(command, option = nil)
+      send command, option
+      check
+    end
+
+    def option(name, value)
+      command 'OPTION', "#{name}=#{value}"
+    end
+
+    def send(command, option = nil)
+      @pipe.puts "#{command}#{option ? ' ' + option : ''}"
+    end
+
+    def check
+      response = @pipe.gets
+      raise 'bad response' unless response.start_with? 'OK'
+    end
+  end
+end

data/lib/OnePass/version.rb

@@ -1,3 +1,3 @@
 module OnePass
-  VERSION = '0.1.0'.freeze
+  VERSION = '0.3.0'.freeze
 end

data/one_pass.gemspec

@@ -27,8 +27,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "dispel", "~> 0.0"
   spec.add_runtime_dependency "thor", "~> 0.19"
+  spec.add_runtime_dependency "ttyname", "~> 1.0"
 
   spec.add_development_dependency "bundler", "~> 1.11"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: one_pass
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Seth Voltz
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-29 00:00:00.000000000 Z
+date: 2016-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: dispel
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: '0.19'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: '0.19'
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: ttyname
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -120,6 +120,7 @@ files:
 - lib/OnePass/application.rb
 - lib/OnePass/cli.rb
 - lib/OnePass/op_vault.rb
+- lib/OnePass/password.rb
 - lib/OnePass/version.rb
 - one_pass.gemspec
 homepage: https://sethvoltz.github.com/one_pass