fix openssl_heardbleed
-) XMPP Domain now configurable -) Missing get_once to initiate the TLS connectionbug/bundler_fix
parent
5696e52fac
commit
e2b50d3709
|
@ -121,6 +121,12 @@ class Metasploit3 < Msf::Auxiliary
|
||||||
OptEnum.new('STARTTLS', [true, 'Protocol to use with STARTTLS, None to avoid STARTTLS ', 'None', [ 'None', 'SMTP', 'IMAP', 'JABBER', 'POP3' ]]),
|
OptEnum.new('STARTTLS', [true, 'Protocol to use with STARTTLS, None to avoid STARTTLS ', 'None', [ 'None', 'SMTP', 'IMAP', 'JABBER', 'POP3' ]]),
|
||||||
OptEnum.new('TLSVERSION', [true, 'TLS version to use', '1.1', ['1.0', '1.1', '1.2']])
|
OptEnum.new('TLSVERSION', [true, 'TLS version to use', '1.1', ['1.0', '1.1', '1.2']])
|
||||||
], self.class)
|
], self.class)
|
||||||
|
|
||||||
|
register_advanced_options(
|
||||||
|
[
|
||||||
|
OptString.new('XMPPDOMAIN', [ true, 'The XMPP Domain to use when Jabber is selected', 'localhost' ])
|
||||||
|
], self.class)
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def peer
|
def peer
|
||||||
|
@ -173,10 +179,13 @@ class Metasploit3 < Msf::Auxiliary
|
||||||
msg << "<stream:stream xmlns='jabber:client' "
|
msg << "<stream:stream xmlns='jabber:client' "
|
||||||
msg << "xmlns:stream='http://etherx.jabber.org/streams' "
|
msg << "xmlns:stream='http://etherx.jabber.org/streams' "
|
||||||
msg << "version='1.0' "
|
msg << "version='1.0' "
|
||||||
msg << "to='localhost'>"
|
msg << "to='#{datastore['XMPPDOMAIN']}'>"
|
||||||
sock.put(msg)
|
sock.put(msg)
|
||||||
|
# get first response with id
|
||||||
res = sock.get_once
|
res = sock.get_once
|
||||||
return nil if res.nil? # SSL not supported
|
return nil if res.nil? # SSL not supported
|
||||||
|
# get next part of the message
|
||||||
|
res = sock.get_once
|
||||||
return nil if res =~ /stream:error/ || res !~ /starttls/i
|
return nil if res =~ /stream:error/ || res !~ /starttls/i
|
||||||
msg = "<starttls xmlns='urn:ietf:params:xml:ns:xmpp-tls'/>"
|
msg = "<starttls xmlns='urn:ietf:params:xml:ns:xmpp-tls'/>"
|
||||||
sock.put(msg)
|
sock.put(msg)
|
||||||
|
|
Loading…
Reference in New Issue