From 39ecc19546dbb8b828fe5ea63e4f95a1dc34b36d Mon Sep 17 00:00:00 2001 From: Tod Beardsley Date: Mon, 17 Oct 2011 21:41:22 +0000 Subject: [PATCH] Give a warning about an unreadable db config file. git-svn-id: file:///home/svn/framework3/trunk@13982 4d416f70-5f16-0410-b530-b9f4589650da --- lib/msf/ui/console/driver.rb | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/lib/msf/ui/console/driver.rb b/lib/msf/ui/console/driver.rb index e72032f34a..5f81eb5149 100644 --- a/lib/msf/ui/console/driver.rb +++ b/lib/msf/ui/console/driver.rb @@ -175,11 +175,14 @@ class Driver < Msf::Ui::Driver dbfile = opts['DatabaseYAML'] dbfile ||= ENV["MSF_DATABASE_CONFIG"] dbfile ||= File.join(Msf::Config.get_config_root, "database.yml") - if (dbfile and File.readable? dbfile) - dbinfo = YAML.load(File.read(dbfile)) - dbenv = opts['DatabaseEnv'] || "production" - db = dbinfo[dbenv] - + if (dbfile and File.exists? dbfile) + if File.readable?(dbfile) + dbinfo = YAML.load(File.read(dbfile)) + dbenv = opts['DatabaseEnv'] || "production" + db = dbinfo[dbenv] + else + print_error("Warning, #{dbfile} is not readable. Try running as root or chmod.") + end if not db print_error("No database definition for environment #{dbenv}") else