From d02108ece228d1b6d5e1468ac525c6886109d49c Mon Sep 17 00:00:00 2001 From: erwanlr Date: Tue, 12 Nov 2013 11:07:35 +0000 Subject: [PATCH 1/3] Better Detection of Kali Linux --- lib/common/common_helper.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/common/common_helper.rb b/lib/common/common_helper.rb index 1b32e51a..1d1d59c8 100644 --- a/lib/common/common_helper.rb +++ b/lib/common/common_helper.rb @@ -40,7 +40,11 @@ $LOAD_PATH.unshift(WPSCAN_LIB_DIR) $LOAD_PATH.unshift(MODELS_LIB_DIR) def kali_linux? - %x{uname -a} =~ /kali/i + begin + File.readlines("/etc/debian_version").grep(/^kali/i).any? + rescue + false + end end require 'environment' From 65cf4a033658454bb8e5dbad6ccd41005439e761 Mon Sep 17 00:00:00 2001 From: erwanlr Date: Tue, 12 Nov 2013 21:31:35 +0000 Subject: [PATCH 2/3] v2.2 release date added to changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4b0161ea..d6ecfc66 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ # Changelog ## Version 2.2 -Released: yyyy-m-d +Released: 2013-11-12 Added * Output the vulnerability fix if available From 16c7edb0f1812c9b05f8892121557b2a2753e9c8 Mon Sep 17 00:00:00 2001 From: erwanlr Date: Tue, 12 Nov 2013 22:38:19 +0100 Subject: [PATCH 3/3] Forgot to bump the version :x --- lib/common/common_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/common/common_helper.rb b/lib/common/common_helper.rb index 1d1d59c8..882e171b 100644 --- a/lib/common/common_helper.rb +++ b/lib/common/common_helper.rb @@ -33,7 +33,7 @@ VULNS_XSD = DATA_DIR + '/vuln.xsd' WP_VERSIONS_XSD = DATA_DIR + '/wp_versions.xsd' LOCAL_FILES_XSD = DATA_DIR + '/local_vulnerable_files.xsd' -WPSCAN_VERSION = '2.1' +WPSCAN_VERSION = '2.2' $LOAD_PATH.unshift(LIB_DIR) $LOAD_PATH.unshift(WPSCAN_LIB_DIR)