trunk 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d63e9f1885845c0dcfbddc0e2e2b8e9a685e732d19fdb0b6e0b319064b7093c6
-  data.tar.gz: ea15f59e0f1864d0d8ad77ea6ad2be038938314481e9d299c00d5aa0a548a413
+  metadata.gz: 237505d740522814bab6d0401ae982a01d12b56792dc3913cf1594dcf50d2ad5
+  data.tar.gz: c9e2b68bdd588fee6e82095662f62bdd025def1c7f948f3085939f83f4d48b51
 SHA512:
-  metadata.gz: 4878ac13c5a8508eb4b426bbf3f76d8907c8d2abbd6790fa508e2612f8da6f817309db678e301c67123899b7502f6981ce7c95b89e4abcc038fef05bea351d8e
-  data.tar.gz: 42f5ddbc1b13dd8c82846b0363fcfb1edab7cbef80ef7714f73196e705025660ecb374a0db5f19d713601304b06aa3c9f45d0437fe81d2efb126530bfc974e69
+  metadata.gz: 7b6900e6f99a1bd58ebd0fa4185535be1c6ec03d9b7649d805263bb19a41715c7a5175d80bc32a13b922e431934c0cd0929ea28a446d7100e22dbd5cd8b9bb8f
+  data.tar.gz: bf4a7c862bdfb9ef31621f70cf6bcd3da6f2ab08221eb2c4ce0f4de2b8f2524fe986e9867e12317c5f5428b112ccc6b55f7ec52a86ca6f2b5003a1b67ac7fd62

data/.gitignore

@@ -10,3 +10,5 @@
 # rspec failure tracking
 .rspec_status
 Gemfile.lock
+.trunk.enc
+.trunk.key.enc

data/README.md

@@ -22,17 +22,9 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
-
 ```bash
-$ trunk add --title=title --username=username --password=password
-$ trunk add <title> <username> - # read password from stdin
-$ trunk add
-$ title:>
-$ username:>
-$ password:>
-
-
+$ trunk add key password
+$ trunk add key - # read password from stdin
 $ trunk show title
 ```
 
@@ -51,7 +43,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/trunk.
+Bug reports and pull requests are welcome on GitHub at https://github.com/mokhan/trunk.
 
 ## License
 

data/lib/trunk.rb

@@ -1,7 +1,15 @@
-require 'optparse'
+require 'base64'
+require 'fileutils'
+require 'openssl'
+require 'thor'
+require 'yaml'
 
 require "trunk/cli"
+require "trunk/serializers/base_64"
+require "trunk/serializers/composite"
+require "trunk/serializers/crypto"
 require "trunk/storage"
+require "trunk/yaml_storage"
 require "trunk/version"
 
 module Trunk

data/lib/trunk/cli.rb

@@ -1,77 +1,56 @@
 module Trunk
-  class AddCommand
-    def matches?(command)
-      "add" == command
+  class CLI < Thor
+    desc "add NAME PASSWORD", "add a key and password"
+    def add(name, password = $stdin.gets.strip)
+      storage.store(name, password)
     end
 
-    def run(arguments)
-      OptionParser.new do |parser|
-        parser.banner = "Usage: trunk add [options]"
-        parser.on_tail("-h", "--help", "print help") do
-          puts parser
-        end
-      end.parse!(arguments)
+    desc "show NAME", "print the password associated with a key"
+    def show(name)
+      print storage.fetch(name)
+    rescue OpenSSL::PKey::RSAError => error
+      say error.message, :red
+    end
 
-      print "title:> "
-      title = STDIN.gets
-      print "username:> "
-      username = STDIN.gets
-      print "password:> "
-      password = STDIN.gets
+    desc "version", "print the version"
+    def version
+      say Trunk::VERSION
+    end
 
-      puts [title, username, password].inspect
+    desc "setup", "create the database and private key file."
+    method_option :algorithm, type: :string, default: 'AES-256-CBC'
+    def setup
+      FileUtils.mkdir_p(dir)
+      exit(0) unless file_collision(private_key_path) if File.exist?(private_key_path)
+      IO.write(private_key_path, OpenSSL::PKey::RSA.new(4096).export(options[:algorithm], passphrase))
+      FileUtils.touch(database_path)
+      [database_path, private_key_path].each { |x| FileUtils.chmod(0600, x) }
     end
-  end
 
-  class DefaultCommand
-    def run(arguments)
-      parser = OptionParser.new
-      parser.banner = "Usage: trunk [options]"
-      parser.on("-v", "--[no-]verbose", "run verbosely") do |v|
-      end
-      parser.on("--version", "show version") do |v|
-        puts Trunk::VERSION
-      end
-      parser.on_tail("-h", "--help", "print help") do
-        puts parser
-      end
-      parser.parse!(arguments)
+    private
+
+    def storage
+      @storage ||= Trunk::YAMLStorage.new(database_path, private_key)
     end
-  end
 
-  class CLI
-    attr_reader :parser, :commands
+    def database_path
+      File.join(dir, '.trunk.enc')
+    end
 
-    def initialize
-      @commands = []
-      @commands.push(AddCommand.new)
+    def private_key_path
+      File.join(dir, '.trunk.key.enc')
     end
 
-    def command_for(arguments)
-      if arguments.empty? || arguments[0]&.start_with?("-")
-        DefaultCommand.new
-      else
-        commands.find { |x| x.matches?(arguments[0]) }
-      end
+    def dir
+      ENV['TRUNK_HOME'] || File.join(Dir.home, '.trunk')
     end
 
-    def run(arguments)
-      parser.banner = "Usage: trunk [options]"
-      parser.on("-v", "--[no-]verbose", "run verbosely") do |v|
-        options[:verbose] = v
-      end
-      parser.on("--version", "show version") do |v|
-        puts Trunk::VERSION
-      end
-      parser.on_tail("-h", "--help", "print help") do
-        puts parser
-      end
-      parser.parse!(arguments)
+    def private_key
+      OpenSSL::PKey::RSA.new(IO.read(private_key_path), passphrase)
     end
 
-    def self.start(arguments)
-      cli = new
-      cli.command_for(arguments).run(arguments)
+    def passphrase
+      ENV['TRUNK_PASSPHRASE'] || ask("passphrase:", echo: false)
     end
   end
 end

data/lib/trunk/serializers/base_64.rb

@@ -0,0 +1,13 @@
+module Trunk
+  module Serializers
+    class Base64
+      def serialize(value)
+        ::Base64.strict_encode64(value)
+      end
+
+      def deserialize(value)
+        ::Base64.decode64(value)
+      end
+    end
+  end
+end

data/lib/trunk/serializers/composite.rb

@@ -0,0 +1,27 @@
+module Trunk
+  module Serializers
+    class Composite
+      def initialize(serializers = [])
+        @serializers = serializers
+      end
+
+      def add(serializer)
+        @serializers.push(serializer)
+      end
+
+      def serialize(value)
+        @serializers.each do |x|
+          value = x.serialize(value)
+        end
+        value
+      end
+
+      def deserialize(value)
+        @serializers.reverse.each do |x|
+          value = x.deserialize(value)
+        end
+        value
+      end
+    end
+  end
+end

data/lib/trunk/serializers/crypto.rb

@@ -0,0 +1,17 @@
+module Trunk
+  module Serializers
+    class Crypto
+      def initialize(private_key)
+        @private_key = private_key
+      end
+
+      def serialize(plain_text)
+        @private_key.public_encrypt(plain_text)
+      end
+
+      def deserialize(cipher_text)
+        @private_key.private_decrypt(cipher_text)
+      end
+    end
+  end
+end

data/lib/trunk/storage.rb

@@ -1,67 +1,7 @@
 module Trunk
-  class CompositeSerializer
-    def initialize(serializers = [])
-      @serializers = serializers
-    end
-
-    def add(serializer)
-      @serializers.push(serializer)
-    end
-
-    def serialize(value)
-      @serializers.each do |x|
-        value = x.serialize(value)
-      end
-      value
-    end
-
-    def deserialize(value)
-      puts "deserialize"
-      @serializers.reverse.each do |x|
-        puts x.class
-        value = x.deserialize(value)
-      end
-      value
-    end
-  end
-
-  class Base64Serializer
-    def serialize(value)
-      Base64.strict_encode64(value)
-    end
-
-    def deserialize(value)
-      Base64.decode64(value)
-    end
-  end
-
-  class SymmetricCrypto
-    attr_reader :private_key, :algorithm
-
-    def initialize(private_key, algorithm: 'AES-256-CBC')
-      @private_key = private_key
-      @algorithm = algorithm
-    end
-
-    def serialize(plain_text)
-      cipher = OpenSSL::Cipher.new(algorithm)
-      cipher.encrypt
-      cipher.key = private_key
-      cipher.random_iv + cipher.update(plain_text) + cipher.final
-    end
-
-    def deserialize(cipher_text)
-      cipher = OpenSSL::Cipher.new(algorithm)
-      cipher.decrypt
-      iv = cipher_text[0..cipher.iv_len - 1]
-      data = cipher_text[cipher.iv_len..-1]
-      cipher.key = private_key
-      cipher.iv = iv
-      cipher.update(data) + cipher.final
-    end
-  end
-
   class Storage
+    attr_reader :hash
+
     def initialize(hash, serializer)
       @hash = hash
       @serializer = serializer

data/lib/trunk/version.rb

@@ -1,3 +1,3 @@
 module Trunk
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/trunk/yaml_storage.rb

@@ -0,0 +1,39 @@
+module Trunk
+  class YAMLStorage
+    attr_reader :private_key, :absolute_path
+
+    def initialize(absolute_path, private_key)
+      @absolute_path = absolute_path
+      @private_key = private_key
+    end
+
+    def fetch(*args)
+      transaction do |storage|
+        storage.fetch(*args)
+      end
+    end
+
+    def store(*args)
+      transaction do |storage|
+        storage.store(*args)
+      end
+    end
+
+    private
+
+    def transaction
+      hash = YAML.load(IO.read(absolute_path)) || {}
+      storage = Storage.new(hash, serializer)
+      yield storage
+    ensure
+      IO.write(absolute_path, YAML.dump(hash))
+    end
+
+    def serializer
+      serializer = Trunk::Serializers::Composite.new
+      serializer.add(Trunk::Serializers::Crypto.new(private_key))
+      serializer.add(Trunk::Serializers::Base64.new)
+      serializer
+    end
+  end
+end

data/trunk.gemspec

@@ -6,8 +6,8 @@ require "trunk/version"
 Gem::Specification.new do |spec|
   spec.name          = "trunk"
   spec.version       = Trunk::VERSION
-  spec.authors       = ["mokha"]
-  spec.email         = ["mokha@cisco.com"]
+  spec.authors       = ["mo"]
+  spec.email         = ["mo@mokhan.ca"]
 
   spec.summary       = %q{A safe place to put things.}
   spec.description   = %q{A safe place to put things.}
@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
+  spec.add_dependency "thor", "~> 0.20"
   spec.add_development_dependency "bundler", "~> 1.16"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: trunk
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
-- mokha
+- mo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-09 00:00:00.000000000 Z
+date: 2018-06-14 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.20'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.20'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -54,7 +68,7 @@ dependencies:
         version: '3.0'
 description: A safe place to put things.
 email:
-- mokha@cisco.com
+- mo@mokhan.ca
 executables:
 - trunk
 extensions: []
@@ -72,8 +86,12 @@ files:
 - exe/trunk
 - lib/trunk.rb
 - lib/trunk/cli.rb
+- lib/trunk/serializers/base_64.rb
+- lib/trunk/serializers/composite.rb
+- lib/trunk/serializers/crypto.rb
 - lib/trunk/storage.rb
 - lib/trunk/version.rb
+- lib/trunk/yaml_storage.rb
 - trunk.gemspec
 homepage: https://www.mokhan.ca
 licenses: