fling 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0c35e2e75fc50c7e36b7f39db74ba04321ce966
-  data.tar.gz: 660ff1f26c8262383c2706e84f06d6e23ce858e6
+  metadata.gz: 671be432ce1ac827abe07d0d965bd73edc7d7cad
+  data.tar.gz: 4b3d2acc5db6e37afac2e4035351ae038fdca986
 SHA512:
-  metadata.gz: a85101e0c8b75968d81bbe66e5155ea509a5181f941d448fc38504bb3404e7f4cce1cd6bd029f793e1ccc46333a70288b3a95c5ff6faafed6e8f566c12deba94
-  data.tar.gz: cdd34537276aa1a3f4ae03a81ae4f0a051cc81a390e79d6fda0ebe583dcc922196fcb6f1b633d2beec75a5e0f69dc43ee00dddc0f7440fa4d48fa4193ae006b2
+  metadata.gz: 6c6d2ecdca3f68d3706e19a8fb9ef0519f27ce412bc1e11b6975f5bb043f240ad58a73eeecca0629f136d21be82f277bc6989e32e560a2f7a4d44b2d65fafea8
+  data.tar.gz: 5500c71c4744eebd5bfa02e531dd9f0f916c8f58f8c519e573a7280587c8e708c9d8f13d78bf4f069bd6b897651ff9744f76dd6b1a380bebeaaa611be9c10865

data/.rubocop.yml

@@ -7,6 +7,9 @@ Style/StringLiterals:
 Style/AlignParameters:
   Enabled: false
 
+Style/MultilineOperationIndentation:
+  Enabled: false
+
 Metrics/MethodLength:
   CountComments: false
   Max: 20

data/CHANGES.md

@@ -1,3 +1,7 @@
+0.0.5 (2015-06-13)
+------------------
+* Fling::Config.decrypt
+
 0.0.4 (2015-06-13)
 ------------------
 * Initial 'fling provision' support

data/lib/fling/cli.rb

@@ -20,7 +20,7 @@ module Fling
 
       say "\nGenerating encrypted config, please wait..."
 
-      config = Config.generate_encrypted(
+      config = Config.encrypt(
         password,
         "introducer"  => introducer,
         "dropcap"     => dropcap,

data/lib/fling/config.rb

@@ -6,6 +6,9 @@ require "rbnacl"
 module Fling
   # Configuration for the local Tahoe cluster
   class Config
+    BEGIN_MARKER = "-----BEGIN ENCRYPTED FLING CONFIGURATION-----\n"
+    END_MARKER   = "------END ENCRYPTED FLING CONFIGURATION------\n"
+
     CONFIG_KEYS = %w(introducer convergence salt dropcap)
     attr_reader(*CONFIG_KEYS)
 
@@ -20,12 +23,17 @@ module Fling
     end
 
     # Generate an encrypted configuration
-    def self.generate_encrypted(password, config)
+    def self.encrypt(password, config)
       ciphertext = Box.encrypt(password, generate_json(config))
+      BEGIN_MARKER + Base64.encode64(ciphertext) + END_MARKER
+    end
+
+    # Decrypt an encrypted configuration
+    def self.decrypt(password, ciphertext)
+      matches = ciphertext.match(/#{BEGIN_MARKER}(.*)#{END_MARKER}/m)
+      fail ConfigError, "couldn't find fling configuration" unless matches
 
-      "-----BEGIN ENCRYPTED FLING CONFIGURATION-----\n" +
-      Base64.encode64(ciphertext) +
-      "------END ENCRYPTED FLING CONFIGURATION------\n"
+      new(Box.decrypt(password, Base64.decode64(matches[1])))
     end
 
     # Generate a JSON configuration

data/lib/fling/version.rb

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

data/spec/fling/config_spec.rb

@@ -5,6 +5,7 @@ RSpec.describe Fling::Config do
   let(:convergence) { "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" }
   let(:salt)        { "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" }
   let(:dropcap)     { "URI:DIR2:#{'x' * 26}:#{'x' * 52}" }
+  let(:password)    { "squeamish ossifrage" }
 
   it "parses JSON" do
     config = described_class.from_json fixture("fling.json")
@@ -19,6 +20,18 @@ RSpec.describe Fling::Config do
     expect { described_class.new("bogus" => "true") }.to raise_error(ArgumentError)
   end
 
+  it "encrypts and decrypts configurations" do
+    json = JSON.parse(fixture("fling.json"))
+
+    ciphertext = described_class.encrypt(password, json)
+    config = described_class.decrypt(password, ciphertext)
+
+    expect(config.introducer).to eq introducer
+    expect(config.convergence).to eq convergence
+    expect(config.salt).to eq salt
+    expect(config.dropcap).to eq dropcap
+  end
+
   context "ConfigError" do
     let(:config_json) { JSON.parse(fixture("fling.json")) }
     it "raises for malformed introducer URL" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fling
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Tony Arcieri