From 52cf5ab541a11f0e8929c5cfb0e8028fcf610d5e Mon Sep 17 00:00:00 2001
From: Francois van der Hoven <francoisvanderhoven@gmail.com>
Date: Wed, 21 Feb 2018 10:04:45 +1000
Subject: [PATCH] Correct namespace errors in metasploit

---
 .gitignore                         |  2 ++
 Gemfile                            |  1 +
 Gemfile.lock                       |  2 ++
 Rakefile                           |  4 +---
 extensions/metasploit/config.yaml  |  4 ++--
 extensions/metasploit/extension.rb | 24 ++++++++++++------------
 extensions/metasploit/rest/msf.rb  |  1 +
 7 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/.gitignore b/.gitignore
index 589b6caa1..b8d65eaeb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -102,3 +102,5 @@ $RECYCLE.BIN/
 # Project-level settings
 /.tgitconfig
 
+test/thirdparty/msf/unit/.byebug_history
+/load
diff --git a/Gemfile b/Gemfile
index 168577ef4..4c04e0004 100644
--- a/Gemfile
+++ b/Gemfile
@@ -102,6 +102,7 @@ if ENV['BEEF_TEST']
   gem 'capybara'
   # RESTful API tests/generic command module tests
   gem 'rest-client', '>= 2.0.1'
+  gem 'byebug'
 end
 end
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 6bb3ceb0c..04db285f3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -8,6 +8,7 @@ GEM
     bundler-audit (0.6.0)
       bundler (~> 1.2)
       thor (~> 0.18)
+    byebug (10.0.0)
     capybara (2.18.0)
       addressable
       mini_mime (>= 0.1.3)
@@ -209,6 +210,7 @@ PLATFORMS
 DEPENDENCIES
   ansi
   bundler-audit
+  byebug
   capybara
   curb
   data_objects
diff --git a/Rakefile b/Rakefile
index 248390365..d1aade0c0 100644
--- a/Rakefile
+++ b/Rakefile
@@ -233,7 +233,7 @@ end
 
 ################################
 # Create CDE Package
-# This will download and make the CDE Executable and 
+# This will download and make the CDE Executable and
 # gnereate a CDE Package in cde-package
 
 task :cde do
@@ -270,5 +270,3 @@ end
 
 
 ################################
-
-
diff --git a/extensions/metasploit/config.yaml b/extensions/metasploit/config.yaml
index d034bf764..a5af4345f 100644
--- a/extensions/metasploit/config.yaml
+++ b/extensions/metasploit/config.yaml
@@ -12,7 +12,7 @@
 #
 # Ensure that the IP address supplied to Metasploit with the 'ServerHost'
 # parameter is the same IP address as specified in beef.extension.metasploit.host
-# 
+#
 # Ensure that the IP address specified in beef.extension.metasploit.callback_host
 # is the publicly accessible IP address for victim connections to Metasploit.
 
@@ -37,7 +37,7 @@ beef:
             # Start msfrpcd automatically with BeEF
             auto_msfrpcd: false
             auto_msfrpcd_timeout: 120
-            msf_path: [ 
+            msf_path: [
               {os: 'osx', path: '/opt/local/msf/'},
               {os: 'livecd', path: '/opt/metasploit-framework/'},
               {os: 'bt5r3', path: '/opt/metasploit/msf3/'},
diff --git a/extensions/metasploit/extension.rb b/extensions/metasploit/extension.rb
index 467559762..7e1bd50e4 100644
--- a/extensions/metasploit/extension.rb
+++ b/extensions/metasploit/extension.rb
@@ -6,7 +6,7 @@
 module BeEF
 module Extension
 module Metasploit
-  
+
   extend BeEF::API::Extension
 
       @short_name = 'msf'
@@ -26,7 +26,7 @@ module Metasploit
 		v['value'] = v['default'] if k != "URIPATH"
         	v['value']  =  BeEF::Core::Configuration.instance.get('beef.extension.metasploit.callback_host') if k == "LHOST"
 
-		
+
             when "bool"
                 v['type'] = 'checkbox'
             when "enum"
@@ -56,16 +56,16 @@ module Metasploit
        defaultPayload = 'generic/shell_bind_tcp' if values.include? 'generic/shell_bind_tcp'
 
        if values.length > 0
-           return { 
-                'name' => 'PAYLOAD', 
-                'type' => 'combobox', 
-                'ui_label' => 'Payload', 
+           return {
+                'name' => 'PAYLOAD',
+                'type' => 'combobox',
+                'ui_label' => 'Payload',
                 'store_type' => 'arraystore',
-                'store_fields' => ['payload'], 
+                'store_fields' => ['payload'],
                 'store_data' => values,
-                'valueField' => 'payload', 
-                'displayField' => 'payload', 
-                'mode' => 'local', 
+                'valueField' => 'payload',
+                'displayField' => 'payload',
+                'mode' => 'local',
                 'autoWidth' => true,
 		'defaultPayload' => defaultPayload,
 		'reloadOnChange' => true
@@ -83,8 +83,8 @@ module Metasploit
        }
        return values
   end
-  
-  
+
+
 end
 end
 end
diff --git a/extensions/metasploit/rest/msf.rb b/extensions/metasploit/rest/msf.rb
index 329d271e3..5030ea2bc 100644
--- a/extensions/metasploit/rest/msf.rb
+++ b/extensions/metasploit/rest/msf.rb
@@ -1,3 +1,4 @@
+require_relative '../../../core/main/router/router.rb'
 #
 # Copyright (c) 2006-2018 Wade Alcorn - wade@bindshell.net
 # Browser Exploitation Framework (BeEF) - http://beefproject.com