diff --git a/modules/router/bt_home_hub_csrf/command.js b/modules/exploits/router/bt_home_hub_csrf/command.js similarity index 100% rename from modules/router/bt_home_hub_csrf/command.js rename to modules/exploits/router/bt_home_hub_csrf/command.js diff --git a/modules/router/bt_home_hub_csrf/config.yaml b/modules/exploits/router/bt_home_hub_csrf/config.yaml similarity index 95% rename from modules/router/bt_home_hub_csrf/config.yaml rename to modules/exploits/router/bt_home_hub_csrf/config.yaml index 452a6ccf5..022045eb9 100644 --- a/modules/router/bt_home_hub_csrf/config.yaml +++ b/modules/exploits/router/bt_home_hub_csrf/config.yaml @@ -17,7 +17,7 @@ beef: module: bt_home_hub_csrf: enable: true - category: "Router" + category: ["Exploits","Router"] name: "BT Home Hub CSRF" description: "Attempts to enable remote administration and change the tech password on a BT Home Hub wireless router." authors: ["bcoles"] diff --git a/modules/router/bt_home_hub_csrf/module.rb b/modules/exploits/router/bt_home_hub_csrf/module.rb similarity index 100% rename from modules/router/bt_home_hub_csrf/module.rb rename to modules/exploits/router/bt_home_hub_csrf/module.rb diff --git a/modules/router/comtrend_ct5367_csrf/command.js b/modules/exploits/router/comtrend_ct5367_csrf/command.js similarity index 100% rename from modules/router/comtrend_ct5367_csrf/command.js rename to modules/exploits/router/comtrend_ct5367_csrf/command.js diff --git a/modules/router/comtrend_ct5367_csrf/config.yaml b/modules/exploits/router/comtrend_ct5367_csrf/config.yaml similarity index 95% rename from modules/router/comtrend_ct5367_csrf/config.yaml rename to modules/exploits/router/comtrend_ct5367_csrf/config.yaml index a96bcab54..b502288f1 100644 --- a/modules/router/comtrend_ct5367_csrf/config.yaml +++ b/modules/exploits/router/comtrend_ct5367_csrf/config.yaml @@ -17,7 +17,7 @@ beef: module: comtrend_ct5367_csrf: enable: true - category: "Router" + category: ["Exploits","Router"] name: "Comtrend CT-5367 CSRF" description: "Attempts to enable remote administration and change the password on a Comtrend CT-5367 router." authors: ["bcoles"] diff --git a/modules/router/comtrend_ct5367_csrf/module.rb b/modules/exploits/router/comtrend_ct5367_csrf/module.rb similarity index 100% rename from modules/router/comtrend_ct5367_csrf/module.rb rename to modules/exploits/router/comtrend_ct5367_csrf/module.rb diff --git a/modules/router/comtrend_ct5624_csrf/command.js b/modules/exploits/router/comtrend_ct5624_csrf/command.js similarity index 100% rename from modules/router/comtrend_ct5624_csrf/command.js rename to modules/exploits/router/comtrend_ct5624_csrf/command.js diff --git a/modules/router/comtrend_ct5624_csrf/config.yaml b/modules/exploits/router/comtrend_ct5624_csrf/config.yaml similarity index 95% rename from modules/router/comtrend_ct5624_csrf/config.yaml rename to modules/exploits/router/comtrend_ct5624_csrf/config.yaml index 2f0a960dd..fe71d96bf 100644 --- a/modules/router/comtrend_ct5624_csrf/config.yaml +++ b/modules/exploits/router/comtrend_ct5624_csrf/config.yaml @@ -17,7 +17,7 @@ beef: module: comtrend_ct5624_csrf: enable: true - category: "Router" + category: ["Exploits","Router"] name: "Comtrend CT-5624 CSRF" description: "Attempts to enable remote administration and change the password on a Comtrend CT-5624 router." authors: ["bcoles"] diff --git a/modules/router/comtrend_ct5624_csrf/module.rb b/modules/exploits/router/comtrend_ct5624_csrf/module.rb similarity index 100% rename from modules/router/comtrend_ct5624_csrf/module.rb rename to modules/exploits/router/comtrend_ct5624_csrf/module.rb diff --git a/modules/router/dlink_dsl500t_csrf/command.js b/modules/exploits/router/dlink_dsl500t_csrf/command.js similarity index 100% rename from modules/router/dlink_dsl500t_csrf/command.js rename to modules/exploits/router/dlink_dsl500t_csrf/command.js diff --git a/modules/router/dlink_dsl500t_csrf/config.yaml b/modules/exploits/router/dlink_dsl500t_csrf/config.yaml similarity index 95% rename from modules/router/dlink_dsl500t_csrf/config.yaml rename to modules/exploits/router/dlink_dsl500t_csrf/config.yaml index b6d900e26..aab56869a 100644 --- a/modules/router/dlink_dsl500t_csrf/config.yaml +++ b/modules/exploits/router/dlink_dsl500t_csrf/config.yaml @@ -17,7 +17,7 @@ beef: module: dlink_dsl500t_csrf: enable: true - category: "Router" + category: ["Exploits","Router"] name: "D-Link DSL500T CSRF" description: "Attempts to change the password on a D-Link DSL500T router." authors: ["bcoles"] diff --git a/modules/router/dlink_dsl500t_csrf/module.rb b/modules/exploits/router/dlink_dsl500t_csrf/module.rb similarity index 100% rename from modules/router/dlink_dsl500t_csrf/module.rb rename to modules/exploits/router/dlink_dsl500t_csrf/module.rb diff --git a/modules/router/linksys_befsr41_csrf/command.js b/modules/exploits/router/linksys_befsr41_csrf/command.js similarity index 100% rename from modules/router/linksys_befsr41_csrf/command.js rename to modules/exploits/router/linksys_befsr41_csrf/command.js diff --git a/modules/router/linksys_befsr41_csrf/config.yaml b/modules/exploits/router/linksys_befsr41_csrf/config.yaml similarity index 95% rename from modules/router/linksys_befsr41_csrf/config.yaml rename to modules/exploits/router/linksys_befsr41_csrf/config.yaml index 034ea1534..790045b2f 100644 --- a/modules/router/linksys_befsr41_csrf/config.yaml +++ b/modules/exploits/router/linksys_befsr41_csrf/config.yaml @@ -17,7 +17,7 @@ beef: module: linksys_befsr41_csrf: enable: true - category: "Router" + category: ["Exploits","Router"] name: "Linksys BEFSR41 CSRF" description: "Attempts to enable remote administration and change the password on a Linksys BEFSR41 router." authors: ["Martin Barbella"] diff --git a/modules/router/linksys_befsr41_csrf/module.rb b/modules/exploits/router/linksys_befsr41_csrf/module.rb similarity index 100% rename from modules/router/linksys_befsr41_csrf/module.rb rename to modules/exploits/router/linksys_befsr41_csrf/module.rb diff --git a/modules/router/linksys_wrt54g2_csrf/command.js b/modules/exploits/router/linksys_wrt54g2_csrf/command.js similarity index 100% rename from modules/router/linksys_wrt54g2_csrf/command.js rename to modules/exploits/router/linksys_wrt54g2_csrf/command.js diff --git a/modules/router/linksys_wrt54g2_csrf/config.yaml b/modules/exploits/router/linksys_wrt54g2_csrf/config.yaml similarity index 95% rename from modules/router/linksys_wrt54g2_csrf/config.yaml rename to modules/exploits/router/linksys_wrt54g2_csrf/config.yaml index 39708db48..de9c1162d 100644 --- a/modules/router/linksys_wrt54g2_csrf/config.yaml +++ b/modules/exploits/router/linksys_wrt54g2_csrf/config.yaml @@ -17,7 +17,7 @@ beef: module: linksys_wrt54g2_csrf: enable: true - category: "Router" + category: ["Exploits","Router"] name: "Linksys WRT54G2 CSRF" description: "Attempts to enable remote administration and change the password on a Linksys WRT54G2 router." authors: ["Martin Barbella"] diff --git a/modules/router/linksys_wrt54g2_csrf/module.rb b/modules/exploits/router/linksys_wrt54g2_csrf/module.rb similarity index 100% rename from modules/router/linksys_wrt54g2_csrf/module.rb rename to modules/exploits/router/linksys_wrt54g2_csrf/module.rb diff --git a/modules/router/linksys_wrt54g_csrf/command.js b/modules/exploits/router/linksys_wrt54g_csrf/command.js similarity index 100% rename from modules/router/linksys_wrt54g_csrf/command.js rename to modules/exploits/router/linksys_wrt54g_csrf/command.js diff --git a/modules/router/linksys_wrt54g_csrf/config.yaml b/modules/exploits/router/linksys_wrt54g_csrf/config.yaml similarity index 95% rename from modules/router/linksys_wrt54g_csrf/config.yaml rename to modules/exploits/router/linksys_wrt54g_csrf/config.yaml index a9cf1625e..a85f8d5f4 100644 --- a/modules/router/linksys_wrt54g_csrf/config.yaml +++ b/modules/exploits/router/linksys_wrt54g_csrf/config.yaml @@ -17,7 +17,7 @@ beef: module: linksys_wrt54g_csrf: enable: true - category: "Router" + category: ["Exploits","Router"] name: "Linksys WRT54G CSRF" description: "Attempts to enable remote administration and change the password on a Linksys WRT54G router." authors: ["Martin Barbella"] diff --git a/modules/router/linksys_wrt54g_csrf/module.rb b/modules/exploits/router/linksys_wrt54g_csrf/module.rb similarity index 100% rename from modules/router/linksys_wrt54g_csrf/module.rb rename to modules/exploits/router/linksys_wrt54g_csrf/module.rb diff --git a/modules/switch/netgear_gs108t_csrf/command.js b/modules/exploits/switch/netgear_gs108t_csrf/command.js similarity index 100% rename from modules/switch/netgear_gs108t_csrf/command.js rename to modules/exploits/switch/netgear_gs108t_csrf/command.js diff --git a/modules/switch/netgear_gs108t_csrf/config.yaml b/modules/exploits/switch/netgear_gs108t_csrf/config.yaml similarity index 95% rename from modules/switch/netgear_gs108t_csrf/config.yaml rename to modules/exploits/switch/netgear_gs108t_csrf/config.yaml index 0d53426ef..42798a2d3 100644 --- a/modules/switch/netgear_gs108t_csrf/config.yaml +++ b/modules/exploits/switch/netgear_gs108t_csrf/config.yaml @@ -17,7 +17,7 @@ beef: module: Netgear_gs108t_csrf: enable: true - category: "Switch" + category: ["Exploits","Switch"] name: "Netgear GS108T CSRF" description: "Attempts to change the password on a Netgear GS108T managed switch." authors: ["Bart Leppens"] diff --git a/modules/switch/netgear_gs108t_csrf/module.rb b/modules/exploits/switch/netgear_gs108t_csrf/module.rb similarity index 100% rename from modules/switch/netgear_gs108t_csrf/module.rb rename to modules/exploits/switch/netgear_gs108t_csrf/module.rb diff --git a/modules/browser/google_search/command.js b/modules/misc/google_search/command.js similarity index 100% rename from modules/browser/google_search/command.js rename to modules/misc/google_search/command.js diff --git a/modules/browser/google_search/config.yaml b/modules/misc/google_search/config.yaml similarity index 96% rename from modules/browser/google_search/config.yaml rename to modules/misc/google_search/config.yaml index 6160abacf..bc0cc6b8f 100644 --- a/modules/browser/google_search/config.yaml +++ b/modules/misc/google_search/config.yaml @@ -17,7 +17,7 @@ beef: module: google_search: enable: true - category: "Browser" + category: "Misc" name: "Google Search" description: "This module uses the hooked browser to search Google." authors: ["bcoles"] diff --git a/modules/browser/google_search/module.rb b/modules/misc/google_search/module.rb similarity index 100% rename from modules/browser/google_search/module.rb rename to modules/misc/google_search/module.rb diff --git a/modules/misc/clippy/command.js b/modules/social_engineering/clippy/command.js similarity index 99% rename from modules/misc/clippy/command.js rename to modules/social_engineering/clippy/command.js index ebc03f06a..ef8704e4b 100755 --- a/modules/misc/clippy/command.js +++ b/modules/social_engineering/clippy/command.js @@ -340,6 +340,7 @@ Clippy.prototype.hahaha = function() { document.body.appendChild(div); _c.openBubble("<%== @thankyoumessage %>"); setTimeout(function () { _c.killClippy(); }, 5000); + beef.net.send('<%= @command_url %>', <%= @command_id %>, 'result=user has accepted'); } Clippy.prototype.addHelp = function(_help, is_startphrase) { diff --git a/modules/misc/clippy/config.yaml b/modules/social_engineering/clippy/config.yaml similarity index 95% rename from modules/misc/clippy/config.yaml rename to modules/social_engineering/clippy/config.yaml index 89d7861be..12cf0ecfa 100755 --- a/modules/misc/clippy/config.yaml +++ b/modules/social_engineering/clippy/config.yaml @@ -17,7 +17,7 @@ beef: module: clippy: enable: true - category: "Misc" + category: "Social Engineering" name: "Clippy" description: "Brings up a clippy image and asks the user to do stuff." authors: ["vt [nick.freeman@security-assessment.com]", "denden [denis.andzakovic@security-assessment.com]"] diff --git a/modules/misc/clippy/module.rb b/modules/social_engineering/clippy/module.rb similarity index 100% rename from modules/misc/clippy/module.rb rename to modules/social_engineering/clippy/module.rb diff --git a/modules/misc/pretty_theft/command.js b/modules/social_engineering/pretty_theft/command.js similarity index 100% rename from modules/misc/pretty_theft/command.js rename to modules/social_engineering/pretty_theft/command.js diff --git a/modules/misc/pretty_theft/config.yaml b/modules/social_engineering/pretty_theft/config.yaml similarity index 95% rename from modules/misc/pretty_theft/config.yaml rename to modules/social_engineering/pretty_theft/config.yaml index 5fdff7fc6..ac175d6cd 100644 --- a/modules/misc/pretty_theft/config.yaml +++ b/modules/social_engineering/pretty_theft/config.yaml @@ -17,7 +17,7 @@ beef: module: pretty_theft: enable: true - category: "Misc" + category: "Social Engineering" name: "Pretty Theft" description: "Asks the user for their username and password using a tidy floating div." authors: ["vt [nick.freeman@security-assessment.com]", "xntrik"] diff --git a/modules/misc/pretty_theft/module.rb b/modules/social_engineering/pretty_theft/module.rb similarity index 100% rename from modules/misc/pretty_theft/module.rb rename to modules/social_engineering/pretty_theft/module.rb diff --git a/modules/browser/tabnapping/command.js b/modules/social_engineering/tabnabbing/command.js similarity index 100% rename from modules/browser/tabnapping/command.js rename to modules/social_engineering/tabnabbing/command.js diff --git a/modules/browser/tabnapping/config.yaml b/modules/social_engineering/tabnabbing/config.yaml similarity index 95% rename from modules/browser/tabnapping/config.yaml rename to modules/social_engineering/tabnabbing/config.yaml index b2eeeb1d7..0a35fced7 100644 --- a/modules/browser/tabnapping/config.yaml +++ b/modules/social_engineering/tabnabbing/config.yaml @@ -17,7 +17,7 @@ beef: module: tabnabbing: enable: true - category: "Browser" + category: "Social Engineering" name: "TabNabbing" description: "This module redirects to the specified URL after the tab has been inactive for a specified amount of time." authors: ["bcoles"] diff --git a/modules/browser/tabnapping/module.rb b/modules/social_engineering/tabnabbing/module.rb similarity index 100% rename from modules/browser/tabnapping/module.rb rename to modules/social_engineering/tabnabbing/module.rb