encbs 0.1.0 → 0.1.1

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/bin/encbs

@@ -20,8 +20,6 @@ require 'backup'
 opts = Slop.parse :help => true do
   on :a, :add, "Add path to backup", true
   on :b, :bucket, "Set Amazon S3 bucket to backup", true
-  on :k, :key, "Set API key to access Amazon S3", true
-  on :s, :secret, "Set API secret to access Amazon S3", true
   on :c, :config, "Use config file to upload backup", true #TODO
   on :colorize, "Colorize print to console"
   on :d, :date, "Date for backup restore (default: last)", true
@@ -29,11 +27,14 @@ opts = Slop.parse :help => true do
   on :h, :hostname, "Set hostname (default: system)", true
   on :i, :increment, "Use increment mode for backup (default: false)"
   on :j, :jar, "Versions of jar (option: hash or path)", true
-  on :t, :token, "RSA Key to encrypt/decrypt backup data", true
+  on :k, :key, "Set API key to access Amazon S3", true
   on :l, :local, "Backup in local directory", true
   on :list, "List of jars"
   on :r, :rescue, "Return data from backup (option: jar, path or filter)", true
+  on :s, :secret, "Set API secret to access Amazon S3", true
   on :t, :to, "Path to recovery (default: /)", true
+  on :token, "RSA Key to encrypt/decrypt backup data", true
+  on :threads, "Set count of thread (default: 1)", true
   on :v, :verbose, "Verbose mode"
 
   banner "Usage:\n    $ encbs [options]\n\nOptions:"
@@ -48,16 +49,19 @@ end
 $PRINT_VERBOSE = opts.verbose?
 $COLORIZE = opts.colorize?
 
-#if opts.generate?
-#  puts "Generate 4096 bits RSA keys"
-#  Crypto::create_keys(
-#    File.join(Dir.getwd, "rsa_key"),
-#  	File.join(Dir.getwd, "rsa_key.pub")
-#  )
-#  puts "Done!"
-#
-#  exit
-#end
+if opts.generate?
+  bits = opts[:generate].to_i
+  puts_fail "Unsupport #{bits} bits" unless bits == 4096 or bits == 2048
+  puts "Generate #{bits} bits RSA keys"
+  Crypto::create_keys(
+    File.join(Dir.getwd, "rsa_key"),
+  	File.join(Dir.getwd, "rsa_key.pub"),
+  	bits
+  )
+  puts "Done!"
+
+  exit
+end
 
 if opts.local?
   try_create_dir opts[:local]
@@ -92,8 +96,7 @@ if opts.list?
   exit
 end
 
-#TODO: AES or RSA
-# @backup.key = opts[:key] if opts.key?
+@backup.key = opts[:token] if opts.token?
 
 if opts.date?
   date = opts[:date].split("-")

data/encbs.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{encbs}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Timothy Klim"]
@@ -35,10 +35,14 @@ Gem::Specification.new do |s|
     "lib/backup/timestamp.rb",
     "lib/crypto.rb",
     "lib/helpers.rb",
+    "test/fixtures/etc/.hide",
+    "test/fixtures/etc/root/file",
+    "test/fixtures/test_crypto.rb",
     "test/helper.rb",
     "test/test_backup.rb",
     "test/test_backup_file_item.rb",
-    "test/test_backup_timestamp.rb"
+    "test/test_backup_timestamp.rb",
+    "test/test_jar.rb"
   ]
   s.homepage = %q{http://github.com/TimothyKlim/encbs}
   s.licenses = ["MIT"]

data/lib/backup/jar.rb

@@ -1,10 +1,11 @@
 module Backup
   class Jar
-    def initialize(file_item, root_path, local_path)
+    def initialize(file_item, root_path, local_path, key = nil)
       @root_path = root_path
       @local_path = local_path
       @timestamp = Backup::Timestamp.create
       @file_item = file_item
+      @key = key
     end
 
     def jar_hash
@@ -73,8 +74,17 @@ module Backup
 
       @local_files.keys.each do |file|
         unless Dir.exists?(file)
-          @file_item.create_file_once "#{jar_data_path}/#{@file_item.file_hash file}",
-                                      File.open(file)
+          data = if @key
+            @key.encrypt_to_stream(File.open(file).read)
+          else
+            File.open(file)
+          end
+
+          @file_item.create_file_once(
+          	"#{jar_data_path}/#{@file_item.file_hash file}",
+            data
+          )
+                                      
           pbar.inc
         end
       end

data/lib/backup.rb

@@ -25,11 +25,11 @@ module Backup
     end
 
     def key=(path)
-      @key = open(path).read
+      @key = Crypto::Key.from_file(path)
     end
 
     def create!(local_path, increment = false)
-      jar = Jar.new(@file_item, @root_path, local_path)
+      jar = Jar.new(@file_item, @root_path, local_path, @key)
       jar.save(increment)
     end
 
@@ -44,6 +44,12 @@ module Backup
     def restore_jar_to(hash, timestamp, to)
       files = Jar.fetch_index_for(@file_item, @root_path, hash, timestamp)
 
+      pbar = ProgressBar.new(
+      	"Restoring",
+        files.keys.length
+      )
+      pbar.bar_mark = '*'
+
       files.keys.sort.each do |file|
         restore_file = File.join(to, file)
         current_file = files[file]
@@ -76,6 +82,7 @@ module Backup
               remote_path += "/#{@file_item.file_hash file}"
 
               data = @file_item.read_file remote_path
+							data = @key.decrypt_from_stream data if @key
               f.puts data
             end
 
@@ -93,28 +100,11 @@ module Backup
             puts_fail "Permission denied for #{restore_file.dark_green}"
           end
         end
+
+        pbar.inc
       end
 
+      pbar.finish
     end
   end
-
-  def self.fetch_versions_of_backup(path)
-    Dir["#{path}/*"].map do |backup|
-      backup.match(/[0-9]{12}$/)[0] if backup.match(/[0-9]{12}$/)
-    end.compact.sort
-  end
-
-  def self.aes(command, key, data)
-    aes = OpenSSL::Cipher::Cipher.new('aes-256-cbc').send(command)
-    aes.key = key
-    aes.update(data) << aes.final
-  end
-
-  def self.encrypt_data(key, data)
-    Backup::aes(:encrypt, key, data) unless data.empty?
-  end
-
-  def self.decrypt_data(key, data)
-    Backup::aes(:decrypt, key, data)
-  end
 end

data/lib/crypto.rb

@@ -3,7 +3,7 @@ require 'base64'
 
 module Crypto
   
-  def self.create_keys(priv = "rsa_key", pub = "#{priv}.pub", bits = 4096)
+  def self.create_keys(priv, pub, bits)
     private_key = OpenSSL::PKey::RSA.new(bits)
     File.open(priv, "w+") { |fp| fp << private_key.to_s }
     File.open(pub,  "w+") { |fp| fp << private_key.public_key.to_s }    
@@ -19,7 +19,30 @@ module Crypto
     def self.from_file(filename)    
       self.new File.read( filename )
     end
+
+    def encrypt_to_stream(data)
+      encrypt_data = StringIO.new
+      i = 0
+  
+      while buf = data[i..(i+=117)] do
+        encrypt_data << encrypt(buf)
+      end
+  
+      encrypt_data.seek(0)
+      encrypt_data
+    end
+
+    def decrypt_from_stream(data)
+      encrypt_data = StringIO.new data
+      decrypt_data = ""
   
+      while buf = encrypt_data.read(256) do
+        decrypt_data += decrypt(buf)
+      end
+
+      decrypt_data
+    end
+
     def encrypt(text)
       @key.send("#{key_type}_encrypt", text)
     end

data/test/fixtures/etc/.hide

@@ -0,0 +1 @@
+Hide data

data/test/fixtures/etc/root/file

@@ -0,0 +1 @@
+Root file

data/test/fixtures/test_crypto.rb

@@ -0,0 +1,23 @@
+require File.expand_path('../helper', __FILE__)
+
+class TestCrypto < Test::Unit::TestCase
+  def fixtures
+    File.expand_path('../fixtures/rsa_keys', __FILE__)
+	end
+
+  def create_keys!(bits = 4096)
+    Crypto.create_keys("#{fixtures}/rsa_key", "#{fixtures}/rsa_key.pub", bits)
+  end
+
+  def load_keys
+    @priv_key = Crypto::Key.from_file("#{fixtures}/rsa_key")
+    @pub_key =  Crypto::Key.from_file("#{fixtures}/rsa_key.pub")
+	end
+
+  def test_create_keys
+    create_keys!
+
+    assert_not_nil File.open("#{fixtures}/rsa_key").read
+    assert_not_nil File.open("#{fixtures}/rsa_key.pub").read
+  end
+end

data/test/test_backup.rb

@@ -9,6 +9,27 @@ class TestBackup < Test::Unit::TestCase
   end
   
   def test_backup_attributes
+    hostname = Socket.gethostname
+    file = File.expand_path("../fixtures/backups", __FILE__)
     
+    assert_equal(
+      @backup.root_path,
+      "#{file}/#{hostname}"
+    )
+    assert_equal @backup.hostname, Socket.gethostname
+    assert_equal @backup.file_item.class, Backup::FileItem::Local
+    assert_not_nil @backup.timestamp
+  end
+  
+  def test_create
+  end
+  
+  def test_show_jars
+  end
+  
+  def test_jar_versions
+  end
+  
+  def test_restore
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: encbs
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Timothy Klim
@@ -105,10 +105,14 @@ files:
 - lib/backup/timestamp.rb
 - lib/crypto.rb
 - lib/helpers.rb
+- test/fixtures/etc/.hide
+- test/fixtures/etc/root/file
+- test/fixtures/test_crypto.rb
 - test/helper.rb
 - test/test_backup.rb
 - test/test_backup_file_item.rb
 - test/test_backup_timestamp.rb
+- test/test_jar.rb
 has_rdoc: true
 homepage: http://github.com/TimothyKlim/encbs
 licenses: 
@@ -123,7 +127,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 4533740644498179754
+      hash: -2711619165124038743
       segments: 
       - 0
       version: "0"