infosecn1nja
/
metasploit-framework
mirror of https://github.com/infosecn1nja/metasploit-framework.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tidy code, remove pro support, don't use tempfile, simplify checks

bug/bundler_fix
Brent Cook 2017-05-14 22:41:11 -05:00
parent 97e47be0ed
commit 1892ac0c6c
1 changed files with 28 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
msfupdate
View File

@ -13,20 +13,19 @@ while File.symlink?(msfbase)
msfbase = File.expand_path(File.readlink(msfbase), File.dirname(msfbase))
end
class Msfupdate
attr_reader :stdin
attr_reader :stdout
attr_reader :stderr
def initialize(msfbase_dir, stdin=$stdin, stdout=$stdout, stderr=$stderr)
def initialize(msfbase_dir, stdin = $stdin, stdout = $stdout, stderr = $stderr)
@msfbase_dir = msfbase_dir
@stdin = stdin
@stdout = stdout
@stderr = stderr
end
def usage(io=stdout)
def usage(io = stdout)
help = "usage: msfupdate [options...]\n"
help << "Options:\n"
help << "-h, --help show help\n"
@ -42,14 +41,14 @@ class Msfupdate
# Copy args into ARGV, then restore ARGV after GetoptLong
real_args = ARGV.clone
ARGV.clear
args.each {|arg| ARGV << arg}
args.each { |arg| ARGV << arg }
require 'getoptlong'
opts = GetoptLong.new(
['--help', '-h', GetoptLong::NO_ARGUMENT],
['--git-remote', GetoptLong::REQUIRED_ARGUMENT],
['--git-branch', GetoptLong::REQUIRED_ARGUMENT],
['--offline-file', GetoptLong::REQUIRED_ARGUMENT],
['--offline-file', GetoptLong::REQUIRED_ARGUMENT]
)
begin
@ -67,7 +66,7 @@ class Msfupdate
end
end
rescue GetoptLong::Error
stderr.puts "#{$0}: try 'msfupdate --help' for more information"
stderr.puts "#{$PROGRAM_NAME}: try 'msfupdate --help' for more information"
maybe_wait_and_exit 0x20
end
@ -79,7 +78,7 @@ class Msfupdate
ensure
# Restore the original ARGV value
ARGV.clear
real_args.each {|arg| ARGV << arg}
real_args.each { |arg| ARGV << arg }
end
end
@ -126,7 +125,7 @@ class Msfupdate
stderr.puts ""
# Bail right away, no waiting around for consoles.
if not (Process.uid == 0 or File.stat(@msfbase_dir).owned?)
unless Process.uid.zero? || File.stat(@msfbase_dir).owned?
stderr.puts "[-] ERROR: User running msfupdate does not own the Metasploit installation"
stderr.puts "[-] Please run msfupdate as the same user who installed Metasploit."
maybe_wait_and_exit 0x10
@ -140,7 +139,7 @@ class Msfupdate
elsif apt?
update_apt!
else
raise RuntimeError, "Cannot determine checkout type: `#{@msfbase_dir}'"
raise "Cannot determine checkout type: `#{@msfbase_dir}'"
end
end
end
@ -148,39 +147,23 @@ class Msfupdate
# We could also do this by running `git config --global user.name` and `git config --global user.email`
# and check the output of those. (it's a bit quieter)
def git_globals_okay?
require 'tempfile'
require 'os'
output = ''
# Make it cross platform
if !OS.windows?
conf_out_status = system('git config --list > /dev/null 2>&1') # Just see if it runs or not
else
conf_out_status = system('git config --list > nul 2&>1')
end
if !conf_out_status || conf_out_status.nil?
stderr.puts '[-] ERROR: Failed to check git settings'
begin
output = `git config --list`
rescue Errno::ENOENT
stderr.puts '[-] ERROR: Failed to check git settings, git not found'
return false
end
begin
conf = Tempfile.new('gitconf') # Create a tempfile
path = conf.path
system("git config --list > #{path}") # Write to the tempfile (Pretty sure this command is cross platform)
output >> conf.read
ensure
conf.close
conf.unlink # Delete the temp file
end
if !output.include? 'user.name'
unless output.include? 'user.name'
stderr.puts '[-] ERROR: user.name is not set in your global git configuration'
stderr.puts '[-] Set it by running: \'git config --global user.name "NAME HERE"\''
stderr.puts ''
return false
end
if !output.include? 'user.email'
unless output.include? 'user.email'
stderr.puts '[-] ERROR: user.email is not set in your global git configuration'
stderr.puts '[-] Set it by running: \'git config --global user.email "email@example.com"\''
stderr.puts ''
@ -188,7 +171,6 @@ class Msfupdate
end
true
end
def update_git!
@ -196,7 +178,8 @@ class Msfupdate
stdout.puts "[*] Checking for updates via git"
stdout.puts "[*] Note: Updating from bleeding edge"
out = `git remote show upstream` # Actually need the output for this one.
add_git_upstream unless $?.success? and out =~ %r{(https|git|git@github\.com):(//github\.com/)?(rapid7/metasploit-framework\.git)}
add_git_upstream unless $?.success? &&
out =~ %r{(https|git|git@github\.com):(//github\.com/)?(rapid7/metasploit-framework\.git)}
remote = @git_remote || "upstream"
branch = @git_branch || "master"
@ -214,8 +197,7 @@ class Msfupdate
# Checks user.name and user.email
global_status = git_globals_okay?
maybe_wait_and_exit(1) if !global_status
maybe_wait_and_exit(1) unless global_status
# We shouldn't get here if the globals dont check out
committed = system("git", "diff", "--quiet", "HEAD")
@ -226,7 +208,7 @@ class Msfupdate
stderr.puts "[-] /usr/local/bin instead of running this file directly (e.g.: ./msfupdate)"
stderr.puts "[-] to ensure a proper environment."
maybe_wait_and_exit 1
elsif not committed
elsif !committed
system("git", "stash")
stdout.puts "[*] Stashed local changes to avoid merge conflicts."
stdout.puts "[*] Run `git stash pop` to reapply local changes."
@ -256,7 +238,7 @@ class Msfupdate
product_key = File.expand_path(File.join(@msfbase_dir, "..", "engine", "license", "product.key"))
if File.exist? product_key
if File.readable? product_key
if (@offline_file)
if @offline_file
system("ruby", update_script, @offline_file)
else
system("ruby", update_script)
@ -288,19 +270,13 @@ class Msfupdate
stdout.puts "[*] Note: expect weekly(ish) updates using this method"
system("apt-get", "-qq", "update")
packages = []
packages << 'metasploit-framework' if framework_version = apt_upgrade_available('metasploit-framework')
packages << 'metasploit' if pro_version = apt_upgrade_available('metasploit')
framework_version = apt_upgrade_available('metasploit-framework')
if packages.empty?
if framework_version.blank?
stdout.puts "[*] No updates available"
else
stdout.puts "[*] Updating to version #{pro_version || framework_version}"
system("apt-get", "install", "--assume-yes", *packages)
if packages.include?('metasploit')
start_cmd = File.expand_path(File.join(@msfbase_dir, '..', '..', '..', 'scripts', 'start.sh'))
system(start_cmd) if ::File.executable_real? start_cmd
end
stdout.puts "[*] Updating to version #{framework_version}"
system("apt-get", "install", "--assume-yes", "metasploit-framework")
end
end
@ -315,23 +291,21 @@ class Msfupdate
# 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)
def maybe_wait_and_exit(exit_code = 0)
if @actually_wait
stdout.puts ""
stdout.puts "[*] Please hit enter to exit"
stdout.puts ""
stdin.readline
exit exit_code
else
exit exit_code
end
exit exit_code
end
def apt_upgrade_available(package)
require 'open3'
installed = nil
upgrade = nil
::Open3.popen3({'LANG'=>'en_US.UTF-8'}, "apt-cache", "policy", package) do |stdin, stdout, stderr|
::Open3.popen3({ 'LANG' => 'en_US.UTF-8' }, "apt-cache", "policy", package) do |_stdin, stdout, _stderr|
stdout.each do |line|
installed = $1 if line =~ /Installed: ([\w\-+.:~]+)$/
upgrade = $1 if line =~ /Candidate: ([\w\-+.:~]+)$/