Fixed code issues as requested in PR2801

Mostly coding style issues
Re-tested in testbed - output as expected
bug/bundler_fix
kicks4kittens 2014-01-15 13:54:25 +01:00
parent d0d82fe405
commit b2f42d2576
1 changed files with 174 additions and 174 deletions

View File

@ -52,7 +52,7 @@ class Metasploit3 < Msf::Auxiliary
register_options( register_options(
[ [
Opt::RPORT(5060), Opt::RPORT(5060),
OptString.new('SIPURI', [true, 'The SIP URI of the user to be targeted', \ OptString.new('SIPURI', [true, 'The SIP URI of the user to be targeted',
'<target_email_address>@<sametime_media_server_FQDN>']), '<target_email_address>@<sametime_media_server_FQDN>']),
OptBool.new('CHECKUSER', [ true, 'Validate user is logged into Sametime', true]), OptBool.new('CHECKUSER', [ true, 'Validate user is logged into Sametime', true]),
OptInt.new('TIMEOUT', [ true, 'Set specific response timeout', 0]) OptInt.new('TIMEOUT', [ true, 'Set specific response timeout', 0])
@ -83,7 +83,7 @@ class Metasploit3 < Msf::Auxiliary
res = send_msg(msg) res = send_msg(msg)
# check response for current user status - common return codes # check response for current user status - common return codes
if not res or res.nil? if res.nil?
print_error("No response recevied from server") print_error("No response recevied from server")
return false return false
elsif res =~ /430 Flow Failed/i elsif res =~ /430 Flow Failed/i
@ -126,7 +126,7 @@ class Metasploit3 < Msf::Auxiliary
msg = create_message(length) msg = create_message(length)
res = send_msg(msg) res = send_msg(msg)
if not res or res.nil? if res.nil?
if datastore['CHECKUSER'] # check user AFTER DoS if datastore['CHECKUSER'] # check user AFTER DoS
print_good("User #{@sipuri} is no longer responding") print_good("User #{@sipuri} is no longer responding")
else else