dnrops
/
metasploit-framework
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

`\t` error msgs bug and some codestyle tweaks 

Minor bugs: `\t` were used inside single quoted strings.
Tweak: `a, b = c` is the same as `a = c[0]; b = [1] if c.length > 1`.
Minor tweak: `qwe if rty` form instead of multiline when `qwe` is only one line long.
Minor tweak: thanks to `#{}` interpolation we can omit `.to_s`.
This commit is contained in:
Victor 2014-08-04 04:11:49 +04:00
parent c31fc61617
commit 2805af2a04
1 changed files with 17 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
plugins/sqlmap.rb
View File

@ -32,8 +32,7 @@ module Msf
return
end
host = args[0]
port = args.length == 2 ? args[1] : nil
host, port = args
if !port
@manager = Sqlmap::Manager.new(Sqlmap::Session.new(host))
@ -47,7 +46,7 @@ module Msf
def cmd_sqlmap_set_option(*args)
unless args.length == 3
print_error('Usage:')
print_error('\tsqlmap_set_option <taskid> <option_name> <option_value>')
print_error("\tsqlmap_set_option <taskid> <option_name> <option_value>")
return
end
@ -56,27 +55,21 @@ module Msf
return
end
val = args[2]
if args[2] =~ /^\d+$/
val = val.to_i
end
val = args[2] =~ /^\d+$/ ? args[2].to_i : args[2]
res = @manager.set_option(@hid_tasks[args[0]], args[1], val)
print_status('Success: ' + res['success'].to_s)
print_status("Success: #{res['success']}")
end
def cmd_sqlmap_start_task(*args)
if args.length == 0
print_error('Usage:')
print_error('\tsqlmap_start_task <taskid> [<url>]')
print_error("\tsqlmap_start_task <taskid> [<url>]")
return
end
options = {}
if args.length == 2
options['url'] = args[1]
end
options['url'] = args[1] if args.length == 2
if !options['url'] && @tasks[@hid_tasks[args[0]]]['url'] == ''
print_error('You need to specify a URL either as an argument to sqlmap_start_task or sqlmap_set_option')
@ -89,13 +82,13 @@ module Msf
end
res = @manager.start_task(@hid_tasks[args[0]], options)
print_status('Started task: ' + res['success'].to_s)
print_status('Started task: #{res['success']}')
end
def cmd_sqlmap_get_log(*args)
unless args.length == 1
print_error('Usage:')
print_error('\tsqlmap_get_log <taskid>')
print_error("\tsqlmap_get_log <taskid>")
return
end
@ -114,7 +107,7 @@ module Msf
def cmd_sqlmap_get_status(*args)
unless args.length == 1
print_error('Usage:')
print_error('\tsqlmap_get_status <taskid>')
print_error("\tsqlmap_get_status <taskid>")
return
end
@ -131,7 +124,7 @@ module Msf
def cmd_sqlmap_get_data(*args)
unless args.length == 1
print_error('Usage:')
print_error('\tsqlmap_get_data <taskid>')
print_error("\tsqlmap_get_data <taskid>")
return
end
@ -171,7 +164,7 @@ module Msf
def cmd_sqlmap_save_data(*args)
unless args.length == 1
print_error('Usage:')
print_error('\tsqlmap_save_data <taskid>')
print_error("\tsqlmap_save_data <taskid>")
return
end
@ -199,8 +192,8 @@ module Msf
proto = url.split(':')[0]
host = url.split('/')[2]
port = 80
port = host.split(':')[1] if host.index(':')
host = host.split(':')[0] if host.index(':')
port = host.split(':')[1] if host[':']
host = host.split(':')[0] if host[':']
path = '/' + (url.split('/')[3..(url.split('/').length - 1)].join('/'))
query = url.split('?')[1]
web_vuln_info[:web_site] = url
@ -232,7 +225,7 @@ module Msf
unless args.length == 2
print_error('Usage:')
print_error('\tsqlmap_get_option <taskid> <option_name>')
print_error("\tsqlmap_get_option <taskid> <option_name>")
end
unless @manager
@ -246,7 +239,7 @@ module Msf
if @tasks[@hid_tasks[args[0]]]
print_good(args[1] + ': ' + @tasks[@hid_tasks[args[0]]][args[1]].to_s)
else
print_error('Option ' + args[0] + ' doesn\'t exist')
print_error("Option #{args[0]} doesn't exist")
end
end
@ -263,14 +256,14 @@ module Msf
@hid_tasks[(@hid_tasks.length+1).to_s] = taskid
task_options = @manager.get_options(taskid)
@tasks[@hid_tasks[@hid_tasks.length]] = task_options['options']
print_good('Created task: ' + @hid_tasks.length.to_s)
print_good("Created task: #{@hid_tasks.length}")
end
def cmd_sqlmap_list_tasks(*args)
@hid_tasks ||= {}
@tasks ||= {}
@hid_tasks.each do |task, options|
print_good('Task ID: ' + task.to_s)
print_good("Task ID: #{task}")
end
end
end