rubeepass 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: abe38f261905a7621be6738e64e28b20898e092c
-  data.tar.gz: 4da29b094e19fcfbaab0f9e6b553a263615c06e1
+  metadata.gz: 46705ef9bef7799846f434283b6e7856dea540d4
+  data.tar.gz: fc21cc8636d4e1a871fd7eaff58c517ac20b563f
 SHA512:
-  metadata.gz: 500bf5533738d8db41ad428289d93948bea52141ec0e1fc1bafb3896d7cc3a7523ad13f60343d7c2e97e2a037240665e445cbbe999ec0ff23f9c68c32691e9bb
-  data.tar.gz: 1cff2527401f526cec0bd5d8dc36b99b46bdc361d1d9e3f88ed27c085163f4fe01e507ce4ce3f22016d2ca84e921802453e792884231675d658e543bcbe82e66
+  metadata.gz: c0b2b619726ac9f62455e9740a544ffb86301d6215ccd9c5d2227f2e69711edc25ad427231c8783e8a49465ddd2e733a4896ecc175814c7ce7a80acb12eff698
+  data.tar.gz: 7e96d550b350b80d3822db5d1713f07ed77be9dc841639f2eaaaca351ff9ecb7b776ed020f9fcf0df69e7983be969d56760a9eebac684578915101c72d7b8a0c

data/bin/rpass

@@ -204,26 +204,19 @@ password = options["password"] if (options["password"])
 password = get_password if (options["password"].nil?)
 keyfile = options["keyfile"]
 
-keepass = nil
+keepass = RubeePass.new(kdbx, password, keyfile)
+
+if (options["export_file"])
+    keepass.export(options["export_file"], options["export_format"])
+    exit RPassExit::GOOD
+end
+
 begin
-    keepass = RubeePass.new(kdbx, password, keyfile).open
+    keepass.open
 rescue RubeePass::Error => e
     puts e.message
     exit RPassExit::KDBX_NOT_OPENED
 end
-exit RPassExit::KDBX_NOT_OPENED if (keepass.nil?)
-
-if (options["export_file"])
-    File.open(options["export_file"], "w") do |f|
-        case options["export_format"]
-        when "gzip"
-            f.write(keepass.gzip)
-        when "xml"
-            f.write(keepass.xml)
-        end
-    end
-    exit RPassExit::GOOD
-end
 
 djinni = Djinni.new
 djinni.load_wishes("#{File.dirname(__FILE__)}/../lib/builtins")

data/lib/rubeepass.rb

@@ -138,6 +138,19 @@ class RubeePass
     end
     private :derive_aes_key
 
+    def export(export_file, format)
+        start_opening
+
+        File.open(export_file, "w") do |f|
+            case format
+            when "gzip"
+                f.write(@gzip)
+            when "xml"
+                f.write(@xml)
+            end
+        end
+    end
+
     def extract_xml
         @xml = Zlib::GzipReader.new(StringIO.new(@gzip)).read
     end
@@ -165,16 +178,9 @@ class RubeePass
     private :handle_protected
 
     def initialize(kdbx, password, keyfile = nil)
-        @aes_iv = nil
-        @aes_key = nil
-        @db = nil
-        @gzip = nil
-        @header = nil
         @kdbx = kdbx
-        @key = nil
         @keyfile = keyfile
         @password = password
-        @xml = nil
     end
 
     def join_key_and_keyfile
@@ -241,15 +247,7 @@ class RubeePass
     end
 
     def open
-        file = File.open(@kdbx)
-
-        read_magic_and_version(file)
-        read_header(file)
-        join_key_and_keyfile
-        derive_aes_key
-        read_gzip(file)
-
-        file.close
+        start_opening
 
         @protected_decryptor = ProtectedDecryptor.new(
             Digest::SHA256.digest(
@@ -258,7 +256,6 @@ class RubeePass
             ["E830094B97205D2A"].pack("H*")
         )
 
-        extract_xml
         parse_xml
 
         return self
@@ -487,6 +484,29 @@ class RubeePass
     end
     private :read_magic_and_version
 
+    def start_opening
+        @aes_iv = nil
+        @aes_key = nil
+        @db = nil
+        @gzip = nil
+        @header = nil
+        @key = nil
+        @xml = nil
+
+        file = File.open(@kdbx)
+
+        read_magic_and_version(file)
+        read_header(file)
+        join_key_and_keyfile
+        derive_aes_key
+        read_gzip(file)
+
+        file.close
+
+        extract_xml
+    end
+    private :start_opening
+
     def to_s
         return @db.to_s
     end

metadata

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