rubeepass 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c9173d805e33e51cc75649bf98888fe43d1ddf6
-  data.tar.gz: cf33596494c2237f9d155b0b3b19695159e04e66
+  metadata.gz: 27da21673c45cfb2ab29bb1c984f477ea16036d6
+  data.tar.gz: 3785cf861668b77aea2d275248f4747e85425c2a
 SHA512:
-  metadata.gz: e17d97fee36dec9b46bb7cee8012ceab4cad86f1efab7e5f391597d4b057d4d99bd218a4ff5683474aaba78af0a915f9f3b5ed589bcd424a5cb7c897763fff18
-  data.tar.gz: ce56faf8900c3425e55fd480966ee5e39a73fc886eda135156a54c52e2e9f8e08726dd84f695755e911a0aa96fc75f8feff2bb7d83d05f2f5328bd50a98fb951
+  metadata.gz: 301723a1764cb1f6698e912069e39fb65f1577dd94ad0dbe3e4ed329c495f6bb3110ceea15e0ce6c1ac56bc91ef1758a642742c9d35ce8857d9368f29b79890e
+  data.tar.gz: 9edb83c2c117297bd7d731fd610fb81c7606fa9ded5d0deefe046f24408d6652bc99547aa560c41fb027225707f912bd610c72f84c187901e9c19e3bdac4b71a

data/bin/rpass

@@ -3,37 +3,57 @@
 require "colorize"
 require "djinni"
 require "io/console"
-require "json"
+require "json_config"
 require "optparse"
-require "pathname"
 require "rubeepass"
 
-class RPassExit
+class RubeePassExit
     GOOD = 0
     INVALID_OPTION = 1
     INVALID_ARGUMENT = 2
     MISSING_ARGUMENT = 3
     EXTRA_ARGUMENTS = 4
-    KDBX_NOT_FOUND = 5
-    KDBX_NOT_READABLE = 6
-    KEYFILE_NOT_FOUND = 7
-    KEYFILE_NOT_READABLE = 8
-    KDBX_NOT_OPENED = 9
+    EXCEPTION = 5
+end
+
+class RubeePassConfig < JSONConfig
+    def default_config
+        set("last_kdbx", nil)
+        set("last_keyfile", nil)
+        set("timeout", 10)
+    end
+
+    def last_kdbx(kdbx = nil)
+        set("last_kdbx", kdbx.to_s) if (kdbx)
+        kdbx = get("last_kdbx")
+        return nil if (kdbx.nil? || kdbx.empty?)
+        return kdbx
+    end
+
+    def last_keyfile(keyfile = nil)
+        set("last_keyfile", keyfile.to_s) if (keyfile)
+        keyfile = get("last_keyfile")
+        return nil if (keyfile.nil? || keyfile.empty?)
+        return keyfile
+    end
+
+    def timeout(t = nil)
+        set("timeout", t) if (t)
+        t = get("timeout")
+        case t
+        when /[0-9]+/
+            return t.to_i
+        else
+            return nil
+        end
+    end
 end
 
 def get_password
     print "Enter password: "
-    begin
-        passwd = STDIN.noecho(&:gets)
-        puts
-        return passwd.chomp
-    rescue Interrupt => e
-        puts
-        exit RPassExit::GOOD
-    rescue
-        puts
-        exit RPassExit::KDBX_NOT_OPENED
-    end
+    passwd = STDIN.noecho(&:gets)
+    puts
+    return passwd.chomp
 end
 
 def parse(args)
@@ -44,6 +64,7 @@ def parse(args)
     options["password"] = nil
     options["keyfile"] = nil
     options["timeout"] = nil
+    options["verbose"] = false
 
     parser = OptionParser.new do |opts|
         opts.banner = "Usage: #{File.basename($0)} [OPTIONS] [kdbx]"
@@ -75,7 +96,7 @@ def parse(args)
 
         opts.on("-h", "--help", "Display this help message") do
             puts opts
-            exit RPassExit::GOOD
+            exit RubeePassExit::GOOD
         end
 
         opts.on(
@@ -83,7 +104,11 @@ def parse(args)
             "--keyfile=KEYFILE",
             "Use specified keyfile"
         ) do |keyfile|
-            options["keyfile"] = Pathname.new(keyfile).expand_path
+            options["keyfile"] = keyfile
+        end
+
+        opts.on("--nocolor", "Disable colorized output") do
+            String.disable_colorization = true
         end
 
         opts.on(
@@ -98,11 +123,19 @@ def parse(args)
             options["timeout"] = t.to_i
         end
 
+        opts.on(
+            "-v",
+            "--verbose",
+            "Show backtrace when error occurs"
+        ) do
+            options["verbose"] = true
+        end
+
         opts.on(
             "",
             "FORMATS",
-            "\tgzip",
-            "\txml"
+            "    gzip",
+            "    xml"
         )
     end
 
@@ -111,109 +144,63 @@ def parse(args)
     rescue OptionParser::InvalidOption => e
         puts e.message
         puts parser
-        exit RPassExit::INVALID_OPTION
+        exit RubeePassExit::INVALID_OPTION
     rescue OptionParser::InvalidArgument => e
         puts e.message
         puts parser
-        exit RPassExit::INVALID_ARGUMENT
+        exit RubeePassExit::INVALID_ARGUMENT
     rescue OptionParser::MissingArgument => e
         puts e.message
         puts parser
-        exit RPassExit::MISSING_ARGUMENT
+        exit RubeePassExit::MISSING_ARGUMENT
     end
 
     if (args.length > 1)
         puts parser
-        exit RPassExit::EXTRA_ARGUMENTS
+        exit RubeePassExit::EXTRA_ARGUMENTS
     end
 
     # Read config
-    rc = read_rpassrc
+    rc = RubeePassConfig.new("~/.rpassrc")
 
     # Determine kdbx and keyfile
     if (args.length == 1)
         # Use specified kdbx (and keyfile if specified)
-        options["kdbx"] = Pathname.new(args[0]).expand_path
+        options["kdbx"] = args[0]
     else
         # Use kdbx from config if stored
-        if (rc["last_kdbx"] && !rc["last_kdbx"].empty?)
-            options["kdbx"] = Pathname.new(
-                rc["last_kdbx"]
-            ).expand_path
+        if (rc.last_kdbx)
+            options["kdbx"] = rc.last_kdbx
         end
 
         # Use keyfile from config if stored and not specified already
         if (options["keyfile"].nil?)
-            if (rc["last_keyfile"] && !rc["last_keyfile"].empty?)
-                options["keyfile"] = Pathname.new(
-                    rc["last_keyfile"]
-                ).expand_path
+            if (rc.last_keyfile)
+                options["keyfile"] = rc.last_keyfile
             end
         end
     end
 
     # Determine timeout
     if (options["timeout"].nil?)
-        if (rc["timeout"])
-            options["timeout"] = rc["timeout"]
-        else
-            options["timeout"] = 7
-        end
+        options["timeout"] = 10
+        options["timeout"] = rc.timeout if (rc.timeout)
     end
 
     # Throw error if kdbx not specified or in config
     if (options["kdbx"].nil?)
         puts parser
-        exit RPassExit::MISSING_ARGUMENT
-    end
-
-    # Throw error if kdbx does not exist or is not readable
-    if (!options["kdbx"].exist?)
-        puts parser
-        exit RPassExit::KDBX_NOT_FOUND
-    elsif (!options["kdbx"].readable?)
-        puts parser
-        exit RPassExit::KDBX_NOT_READABLE
-    end
-
-    # Throw error if keyfile does not exist or is not readable
-    if (options["keyfile"])
-        if (!options["keyfile"].exist?)
-            puts parser
-            exit RPassExit::KEYFILE_NOT_FOUND
-        elsif (!options["keyfile"].readable?)
-            puts parser
-            exit RPassExit::KEYFILE_NOT_READABLE
-        end
+        exit RubeePassExit::MISSING_ARGUMENT
     end
 
     # Store data in config
-    rc["last_kdbx"] = options["kdbx"]
-    rc["last_keyfile"] = options["keyfile"]
-    rc["timeout"] = options["timeout"]
-    write_rpassrc(rc)
+    rc.last_kdbx(options["kdbx"])
+    rc.last_keyfile(options["keyfile"])
+    rc.timeout(options["timeout"])
 
     return options
 end
 
-def read_rpassrc
-    default = Hash.new
-    default["last_kdbx"] = nil
-    default["last_keyfile"] = nil
-    default["timeout"] = 7
-
-    rc_file = Pathname.new("~/.rpassrc").expand_path
-    return default if (!rc_file.exist? && !rc_file.symlink?)
-    return JSON.parse(File.read(rc_file))
-end
-
-def write_rpassrc(rc)
-    rc_file = Pathname.new("~/.rpassrc").expand_path
-    File.open(rc_file, "w") do |f|
-        f.write(JSON.pretty_generate(rc))
-    end
-end
-
 options = parse(ARGV)
 
 kdbx = options["kdbx"]
@@ -221,39 +208,41 @@ password = options["password"] if (options["password"])
 password = get_password if (options["password"].nil?)
 keyfile = options["keyfile"]
 
-keepass = RubeePass.new(kdbx, password, keyfile)
-
-if (options["export_file"])
-    begin
-        keepass.export(
-            options["export_file"],
-            options["export_format"]
-        )
-    rescue RubeePass::Error::InvalidPasswordError => e
-        puts e.message
-        password = get_password
-        keepass = RubeePass.new(kdbx, password, keyfile)
+begin
+    keepass = RubeePass.new(
+        kdbx,
+        password,
+        keyfile,
+        !String.disable_colorization
+    )
+
+    loop do
+        begin
+            if (options["export_file"])
+                keepass.export(
+                    options["export_file"],
+                    options["export_format"]
+                )
+                exit RubeePassExit::GOOD
+            else
+                keepass.open
+            end
+            break
+        rescue RubeePass::Error::InvalidPassword => e
+            puts e.message
+            password = get_password
+            keepass = RubeePass.new(
+                kdbx,
+                password,
+                keyfile,
+                !String.disable_colorization
+            )
+        end
     end
-    exit RPassExit::GOOD
-end
 
-loop do
-    begin
-        keepass.open
-        break
-    rescue RubeePass::Error::InvalidPasswordError => e
-        puts e.message
-        password = get_password
-        keepass = RubeePass.new(kdbx, password, keyfile)
-    rescue RubeePass::Error => e
-        puts e.message
-        exit RPassExit::KDBX_NOT_OPENED
-    end
-end
+    djinni = Djinni.new
+    djinni.load_wishes("#{File.dirname(__FILE__)}/../lib/rubeepass/wish")
 
-djinni = Djinni.new
-djinni.load_wishes("#{File.dirname(__FILE__)}/../lib/rubeepass/wish")
-begin
     if (options["command"])
         djinni.grant_wish(
             "#{options["command"].chomp}\n",
@@ -269,14 +258,44 @@ begin
             {
                 "keepass" => keepass,
                 "cwd" => keepass.db,
-                "clipboard_timeout" => options["timeout"]
+                "clipboard_timeout" => options["timeout"],
+                "prompt_color" => "light_white"
             },
-            "rpass:/> ".white
+            "rpass:/> ".light_white
         )
     end
-# rescue SystemExit => e
+rescue SystemExit
+    # Quit from djinni
+    # Exit gracefully
+rescue Interrupt
+    # ^C
+    # Exit gracefully
+rescue Errno::EPIPE
+    # Do nothing. This can happen if piping to another program such as
+    # less. Usually if less is closed before we're done with STDOUT.
+rescue RubeePass::Error => e
+    puts e.message
+    exit RubeePassExit::EXCEPTION
+rescue Exception => e
+    $stderr.puts "Oops! Looks like an error has occured! If the " \
+        "error persists, file a bug at:".word_wrap
+    $stderr.puts
+    $stderr.puts "    https://gitlab.com/mjwhitta/rubeepass/issues"
+    $stderr.puts
+    $stderr.puts "Maybe the message below will help. If not, you " \
+        "can use the --verbose flag to get a backtrace.".word_wrap
+
+    $stderr.puts e.message.white.on_red
+    if (options["verbose"])
+        e.backtrace.each do |line|
+            $stderr.puts line.light_yellow
+        end
+    end
+    exit RubeePassExit::EXCEPTION
 ensure
-    keepass.clear_clipboard
-    keepass.wait_to_exit
+    if (keepass)
+        keepass.clear_clipboard
+        keepass.wait_to_exit
+    end
 end
-exit RPassExit::GOOD
+exit RubeePassExit::GOOD

data/lib/rubeepass/entry.rb

@@ -22,14 +22,30 @@ class RubeePass::Entry
         return (self.title.downcase <=> other.title.downcase)
     end
 
+    def colorize_password(passwd)
+        return passwd if (!@colorize)
+        return passwd.light_red
+    end
+    private :colorize_password
+
+    def colorize_title(title)
+        return title if (!@colorize)
+        return title.light_green
+    end
+    private :colorize_title
+
     def details(level = 0, show_passwd = false)
         lvl = Array.new(level, "  ").join
 
         ret = Array.new
-        ret.push("#{lvl}Title    : #{@title}".green)
+        ret.push(colorize_title("#{lvl}Title    : #{@title}"))
         # ret.push("#{lvl}UUID     : #{@uuid}")
         ret.push("#{lvl}Username : #{@username}")
-        ret.push("#{lvl}Password : #{password}".red) if (show_passwd)
+        if (show_passwd)
+            ret.push(
+                colorize_password("#{lvl}Password : #{password}")
+            )
+        end
         ret.push("#{lvl}Url      : #{@url}")
 
         first = true
@@ -45,7 +61,7 @@ class RubeePass::Entry
         return ret.join("\n")
     end
 
-    def self.from_xml(keepass, parent, xml)
+    def self.from_xml(keepass, parent, xml, colorize = false)
         notes = ""
         password = ""
         title = ""
@@ -95,7 +111,8 @@ class RubeePass::Entry
             title,
             url,
             username,
-            uuid
+            uuid,
+            colorize
         )
     end
 
@@ -105,9 +122,9 @@ class RubeePass::Entry
         begin
             data = base64.unpack("m*")[0].fix
         rescue ArgumentError => e
-            raise Error::InvalidProtectedDataError.new
+            raise Error::InvalidProtectedData.new
         end
-        raise Error::InvalidProtectedDataError.new if (data.nil?)
+        raise Error::InvalidProtectedData.new if (data.nil?)
 
         return keepass.protected_decryptor.add_to_stream(data)
     end
@@ -120,8 +137,10 @@ class RubeePass::Entry
         title,
         url,
         username,
-        uuid
+        uuid,
+        colorize = false
     )
+        @colorize = colorize
         @group = group
         @keepass = keepass
         @notes = notes

data/lib/rubeepass/error/file_not_found.rb

@@ -0,0 +1,5 @@
+class RubeePass::Error::FileNotFound < RubeePass::Error
+    def initialize(file)
+        super("File not found: #{file}")
+    end
+end

data/lib/rubeepass/error/file_not_readable.rb

@@ -0,0 +1,5 @@
+class RubeePass::Error::FileNotReadable < RubeePass::Error
+    def initialize(file)
+        super("File not readable: #{file}")
+    end
+end

data/lib/rubeepass/error/{invalid_gzip_error.rb → invalid_gzip.rb}

@@ -1,6 +1,6 @@
 require "rubeepass/error"
 
-class RubeePass::Error::InvalidGzipError < RubeePass::Error
+class RubeePass::Error::InvalidGzip < RubeePass::Error
     def initialize
         super("Invalid gzip format!")
     end

data/lib/rubeepass/error/{invalid_header_error.rb → invalid_header.rb}

@@ -1,6 +1,6 @@
 require "rubeepass/error"
 
-class RubeePass::Error::InvalidHeaderError < RubeePass::Error
+class RubeePass::Error::InvalidHeader < RubeePass::Error
     def initialize
         super("Invalid header format!")
     end

data/lib/rubeepass/error/{invalid_magic_error.rb → invalid_magic.rb}

@@ -1,6 +1,6 @@
 require "rubeepass/error"
 
-class RubeePass::Error::InvalidMagicError < RubeePass::Error
+class RubeePass::Error::InvalidMagic < RubeePass::Error
     def initialize
         super("Invalid magic values detected!")
     end

data/lib/rubeepass/error/{invalid_password_error.rb → invalid_password.rb}

@@ -1,6 +1,6 @@
 require "rubeepass/error"
 
-class RubeePass::Error::InvalidPasswordError < RubeePass::Error
+class RubeePass::Error::InvalidPassword < RubeePass::Error
     def initialize
         super("Invalid password provided!")
     end

data/lib/rubeepass/error/{invalid_protected_data_error.rb → invalid_protected_data.rb}

@@ -1,6 +1,6 @@
 require "rubeepass/error"
 
-class RubeePass::Error::InvalidProtectedDataError < RubeePass::Error
+class RubeePass::Error::InvalidProtectedData < RubeePass::Error
     def initialize
         super("Invalid protected data!")
     end

data/lib/rubeepass/error/{invalid_protected_stream_key_error.rb → invalid_protected_stream_key.rb}

@@ -1,6 +1,6 @@
 require "rubeepass/error"
 
-class RubeePass::Error::InvalidProtectedStreamKeyError < RubeePass::Error
+class RubeePass::Error::InvalidProtectedStreamKey < RubeePass::Error
     def initialize
         super("Invalid protected stream key!")
     end

data/lib/rubeepass/error/{invalid_version_error.rb → invalid_version.rb}

@@ -1,6 +1,6 @@
 require "rubeepass/error"
 
-class RubeePass::Error::InvalidVersionError < RubeePass::Error
+class RubeePass::Error::InvalidVersion < RubeePass::Error
     def initialize
         super("Invalid version detected!")
     end

data/lib/rubeepass/error/{invalid_xml_error.rb → invalid_xml.rb}

@@ -1,6 +1,6 @@
 require "rubeepass/error"
 
-class RubeePass::Error::InvalidXMLError < RubeePass::Error
+class RubeePass::Error::InvalidXML < RubeePass::Error
     def initialize
         super("Invalid xml schema!")
     end

data/lib/rubeepass/error/{not_aes_error.rb → not_aes.rb}

@@ -1,6 +1,6 @@
 require "rubeepass/error"
 
-class RubeePass::Error::NotAESError < RubeePass::Error
+class RubeePass::Error::NotAES < RubeePass::Error
     def initialize
         super("Not AES!")
     end

data/lib/rubeepass/error/{not_salsa20_error.rb → not_salsa20.rb}

@@ -1,6 +1,6 @@
 require "rubeepass/error"
 
-class RubeePass::Error::NotSalsa20Error < RubeePass::Error
+class RubeePass::Error::NotSalsa20 < RubeePass::Error
     def initialize
         super("Not a Salsa20 CrsAlgorithm!")
     end

data/lib/rubeepass/error.rb

@@ -1,13 +1,15 @@
 class RubeePass::Error < RuntimeError
 end
 
-require "rubeepass/error/invalid_gzip_error"
-require "rubeepass/error/invalid_header_error"
-require "rubeepass/error/invalid_magic_error"
-require "rubeepass/error/invalid_password_error"
-require "rubeepass/error/invalid_protected_data_error"
-require "rubeepass/error/invalid_protected_stream_key_error"
-require "rubeepass/error/invalid_version_error"
-require "rubeepass/error/invalid_xml_error"
-require "rubeepass/error/not_aes_error"
-require "rubeepass/error/not_salsa20_error"
+require "rubeepass/error/file_not_found"
+require "rubeepass/error/file_not_readable"
+require "rubeepass/error/invalid_gzip"
+require "rubeepass/error/invalid_header"
+require "rubeepass/error/invalid_magic"
+require "rubeepass/error/invalid_password"
+require "rubeepass/error/invalid_protected_data"
+require "rubeepass/error/invalid_protected_stream_key"
+require "rubeepass/error/invalid_version"
+require "rubeepass/error/invalid_xml"
+require "rubeepass/error/not_aes"
+require "rubeepass/error/not_salsa20"

data/lib/rubeepass/group.rb

@@ -20,12 +20,18 @@ class RubeePass::Group
         return (self.name.downcase <=> other.name.downcase)
     end
 
+    def colorize_header(header)
+        return header if (!@colorize)
+        return header.light_blue
+    end
+    private :colorize_header
+
     def details(level = 0, show_passwd = false)
         out = Array.new
         lvl = Array.new(level, "  ").join
 
-        group_details = [ "#{@path}".blue ] if (level == 0)
-        group_details = [ "#{@name}".blue ] if (level != 0)
+        group_details = [ colorize_header(@path) ] if (level == 0)
+        group_details = [ colorize_header(@name) ] if (level != 0)
 
         group_details.each do |line|
             out.push("#{lvl}#{line}")
@@ -64,7 +70,7 @@ class RubeePass::Group
         return cwd
     end
 
-    def self.from_xml(keepass, parent, xml)
+    def self.from_xml(keepass, parent, xml, colorize = false)
         name = xml.elements["Name"].text if (parent)
         name = "" if (name.nil?)
         name = "/" if (parent.nil?)
@@ -82,7 +88,8 @@ class RubeePass::Group
             keepass,
             name,
             notes,
-            uuid
+            uuid,
+            colorize
         )
 
         if (xml.elements["Entry"])
@@ -90,7 +97,8 @@ class RubeePass::Group
                 entry = RubeePass::Entry.from_xml(
                     keepass,
                     group,
-                    entry_xml
+                    entry_xml,
+                    colorize
                 )
                 group.entries[entry.title] = entry
             end
@@ -101,7 +109,8 @@ class RubeePass::Group
                 child = RubeePass::Group.from_xml(
                     keepass,
                     group,
-                    group_xml
+                    group_xml,
+                    colorize
                 )
                 group.groups[child.name] = child
             end
@@ -161,7 +170,15 @@ class RubeePass::Group
         return false
     end
 
-    def initialize(group, keepass, name, notes, uuid)
+    def initialize(
+        group,
+        keepass,
+        name,
+        notes,
+        uuid,
+        colorize = false
+    )
+        @colorize = colorize
         @entries = Hash.new
         @group = group
         @groups = Hash.new

data/lib/rubeepass/wish/cd_wish.rb

@@ -13,13 +13,18 @@ class CDWish < Djinni::Wish
     def execute(args, djinni_env = {})
         keepass = djinni_env["keepass"]
         cwd = djinni_env["cwd"]
+        prompt_color = djinni_env["prompt_color"]
 
         args = keepass.absolute_path(args, cwd.path)
         new_cwd = keepass.find_group(args)
 
         if (new_cwd)
             djinni_env["cwd"] = new_cwd
-            prompt = "rpass:#{new_cwd.name}> ".white
+            if (prompt_color)
+                prompt = "rpass:#{new_cwd.name}> ".send(prompt_color)
+            else
+                prompt = "rpass:#{new_cwd.name}> "
+            end
             djinni_env["djinni_prompt"] = prompt
         else
             puts "Group \"#{args}\" doesn't exist!"

data/lib/rubeepass/wish/copy_wish.rb

@@ -1,4 +1,3 @@
-require "colorize"
 require "djinni"
 
 class CopyWish < Djinni::Wish

data/lib/rubeepass/wish/echo_wish.rb

@@ -1,4 +1,3 @@
-require "colorize"
 require "djinni"
 
 class EchoWish < Djinni::Wish

data/lib/rubeepass/wish/ls_wish.rb

@@ -1,4 +1,3 @@
-require "colorize"
 require "djinni"
 
 class LSWish < Djinni::Wish

data/lib/rubeepass/wish/show_all_wish.rb

@@ -1,4 +1,3 @@
-require "colorize"
 require "djinni"
 
 class ShowAllWish < Djinni::Wish

data/lib/rubeepass/wish/show_wish.rb

@@ -1,4 +1,3 @@
-require "colorize"
 require "djinni"
 
 class ShowWish < Djinni::Wish

data/lib/rubeepass.rb

@@ -2,6 +2,7 @@ require "cgi"
 require "digest"
 require "openssl"
 require "os"
+require "pathname"
 require "rexml/document"
 require "scoobydoo"
 require "shellwords"
@@ -173,10 +174,28 @@ class RubeePass
         return @db.fuzzy_find(input)
     end
 
-    def initialize(kdbx, password, keyfile = nil)
-        @kdbx = kdbx
-        @keyfile = keyfile
+    def initialize(kdbx, password, keyfile = nil, colorize = false)
+        @colorize = colorize
+        @kdbx = Pathname.new(kdbx).expand_path
+        @keyfile = nil
+        @keyfile = Pathname.new(keyfile).expand_path if (keyfile)
         @password = password
+
+        if (@kdbx.nil?)
+            # TODO
+        elsif (!@kdbx.exist?)
+            raise RubeePass::Error::FileNotFound.new(@kdbx)
+        elsif (!@kdbx.readable?)
+            raise RubeePass::Error::FileNotReadable.new(@kdbx)
+        end
+
+        if (@keyfile)
+            if (!@keyfile.exist?)
+                raise RubeePass::Error::FileNotFound.new(@keyfile)
+            elsif (!@keyfile.readable?)
+                raise RubeePass::Error::FileNotReadable.new(@keyfile)
+            end
+        end
     end
 
     def join_key_and_keyfile
@@ -264,28 +283,26 @@ class RubeePass
         loop do
             # Read block ID
             data = file.read(4)
-            raise Error::InvalidGzipError.new if (data.nil?)
+            raise Error::InvalidGzip.new if (data.nil?)
             id = data.unpack("L*")[0]
-            raise Error::InvalidGzipError.new if (block_id != id)
+            raise Error::InvalidGzip.new if (block_id != id)
 
             block_id += 1
 
             # Read expected hash
             data = file.read(32)
-            raise Error::InvalidGzipError.new if (data.nil?)
+            raise Error::InvalidGzip.new if (data.nil?)
             expected_hash = data
 
             # Read size
             data = file.read(4)
-            raise Error::InvalidGzipError.new if (data.nil?)
+            raise Error::InvalidGzip.new if (data.nil?)
             size = data.unpack("L*")[0]
 
             # Break is size is 0 and expected hash is all 0's
             if (size == 0)
                 expected_hash.each_byte do |byte|
-                    if (byte != 0)
-                        raise Error::InvalidGzipError.new
-                    end
+                    raise Error::InvalidGzip.new if (byte != 0)
                 end
                 break
             end
@@ -296,7 +313,7 @@ class RubeePass
 
             # Check that actual hash is same as expected hash
             if (actual_hash != expected_hash)
-                raise Error::InvalidGzipError.new
+                raise Error::InvalidGzip.new
             end
 
             # Append data
@@ -310,11 +327,11 @@ class RubeePass
     def parse_xml
         doc = REXML::Document.new(@xml)
         if (doc.elements["KeePassFile/Root"].nil?)
-            raise Error::InvalidXMLError.new
+            raise Error::InvalidXML.new
         end
 
         root = doc.elements["KeePassFile/Root"]
-        @db = Group.from_xml(self, nil, root)
+        @db = Group.from_xml(self, nil, root, @colorize)
     end
     private :parse_xml
 
@@ -331,11 +348,11 @@ class RubeePass
                 cipher.update(encrypted) + cipher.final
             )
         rescue OpenSSL::Cipher::CipherError => e
-            raise Error::InvalidPasswordError.new
+            raise Error::InvalidPassword.new
         end
 
         if (data.read(32) != @header[@@STREAM_START_BYTES])
-            raise Error::InvalidPasswordError.new
+            raise Error::InvalidPassword.new
         end
 
         @gzip = parse_gzip(data)
@@ -346,11 +363,11 @@ class RubeePass
         header = Hash.new
         loop do
             data = file.read(1)
-            raise Error::InvalidHeaderError.new if (data.nil?)
+            raise Error::InvalidHeader.new if (data.nil?)
             id = data.unpack("C*")[0]
 
             data = file.read(2)
-            raise Error::InvalidHeaderError.new if (data.nil?)
+            raise Error::InvalidHeader.new if (data.nil?)
             size = data.unpack("S*")[0]
 
             data = file.read(size)
@@ -371,11 +388,11 @@ class RubeePass
             (header[@@MASTER_SEED].length != 32) ||
             (header[@@TRANSFORM_SEED].length != 32)
         )
-            raise Error::InvalidHeaderError.new
+            raise Error::InvalidHeader.new
         elsif (header[@@INNER_RANDOM_STREAM_ID] != irsi)
-            raise Error::NotSalsaError.new
+            raise Error::NotSalsa.new
         elsif (header[@@CIPHER_ID].unpack("H*")[0] != aes)
-            raise Error::NotAESError.new
+            raise Error::NotAES.new
         end
 
         @header = header
@@ -384,24 +401,20 @@ class RubeePass
 
     def read_magic_and_version(file)
         data = file.read(4)
-        raise Error::InvalidMagicError.new if (data.nil?)
+        raise Error::InvalidMagic.new if (data.nil?)
         sig1 = data.unpack("L*")[0]
-        if (sig1 != @@MAGIC_SIG1)
-            raise Error::InvalidMagicError.new
-        end
+        raise Error::InvalidMagic.new if (sig1 != @@MAGIC_SIG1)
 
         data = file.read(4)
-        raise Error::InvalidMagicError.new if (data.nil?)
+        raise Error::InvalidMagic.new if (data.nil?)
         sig2 = data.unpack("L*")[0]
-        if (sig2 != @@MAGIC_SIG2)
-            raise Error::InvalidMagicError.new
-        end
+        raise Error::InvalidMagic.new if (sig2 != @@MAGIC_SIG2)
 
         data = file.read(4)
-        raise Error::InvalidVersionError.new if (data.nil?)
+        raise Error::InvalidVersion.new if (data.nil?)
         ver = data.unpack("L*")[0]
         if ((ver & 0xffff0000) != @@VERSION)
-            raise Error::InvalidVersionError.new if (data.nil?)
+            raise Error::InvalidVersion.new if (data.nil?)
         end
     end
     private :read_magic_and_version

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubeepass
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Miles Whittaker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-18 00:00:00.000000000 Z
+date: 2016-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -19,7 +19,7 @@ dependencies:
         version: '5.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.8.1
+        version: 5.8.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,27 +29,27 @@ dependencies:
         version: '5.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.8.1
+        version: 5.8.4
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.4'
+        version: '10.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 10.4.2
+        version: 10.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.4'
+        version: '10.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 10.4.2
+        version: 10.5.0
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
@@ -79,7 +79,7 @@ dependencies:
         version: '1.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 1.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -89,7 +89,27 @@ dependencies:
         version: '1.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 1.3.3
+- !ruby/object:Gem::Dependency
+  name: json_config
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: os
   requirement: !ruby/object:Gem::Requirement
@@ -139,7 +159,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -149,7 +169,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.1.3
 description: Ruby KeePass 2.x implementation. Currently it is read-only.
 email: mjwhitta@gmail.com
 executables:
@@ -161,16 +181,18 @@ files:
 - lib/rubeepass.rb
 - lib/rubeepass/entry.rb
 - lib/rubeepass/error.rb
-- lib/rubeepass/error/invalid_gzip_error.rb
-- lib/rubeepass/error/invalid_header_error.rb
-- lib/rubeepass/error/invalid_magic_error.rb
-- lib/rubeepass/error/invalid_password_error.rb
-- lib/rubeepass/error/invalid_protected_data_error.rb
-- lib/rubeepass/error/invalid_protected_stream_key_error.rb
-- lib/rubeepass/error/invalid_version_error.rb
-- lib/rubeepass/error/invalid_xml_error.rb
-- lib/rubeepass/error/not_aes_error.rb
-- lib/rubeepass/error/not_salsa20_error.rb
+- lib/rubeepass/error/file_not_found.rb
+- lib/rubeepass/error/file_not_readable.rb
+- lib/rubeepass/error/invalid_gzip.rb
+- lib/rubeepass/error/invalid_header.rb
+- lib/rubeepass/error/invalid_magic.rb
+- lib/rubeepass/error/invalid_password.rb
+- lib/rubeepass/error/invalid_protected_data.rb
+- lib/rubeepass/error/invalid_protected_stream_key.rb
+- lib/rubeepass/error/invalid_version.rb
+- lib/rubeepass/error/invalid_xml.rb
+- lib/rubeepass/error/not_aes.rb
+- lib/rubeepass/error/not_salsa20.rb
 - lib/rubeepass/group.rb
 - lib/rubeepass/protected_decryptor.rb
 - lib/rubeepass/wish/cd_wish.rb