scrambled_eggs 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c15a26f213ecbe33ec15f37aeb55efb646b3e8f6
-  data.tar.gz: 5f12e23898ebd3e293a8290e37a6dcd68cbfe5e1
+  metadata.gz: 351118ea6a4fe0d78c3920914c1bf29fcc5ea8e9
+  data.tar.gz: a9809c8abee09fdd5c3317a663a34061be34c4c4
 SHA512:
-  metadata.gz: 5041f9b365924480e3495faaedbef8954a79dd8024a74a1d5b74a0816b60405ce04b170075af0ee86b22b8d54393bf5623c044a6ac8d7580501602180704e2a0
-  data.tar.gz: 655fd551d2c3b01d9924cd49d02aa52652cc7369f5064751de9f5e20f9a040ed64fc7482e0573980233cbf43fddd0c4216e3de37fbe3ff47013b526e2a4a0052
+  metadata.gz: e0627a14c49e8ffe3cd0a9ca580821cee892720b3f039c8fd18194c5d8af488daae1b190b520c48c2ff65a9247ccedd85fcdb067d4045a89116c7003b0eff4b3
+  data.tar.gz: c91c4d5453be9113a168ad6dc671a6a127941d90502b1a58736e73eccebcd204e2c57c00dedb8cd2920fb4924faad0175ea3c2212dc4e6108fd665f2fb146d5c

data/CHANGELOG.md

@@ -1,7 +1,15 @@
+### 0.1.0 / 1015-02-11  sanadan <jecy00@gmail.com>
+
+  * Add generate key from key file.
+  * Change default key to generate key from hostname file.
+  * Add scramble/descramble file function.
+
+
 ### 0.0.2 / 2015-02-07  sanadan <jecy00@gmail.com>
 
   * Fixed: Can't require in gemspec file
 
+
 ### 0.0.1 / 2015-02-06  sanadan <jecy00@gmail.com>
 
   * First

data/lib/scrambled_eggs.rb

@@ -8,15 +8,19 @@ class ScrambledEggs
   # _algorithm_ ::  Algorithm (ex. 'aes-256-cbc')
   # _salt_      ::  Salt (8 bytes)
   # _key_       ::  Crypt key
+  # _key_file_  ::  Crypt key file (exclude key)
   #
   # return      ::  ScrambledEggs object
-  def initialize( algorithm: 'aes-256-cbc', salt: nil, key: nil )
+  def initialize( algorithm: 'aes-256-cbc', salt: nil, key: nil, key_file: nil )
     @@algorithm = algorithm
-    @@salt = salt ? salt : OpenSSL::Random.random_bytes( 8 )
+    @@salt = salt != nil ? salt : OpenSSL::Random.random_bytes( 8 )
     if key
       @@key = key
     else
-      @@key = File.open( '/etc/hostname' ).read
+      unless key_file
+        key_file = '/etc/hostname'
+      end
+      @@key = OpenSSL::Digest::SHA512.digest( Pathname.new( key_file ).binread )
     end
   end
 
@@ -45,5 +49,25 @@ class ScrambledEggs
     cipher.pkcs5_keyivgen( @@key, salt )
     cipher.update( data ) + cipher.final
   end
+
+  # Scramble (encrypt) file
+  #
+  # _path_  ::  File for scramble
+  def scramble_file( path )
+    pathname = Pathname( path )
+    # Not exist Pathname#binwrite on Ruby 2.0.0
+    #pathname.binwrite( scramble( pathname.binread ) )
+    IO.binwrite( pathname, scramble( pathname.binread ) )
+  end
+
+  # Descramble (decrypt) file
+  #
+  # _path ::  File for descramble
+  def descramble_file( path )
+    pathname = Pathname.new( path )
+    # Not exist Pathname#binwrite on Ruby 2.0.0
+    #pathname.binwrite( descramble( pathname.binread ) )
+    IO.binwrite( pathname, descramble( pathname.binread ) )
+  end
 end
 

data/lib/scrambled_eggs/version.rb

@@ -1,3 +1,3 @@
 class ScrambledEggs
-  VERSION = "0.0.2"
+  VERSION = "0.1.0"
 end

data/scrambled_eggs.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ["sanadan"]
   spec.email         = ["jecy00@gmail.com"]
   spec.summary       = %q{Easy data scrambler.}
-  spec.description   = %q{Easy data Scrambler. Default by hostname.}
+  spec.description   = %q{Easy data scrambler. Default by hostname.}
   spec.homepage      = "https://github.com/sanadan/scrambled_eggs"
   spec.license       = "MIT"
 

data/test/scrambled_eggs_test.rb

@@ -1,48 +1,105 @@
-=begin
-require "tmpdir"
-require "pathname"
-
-class Pathname
-	@@tempname_number = 0
-	def self.tempname(base=$0, dir=Dir.tmpdir)
-		@@tempname_number += 1
-		path = new(dir) + "#{File.basename(base)}.#{$$}.#{@@tempname_number}"
-		at_exit do
-			path.rmtree if path.exist?
-		end
-		path
-	end
+require File.dirname(__FILE__) + '/test_helper.rb'
+require 'tempfile'
+require 'pathname'
+
+def generate_random_data( size = 4096 )
+  random_size = OpenSSL::BN.rand_range( size ) + 1
+  return OpenSSL::Random.random_bytes( random_size )
 end
-=end
 
-require File.dirname(__FILE__) + '/test_helper.rb'
+def generate_random_file( data )
+  file = Tempfile.open( 'ScrambledEggs' )
+  path = Pathname( file.path )
+  # Not exist Pathname#binwrite on Ruby 2.0.0
+  #path.binwrite( data )
+  IO.binwrite( path, data )
+  return path
+end
 
 class ScrambledEggsTest < Test::Unit::TestCase
   def test_scramble_text
     text = 'Test text'
     egg = ScrambledEggs.new
     scrambled = egg.scramble( text )
+    assert_not_equal( scrambled, text )
     assert_equal( egg.descramble( scrambled ), text )
   end
+
   def test_scramble_binary
-    size = OpenSSL::BN.rand_range( 4096 ) + 1
-    data = OpenSSL::Random.random_bytes( size )
+    data = generate_random_data
     egg = ScrambledEggs.new
     scrambled = egg.scramble( data )
+    assert_not_equal( scrambled, data )
     assert_equal( egg.descramble( scrambled ), data )
   end
-  def test_scramble
-    text = 'Test texti 2'
+
+  def test_scramble_another_parameter
+    text = 'Test text 2'
     egg = ScrambledEggs.new( algorithm: 'aes-128-cbc', salt: '01234567', key: 'Test key' )
     scrambled = egg.scramble( text )
 #    puts scrambled.unpack( 'H*' )
-    assert_equal( scrambled, [ '30313233343536371c24bce6e1bc9562162f4625602fb608' ].pack( 'H*' ) )
+    assert_equal( scrambled, [ '30313233343536374d34d042eecb111955e73b3630a399e5' ].pack( 'H*' ) )
     assert_equal( egg.descramble( scrambled ), text )
   end
+
   def test_another_eggs
     text = 'Test text 3'
     scrambled = ScrambledEggs.new.scramble( text )
     assert_equal( ScrambledEggs.new.descramble( scrambled ), text )
+    assert_raise OpenSSL::Cipher::CipherError do
+      ScrambledEggs.new( key: generate_random_data( 256 ) ).descramble( scrambled )
+    end
+
+    algorithm = 'aes-192-cbc'
+    salt = '98765432'
+    key = 'Test key 2'
+    scrambled = ScrambledEggs.new( algorithm: algorithm, salt: salt, key: key ).scramble( text )
+    assert_equal( ScrambledEggs.new( algorithm: algorithm, salt: salt, key: key ).descramble( scrambled ), text )
+    assert_raise OpenSSL::Cipher::CipherError do
+      ScrambledEggs.new( algorithm: algorithm, salt: salt, key: generate_random_data( 256 ) ).descramble( scrambled )
+    end
+  end
+
+  def test_salt
+    text = 'Test text 4'
+    256.times do |i|
+      salt = []
+      8.times do
+        salt << i
+      end
+      salt = salt.pack( 'C*' )
+      scrambled = ''
+      assert_nothing_raised do
+        scrambled = ScrambledEggs.new( salt: salt ).scramble( text )
+      end
+      assert_nothing_raised do
+        ScrambledEggs.new.descramble( scrambled )
+      end
+    end
+  end
+
+  def test_file
+    data = generate_random_data
+    path = generate_random_file( data )
+    ScrambledEggs.new.scramble_file( path )
+    assert_not_equal( path.binread, data )
+    ScrambledEggs.new.descramble_file( path )
+    assert_equal( path.binread, data )
+    assert_raise OpenSSL::Cipher::CipherError do
+      ScrambledEggs.new( key: generate_random_data( 256 ) ).descramble_file( path )
+    end
+  end
+
+  def test_key_file
+    text = 'Test text 5'
+    key_path = generate_random_file( generate_random_data )
+    scrambled = ScrambledEggs.new( key_file: key_path ).scramble( text )
+    assert_not_equal( scrambled, text )
+    assert_equal( ScrambledEggs.new( key_file: key_path ).descramble( scrambled ), text )
+    key_path2 = generate_random_file( generate_random_data )
+    assert_raise OpenSSL::Cipher::CipherError do
+      ScrambledEggs.new( key_file: key_path2 ).descramble( scrambled )
+    end
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scrambled_eggs
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - sanadan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-07 00:00:00.000000000 Z
+date: 2015-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -38,7 +38,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Easy data Scrambler. Default by hostname.
+description: Easy data scrambler. Default by hostname.
 email:
 - jecy00@gmail.com
 executables: []