fling 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b8b667ebbd60b71dd973163d999dd0ce6044097
-  data.tar.gz: 76becf99d58883de950d921ec384e3f5ab6045dd
+  metadata.gz: e0c35e2e75fc50c7e36b7f39db74ba04321ce966
+  data.tar.gz: 660ff1f26c8262383c2706e84f06d6e23ce858e6
 SHA512:
-  metadata.gz: 91dc59256194ef07e8aca6caf8473f204025a86a48d422a8155f3860855817ec6cdd1d8f32980401cac3407bb87db481c47c55e20ead9990b44c0dcd9d1db406
-  data.tar.gz: 0ec72f48d23bd74b2cb5f98df7a178bdc7c62b8397df4b6ac9d8a03ecf3cf52a8b6ce6dc25e036fbe368105e5108a9006dea256249742c8894e01a9659a88707
+  metadata.gz: a85101e0c8b75968d81bbe66e5155ea509a5181f941d448fc38504bb3404e7f4cce1cd6bd029f793e1ccc46333a70288b3a95c5ff6faafed6e8f566c12deba94
+  data.tar.gz: cdd34537276aa1a3f4ae03a81ae4f0a051cc81a390e79d6fda0ebe583dcc922196fcb6f1b633d2beec75a5e0f69dc43ee00dddc0f7440fa4d48fa4193ae006b2

data/.rubocop.yml

@@ -4,6 +4,9 @@ LineLength:
 Style/StringLiterals:
   EnforcedStyle: double_quotes
 
+Style/AlignParameters:
+  Enabled: false
+
 Metrics/MethodLength:
   CountComments: false
   Max: 20

data/CHANGES.md

@@ -1,3 +1,7 @@
+0.0.4 (2015-06-13)
+------------------
+* Initial 'fling provision' support
+
 0.0.3 (2015-05-31)
 ------------------
 * Update to Tahoe-LAFS 1.10.1a1

data/fling.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "thor"
   spec.add_runtime_dependency "colorize"
   spec.add_runtime_dependency "base32"
+  spec.add_runtime_dependency "rbnacl-libsodium"
 
   spec.add_development_dependency "bundler", "~> 1.9"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/fling/box.rb

@@ -0,0 +1,71 @@
+require "json"
+require "rbnacl/libsodium"
+
+module Fling
+  # Simple encryption with password-derived keys
+  class Box
+    attr_reader :key, :fingerprint
+
+    SALT_SIZE = 32
+    FINGERPRINT_SIZE = 32
+
+    SCRYPT_OPSLIMIT = 2**25
+    SCRYPT_MEMLIMIT = 2**30
+
+    def self.encrypt(password, plaintext, options = {})
+      salt = RbNaCl::Random.random_bytes(SALT_SIZE)
+      box = new(password, salt, options)
+      salt + box.encrypt(plaintext)
+    end
+
+    def self.decrypt(password, ciphertext, options = {})
+      salt = ciphertext[0, SALT_SIZE]
+      ciphertext = ciphertext[SALT_SIZE, ciphertext.length - SALT_SIZE]
+      box = new(password, salt, options)
+      box.decrypt(ciphertext)
+    end
+
+    def initialize(password, salt, options = {})
+      opts = {
+        scrypt_opslimit: SCRYPT_OPSLIMIT,
+        scrypt_memlimit: SCRYPT_MEMLIMIT
+      }.merge(options)
+
+      @key = RbNaCl::PasswordHash.scrypt(
+        password.force_encoding("BINARY"),
+        salt.force_encoding("BINARY"),
+        opts[:scrypt_opslimit],
+        opts[:scrypt_memlimit],
+        RbNaCl::SecretBox::KEYBYTES
+      )
+
+      @fingerprint = Encoding.encode(RbNaCl::Hash.blake2b(@key, digest_size: FINGERPRINT_SIZE))
+    end
+
+    def encrypt(data = {})
+      # Ensure data is a simple flat hash of strings
+      data = data.map do |key, value|
+        fail TypeError, "bad key: #{key.inspect}" unless key.is_a?(String) || key.is_a?(Symbol)
+        fail TypeError, "bad value: #{value.inspect}" unless value.is_a?(String)
+        [key.to_s, value]
+      end.flatten
+
+      json = JSON.generate(Hash[*data])
+      encryption_box.encrypt(json.force_encoding("BINARY"))
+    end
+
+    def decrypt(ciphertext)
+      json = encryption_box.decrypt(ciphertext.force_encoding("BINARY"))
+      JSON.parse(json)
+    end
+
+    # Hide contents of instance variables from inspection
+    alias_method :inspect, :to_s
+
+    private
+
+    def encryption_box
+      RbNaCl::SimpleBox.from_secret_key(@key)
+    end
+  end
+end

data/lib/fling/cli.rb

@@ -9,5 +9,27 @@ module Fling
       require "fling/setup"
       Setup.run
     end
+
+    desc "provision FILE", "Create encrypted Fling configuration"
+    def provision(config_file)
+      say "Provisioning #{config_file}"
+
+      introducer = ask "What is your introducer FURL? (e.g. pb://...)"
+      dropcap    = ask "What is your 'dropcap'? (e.g. URI:DIR2:...)"
+      password   = ask "Please enter a password to encrypt the config:", echo: false
+
+      say "\nGenerating encrypted config, please wait..."
+
+      config = Config.generate_encrypted(
+        password,
+        "introducer"  => introducer,
+        "dropcap"     => dropcap,
+        "convergence" => Encoding.encode(RbNaCl::Random.random_bytes(32)),
+        "salt"        => Encoding.encode(RbNaCl::Random.random_bytes(32))
+      )
+
+      File.open(config_file, "w") { |file| file << config }
+      say "Created #{config_file}"
+    end
   end
 end

data/lib/fling/config.rb

@@ -1,5 +1,7 @@
 require "json"
 require "uri"
+require "base64"
+require "rbnacl"
 
 module Fling
   # Configuration for the local Tahoe cluster
@@ -17,6 +19,20 @@ module Fling
       new(JSON.parse(json))
     end
 
+    # Generate an encrypted configuration
+    def self.generate_encrypted(password, config)
+      ciphertext = Box.encrypt(password, generate_json(config))
+
+      "-----BEGIN ENCRYPTED FLING CONFIGURATION-----\n" +
+      Base64.encode64(ciphertext) +
+      "------END ENCRYPTED FLING CONFIGURATION------\n"
+    end
+
+    # Generate a JSON configuration
+    def self.generate_json(config)
+      new(config).as_json
+    end
+
     def initialize(options = {})
       CONFIG_KEYS.each do |key|
         fail ArgumentError, "missing key: #{key}" unless options[key]
@@ -38,5 +54,14 @@ module Fling
         fail ConfigError, "bad #{key} (wrong size): #{b32_value}" if value.size != 32
       end
     end
+
+    def as_json
+      {
+        introducer:  introducer,
+        convergence: convergence,
+        salt:        salt,
+        dropcap:     dropcap
+      }
+    end
   end
 end

data/lib/fling/version.rb

@@ -1,4 +1,4 @@
 # Simple secret sharing over Tahoe-LAFS
 module Fling
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/fling.rb

@@ -1,5 +1,6 @@
 require "fling/version"
 
+require "fling/box"
 require "fling/config"
 require "fling/encoding"
 

data/spec/fling/box_spec.rb

@@ -0,0 +1,21 @@
+require "spec_helper"
+
+RSpec.describe Fling::Box do
+  let(:example_password)    { "artifical accept common any later" }
+  let(:example_salt)        { "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX" }
+  let(:example_key)         { "dzneyh62qzzmsuvglnmmliupc3cwmdptlyz63saxp6ktl5sojzca" }
+  let(:example_fingerprint) { "3rqs343l5icb4fbx4na3fgjwqij7rntba3dprkppjst7r7enxurq" }
+  let(:example_message)     { Hash.new(foo: "x", bar: "y", baz: "z") }
+
+  let(:example_box) { described_class.new(example_password, example_salt) }
+
+  it "derives keys" do
+    expect(Fling::Encoding.encode(example_box.key)).to eq example_key
+    expect(example_box.fingerprint).to eq example_fingerprint
+  end
+
+  it "encrypts and decrypts hashes" do
+    ciphertext = example_box.encrypt(example_message)
+    expect(example_box.decrypt(ciphertext)).to eq example_message
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fling
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Tony Arcieri
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-31 00:00:00.000000000 Z
+date: 2015-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rbnacl-libsodium
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -119,12 +133,14 @@ files:
 - bin/setup
 - fling.gemspec
 - lib/fling.rb
+- lib/fling/box.rb
 - lib/fling/cli.rb
 - lib/fling/config.rb
 - lib/fling/encoding.rb
 - lib/fling/setup.rb
 - lib/fling/version.rb
 - spec/fixtures/fling.json
+- spec/fling/box_spec.rb
 - spec/fling/config_spec.rb
 - spec/fling/encoding_spec.rb
 - spec/fling_spec.rb