Fixes #6689 by moving to 7za which is included in the installer
parent
90a7458b56
commit
86a1a58d2c
|
@ -75,7 +75,8 @@ class Metasploit3 < Msf::Exploit::Remote
|
|||
end
|
||||
|
||||
def check_dependencies
|
||||
return if Rex::FileUtils::find_full_path('zip')
|
||||
@zip = (Rex::FileUtils::find_full_path('7za') || Rex::FileUtils::find_full_path('7za.exe'))
|
||||
return if @zip
|
||||
raise RuntimeError, "This exploit requires the zip command to be installed in your path"
|
||||
end
|
||||
|
||||
|
@ -109,7 +110,7 @@ class Metasploit3 < Msf::Exploit::Remote
|
|||
fd.close
|
||||
|
||||
FileUtils.chmod(0755, tmov)
|
||||
system('zip', tdir+'.zip', tmov, '__MACOSX/._'+tmov)
|
||||
system(@zip, "a", tdir+'.zip', tmov, '__MACOSX/._'+tmov)
|
||||
|
||||
fd = File.new(tdir+'.zip')
|
||||
data = fd.read(fd.stat.size)
|
||||
|
|
Loading…
Reference in New Issue