rubeepass 1.1.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 555d0b9b3fed60c5950e2fa38fbd5bfdeb2dc77d
-  data.tar.gz: 326c1d9ff76b5c0d4bcf6f7f2db37046b21c7d47
+  metadata.gz: a497c0ba1c2d89f4be0f1c386c3cba1b692d1452
+  data.tar.gz: ff4a9f75e497c6d7c1c06d21fffe40680798d929
 SHA512:
-  metadata.gz: 197daacca2a88066501904fb04fd44abc111bfc890a2b9c65a6a0183ee02924dd509d2af388110f59b96c90553fe22916713ca1ab2f96778c77c3003591d88a6
-  data.tar.gz: 758b32334cc0a1941b876e824ac0dfd9b44480a6224cc5e9e943c5e111a9f538236f6787f1624860826544e283d42902c6d6c75cc8aef97ad57dcdc9e774646e
+  metadata.gz: d2141b8e46f3f30be2b0bd08f5159ee71692f1aee5ca923dbf48ffe27a534f7598d47b3e2b28466346bb7a09fa90a39472edee09f207eba583a6981397d0aa48
+  data.tar.gz: 1a702fca0863fc0787d6b3034ff71c1b32a00d8f01d0539dc217466b76072915c7c333c37d57e3705c60432c45930dd78646e34e0f64a5dce403a017db64923f

data/bin/rpass

@@ -32,13 +32,11 @@ class RubeePassConfig < JSONConfig
         return kdbx
     end
 
-    def last_keyfile(keyfile = nil)
-        if (keyfile)
-            set("last_keyfile", Pathname.new(keyfile).expand_path)
-        end
-        keyfile = get("last_keyfile").to_s
-        return nil if (keyfile.nil? || keyfile.empty?)
-        return keyfile
+    def last_keyfile(kf = nil)
+        set("last_keyfile", Pathname.new(kf).expand_path) if (kf)
+        kf = get("last_keyfile").to_s
+        return nil if (kf.nil? || kf.empty?)
+        return kf
     end
 
     def timeout(t = nil)

data/lib/rubeepass/attachment_decoder.rb

@@ -0,0 +1,34 @@
+require "base64"
+require "rexml/document"
+require "zlib"
+
+class RubeePass::AttachmentDecoder
+    def get_attachment(ref)
+        @binaries.elements.each("Binary") do |elem|
+            if (elem.attributes["ID"] == ref)
+                if (elem.attributes["Compressed"].nil?)
+                    begin
+                        return Base64.decode64(elem.text)
+                    rescue
+                        return elem.text
+                    end
+                end
+                return parse_gzip(elem.text)
+            end
+        end
+    end
+
+    def initialize(binaries)
+        @binaries = binaries
+    end
+
+    def parse_gzip(attachment)
+        begin
+            attachment = Base64.decode64(attachment)
+        rescue
+            # Do nothing
+        end
+        return Zlib::GzipReader.new(StringIO.new(attachment)).read
+    end
+    private :parse_gzip
+end

data/lib/rubeepass/entry.rb

@@ -24,10 +24,28 @@ class RubeePass::Entry
 
     def additional_attributes
         return attributes.select do |key, value|
-            key.match(/^(Notes|Password|Title|URL|UserName)$/).nil?
+            key.match(/^(notes|password|title|url|username)$/i).nil?
         end
     end
 
+    def attachment(name)
+        return nil if (@keepass.nil?)
+        return nil if (!has_attachment?(name))
+        return @keepass.attachment_decoder.get_attachment(
+            @attachments[name]
+        )
+    end
+
+    def attachments
+        attachments = Hash.new
+
+        @attachments.each do |key, value|
+            attachments[key] = attachment(key)
+        end
+
+        return attachments
+    end
+
     def attribute(attr)
         return nil if (@keepass.nil?)
         return "" if (!has_attribute?(attr))
@@ -53,34 +71,41 @@ class RubeePass::Entry
     end
 
     def details(level = 0, show_passwd = false)
-        lvl = Array.new(level, "  ").join
+        lvl = "  " * level
 
-        ret = Array.new
-        ret.push(hilight_title("#{lvl}Title    : #{@title}"))
-        # ret.push("#{lvl}UUID     : #{@uuid}")
-        ret.push("#{lvl}Username : #{@username}")
+        r = Array.new
+        r.push("#{lvl}#{hilight_attr("Title:")} #{@title}")
+        # r.push("#{lvl}#{hilight_attr("UUID:")} #{@uuid}")
+        r.push("#{lvl}#{hilight_attr("Username:")} #{@username}")
         if (show_passwd)
-            ret.push(
-                hilight_password("#{lvl}Password : #{@password}")
+            r.push(
+                "#{lvl}#{hilight_password("Password:")} #{@password}"
             )
         end
-        ret.push("#{lvl}Url      : #{@url}")
+        r.push("#{lvl}#{hilight_attr("URL:")} #{@url}")
 
-        first = true
+        r.push("#{lvl}#{hilight_attr("Notes:")}") if (!@notes.empty?)
         @notes.each_line do |line|
-            if (first)
-                ret.push("#{lvl}Notes    : #{line.strip}")
-                first = false
-            else
-                ret.push("#{lvl}           #{line.strip}")
-            end
+            r.push("#{lvl}  #{line.strip}")
+        end
+
+        additional_attributes.each do |k, v|
+            r.push("#{lvl}#{hilight_attr("#{k}:")} #{v}")
+        end
+
+        if (!@attachments.empty?)
+            r.push("#{lvl}#{hilight_attr("Attachments:")}")
+        end
+        @attachments.keys.each do |name|
+            r.push("#{lvl}  #{name}")
         end
 
-        return ret.join("\n")
+        return r.join("\n")
     end
 
     def self.from_xml(keepass, parent, xml)
         attrs = Hash.new
+        attachs = Hash.new
 
         uuid = xml.elements["UUID"].text || ""
 
@@ -101,7 +126,19 @@ class RubeePass::Entry
             end
         end
 
-        return RubeePass::Entry.new(parent, keepass, attrs, uuid)
+        xml.elements.each("Binary") do |elem|
+            key = elem.elements["Key"].text
+            value = elem.elements["Value"].attributes["Ref"]
+            attachs[key] = value
+        end
+
+        return RubeePass::Entry.new(
+            parent,
+            keepass,
+            attrs,
+            attachs,
+            uuid
+        )
     end
 
     def self.handle_protected(keepass, base64)
@@ -121,26 +158,35 @@ class RubeePass::Entry
         return keepass.protected_decryptor.add_to_stream(data)
     end
 
+    def has_attachment?(name)
+        return @attachments.any? do |k, v|
+            k.downcase == name.downcase
+        end
+    end
+
     def has_attribute?(attr)
-        return !@attributes[attr].nil?
+        return @attributes.any? do |k, v|
+            k.downcase == attr.downcase
+        end
     end
 
+    def hilight_attr(title)
+        return title if (!RubeePass.hilight?)
+        return title.light_green
+    end
+    private :hilight_attr
+
     def hilight_password(passwd)
         return passwd if (!RubeePass.hilight?)
         return passwd.light_red
     end
     private :hilight_password
 
-    def hilight_title(title)
-        return title if (!RubeePass.hilight?)
-        return title.light_green
-    end
-    private :hilight_title
-
-    def initialize(group, keepass, attributes, uuid)
+    def initialize(group, keepass, attributes, attachments, uuid)
         @group = group
         @keepass = keepass
         @attributes = attributes
+        @attachments = attachments
 
         @notes = attribute("Notes")
         @password = attribute("Password")

data/lib/rubeepass/error.rb

@@ -1,5 +1,4 @@
-class RubeePass::Error < RuntimeError
-end
+class RubeePass::Error < RuntimeError; end
 
 require "rubeepass/error/file_not_found"
 require "rubeepass/error/file_not_readable"

data/lib/rubeepass/group.rb

@@ -22,10 +22,10 @@ class RubeePass::Group
 
     def details(level = 0, show_passwd = false)
         out = Array.new
-        lvl = Array.new(level, "  ").join
+        lvl = "  " * level
 
-        group_details = [ hilight_header(@path) ] if (level == 0)
-        group_details = [ hilight_header(@name) ] if (level != 0)
+        group_details = [hilight_header(@path)] if (level == 0)
+        group_details = [hilight_header(@name)] if (level != 0)
 
         group_details.each do |line|
             out.push("#{lvl}#{line}")
@@ -35,8 +35,11 @@ class RubeePass::Group
             out.push(group.details(level + 1, show_passwd))
         end
 
+        div = "-" * (70 - lvl.length - 2)
+        out.push("#{lvl}  #{div}") if (!@entries.empty?)
         @entries.values.each do |entry|
             out.push(entry.details(level + 1, show_passwd))
+            out.push("#{lvl}  #{div}")
         end
 
         return out.join("\n")
@@ -67,17 +70,14 @@ class RubeePass::Group
     end
 
     def self.from_xml(keepass, parent, xml)
-        name = xml.elements["Name"].text if (parent)
-        name = "" if (name.nil?)
-        name = "/" if (parent.nil?)
+        name = "/"
+        name = xml.elements["Name"].text || "" if (parent)
 
-        notes = xml.elements["Notes"].text if (parent)
-        notes = "" if (notes.nil?)
-        notes = "" if (parent.nil?)
+        notes = ""
+        notes = xml.elements["Notes"].text || "" if (parent)
 
-        uuid = xml.elements["UUID"].text if (parent)
-        uuid = "" if (uuid.nil?)
-        uuid = "" if (parent.nil?)
+        uuid = ""
+        uuid = xml.elements["UUID"].text || "" if (parent)
 
         group = RubeePass::Group.new(
             parent,
@@ -151,22 +151,20 @@ class RubeePass::Group
     end
 
     def has_entry?(title)
-        entry_titles.each do |entry|
-            return true if (title.downcase == entry.downcase)
+        return entry_titles.any? do |entry|
+            entry.downcase == title.downcase
         end
-        return false
     end
 
     def has_group?(name)
-        group_names.each do |group|
-            return true if (name.downcase == group.downcase)
+        return group_names.any? do |group|
+            group.downcase == name.downcase
         end
-        return false
     end
 
     def hilight_header(header)
         return header if (!RubeePass.hilight?)
-        return header.light_blue
+        return header.cyan
     end
     private :hilight_header
 

data/lib/rubeepass.rb

@@ -26,6 +26,7 @@ class RubeePass
     @@MAGIC_SIG2 = 0xb54bfb67
     @@VERSION = 0x00030000
 
+    attr_reader :attachment_decoder
     attr_reader :db
     attr_reader :gzip
     attr_reader :protected_decryptor
@@ -337,6 +338,10 @@ class RubeePass
             raise Error::InvalidXML.new
         end
 
+        @attachment_decoder = AttachmentDecoder.new(
+            doc.elements["KeePassFile/Meta/Binaries"]
+        )
+
         root = doc.elements["KeePassFile/Root"]
         @db = Group.from_xml(self, nil, root)
     end
@@ -463,6 +468,7 @@ class RubeePass
     end
 end
 
+require "rubeepass/attachment_decoder"
 require "rubeepass/entry"
 require "rubeepass/error"
 require "rubeepass/group"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubeepass
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 2.0.0
 platform: ruby
 authors:
 - Miles Whittaker
@@ -179,6 +179,7 @@ extra_rdoc_files: []
 files:
 - bin/rpass
 - lib/rubeepass.rb
+- lib/rubeepass/attachment_decoder.rb
 - lib/rubeepass/entry.rb
 - lib/rubeepass/error.rb
 - lib/rubeepass/error/file_not_found.rb