command modules re-organised and re-named

git-svn-id: https://beef.googlecode.com/svn/trunk@1292 b87d56ec-f9c0-11de-8c8a-61c5e9addfc9

modules/browser/alert_dialog/config.yaml

@@ -17,9 +17,9 @@ beef:
     module:
         alert_dialog:
             enable: true
-            category: "Misc"
-            name: "Alert Dialog"
+            category: "Browser"
+            name: "Create Alert Dialog"
             description: "Sends an alert dialog to the hooked browser."
-            authors: ["bm"]
+            authors: ["wade", "bm"]
             target:
                 user_notify: ["All"]

modules/browser/browser_fingerprinting/config.yaml

@@ -17,8 +17,8 @@ beef:
     module:
         browser_fingerprinting:
             enable: true
-            category: "Recon"
-            name: "Browser Fingerprinting"
+            category: "Browser"
+            name: "Fingerprint Browser"
             description: "This module attempts to fingerprint the browser type and version using URI handlers unique to Internet Explorer and Mozilla Firefox. This method does not rely on JavaScript objects which may have been modified by the user or browser compatibility mode."
             authors: ["bcoles"]
             target:

modules/browser/collect_links/config.yaml

@@ -17,8 +17,8 @@ beef:
     module:
         collect_links:
             enable: true
-            category: "Recon"
-            name: "Collect Links"
+            category: "Browser"
+            name: "Get Page HREFs"
             description: "This module will retrieve HREFs from the target page."
             authors: ["vo"]
             target:

modules/browser/deface_web_page/config.yaml

@@ -17,8 +17,8 @@ beef:
     module:
         deface_web_page:
             enable: true
-            category: "Misc"
-            name: "Deface Web Page"
+            category: "Browser"
+            name: "Replace Content (Deface)"
             description: "Overwrite the body of the page the hooked browser is on with the 'Deface Content' string."
             authors: ["antisnatchor"]
             target:

modules/browser/detect_visited_urls/config.yaml

@@ -18,7 +18,7 @@ beef:
         detect_visited_urls:
             enable: true
             category: "Browser"
-            name: "Detect Visited URLs"
+            name: "Get Visited URLs"
             description: "This module will detect whether or not the hooked browser has visited the specified URL(s)"
             authors: ["passbe"]
             target:

modules/browser/extract_local_storage/config.yaml

@@ -17,8 +17,8 @@ beef:
     module:
         extract_local_storage:
             enable: true
-            category: "Misc"
-            name: "Extract Local Storage"
+            category: "Browser"
+            name: "Get Local Storage"
             description: "Extracts data from the HTML5 localStorage object."
             authors: ["bcoles"]
             target:

modules/browser/link_rewrite/config.yaml

@@ -18,7 +18,7 @@ beef:
         link_rewrite:
             enable: true
             category: "Browser"
-            name: "Link Rewriter"
+            name: "Replace HREFs"
             description: "This module will rewrite all the href attributes of all matched links.<br /><br />The jQuery selector field can be used to limit the selection of links. eg: a[href=\"http://www.bindshell.net\"]. For more information please see: http://api.jquery.com/category/selectors/"
             authors: ["passbe"]
             target:

modules/browser/prompt_dialog/config.yaml

@@ -17,9 +17,9 @@ beef:
     module:
         prompt_dialog:
             enable: true
-            category: "Misc"
-            name: "Prompt Dialog"
+            category: "Browser"
+            name: "Create Prompt Dialog"
             description: "Sends a prompt dialog to the hooked browser."
-            authors: ["bm"]
+            authors: ["wade", "bm"]
             target:
                 user_notify: ['ALL']

modules/browser/replace_video/config.yaml

@@ -17,8 +17,8 @@ beef:
     module:
         replace_video:
             enable: true
-            category: "Misc"
-            name: "Replace Video"
+            category: "Browser"
+            name: "Replace Videos"
             description: "Replaces an object selected with jQuery (all embed tags by default) with an embed tag containing the youtube video of your choice (rickroll by default)."
             authors: ["Yori Kvitchko", "antisnatchor"]
             target:

modules/browser/rickroll/config.yaml

@@ -17,8 +17,8 @@ beef:
     module:
         rickroll:
             enable: true
-            category: "Misc"
-            name: "Rickroll"
+            category: "Browser"
+            name: "Redirect Browser (Rickroll)"
             description: "Overwrite the body of the page the victim is on with a full screen Rickroll."
             authors: ["Yori Kvitchko"]
             target:

modules/browser/site_redirect/config.yaml

@@ -18,7 +18,7 @@ beef:
         site_redirect:
             enable: true
             category: "Browser"
-            name: "Site Redirect"
+            name: "Redirect Browser"
             description: "This module will redirect the selected hooked browser to the address specified in the 'Redirect URL' input."
             authors: ["wade", "vo"]
             target:

modules/browser/site_redirect_iframe/config.yaml

@@ -18,7 +18,7 @@ beef:
         site_redirect_iframe:
             enable: true
             category: "Browser"
-            name: "Site Redirect (iframe)"
+            name: "Redirect Browser (iFrame)"
             description: "This module creates a 100% x 100% overlaying iframe and keeps the browers hooked to the framework. The content of the iframe, page title and the time delay are specified in the parameters below.<br><br>The content of the URL bar will not be changed in the hooked browser."
             authors: ["ethicalhack3r", "Yori Kvitchko"]
             target:

modules/exploits/coldfusion_dir_traversal_exploit/config.yaml

@@ -17,7 +17,7 @@ beef:
     module:
         coldfusion_dir_traversal_exploit:
             enable: true
-            category: "Network"
+            category: "Exploits"
             name: "ColdFusion Directory Traversal Exploit"
             description: "ColdFusion 9.0, 8.0.1, 9.0 and 9.0.1 are vulnerable to directory traversal that leads to arbitrary file retrieval from the ColdFusion server (CVE-2010-2861)"
             authors: ["antisnatchor"]

modules/exploits/jboss_jmx_upload_exploit/config.yaml

@@ -17,7 +17,7 @@ beef:
     module:
         jboss_jmx_upload_exploit:
             enable: true
-            category: "Network"
+            category: "Exploits"
             name: "Jboss 6.0.0M1 JMX Deploy Exploit"
             description: "Deploy a JSP reverse or bind shell (Metasploit one) using the JMX exposed deploymentFileRepository MBean of JBoss. The first request made is a HEAD one to bypass auth and deploy the malicious JSP, the second request is a GET one that triggers the reverse connection to the specified MSF listener.<br>Remember to run the MSF multi/hanlder listener with java/jsp_shell_reverse_tcp as payload, in case you are using the reverse payload."
             authors: ["antisnatchor", "l33tb0y"]

modules/exploits/vtiger_crm_upload_exploit/config.yaml

@@ -17,7 +17,7 @@ beef:
     module:
         vtiger_crm_upload_exploit:
             enable: true
-            category: "Network"
+            category: "Exploits"
             name: "VTiger CRM Upload Exploit"
             description: "This module demonstrates chained exploitation. It will upload and execute a reverse bindshell. The vulnerability is exploited in the CRM <a href=\"http://www.vtiger.com/\">vtiger 5.0.4</a><br />The default PHP requires a listener, so don't forget to start one, for example: nc -l 8888."
             authors: ["wade", "bm", "pipes", "xntrik", "yorikv"]

modules/host/clipboard_theft/config.yaml

@@ -17,8 +17,8 @@ beef:
     module:
         clipboard_theft:
             enable: true
-            category: "Misc"
-            name: "Clipboard Theft"
+            category: "Host"
+            name: "Get Clipboard"
             description: "Retrieves the clipboard contents. This module will work automatically with Internet Explorer 6.x however Internet Explorer 7.x will prompt the user and ask for permission to access the clipboard."
             authors: ["bcoles"]
             target:

modules/host/detect_local_settings/config.yaml

@@ -17,8 +17,8 @@ beef:
     module:
         detect_local_settings:
             enable: true
-            category: "Network"
-            name: "Detect Local Settings"
+            category: "Host"
+            name: "Get Network Settings"
             description: "Grab the local network settings (ie internal ip address)."
             authors: ["pdp", "wade", "bm", "xntrik"]
             target:

modules/host/hook_default/config.yaml

@@ -17,7 +17,7 @@ beef:
     module:
         hook_ie:
             enable: true
-            category: "Browser"
+            category: "Host"
             name: "Hook Default Browser"
             description: "This module will use a PDF to attempt to hook the default browser (assuming it isn't currently hooked). <br><br>Normally, this will be IE but it will also work when Chrome is set to the default. When executed, the hooked browser will load a PDF and use that to start the default browser. If successful another browser will appear in the browser tree."
             authors: ["saafan"]

modules/host/insecure_url_skype/config.yaml

@@ -18,7 +18,7 @@ beef:
         insecure_url_skype:
             enable: true
             category: "Host"
-            name: "Skype Call"
+            name: "Make Skype Call (Skype)"
             description: "This module will force the browser to attempt a skype call. It will exploit the insecure handling of URL schemes<br><br>The protocol handler used will be: skype."
             authors: ["xntrik", "Nitesh Dhanjani"]
             target:

modules/host/iphone_tel/config.yaml

@@ -18,7 +18,7 @@ beef:
         iphone_tel:
             enable: true
             category: "Host"
-            name: "iPhone Telephone URL"
+            name: "Make Skype Call (Tel)"
             description: "This module will force the browser to attempt a skype call. It will exploit the insecure handling of URL schemes in iOS.<br><br>The protocol handler used will be: tel"
             authors: ["xntrik", "Nitesh Dhanjani"]
             target:

modules/host/physical_location/config.yaml

@@ -18,7 +18,7 @@ beef:
         physical_location:
             enable: true
             category: "Host"
-            name: "Physical Location"
+            name: "Get Geolocation"
             description: "This module will retrieve the physical location of the hooked browser using the geolocation API."
             authors: ["antisnatchor"]
             target:

modules/misc/iframe_keylogger/config.yaml

@@ -17,7 +17,7 @@ beef:
     module:
         iframe_keylogger:
             enable: true
-            category: "Persistence"
+            category: "Misc"
             name: "iFrame Event Logger"
             description: "Creates a 100% by 100% iFrame overlay with event logging. The content of the overlay is set in the 'iFrame Src' option."
             authors: ["antisnatchor"]

modules/network/detect_soc_nets/config.yaml

@@ -17,7 +17,7 @@ beef:
     module:
         detect_soc_nets:
             enable: true
-            category: "Recon"
+            category: "Network"
             name: "Detect Social Networks"
             description: "This module will detect if the Hooked Browser is currently authenticated to GMail, Facebook and Twitter."
             authors: ["xntrik", "Mike Cardwell"]

modules/network/detect_tor/config.yaml

@@ -17,7 +17,7 @@ beef:
     module:
         detect_tor:
             enable: true
-            category: "Recon"
+            category: "Network"
             name: "Detect Tor" 
             description: "This module will detect if the zombie is currently using Tor (https://www.torproject.org/)."
             authors: ["wade", "pdp", "bm", "xntrik"]

modules/network/internal_network_fingerprinting/config.yaml

@@ -17,8 +17,8 @@ beef:
     module:
         internal_network_fingerprinting:
             enable: true
-            category: "Recon"
-            name: "Network Fingerprinting"
+            category: "Network"
+            name: "Fingerprint Network"
             description: "Discover devices and applications in the network of the victim using signatures like default logo images/favicons (partially based on the Yokoso idea)."
             authors: ["bcoles@gmail.com", "wade", "antisnatchor"]
             target:

modules/network/ping_sweep/config.yaml

@@ -17,7 +17,7 @@ beef:
     module:
         ping_sweep:
             enable: true
-            category: "Recon"
+            category: "Network"
             name: "Ping Sweep"
             description: "Discover active hosts in the internal network of the hooked browser. It works calling a Java method from JavaScript and do not require user interaction."
             authors: ["jgaliana"]

modules/persistence/iframe_above/config.yaml

@@ -18,7 +18,7 @@ beef:
         iframe_above:
             enable: true
             category: "Persistence"
-            name: "iFrame Persistance"
+            name: "Create Forground iFrame"
             description: "Rewrites all links on the webpage to spawn a 100% by 100% iFrame with a source relative to the selected link."
             authors: ["passbe"]
             target:

modules/persistence/popunder_window/config.yaml

@@ -18,7 +18,7 @@ beef:
         popunder_window:
             enable: true
             category: "Persistence"
-            name: "Pop Under Window"
+            name: "Create Pop Under"
             description: "Creates a new discrete pop under window with the beef hook included.<br><br>This module will add another browser node to the tree. It will be a duplicate. This will be addressed in a future release"
             authors: ["ethicalhack3r"]
             target: