From 57c99c4a34661904c7170fdfb783294621aea058 Mon Sep 17 00:00:00 2001 From: erwanlr Date: Sun, 17 Mar 2019 06:59:44 +0000 Subject: [PATCH] Fixes #1313 --- app/controllers/custom_directories.rb | 2 +- lib/wpscan/errors/wordpress.rb | 6 ++++++ spec/app/controllers/custom_directories_spec.rb | 6 +----- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/app/controllers/custom_directories.rb b/app/controllers/custom_directories.rb index 175d0760..04494041 100644 --- a/app/controllers/custom_directories.rb +++ b/app/controllers/custom_directories.rb @@ -16,7 +16,7 @@ module WPScan return if target.content_dir - raise 'Unable to identify the wp-content dir, please supply it with --wp-content-dir' + raise WpContentDirNotDetected end end end diff --git a/lib/wpscan/errors/wordpress.rb b/lib/wpscan/errors/wordpress.rb index 736ec86b..7e2ef5ea 100644 --- a/lib/wpscan/errors/wordpress.rb +++ b/lib/wpscan/errors/wordpress.rb @@ -19,4 +19,10 @@ module WPScan 'The WordPress version is invalid' end end + + class WpContentDirNotDetected < Error + def to_s + 'Unable to identify the wp-content dir, please supply it with --wp-content-dir' + end + end end diff --git a/spec/app/controllers/custom_directories_spec.rb b/spec/app/controllers/custom_directories_spec.rb index 64dc3889..fc3e0f3a 100644 --- a/spec/app/controllers/custom_directories_spec.rb +++ b/spec/app/controllers/custom_directories_spec.rb @@ -22,12 +22,8 @@ describe WPScan::Controller::CustomDirectories do context 'when the content_dir is not found and not supply' do before { expect(controller.target).to receive(:content_dir) } - let(:exception) do - 'Unable to identify the wp-content dir, please supply it with --wp-content-dir' - end - it 'raises an exception' do - expect { controller.before_scan }.to raise_error(exception) + expect { controller.before_scan }.to raise_error(WPScan::WpContentDirNotDetected) end end