From 3db143c4522086cab20ac98a9dbe887c35dc1a88 Mon Sep 17 00:00:00 2001 From: Joe Vennix Date: Mon, 13 Jan 2014 13:07:55 -0600 Subject: [PATCH] Remove explicit requires for FF payload. Adds ff payload require to msf/core/payload.rb --- lib/msf/core/payload.rb | 1 + modules/payloads/singles/firefox/exec.rb | 1 - modules/payloads/singles/firefox/shell_bind_tcp.rb | 1 - modules/payloads/singles/firefox/shell_reverse_tcp.rb | 1 - 4 files changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/msf/core/payload.rb b/lib/msf/core/payload.rb index f3e981db47..37663df261 100644 --- a/lib/msf/core/payload.rb +++ b/lib/msf/core/payload.rb @@ -29,6 +29,7 @@ class Payload < Msf::Module require 'msf/core/payload/netware' require 'msf/core/payload/java' require 'msf/core/payload/dalvik' + require 'msf/core/payload/firefox' ## # diff --git a/modules/payloads/singles/firefox/exec.rb b/modules/payloads/singles/firefox/exec.rb index f78939b46c..d5617d6eff 100644 --- a/modules/payloads/singles/firefox/exec.rb +++ b/modules/payloads/singles/firefox/exec.rb @@ -4,7 +4,6 @@ ## require 'msf/core' -require 'msf/core/payload/firefox' module Metasploit3 diff --git a/modules/payloads/singles/firefox/shell_bind_tcp.rb b/modules/payloads/singles/firefox/shell_bind_tcp.rb index a333381bed..a6d5efc12f 100644 --- a/modules/payloads/singles/firefox/shell_bind_tcp.rb +++ b/modules/payloads/singles/firefox/shell_bind_tcp.rb @@ -5,7 +5,6 @@ require 'msf/core' require 'msf/core/handler/bind_tcp' -require 'msf/core/payload/firefox' require 'msf/base/sessions/command_shell' module Metasploit3 diff --git a/modules/payloads/singles/firefox/shell_reverse_tcp.rb b/modules/payloads/singles/firefox/shell_reverse_tcp.rb index 2604fc9beb..8e1437954e 100644 --- a/modules/payloads/singles/firefox/shell_reverse_tcp.rb +++ b/modules/payloads/singles/firefox/shell_reverse_tcp.rb @@ -5,7 +5,6 @@ require 'msf/core' require 'msf/core/handler/reverse_tcp' -require 'msf/core/payload/firefox' require 'msf/base/sessions/command_shell' module Metasploit3