Land #8899, Make backgrounding messages more consistent

bug/bundler_fix
Brent Cook 2017-08-28 18:51:22 -05:00
commit 847407f1dd
No known key found for this signature in database
GPG Key ID: 1FFAA0B24B708F96
4 changed files with 8 additions and 10 deletions

View File

@ -96,7 +96,7 @@ class Auxiliary
}
# Always run passive modules in the background
if (mod.passive or mod.passive_action?(action))
if (mod.passive || mod.passive_action?(action || mod.default_action))
jobify = true
end
@ -131,8 +131,8 @@ class Auxiliary
return false
end
if (jobify)
print_status("Auxiliary module running as background job")
if (jobify && mod.job_id)
print_status("Auxiliary module running as background job #{mod.job_id}.")
else
print_status("Auxiliary module execution completed")
end

View File

@ -145,10 +145,8 @@ class Exploit
end
# If we ran the exploit as a job, indicate such so the user doesn't
# wonder what's up.
elsif (jobify)
if mod.job_id
print_status("Exploit running as background job #{mod.job_id}.")
end
elsif (jobify && mod.job_id)
print_status("Exploit running as background job #{mod.job_id}.")
# Worst case, the exploit ran but we got no session, bummer.
else
# If we didn't run a payload handler for this exploit it doesn't

View File

@ -339,7 +339,7 @@ module Msf
framework.jobs[job_id.to_s].send(:name=, job_name)
end
print_status "Payload Handler Started as Job #{job_id}"
print_status "Payload handler running as background job #{job_id}."
end
end
end

View File

@ -131,8 +131,8 @@ class Post
return false
end
if (jobify)
print_status("Post module running as background job")
if (jobify && mod.job_id)
print_status("Post module running as background job #{mod.job_id}.")
else
print_status("Post module execution completed")
end