rubeepass 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46705ef9bef7799846f434283b6e7856dea540d4
-  data.tar.gz: fc21cc8636d4e1a871fd7eaff58c517ac20b563f
+  metadata.gz: 1244eae333d927767643b37d6d6612800fc12a5d
+  data.tar.gz: 3818c6ae675fa05c04df6d62466809b02eccac27
 SHA512:
-  metadata.gz: c0b2b619726ac9f62455e9740a544ffb86301d6215ccd9c5d2227f2e69711edc25ad427231c8783e8a49465ddd2e733a4896ecc175814c7ce7a80acb12eff698
-  data.tar.gz: 7e96d550b350b80d3822db5d1713f07ed77be9dc841639f2eaaaca351ff9ecb7b776ed020f9fcf0df69e7983be969d56760a9eebac684578915101c72d7b8a0c
+  metadata.gz: eba9bb74e5da41f1aa2c49ac4672a7c23e459cfe31cb2ef9b1bd29e8d0fc2b8ebb32f4bf15eaf03588016768e4cd85d9b5b56d1db4db8ea4ac785d97060f697f
+  data.tar.gz: 9bfd779dcf88b6a38358162aeb01762e6a9144a3db92771d562a5b94795a44385aa57f1b92f77ce84707df9f09be8c755baa4fc268a6c20ea9aa7e6792fbe196

data/lib/rubeepass.rb

@@ -311,19 +311,16 @@ class RubeePass
     end
     private :parse_gzip
 
+    # Horrible attempt at parsing xml. Someday I might use a library
     def parse_xml
-        curr = Group.new(
-            {
-                "Keepass" => self,
-                "Name" => "/"
-            }
-        )
+        curr = Group.new({"Keepass" => self, "Name" => "/"})
         entry_params = Hash.new
         group_params = Hash.new
         ignore = true
+        inside_value = false
         status = nil
 
-        @xml.each_line do |line|
+        @xml.gsub("<", "\n<").each_line do |line|
             line.strip!
 
             case line
@@ -338,20 +335,37 @@ 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
+
+                status = nil
+                inside_value = false
+                next
+            when ""
+                next if (!inside_value)
             end
 
             line = CGI::unescapeHTML(line)
             line = URI::unescape(line)
 
+            # Handle values with newlines
+            if (inside_value && !ignore)
+                entry_params[status] += "\n#{line}"
+                next
+            end
+
             # Always handle protected data
             case line
-            when %r{<Value Protected}
-                line.gsub!(%r{<?Value( Protected=\"True\")?>}, "")
+            when %r{^<Value Protected="True">.+}
+                line.gsub!(%r{^<Value Protected="True">}, "")
                 if (ignore)
                     handle_protected(line)
                 else
                     entry_params[status] = handle_protected(line)
-                    status = nil
                 end
                 next
             else
@@ -369,26 +383,27 @@ class RubeePass
             when "</Group>"
                 curr = curr.group
                 break if (curr.nil?)
-            when %r{<Key>.+</Key>}
-                status = line.gsub(%r{^<Key>|</Key>$}, "")
-            when %r{<Name>}
-                line.gsub!(%r{^<Name>|</Name>$}, "")
+            when %r{^<Key>.+}
+                status = line.gsub(%r{^<Key>}, "")
+            when %r{^<Name>.+}
+                line.gsub!(%r{^<Name>}, "")
                 group_params["Name"] = line
 
                 group = Group.new(group_params)
                 curr.groups[group.name] = group
                 curr = group
-            when %r{<UUID>.+</UUID>}
-                uuid = line.gsub(%r{^<UUID>|</UUID>$}, "")
+            when %r{^<UUID>.+}
+                uuid = line.gsub(%r{^<UUID>}, "")
                 if (group_params["UUID"].nil?)
                     group_params["UUID"] = uuid
                 else
                     entry_params["UUID"] = uuid
                 end
-            when %r{<Value>}
-                line.gsub!(%r{</?Value( /)?>}, "")
+            when %r{^<Value>.*}
+                line.gsub!(%r{<Value>}, "")
+                line = "" if (line.nil?)
                 entry_params[status] = line
-                status = nil
+                inside_value = true
             end
         end
 

data/lib/rubeepass/entry.rb

@@ -20,23 +20,33 @@ class RubeePass::Entry
         return (self.title.downcase <=> other.title.downcase)
     end
 
-    def details(level = 0)
+    def details(level = 0, show_passwd = false)
         lvl = Array.new(level, "  ").join
 
-        return [
-            "#{lvl}Title    : #{@title}".green,
-            # "#{lvl}UUID     : #{@uuid}",
-            "#{lvl}Username : #{@username}",
-            # "#{lvl}Password : #{password}".red,
-            "#{lvl}Url      : #{@url}",
-            "#{lvl}Notes    : #{@notes}"
-        ].join("\n")
+        ret = Array.new
+        ret.push("#{lvl}Title    : #{@title}".green)
+        # ret.push("#{lvl}UUID     : #{@uuid}")
+        ret.push("#{lvl}Username : #{@username}")
+        ret.push("#{lvl}Password : #{password}".red) if (show_passwd)
+        ret.push("#{lvl}Url      : #{@url}")
+
+        first = true
+        @notes.each_line do |line|
+            if (first)
+                ret.push("#{lvl}Notes    : #{line.strip}")
+                first = false
+            else
+                ret.push("#{lvl}           #{line.strip}")
+            end
+        end
+
+        return ret.join("\n")
     end
 
     def initialize(params)
         @group = params.fetch("Group", nil)
         @keepass = params.fetch("Keepass", nil)
-        @password = params.fetch("Notes", "")
+        @notes = params.fetch("Notes", "")
         @password = params.fetch("Password", "")
         @title = params.fetch("Title", "")
         @url = params.fetch("URL", "")

data/lib/rubeepass/group.rb

@@ -19,7 +19,7 @@ class RubeePass::Group
         return (self.name.downcase <=> other.name.downcase)
     end
 
-    def details(level = 0)
+    def details(level = 0, show_passwd = false)
         out = Array.new
         lvl = Array.new(level, "  ").join
 
@@ -31,11 +31,11 @@ class RubeePass::Group
         end
 
         @groups.values.each do |group|
-            out.push(group.details(level + 1))
+            out.push(group.details(level + 1, show_passwd))
         end
 
         @entries.values.each do |entry|
-            out.push(entry.details(level + 1))
+            out.push(entry.details(level + 1, show_passwd))
         end
 
         return out.join("\n")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubeepass
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Miles Whittaker