rubeepass 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 88ea712dd5f74c73236a618c5d372fecf37c5d46
-  data.tar.gz: a1903d7e08f34d93a6b36e1289bbe39e4299c28c
+  metadata.gz: 006a68f0d13c9efe8eecf937d1bec8a8c2d067eb
+  data.tar.gz: e19d1a9a76ffd938a85feea89d3bc8211a7458c2
 SHA512:
-  metadata.gz: 4879ef2590d50c6103e2a4007fc0f954b8bb0b00eeab5a4afcab20e231e4e3254e26f6ecde3c74ea2349418f87aa0c3a1cda7fe24840261f161472b222717cbf
-  data.tar.gz: 71d1411ad94c214dac2aa250e4fb00e006b4892541c6d4156c3925a8f7e984117885bc3b8904786b063c9bc71c2124f29c657ff7a94ff0770162a78c3a463a69
+  metadata.gz: 1b71c2f598f1e5d56575e6faca2dad81f24c790f713218b101467f3982ce3a5cc4b84f6f0815b7b4f8c40cec87b772097a07ce08d523551ed6849d26699d584b
+  data.tar.gz: 1f53c5905d5e620f58576789dfeea5617394f278e8196f3bb1d01b23fc48c78704a1c9367dd76a2cb8cae420dba05b83fc77d5d0629e3fdcfbe89dc1a40cc380

data/lib/rubeepass/entry.rb

@@ -75,7 +75,11 @@ class RubeePass::Entry
 
     def password
         return nil if (@keepass.nil?)
-        return @keepass.protected_decryptor.get_password(@password)
+        begin
+            return @keepass.protected_decryptor.get_password(@password)
+        rescue
+            return @password
+        end
     end
 
     def to_s

data/lib/rubeepass.rb

@@ -311,7 +311,7 @@ class RubeePass
     end
     private :parse_gzip
 
-    # Horrible attempt at parsing xml. Someday I might use a library
+    # Horrible attempt at parsing xml. Someday I might use a library.
     def parse_xml
         curr = Group.new({"Keepass" => self, "Name" => "/"})
         entry_params = Hash.new
@@ -335,13 +335,7 @@ class RubeePass
                 next
             when "</Root>"
                 break
-            when %r{^.*</Value>}
-                line.gsub!(%r{</Value>$}, "")
-                entry_params[status] += line if (line && !line.empty?)
-                if (line && !line.empty?)
-                    entry_params[status] += "\n#{line}"
-                end
-
+            when "</Value>"
                 status = nil
                 inside_value = false
                 next
@@ -351,6 +345,13 @@ class RubeePass
 
             line = CGI::unescapeHTML(line)
             line = URI::unescape(line)
+            if (!line.valid_encoding?)
+                line = line.encode(
+                    "UTF-16be",
+                    :invalid=>:replace,
+                    :replace=>"?"
+                ).encode('UTF-8')
+            end
 
             # Handle values with newlines
             if (inside_value && !ignore)
@@ -400,7 +401,7 @@ class RubeePass
                     entry_params["UUID"] = uuid
                 end
             when %r{^<Value>.*}
-                line.gsub!(%r{<Value>}, "")
+                line.gsub!(%r{^<Value>}, "")
                 line = "" if (line.nil?)
                 entry_params[status] = line
                 inside_value = true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubeepass
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Miles Whittaker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-19 00:00:00.000000000 Z
+date: 2015-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest