From 7681d73e01587bacc5d919a2db439604317b2b9a Mon Sep 17 00:00:00 2001
From: HD Moore <hd_moore@rapid7.com>
Date: Tue, 28 Jul 2015 04:11:17 -0700
Subject: [PATCH] Relocate Webarchive into the Exploit namespace, fixes #5717

---
 lib/msf/core/{ => exploit}/format/webarchive.rb        | 2 ++
 modules/auxiliary/gather/safari_file_url_navigation.rb | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)
 rename lib/msf/core/{ => exploit}/format/webarchive.rb (99%)

diff --git a/lib/msf/core/format/webarchive.rb b/lib/msf/core/exploit/format/webarchive.rb
similarity index 99%
rename from lib/msf/core/format/webarchive.rb
rename to lib/msf/core/exploit/format/webarchive.rb
index 7a8c3e79c9..876be35c17 100644
--- a/lib/msf/core/format/webarchive.rb
+++ b/lib/msf/core/exploit/format/webarchive.rb
@@ -4,6 +4,7 @@
 # installing extensions from extensions.apple.com.
 #
 module Msf
+module Exploit
 module Format
 module Webarchive
 
@@ -363,3 +364,4 @@ function reportStolenCookies() {
 end
 end
 end
+end
diff --git a/modules/auxiliary/gather/safari_file_url_navigation.rb b/modules/auxiliary/gather/safari_file_url_navigation.rb
index c4509baf81..bd2c72c701 100644
--- a/modules/auxiliary/gather/safari_file_url_navigation.rb
+++ b/modules/auxiliary/gather/safari_file_url_navigation.rb
@@ -4,12 +4,12 @@
 ###
 
 require 'msf/core'
-require 'msf/core/format/webarchive'
+require 'msf/core/exploit/format/webarchive'
 
 class Metasploit3 < Msf::Auxiliary
 
   include Msf::Exploit::Remote::FtpServer
-  include Msf::Format::Webarchive
+  include Msf::Exploit::Format::Webarchive
   include Msf::Auxiliary::Report
 
   def initialize(info = {})