Skip to content

Commit 1f452aa

Browse files
committed
Code cleanup
Changes requested by wvu-R7
1 parent 9e22856 commit 1f452aa

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

modules/auxiliary/scanner/ssl/openssl_heartbleed.rb

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -203,26 +203,26 @@ def jabber_connect_msg(hostname)
203203
end
204204

205205
def tls_jabber
206-
sock.put( jabber_connect_msg(datastore['XMPPDOMAIN']) )
206+
sock.put(jabber_connect_msg(datastore['XMPPDOMAIN']))
207207
res = sock.get
208-
if res && res =~ /host-unknown/
208+
if res && res.include?('host-unknown')
209209
jabber_host = res.match(/ from='([\w.]*)' /)
210210
if jabber_host && jabber_host[1]
211211
disconnect
212212
connect
213213
vprint_status("#{peer} - Connecting with autodetected remote XMPP hostname: #{jabber_host[1]}...")
214-
sock.put( jabber_connect_msg(jabber_host[1]) )
214+
sock.put(jabber_connect_msg(jabber_host[1]))
215215
res = sock.get
216216
end
217217
end
218-
if res.nil? || res =~ /stream:error/ || res !~ /<starttls xmlns=['"]urn:ietf:params:xml:ns:xmpp-tls['"]/
219-
vprint_error("#{peer} - Jabber host unknown. Please try changing the XMPPDOMAIN option.") if res && res =~ /<host-unknown/
218+
if res.nil? || res.include?('stream:error') || res !~ /<starttls xmlns=['"]urn:ietf:params:xml:ns:xmpp-tls['"]/
219+
vprint_error("#{peer} - Jabber host unknown. Please try changing the XMPPDOMAIN option.") if res && res.include?('host-unknown')
220220
return nil
221221
end
222222
msg = "<starttls xmlns='urn:ietf:params:xml:ns:xmpp-tls'/>"
223223
sock.put(msg)
224224
res = sock.get
225-
return nil if res.nil? || res !~ /<proceed/
225+
return nil if res.nil? || !res.include?('<proceed')
226226
res
227227
end
228228

0 commit comments

Comments
 (0)