boat 0.2 → 0.2.1

data/boat.gemspec

@@ -17,4 +17,6 @@ Gem::Specification.new do |s|
   s.files        = `git ls-files`.split("\n")
   s.executables  = `git ls-files`.split("\n").map{|f| f =~ /^bin\/(.*)/ ? $1 : nil}.compact
   s.require_path = 'lib'
+
+  s.add_dependency 'eventmachine'
 end

data/lib/boat/client.rb

@@ -1,4 +1,4 @@
-require 'hmac/sha2'
+require 'openssl'
 require 'socket'
 
 class Boat::Client
@@ -21,7 +21,7 @@ class Boat::Client
     raise Error, response unless response =~ /^251 HMAC-SHA256 (.+)/
 
     puts "[debug] sending password" if @debug
-    password_hash = HMAC::SHA256.hexdigest(key, $1)
+    password_hash = OpenSSL::HMAC.hexdigest(OpenSSL::Digest.new('sha256'), key, $1)
     socket_puts "pass #{password_hash}"
     response = socket_gets.to_s
     raise Error, response unless response =~ /^250/
@@ -37,16 +37,17 @@ class Boat::Client
 
     size ||= io.respond_to?(:stat) ? io.stat.size : io.length
 
+    digest = OpenSSL::Digest.new('sha256')
     hash ||= if io.respond_to?(:path)
-      Digest::SHA256.file(io.path)
+      digest.file(io.path).hexdigest
     elsif !io.respond_to?(:read)
-      Digest::SHA256.hexdigest(io)
+      digest.hexdigest(io)
     else
       "-"
     end
 
-    client_salt = [Digest::SHA256.digest((0..64).inject("") {|r, i| r << rand(256).chr})].pack("m").strip
-    signature = HMAC::SHA256.hexdigest(@key, "#{server_salt}#{encoded_filename}#{size}#{hash}#{client_salt}")
+    client_salt = [digest.digest((0..64).inject("") {|r, i| r << rand(256).chr})].pack("m").strip
+    signature = OpenSSL::HMAC.hexdigest(digest, @key, "#{server_salt}#{encoded_filename}#{size}#{hash}#{client_salt}")
 
     puts "[debug] sending data command" if @debug
     socket_puts "data #{size} #{hash} #{client_salt} #{signature}"
@@ -54,7 +55,7 @@ class Boat::Client
 
     # The server might already have the file with this hash - if so it'll return 255 at this point.
     if matches = response.strip.match(/\A255 accepted ([0-9a-f]{64})\z/i)
-      confirm_hash = HMAC::SHA256.hexdigest(@key, "#{client_salt}#{hash}")
+      confirm_hash = OpenSSL::HMAC.hexdigest(digest, @key, "#{client_salt}#{hash}")
       if matches[1] != confirm_hash
         raise Error, "Incorrect server signature; the srver may be faking that it received the upload"
       end
@@ -64,7 +65,7 @@ class Boat::Client
     raise Error, response unless response =~ /^253/
 
     if io.respond_to?(:read)
-      digest = Digest::SHA256.new if hash == '-'
+      digest = OpenSSL::Digest.new('sha256') if hash == '-'
       written = 0
       while data = io.read(@chunk_size)
         if @debug
@@ -86,7 +87,7 @@ class Boat::Client
 
     if response =~ /^254/ # we need to send the hash of the file because we didn't on the DATA line
       hash = digest.to_s
-      signature = HMAC::SHA256.hexdigest(@key, "#{server_salt}#{encoded_filename}#{size}#{hash}#{client_salt}")
+      signature = OpenSSL::HMAC.hexdigest(digest, @key, "#{server_salt}#{encoded_filename}#{size}#{hash}#{client_salt}")
 
       puts "[debug] sending confirm command" if @debug
       socket_puts "confirm #{hash} #{signature}\n"
@@ -95,7 +96,7 @@ class Boat::Client
 
     raise Error, response unless response && matches = response.strip.match(/\A255 accepted ([0-9a-f]{64})\z/i)
 
-    confirm_hash = HMAC::SHA256.hexdigest(@key, "#{client_salt}#{hash}")
+    confirm_hash = OpenSSL::HMAC.hexdigest(digest, @key, "#{client_salt}#{hash}")
     if matches[1] != confirm_hash
       raise Error, "Incorrect server signature; the srver may be faking that it received the upload"
     end

data/lib/boat/server.rb

@@ -1,7 +1,5 @@
-require 'hmac/sha2'
+require 'openssl'
 require 'eventmachine'
-require 'syslog'
-require 'digest'
 require 'fileutils'
 
 class Boat::Server
@@ -22,6 +20,7 @@ class Boat::Server
       @@last_connection_id += 1
       @connection_id = @@last_connection_id
       @temporary_files = []
+      @digest = OpenSSL::Digest::Digest.new('sha256')
       send_data "220 Boat Server #{Boat::VERSION}\n"
     end
 
@@ -59,7 +58,7 @@ class Boat::Server
         send_data "500 USER first\n"
       else
         user = @configuration.fetch("users", {}).fetch(@username, nil)
-        expected = HMAC::SHA256.hexdigest(user["key"], @login_salt) if user
+        expected = OpenSSL::HMAC.hexdigest(@digest, user["key"], @login_salt) if user
         if user && expected && args == expected
           send_data "250 OK\n"
           @user = user
@@ -107,10 +106,10 @@ class Boat::Server
 
         if size >= 1<<31
           send_data "500 size too large\n"
-        elsif signature != HMAC::SHA256.hexdigest(@user["key"], "#{@put.fetch(:server_salt)}#{@put.fetch(:filename)}#{size}#{file_hash}#{client_salt}")
+        elsif signature != OpenSSL::HMAC.hexdigest(@digest, @user["key"], "#{@put.fetch(:server_salt)}#{@put.fetch(:filename)}#{size}#{file_hash}#{client_salt}")
           send_data "500 signature is invalid\n"
-        elsif File.exists?(current_filename = "#{repository_path}/current.#{@put.fetch(:filename)}") && Digest::SHA256.file(current_filename).to_s == file_hash
-          signature = HMAC::SHA256.hexdigest(@user["key"], "#{client_salt}#{file_hash}")
+        elsif File.exists?(current_filename = "#{repository_path}/current.#{@put.fetch(:filename)}") && OpenSSL::Digest.new('sha256').file(current_filename).to_s == file_hash
+          signature = OpenSSL::HMAC.hexdigest(@digest, @user["key"], "#{client_salt}#{file_hash}")
           send_data "255 accepted #{signature}\n"
         else
           @put[:temporary_id] = "#{Time.now.to_i}.#{Process.pid}.#{@connection_id}"
@@ -121,7 +120,7 @@ class Boat::Server
             :hash => (file_hash unless file_hash == '-'),
             :client_salt => client_salt,
             :file_handle => File.open(@put[:temporary_filename], "w"),
-            :digest => Digest::SHA256.new)
+            :digest => OpenSSL::Digest.new('sha256'))
 
           @temporary_files << @put[:temporary_filename]
 
@@ -156,7 +155,7 @@ class Boat::Server
         file_hash = matches[1].downcase
         signature = matches[2].downcase
 
-        if signature != HMAC::SHA256.hexdigest(@user["key"], "#{@put.fetch(:server_salt)}#{@put.fetch(:filename)}#{@put.fetch(:size)}#{file_hash}#{@put.fetch(:client_salt)}")
+        if signature != OpenSSL::HMAC.hexdigest(@digest, @user["key"], "#{@put.fetch(:server_salt)}#{@put.fetch(:filename)}#{@put.fetch(:size)}#{file_hash}#{@put.fetch(:client_salt)}")
           send_data "500 signature is invalid\n"
           @put = nil
         else
@@ -167,7 +166,7 @@ class Boat::Server
     end
 
     def complete_put
-      calculated_hash = @put.fetch(:digest).to_s
+      calculated_hash = @put.fetch(:digest).hexdigest
 
       if @put.fetch(:hash) != calculated_hash
         send_data "500 file hash does not match hash supplied by client\n"
@@ -195,7 +194,7 @@ class Boat::Server
       end
       File.symlink(version_filename, symlink_name)
 
-      signature = HMAC::SHA256.hexdigest(@user["key"], "#{@put.fetch(:client_salt)}#{@put.fetch(:hash)}")
+      signature = OpenSSL::HMAC.hexdigest(@digest, @user["key"], "#{@put.fetch(:client_salt)}#{@put.fetch(:hash)}")
       send_data "255 accepted #{signature}\n"
     ensure
       @put = nil
@@ -228,7 +227,7 @@ class Boat::Server
     end
 
     def random_salt
-      [Digest::SHA256.digest((0..64).inject("") {|r, i| r << rand(256).chr})].pack("m").strip
+      [OpenSSL::Digest.new('sha256').digest((0..64).inject("") {|r, i| r << rand(256).chr})].pack("m").strip
     end
 
     def repository_path
@@ -277,8 +276,6 @@ class Boat::Server
       end
     end
 
-    #Syslog.open 'boat'
-
     File.umask(0077)
     EventMachine.run do
       EventMachine.start_server(

data/lib/boat/version.rb

@@ -1,3 +1,3 @@
 module Boat
-  VERSION = "0.2"
+  VERSION = "0.2.1"
 end

data/server.conf

@@ -1,7 +1,7 @@
 listen_address: localhost
 listen_port: 19184
 
-storage_path: /var/lib/boat
+storage_path: /Users/roger/boat
 
 users:
   roger:

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: boat
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 2
-  version: "0.2"
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Roger Nesbitt
@@ -16,8 +17,21 @@ cert_chain: []
 
 date: 2011-05-30 00:00:00 +12:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: eventmachine
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id001
 description: File upload client and server specifically aimed at transferring already-encrypted backups
 email: []