From b3495e9fc5d7fbe49bd6ec6d0286290fcff068df Mon Sep 17 00:00:00 2001
From: Dominik Richter <dominik@vulcanosec.com>
Date: Mon, 22 Jun 2015 16:18:40 +0200
Subject: [PATCH] bugfix: mysql resouce skipping and checking

Signed-off-by: Dominik Richter <dominik@vulcanosec.com>
---
 lib/resources/mysql_conf.rb    | 9 ++++++++-
 lib/resources/mysql_session.rb | 4 ++--
 lib/verify/dummy.rb            | 4 ++--
 lib/verify/specfile.rb         | 4 ++++
 4 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/lib/resources/mysql_conf.rb b/lib/resources/mysql_conf.rb
index 0a00d550d..14e29aaa1 100644
--- a/lib/resources/mysql_conf.rb
+++ b/lib/resources/mysql_conf.rb
@@ -6,6 +6,7 @@ require 'utils/parseconfig'
 
 class MysqlConfEntry
   def initialize( path, params )
+    @runner = Specinfra::Runner
     @params = params
     @path = path
   end
@@ -22,7 +23,7 @@ class MysqlConfEntry
   end
 end
 
-class MysqlConf
+class MysqlConf < Vulcano::Resource
 
   def initialize( conf_path )
     @runner = Specinfra::Runner
@@ -56,7 +57,13 @@ class MysqlConf
     @params = {}
     to_read = [@conf_path]
     while !to_read.empty?
+      if !@runner.check_file_is_file(to_read[0])
+        return skip_resource("Can't find file \"#{to_read[0]}\"")
+      end
       raw_conf = read_file(to_read[0])
+      if raw_conf.empty? && @runner.get_file_size(to_read[0]).stdout.strip.to_i > 0
+        return skip_resource("Can't read file \"#{to_read[0]}\"")
+      end
       @content += raw_conf
 
       params = ParseConfig.new(raw_conf).params
diff --git a/lib/resources/mysql_session.rb b/lib/resources/mysql_session.rb
index 274b25dc8..142c74b1f 100644
--- a/lib/resources/mysql_session.rb
+++ b/lib/resources/mysql_session.rb
@@ -2,13 +2,13 @@
 # copyright: 2015, Dominik Richter
 # license: All rights reserved
 
-class MysqlSession
+class MysqlSession < Vulcano::Resource
   def initialize user, pass
     @user = user
     @pass = pass
     @runner = Specinfra::Runner
     initialize_fallback if user.nil? or pass.nil?
-    skip_resource if @user.nil? or @pass.nil?
+    skip_resource("Can't run MySQL SQL checks without authentication") if @user.nil? or @pass.nil?
   end
 
   def describe(query, db = "", &block)
diff --git a/lib/verify/dummy.rb b/lib/verify/dummy.rb
index 4b57c28db..f0e073b85 100644
--- a/lib/verify/dummy.rb
+++ b/lib/verify/dummy.rb
@@ -53,9 +53,9 @@ class SshConf
 end
 class PostgresConf
   def initialize *args; end
-  def params; {} end
+  def params *a, &b; {} end
 end
 class MysqlConf
   def initialize *args; end
-  def params; {} end
+  def params *a, &b; {} end
 end
\ No newline at end of file
diff --git a/lib/verify/specfile.rb b/lib/verify/specfile.rb
index 6efa852e6..2d15f8381 100644
--- a/lib/verify/specfile.rb
+++ b/lib/verify/specfile.rb
@@ -130,3 +130,7 @@ module Vulcano
 
   end
 end
+
+def os *a, &b
+  {}
+end
\ No newline at end of file