fling 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3cd2af30b79f618b70a08e473998df9dbc8f5207
-  data.tar.gz: 27722cb52b941d51c56bac861870b4a2739f52c6
+  metadata.gz: 42a6f202d12d757770f9fef30de7a95cee9ba807
+  data.tar.gz: 227651d33e67bca3f0f92c153eb238d792fe1298
 SHA512:
-  metadata.gz: 4c597cca8dc4e278b8d21dad6164a30455bb0752cbe5bdd3939d8378be561dc942eeedc0ef94cb73f434f093f5b52dc3bf978c221b07b616f8df26ca424ea538
-  data.tar.gz: 3e0a04a8cc60a00f46aa512eb299bcd35e45ab1ec3d84441345661f6040b7bee1021af1b62966ab38bac3aa8d0ebe91e47680e88b122475a6c6cfa55a5301cfa
+  metadata.gz: 65076a7b134a4e458929d2bbda14a0ade327e40d33fcd1f63e0c32fee0f36df05101862492dba44be947b684edfdc707a69a8ce92530366db509fd98ee1b821a
+  data.tar.gz: 4590386fe7a699f37b1aff4a7c987ef234a238e8cd71019c1eb46a4aeeb6938a1cb995404822948552578ba18802cb282fe68ad9e6015190d7de1e2c15acada4

data/CHANGES.md

@@ -1,3 +1,8 @@
+0.0.7 (2015-06-23)
+------------------
+* Rename 'fling setup' to 'fling install'
+* Initial 'fling config' command
+
 0.0.6 (2015-06-16)
 ------------------
 * Update to Tahoe-LAFS 1.10.1

data/README.md

@@ -38,12 +38,19 @@ Or install it yourself as:
 Once fling has been installed, you can use it to install a local Tahoe-LAFS
 client by running the following command:
 
-    $ fling setup
+    $ fling install
 
 (NOTE: This command is presently only supported on OS X)
 
 This will download and install a local copy of Tahoe-LAFS.
 
+After installing Tahoe-LAFS, you can configure your local instance from
+an administrator-supplied config file with the following command:
+
+    $ fling config https://uri.to/your/orgs.fling
+
+(NOTE: See below for first-time setup)
+
 ## Contributing
 
 * Fork this repository on github

data/lib/fling/cli.rb

@@ -1,13 +1,16 @@
 require "fling"
 require "thor"
+require "uri"
+require "net/http"
 
 module Fling
   # The Fling Command Line Interface
   class CLI < Thor
-    desc :setup, "Install Tahoe-LAFS"
-    def setup
-      require "fling/setup"
-      Setup.run
+    desc :install, "Install Tahoe-LAFS"
+    def install
+      require "fling/install"
+      Install.run
+      say "Now run 'fling config [file or url]' to configure Tahoe-LAFS"
     end
 
     desc "provision FILE", "Create encrypted Fling configuration"
@@ -31,5 +34,47 @@ module Fling
       File.open(config_file, "w") { |file| file << config }
       say "Created #{config_file}"
     end
+
+    desc "config FILE_OR_URL", "Configure Fling from an encrypted configuration file"
+    def config(file_or_uri)
+      require "fling/install"
+
+      if file_or_uri[/\Ahttps:\/\//]
+        uri = URI(file_or_uri)
+        ciphertext = Net::HTTP.get(uri)
+      elsif file_or_uri[/\Ahttp:\/\//] # ಠ_ಠ
+        say "Friends don't let friends use http://"
+        exit 1
+      else # Perhaps it's a file?
+        unless File.exist?(file_or_uri)
+          say "No such file: #{file_or_uri}"
+          exit 1
+        end
+
+        ciphertext = File.read(file_or_uri)
+      end
+
+      say "Loaded #{file_or_uri}"
+      password = ask "Please enter the password to decrypt the config:", echo: false
+      say # newline
+
+      begin
+        config = Config.decrypt(password, ciphertext)
+      rescue Fling::ConfigError => ex
+        say "Error: Couldn't decrypt config: #{ex}"
+        exit 1
+      end
+
+      config_dir = File.expand_path("~/.tahoe")
+      if File.exist?(config_dir)
+        say "Error: #{config_dir} already exists"
+        exit 1
+      end
+
+      config.render(config_dir)
+
+      say "Created #{config_dir}!"
+      say "Start Tahoe by running 'tahoe start'"
+    end
   end
 end

data/lib/fling/config.rb

@@ -2,12 +2,14 @@ require "json"
 require "uri"
 require "base64"
 require "rbnacl"
+require "fileutils"
+require "erb"
 
 module Fling
   # Configuration for the local Tahoe cluster
   class Config
     BEGIN_MARKER = "-----BEGIN ENCRYPTED FLING CONFIGURATION-----\n"
-    END_MARKER   = "------END ENCRYPTED FLING CONFIGURATION------\n"
+    END_MARKER   = "------END ENCRYPTED FLING CONFIGURATION------"
 
     CONFIG_KEYS = %w(introducer convergence salt dropcap)
     attr_reader(*CONFIG_KEYS)
@@ -31,9 +33,11 @@ module Fling
     # 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
+      fail ConfigError, "couldn't find fling configuration (corrupted file?)" unless matches
 
       new(Box.decrypt(password, Base64.decode64(matches[1])))
+    rescue RbNaCl::CryptoError # bad password
+      fail ConfigError, "couldn't decrypt configuration (corrupted file or bad password?)"
     end
 
     # Generate a JSON configuration
@@ -63,6 +67,24 @@ module Fling
       end
     end
 
+    # Render the configuration to the given path
+    def render(path)
+      tahoe_bin = File.expand_path("~/#{Fling::Install::TAHOE_DIR}/bin/tahoe")
+      system "#{tahoe_bin} create-node > /dev/null"
+
+      @nickname = `whoami`
+      @introducer_furl = introducer
+
+      config_template = File.expand_path("../../../templates/tahoe.cfg.erb", __FILE__)
+      tahoe_config = ERB.new(File.read(config_template)).result(binding)
+
+      File.open(File.join(path, "tahoe.cfg"), "w", 0600) { |file| file << tahoe_config }
+
+      secrets = File.join(path, "private")
+      File.open(File.join(secrets, "convergence"), "w", 0600) { |file| file << convergence }
+      File.open(File.join(secrets, "aliases"), "w", 0600) { |file| file << "dropcap: #{dropcap}" }
+    end
+
     def as_json
       {
         introducer:  introducer,

data/lib/fling/{setup.rb → install.rb}

@@ -3,7 +3,7 @@ require "fileutils"
 
 module Fling
   # Central utilities for Tahoe-LAFS setup
-  module Setup
+  module Install
     module_function
 
     TAHOE_VERSION = "1.10.1"

data/lib/fling/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fling
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Tony Arcieri
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-16 00:00:00.000000000 Z
+date: 2015-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -137,7 +137,7 @@ files:
 - lib/fling/cli.rb
 - lib/fling/config.rb
 - lib/fling/encoding.rb
-- lib/fling/setup.rb
+- lib/fling/install.rb
 - lib/fling/version.rb
 - spec/fixtures/fling.json
 - spec/fling/box_spec.rb