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

Fix up opts.delete into temp storage for attempt tracking

unstable
HD Moore 2012-06-18 20:30:24 -05:00
parent 073205a875
commit bf3062aa89
1 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
lib/msf/core/db.rb
View File

@ -821,6 +821,10 @@ class DBManager
svc = opts.delete(:service) svc = opts.delete(:service)
vuln = opts.delete(:vuln) vuln = opts.delete(:vuln)
timestamp = opts.delete(:timestamp)
username = opts.delete(:username)
mname = opts.delete(:module)
# Look up or generate the host as appropriate # Look up or generate the host as appropriate
if not (host and host.kind_of? ::Mdm::Host) if not (host and host.kind_of? ::Mdm::Host)
if svc.kind_of? ::Mdm::Service if svc.kind_of? ::Mdm::Service
@ -856,10 +860,10 @@ class DBManager
if vuln if vuln
attempt_info = { attempt_info = {
:vuln_id => vuln.id, :vuln_id => vuln.id,
:attempted_at => opts.delete(:timestamp) || Time.now.utc, :attempted_at => timestamp || Time.now.utc,
:exploited => true, :exploited => true,
:username => opts.delete(:username) || "unknown", :username => username || "unknown",
:module => opts.delete(:module) :module => mname
} }
attempt_info[:session_id] = opts[:session_id] if opts[:session_id] attempt_info[:session_id] = opts[:session_id] if opts[:session_id]
@ -876,10 +880,10 @@ class DBManager
# Report an exploit attempt all the same # Report an exploit attempt all the same
attempt_info = { attempt_info = {
:attempted_at => opts.delete(:timestamp) || Time.now.utc, :attempted_at => timestamp || Time.now.utc,
:exploited => true, :exploited => true,
:username => opts.delete(:username) || "unknown", :username => username || "unknown",
:module => opts.delete(:module) :module => mname
} }
attempt_info[:vuln_id] = vuln.id if vuln attempt_info[:vuln_id] = vuln.id if vuln
@ -910,6 +914,11 @@ class DBManager
svc = opts.delete(:service) svc = opts.delete(:service)
vuln = opts.delete(:vuln) vuln = opts.delete(:vuln)
timestamp = opts.delete(:timestamp)
reason = opts.delete(:reason)
username = opts.delete(:username)
mname = opts.delete(:module)
# Look up the host as appropriate # Look up the host as appropriate
if not (host and host.kind_of? ::Mdm::Host) if not (host and host.kind_of? ::Mdm::Host)
if svc.kind_of? ::Mdm::Service if svc.kind_of? ::Mdm::Service
@ -945,11 +954,11 @@ class DBManager
# Report a vuln_attempt if we found a match # Report a vuln_attempt if we found a match
if vuln if vuln
attempt_info = { attempt_info = {
:attempted_at => opts.delete(:timestamp) || Time.now.utc, :attempted_at => timestamp || Time.now.utc,
:exploited => false, :exploited => false,
:fail_reason => opts.delete(:reason), :fail_reason => reason,
:username => opts.delete(:username) || "unknown", :username => username || "unknown",
:module => opts.delete(:module) :module => mname
} }
vuln.vuln_attempts.create(attempt_info) vuln.vuln_attempts.create(attempt_info)
@ -957,11 +966,11 @@ class DBManager
# Report an exploit attempt all the same # Report an exploit attempt all the same
attempt_info = { attempt_info = {
:attempted_at => opts.delete(:timestamp) || Time.now.utc, :attempted_at => timestamp || Time.now.utc,
:exploited => false, :exploited => false,
:username => opts.delete(:username) || "unknown", :username => username || "unknown",
:module => opts.delete(:module), :module => mname,
:fail_reason => opts.delete(:reason), :fail_reason => reason,
} }
attempt_info[:vuln_id] = vuln.id if vuln attempt_info[:vuln_id] = vuln.id if vuln