safe 0.3 → 0.4

data/README

@@ -58,6 +58,7 @@ Windows:
 0.1 -- May 12, 2007
 0.2 -- August 19, 2007
 0.3 -- September 7, 2007
+0.4 -- April 4, 2008
 
 See Release-Notes.txt for more information
 

data/Rakefile

@@ -7,7 +7,7 @@ gem_spec = Gem::Specification.new do |spec|
   spec.summary = 'A command-line password storage program'
   spec.description = %{safe safely stores all your user IDs and passwords,
   encrypted by a password of your choosing.}
-  spec.version = '0.3'
+  spec.version = '0.4'
   
   # Author information
   spec.author = 'Rob Warner'

data/Release-Notes.txt

@@ -1,8 +1,12 @@
 Safe Release Notes
 ------------------
+0.4 (April 4, 2008)
+-------------------
+[FIXED] Passwords stopped authenticating (change in REXML perhaps?--whitespace returned in salt and hash), so moved salt
+        and hash to attributes of root
 
 0.3 (September 7, 2007)
----------------------
+-----------------------
 [NEW] Added support files to gem
 [NEW] Specified versions for highline and crypt
 [NEW] Changed executable from 'safe.rb' to 'safe'

data/lib/safefile.rb

@@ -42,12 +42,13 @@ include REXML
 # The file containing the safe entries
 ##
 class SafeFile
-  attr_accessor :hash, :salt, :password, :filename, :entries
+  attr_accessor :filename, :entries, :password
   
   def initialize(password, dir, filename = '.safe.xml')
-    @entries = Hash.new
-    @filename = "#{dir}/#{filename}"
-    @password = password
+    raise "Password must not be blank" unless password
+    self.entries = Hash.new
+    self.filename = "#{dir}/#{filename}"
+    self.password = password
     load
   end
 
@@ -55,39 +56,30 @@ class SafeFile
   def load
     f = File.open(@filename, File::CREAT)
     begin
-      if f.lstat.size == 0
-          create_file(f)
-      else
-          decrypt_file(f)
-      end
-      rescue
-        # TODO Determine whether error is can't create file, and print appropriate error
-        puts $!
-      ensure
-        f.close unless f.nil?
+      f.lstat.size == 0 ? create_file(f) : decrypt_file(f)
+    rescue
+      # TODO Determine whether error is can't create file, and print appropriate error
+      raise $!
+    ensure
+      f.close unless f.nil?
     end
   end
 
   # Decrypts the file
   def decrypt_file(file)
     begin
-      doc = Document.new file
-      root = doc.root
-      @hash = root.elements["hash"].text
-      @salt = root.elements["salt"].text
+      root = Document.new(file).root
+      @salt = root.attributes["salt"]
+      @hash = root.attributes["hash"]
       if authorized?
-        crypt_key = Crypt::Blowfish.new(@password)
+        crypt_key = Crypt::Blowfish.new(self.password)
         e_entries = root.elements["entries"]
         e_entries.elements.each("entry") do |entry|
           fields = crypt_key.decrypt_string(Base64::decode64(entry.cdatas[0].to_s)).split("\t")
-          if fields.length == 3
-            insert(fields[0], fields[1], fields[2])
-          else
-            puts "Cannot parse #{fields}, discarding."
-          end
+          fields.length == 3 ? insert(fields[0], fields[1], fields[2]) : puts("Cannot parse #{fields}, discarding.")
         end
       else
-        abort('The password you entered is not valid')
+        raise 'The password you entered is not valid'
       end
     rescue ParseException
       puts "Cannot parse #{file.path}"
@@ -97,20 +89,19 @@ class SafeFile
   # Creates a new file
   def create_file(file)
     puts 'Creating new file . . .'
-    generate_hash_and_salt
+    generate_salt_and_hash
     save
   end
 
   # Saves the file
   def save
-    crypt_key = Crypt::Blowfish.new(@password)
     doc = Document.new
     root = Element.new "safe"
+    root.attributes["salt"] = @salt
+    root.attributes["hash"] = @hash
     doc.add_element root
 
-    root.add_element create_element("hash", @hash)
-    root.add_element create_element("salt", @salt)
-    
+    crypt_key = Crypt::Blowfish.new(self.password)
     e_entries = Element.new "entries"
     @entries.each_value do |entry|
       e = Element.new "entry"
@@ -120,7 +111,7 @@ class SafeFile
     root.add_element e_entries
     
     f = File.new(@filename, 'w')
-    doc.write f, 0
+    doc.write f, 2
     f.close
   end
 
@@ -185,24 +176,24 @@ class SafeFile
     new_password = SafeUtils::get_password('Enter new password: ')
     rpt_password = SafeUtils::get_password('Confirm password: ')
     if new_password == rpt_password
-      @password = new_password
-      generate_hash_and_salt
+      self.password = new_password
+      generate_salt_and_hash
       save
     else
       puts 'Passwords do not match'
     end
   end
 
-  def generate_hash_and_salt
+  def generate_salt_and_hash
     @salt = [Array.new(20){rand(256).chr}.join].pack('m').chomp
-    @hash = Digest::SHA256.hexdigest(@password + @salt)
+    @hash = Digest::SHA256.hexdigest(self.password + @salt)
   end
   
   # Returns whether the password is authorized
   def authorized?
-    Digest::SHA256.hexdigest(@password + @salt) == @hash
+    @hash == Digest::SHA256.hexdigest(self.password + @salt)
   end
-  
+
   # Helper method to create an XML element with a name and text
   def create_element(name, text)
     e = Element.new name

data/test/tc_safefile.rb

@@ -42,6 +42,18 @@ class SafeFileTest < Test::Unit::TestCase
     FileUtils::rm("./.safe.xml")
   end
   
+  def test_add
+    f = SafeFile.new("password", ".")
+    f.insert('apple', 'baker', 'charlie')
+    f.save
+    assert_equal 1, f.count
+
+    f1 = SafeFile.new("password", ".")
+    assert_equal 1, f1.count
+
+    FileUtils::rm("./.safe.xml")
+  end
+  
   def test_entry
     f = SafeFile.new("password", ".")
     f.insert('apple', 'baker', 'charlie')

metadata

@@ -1,60 +1,21 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.4
-specification_version: 1
 name: safe
 version: !ruby/object:Gem::Version 
-  version: "0.3"
-date: 2007-09-07 00:00:00 -04:00
-summary: A command-line password storage program
-require_paths: 
-- lib
-email: rwarner@grailbox.com
-homepage: http://safe.rubyforge.org/
-rubyforge_project: safe
-description: safe safely stores all your user IDs and passwords, encrypted by a password of your choosing.
-autorequire: 
-default_executable: safe
-bindir: bin
-has_rdoc: false
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  version: "0.4"
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - Rob Warner
-files: 
-- README
-- lib/safeentry.rb
-- lib/safefile.rb
-- lib/safeutils.rb
-- index.html
-- Rakefile
-- Release-Notes.txt
-test_files: 
-- test/tc_safefile.rb
-- test/tc_safeentry.rb
-- test/tc_safeutils.rb
-rdoc_options: []
-
-extra_rdoc_files: []
-
-executables: 
-- safe
-extensions: []
-
-requirements: []
+autorequire: 
+bindir: bin
+cert_chain: []
 
+date: 2008-04-04 00:00:00 -04:00
+default_executable: safe
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: crypt
   version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -63,9 +24,55 @@ dependencies:
 - !ruby/object:Gem::Dependency 
   name: highline
   version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: 1.4.0
     version: 
+description: safe safely stores all your user IDs and passwords, encrypted by a password of your choosing.
+email: rwarner@grailbox.com
+executables: 
+- safe
+extensions: []
+
+extra_rdoc_files: []
+
+files: 
+- README
+- lib/safeentry.rb
+- lib/safefile.rb
+- lib/safeutils.rb
+- index.html
+- Rakefile
+- Release-Notes.txt
+has_rdoc: false
+homepage: http://safe.rubyforge.org/
+post_install_message: 
+rdoc_options: []
+
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+requirements: []
+
+rubyforge_project: safe
+rubygems_version: 1.0.1
+signing_key: 
+specification_version: 2
+summary: A command-line password storage program
+test_files: 
+- test/tc_safeentry.rb
+- test/tc_safefile.rb
+- test/tc_safeutils.rb