rubeepass 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb87ea45836dac08a8f7d0127dc31134e976e57f
-  data.tar.gz: 405356c08747438ffbb5c58203bbe631a98377a2
+  metadata.gz: 5945c73082ac80abb126641064d1adc6ff1b08d1
+  data.tar.gz: 387b03a273731daf0330dbdc2419494c22c66b46
 SHA512:
-  metadata.gz: 72834f102e69ffca03cccec065741aef39f834558cb46014269b1386b80a41aa748140c1b4f3c905e63a038bea25fe8c2fb6f51efe551d23f5868821173781e0
-  data.tar.gz: 3ca9453d67fa6f66a07883e9dc665753d4db6261831b266963c6785de13ff7e77e8a282e4bb73ed2eefaac1f4841d741224bb3148e3ccdd1dde38926dd3a9a1f
+  metadata.gz: b5d068702f0b3d5bbe09ec040434f6c52a947c995b1d62fa2580f894497b9184c1b842467c05c4297345b164078e19d298b69273af90133e8f71a608af692539
+  data.tar.gz: 714026548c9412fa21ea26f97dca37462a94d596041d432b4424757b351843372aa9617ce8ac18373593013142e76010d441b984eb45bc290c406ed9bf515ef5

data/lib/rubeepass/entry.rb

@@ -22,6 +22,36 @@ class RubeePass::Entry
         return (self.title.downcase <=> other.title.downcase)
     end
 
+    def additional_attributes
+        return attributes.select do |key, value|
+            key.match(/^(Notes|Password|Title|URL|UserName)$/).nil?
+        end
+    end
+
+    def attribute(attr)
+        return nil if (@keepass.nil?)
+        return "" if (!has_attribute?(attr))
+
+        begin
+            return @keepass.protected_decryptor.decrypt(
+                @attributes[attr]
+            )
+        rescue
+            return @attributes[attr]
+        end
+    end
+
+    def attributes
+        return nil if (@keepass.nil?)
+
+        attrs = Hash.new
+        @attributes.each do |key, value|
+            attrs[key] = attribute(key)
+        end
+
+        return attrs
+    end
+
     def details(level = 0, show_passwd = false)
         lvl = Array.new(level, "  ").join
 
@@ -75,8 +105,9 @@ class RubeePass::Entry
     end
 
     def self.handle_protected(keepass, base64)
-        data = nil
         return nil if (base64.nil?)
+
+        data = nil
         begin
             data = base64.unpack("m*")[0]
             if (data.length != data.bytesize)
@@ -90,6 +121,10 @@ class RubeePass::Entry
         return keepass.protected_decryptor.add_to_stream(data)
     end
 
+    def has_attribute?(attr)
+        return !@attributes[attr].nil?
+    end
+
     def hilight_password(passwd)
         return passwd if (!RubeePass.hilight?)
         return passwd.light_red
@@ -154,34 +189,6 @@ class RubeePass::Entry
         end
     end
 
-    def has_attribute?(attr)
-        !@attributes[attr].nil?
-    end
-
-    def attribute(attr)
-        return nil if (@keepass.nil?)
-        return "" unless (has_attribute?(attr))
-
-        begin
-            return @keepass.protected_decryptor.get_password(
-                @attributes[attr]
-            )
-        rescue
-            return @attributes[attr]
-        end
-    end
-
-    def attributes
-        return nil if (@keepass.nil?)
-
-        attributes = {}
-        @attributes.each do |key, value|
-            attributes[key] = attribute(key)
-        end
-
-        return attributes
-    end
-
     def to_s
         return details
     end

data/lib/rubeepass/protected_decryptor.rb

@@ -6,7 +6,7 @@ class RubeePass::ProtectedDecryptor
         return (@ciphertext.length - 1)
     end
 
-    def get_password(index)
+    def decrypt(index)
         return nil if (@iv.nil? || @key.nil?)
         return nil if ((index < 0) || (index >= @ciphertext.length))
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubeepass
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Miles Whittaker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-10 00:00:00.000000000 Z
+date: 2017-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -221,7 +221,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Ruby KeePass 2.x implementation