From c322b91a830d871791ce136892a49e520a8aab8c Mon Sep 17 00:00:00 2001 From: Tod Beardsley Date: Thu, 14 Mar 2013 15:21:33 -0500 Subject: [PATCH 1/2] Fully deprecates msfupdate over SVN Once this lands, SVN users will no longer be able to update over SVN. --- msfconsole | 15 ++++++++------- msfupdate | 13 ++++++++----- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/msfconsole b/msfconsole index 486f4155cd..211b455af5 100755 --- a/msfconsole +++ b/msfconsole @@ -36,13 +36,14 @@ end def print_deprecation_warning $stdout.puts "" - $stdout.puts "[*] Deprecation Note: After 2013-03-15 (March 15, 2013), Metasploit" - $stdout.puts "[*] source checkouts will NO LONGER update over SVN, but will be using" - $stdout.puts "[*] GitHub exclusively. You should either download a new Metasploit" - $stdout.puts "[*] installer, or use a git clone of Metasploit Framework before" - $stdout.puts "[*] then. You will also need outbound access to github.com on" - $stdout.puts "[*] TCP port 9418 (git), 22 (ssh) or 443 (https), depending on the" - $stdout.puts "[*] protocol used to clone Metasploit Framework (usually, git protocol)." + $stdout.puts "[-] Deprecation Note: Metasploit source checkouts NO LONGER update" + $stdout.puts "[-] over SVN. You will need to reinstall Metasploit using" + $stdout.puts "[-] binary installers (from http://www.metasploit.com/download )," + $stdout.puts "[-] Debian packages (currently only supported on Kali Linux), or" + $stdout.puts "[-] a development source checkout from GitHub (see http://r-7.co/ZLhA8P )" + $stdout.puts "[-] " + $stdout.puts "[-] For more on msfupdate and migrating off of SVN, see http://r-7.co/MSF-UP" + $stdout.puts "" end if is_svn diff --git a/msfupdate b/msfupdate index d32010e5fb..1b13f91adb 100755 --- a/msfupdate +++ b/msfupdate @@ -58,12 +58,15 @@ end def print_deprecation_warning $stdout.puts "" - $stdout.puts "[*] Deprecation Note: After 2013-02-28 (February 28, 2013), Metasploit" - $stdout.puts "[*] source checkouts will NO LONGER update over SVN, but will be using" - $stdout.puts "[*] GitHub exclusively. You should either download a new Metasploit" - $stdout.puts "[*] installer, or use a git clone of Metasploit Framework before" - $stdout.puts "[*] then. You will also need outbound access to github.com:9418/TCP." + $stdout.puts "[-] Deprecation Note: Metasploit source checkouts NO LONGER update" + $stdout.puts "[-] over SVN. You will need to reinstall Metasploit using" + $stdout.puts "[-] binary installers (from http://www.metasploit.com/download )," + $stdout.puts "[-] Debian packages (currently only supported on Kali Linux), or" + $stdout.puts "[-] a development source checkout from GitHub (see http://r-7.co/ZLhA8P )" + $stdout.puts "[-] " + $stdout.puts "[-] For more on msfupdate and migrating off of SVN, see http://r-7.co/MSF-UP" $stdout.puts "" + maybe_wait_and_exit 0x11 end def maybe_wait_and_exit(exit_code=0) From debae8a944fc23bdf95aedab47686c1c728c6f4b Mon Sep 17 00:00:00 2001 From: Tod Beardsley Date: Tue, 26 Mar 2013 14:32:21 -0500 Subject: [PATCH 2/2] Always exit with status 11 when SVN --- msfupdate | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/msfupdate b/msfupdate index 1b13f91adb..d702eb718b 100755 --- a/msfupdate +++ b/msfupdate @@ -66,9 +66,10 @@ def print_deprecation_warning $stdout.puts "[-] " $stdout.puts "[-] For more on msfupdate and migrating off of SVN, see http://r-7.co/MSF-UP" $stdout.puts "" - maybe_wait_and_exit 0x11 end +# This only exits if you actually pass a wait option, otherwise +# just returns nil. This is likely unexpected, revisit this. def maybe_wait_and_exit(exit_code=0) if @actually_wait $stdout.puts "" @@ -132,7 +133,13 @@ end ####### Since we're SVN, do it all this way ####### if is_svn + # We're fully deprecated now, so just exit. + # Leaving in the commented code in case someone wants to + # get a last-chance at msfupdate before the SVN server goes + # off line, which will be ANY DAY NOW. Seriously. print_deprecation_warning + $stdin.readline if @actually_wait + exit(0x11) # Comment this to get old functionality back. @args.push("--config-dir=#{@configdir}") @args.push("--non-interactive")