Refactored jboss mixin and modules

Moved VERB option to the mixin. Replaced "if datastore['VERBOSE']"
by vprint_status().

lib/msf/http/jboss.rb

@@ -15,7 +15,8 @@ module Msf
         super
         register_options(
           [
-            OptString.new('TARGETURI', [ true,  'The URI path of the JMX console', '/jmx-console'])
+            OptString.new('TARGETURI', [ true,  'The URI path of the JMX console', '/jmx-console']),
+            OptEnum.new('VERB', [true, 'HTTP Method to use (for CVE-2010-0738)', 'POST', ['GET', 'POST', 'HEAD']])
           ], self.class)
       end
     end

lib/msf/http/jboss/base.rb

@@ -1,7 +1,7 @@
 # -*- coding: binary -*-
 module Msf::HTTP::JBoss::Base
   def call_uri_mtimes(uri, num_attempts = 5, verb = nil, data = nil)
-    verb = datastore['VERB'] if verb.nil?
+    verb = datastore['VERB'] if verb.nil? 
 
     # JBoss might need some time for the deployment. Try 5 times at most and
     # wait 5 seconds inbetween tries
@@ -30,13 +30,13 @@ module Msf::HTTP::JBoss::Base
       elsif (res.code < 200 or res.code >= 300)
         msg = "http request failed to #{uri} [#{res.code}]"
       elsif (res.code == 200)
-        print_status("Successfully called '#{uri}'") if datastore['VERBOSE']
+        vprint_status("Successfully called '#{uri}'")
         return res
       end
 
       if (attempt < num_attempts - 1)
         msg << ", retrying in 5 seconds..."
-        print_status(msg) if datastore['VERBOSE']
+        vprint_status(msg)
         select(nil, nil, nil, 5)
       else
         print_error(msg)

lib/msf/http/jboss/bsh.rb

@@ -66,7 +66,7 @@ module Msf::HTTP::JBoss::BSH
   }
 %>
 EOT
-		encoded_stager_code = Rex::Text.encode_base64(stager_jsp).gsub(/\n/, '')
+    encoded_stager_code = Rex::Text.encode_base64(stager_jsp).gsub(/\n/, '')
 
     jsp_file_var = Rex::Text.rand_text_alpha(8+rand(8))
     fstream_var = Rex::Text.rand_text_alpha(8+rand(8))

modules/auxiliary/admin/http/jboss_bshdeployer.rb

@@ -38,12 +38,10 @@ class Metasploit3 < Msf::Auxiliary
       [
         Opt::RPORT(8080),
         OptString.new('APPBASE',    [ true,  'Application base name']),
-        OptString.new('STAGERNAME', [ false, 'Only used if VERB is not POST (default: "stager"', 'stager']),
-        OptString.new('PACKAGE',    [ true,  'The package containing the BSHDeployer service', 'auto' ]),
+        OptString.new('STAGERNAME', [ false, 'Only used if VERB is not POST (default: "stager")', 'stager']),
         OptString.new('WARFILE',    [ true,  'The WAR file to deploy']),
-        OptBool.new('DEPLOY',       [ true,  'Deploy: true. Undeploy: false', true]),
         OptString.new('PACKAGE',    [ true,  'The package containing the BSHDeployer service', 'auto' ]),
-        OptEnum.new('VERB', [true, 'HTTP Method to use (for CVE-2010-0738)', 'POST', ['GET', 'POST', 'HEAD']])
+        OptBool.new('DEPLOY',       [ true,  'Deploy: true. Undeploy: false', true]),
       ], self.class)
   end
 

modules/exploits/multi/http/jboss_bshdeployer.rb

@@ -82,10 +82,9 @@ class Metasploit3 < Msf::Exploit::Remote
     register_options(
       [
         Opt::RPORT(8080),
-        OptString.new('JSP',	   [ false, 'JSP name to use without .jsp extension (default: random)', nil ]),
-        OptString.new('APPBASE',	[ false, 'Application base name, (default: random)', nil ]),
+        OptString.new('JSP',	     [ false, 'JSP name to use without .jsp extension (default: random)', nil ]),
+        OptString.new('APPBASE',	 [ false, 'Application base name, (default: random)', nil ]),
         OptString.new('PACKAGE',   [ true,  'The package containing the BSHDeployer service', 'auto' ]),
-        OptEnum.new('VERB', [true, 'HTTP Method to use (for CVE-2010-0738)', 'POST', ['GET', 'POST', 'HEAD']])
       ], self.class)
   end