syde 0.0.1 → 0.0.2

data/README.md

@@ -21,6 +21,7 @@ To contribute:
 
 * Fork it
 * Make a new feature branch: `git checkout -b some-new-thing master`
+* Hack away and add tests
 * Pull request
 
 Basic usage
@@ -64,7 +65,7 @@ To delete something in the vault, use `delete`:
     vault.contents #=> ["foo"]
     string = vault.contents.first #=> "foo"
     string.replace("bar")
-    vault.contents #=> ["bar"]
+    vault.contents #=> ["foo"]
 
 Objects in the vault are serialised and then deserialised and as such are not modifiable.
 

data/lib/syde.rb

@@ -1,3 +1,6 @@
+# Copyright (c) 2010 Adam Prescott
+# Licensed under the MIT license. See LICENSE.
+
 require "openssl"
 require "yaml"
 require "fileutils"
@@ -10,7 +13,7 @@ FileUtils.mkdir(File.expand_path("~/.syde")) unless File.exist?(File.expand_path
 module Syde
 	SYDE_VERSION_MAJOR = "0"
 	SYDE_VERSION_MINOR = "0"
-	SYDE_VERSION_TINY  = "1"
+	SYDE_VERSION_TINY  = "2"
 	
 	SYDE_VERSION = [SYDE_VERSION_MAJOR, SYDE_VERSION_MINOR, SYDE_VERSION_TINY].join(".")
 	

data/syde.gemspec

@@ -1,15 +1,14 @@
 Gem::Specification.new do |s|
   s.name         = "syde"
-  s.version      = "0.0.1"
+  s.version      = "0.0.2"
   s.authors      = ["Adam Prescott"]
   s.email        = ["adam@aprescott.com"]
   s.homepage     = "https://github.com/aprescott/syde"
   s.summary      = "Symmetric data encryption library."
   s.description  = "Syde is a symmetric data encryption library written in Ruby, licensed under the MIT license. It provides a saved encrypted data storage under a single password."
-  s.files        = Dir["{lib/**/*,test/**/*}"] + %w[LICENSE.mit Gemfile rakefile README.md syde.gemspec .gemtest]
+  s.files        = Dir["{lib/**/*,test/**/*}"] + %w[LICENSE Gemfile rakefile README.md syde.gemspec .gemtest]
   s.require_path = "lib"
   s.test_files   = Dir["test/*"]
-  s.has_rdoc     = false
   s.add_development_dependency "rake"
   s.required_ruby_version = "~> 1.8.7"
   s.requirements << "Ruby 1.8.7, does not work with 1.9 (yet) due to encodings"

data/test/test_vault.rb

@@ -65,4 +65,13 @@ class TC_Syde_Vault < Test::Unit::TestCase
     @vault.unlock("test_password", 0)
     assert @vault.locked?
   end
-end
+
+  def test_contents_not_overridable
+    @vault.unlock!("test_password")
+    @vault << "foo"
+    assert @vault.contents.last == "foo"
+    @vault.contents.last.replace("bar")
+    assert @vault.contents.last == "foo"
+    assert @vault.contents.last != "bar"
+  end
+end

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: syde
 version: !ruby/object:Gem::Version 
+  hash: 27
   prerelease: 
-  version: 0.0.1
+  segments: 
+  - 0
+  - 0
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Adam Prescott
@@ -10,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-17 00:00:00 +01:00
-default_executable: 
+date: 2011-05-19 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -21,6 +25,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id001
@@ -37,7 +44,6 @@ files:
 - lib/syde.rb
 - lib/syde.rb~
 - lib/syde/vault.rb
-- lib/syde/vault.rb~
 - lib/syde/errors.rb
 - lib/syde/storage.rb
 - lib/syde/crypto.rb
@@ -45,13 +51,12 @@ files:
 - test/test_vault.rb
 - test/_test.rb
 - test/test_crypto.rb
-- LICENSE.mit
+- LICENSE
 - Gemfile
 - rakefile
 - README.md
 - syde.gemspec
 - .gemtest
-has_rdoc: true
 homepage: https://github.com/aprescott/syde
 licenses: []
 
@@ -65,17 +70,25 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ~>
     - !ruby/object:Gem::Version 
+      hash: 57
+      segments: 
+      - 1
+      - 8
+      - 7
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 requirements: 
 - Ruby 1.8.7, does not work with 1.9 (yet) due to encodings
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.2
 signing_key: 
 specification_version: 3
 summary: Symmetric data encryption library.

data/lib/syde/vault.rb~

@@ -1,214 +0,0 @@
-module Syde
-class Vault
-	include Errors
-	
-	attr_accessor	:plaintext_secret_key
-	attr_reader		:file
-
-	def self.open(file = Storage::DefaultStorageFile)
-	  file = File.expand_path(file)
-	  FileUtils.touch(file) unless File.exist?(file)
-	  
-		Vault.new(YAML.load_file(file) || "", file)
-	end
-	
-	def self.create(password, file = Storage::DefaultStorageFile)
-	  file = File.expand_path(file)
-	  
-		raise "#{file} contains content -- refusing to override." if File.exist?(file) && File.size(file) > 0
-		
-		FileUtils.touch(file) unless File.exist?(file)
-		
-		h = {}
-		[:plaintext, :encrypted].each { |e| h[e] = {} }
-		
-		h[:plaintext][:iv] = Crypto.new_iv
-		new_secret_key = Vault.new_secret_key(password, h[:plaintext][:iv])
-		encrypted_key = new_secret_key[:encrypted_key]
-		hash = new_secret_key[:plaintext_key_hash]
-		plaintext_key = new_secret_key[:plaintext_key]
-		
-		h[:encrypted][:secret_key] = encrypted_key
-		h[:plaintext][:secret_key_hash] = hash
-		
-		h[:encrypted][:contents] = Crypto.encrypt(plaintext_key, h[:plaintext][:iv], YAML.dump([]))
-		h[:plaintext][:contents] = []
-				
-		File.open(file, "w") do |f|
-			f << YAML.dump(h)
-		end
-		
-		Vault.new(h, file)
-	end
-	
-	def initialize(data, file)
-		@data = data
-		@file = file.freeze
-				
-		raise ArgumentError, "unable to find any stored data." if @data.empty?
-		raise ArgumentError, "data is not valid." unless Storage.valid_format?(@data)
-	end
-	
-	def data
-    if locked?
-      public_data
-    else
-      internal_data
-    end
-	end
-	
-	def public_data
-	  public_data = YAML.load(YAML.dump(internal_data))
-	  public_data[:plaintext].delete(:contents)
-	  public_data
-	end
-	
-	private
-	
-	def internal_data
-	  @data
-	end
-	
-	public
-		
-	def iv
-		internal_data[:plaintext][:iv]
-	end
-	
-	def secret_key_hash
-		internal_data[:plaintext][:secret_key_hash]
-	end
-	
-	def decrypt_secret_key(password)
-		Crypto.aes(:decrypt, password, iv, internal_data[:encrypted][:secret_key])
-	end
-	
-	def lock
-	  internal_data[:encrypted][:contents] = Crypto.encrypt(@plaintext_secret_key, iv, YAML.dump(internal_data[:plaintext][:contents]))
-	  internal_data[:plaintext][:contents] = nil
-		@plaintext_secret_key = nil
-	end
-	
-	def unlock!(password = nil)
-  	raise MissingPasswordError, "no password given." unless password
-
-  	plaintext_secret_key = decrypt_secret_key(password)
-  	if Crypto.digest(plaintext_secret_key) != secret_key_hash
-  		raise PasswordIncorrectError
-  	else
-  		@plaintext_secret_key = plaintext_secret_key
-  		internal_data[:encrypted][:contents] ||= Crypto.encrypt(@plaintext_secret_key, iv, YAML.dump([]))
-  		internal_data[:plaintext][:contents] = YAML.load(Crypto.decrypt(@plaintext_secret_key, iv, internal_data[:encrypted][:contents]))
-  	end
-	end
-	
-	def unlock(password = nil, timeout = 5 * 60)
-	  return false unless timeout > 0
-	  unlock!(password)
-    start_locking_timer(timeout)
-		true
-	end
-	
-	def start_locking_timer(seconds)
-	  Thread.new do
-	    sleep seconds
-	    self.lock
-	  end
-	end
-	
-	def locked?
-		if plaintext_secret_key
-			false
-		else
-			true
-		end
-	end
-	
-	def plaintext_contents
-	  raise AccessError, "vault is locked; unable to access vault contents." if locked?
-	  
-    YAML.load(YAML.dump(internal_contents))
-	end
-	
-	private
-	
-	def internal_contents
-	  internal_data[:plaintext][:contents]
-	end
-	
-	public
-	
-	def contents
-    if locked?
-      public_contents
-    else
-      plaintext_contents
-    end
-  end
-
-	def public_contents
-	  raise AccessError, "vault is locked; unable to access vault contents." if locked?
-	  
-	  public_data[:plaintext][:contents]
-	end
-	
-	private
-	
-	def update_contents(new_content)
-    internal_data[:encrypted][:contents] = Crypto.encrypt(@plaintext_secret_key, iv, YAML.dump(internal_contents))
-
-    Storage.write(YAML.dump(public_data), file)
-    
-    plaintext_contents
-	end
-	
-	public
-	
-	def contents=(new_content)
-	  raise AccessError, "vault is locked; unable to modify vault contents." if locked?
-	  
-	  internal_contents.replace(new_content)
-	  
-	  update_contents(new_content)
-	end
-	
-	def add(*contents)
-	  raise AccessError, "vault is locked; unable to add content to vault." if locked?
-	  
-	  contents.each do |content|
-	    internal_contents << content
-	  end
-
-    update_contents(internal_contents)
-	end
-	alias_method :<<, :add
-	
-	def remove(*contents)
-	  raise AccessError, "vault is locked; unable to remove content from vault." if locked?
-	  
-	  contents.each do |content|
-	    internal_contents.delete(content)
-	  end
-	  
-	  update_contents(internal_contents)
-	end
-	
-	def status
-		locked? ? "locked" : "unlocked"
-	end
-	
-	def inspect
-		%Q{#<Vault (#{status})>}
-	end
-		
-	def self.new_secret_key(password, iv)
-		plaintext = Crypto.digest(Crypto.random_bytes(4096))
-		new_key = Crypto.aes(:encrypt, password, iv, plaintext)
-		#? plaintext = nil
-		#? GC.start
-		{ :encrypted_key => new_key,
-		  :plaintext_key_hash => Crypto.digest(plaintext),
-		  :plaintext_key => plaintext	}
-	end
-end
-end