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

honor the SSL option in HttpServer, fixes #1001 

git-svn-id: file:///home/svn/framework3/trunk@8699 4d416f70-5f16-0410-b530-b9f4589650da
unstable
James Lee 2010-03-03 18:47:04 +00:00
parent fb5906385d
commit 7d348c3593
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/msf/core/exploit/http.rb
View File

@ -361,6 +361,7 @@ module Exploit::Remote::HttpServer
Rex::Proto::Http::Server, Rex::Proto::Http::Server,
opts['ServerPort'].to_i, opts['ServerPort'].to_i,
opts['ServerHost'], opts['ServerHost'],
datastore['SSL'],
{ {
'Msf' => framework, 'Msf' => framework,
'MsfExploit' => self, 'MsfExploit' => self,

4
lib/rex/proto/http/server.rb
View File

@ -99,14 +99,14 @@ class Server
# Initializes an HTTP server as listening on the provided port and # Initializes an HTTP server as listening on the provided port and
# hostname. # hostname.
# #
def initialize(port = 80, listen_host = '0.0.0.0', context = {}) def initialize(port = 80, listen_host = '0.0.0.0', ssl = false, context = {})
self.listen_host = listen_host self.listen_host = listen_host
self.listen_port = port self.listen_port = port
self.context = context self.context = context
self.listener = nil self.listener = nil
self.resources = {} self.resources = {}
self.server_name = DefaultServer self.server_name = DefaultServer
self.ssl = false self.ssl = ssl
end end
# #