Skip to content

Fix VERBOSE flag ignored when set before module load #21105

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SilentSobs wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix VERBOSE flag ignored when set before module load #21105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions lib/msf/core/module/ui/line/verbose.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
module Msf::Module::UI::Line::Verbose
TRUE_REGEX = /^(y|yes|t|1|true)$/i
# Verbose version of #print_line
def vprint_line(msg='')
print_line(msg) if datastore['VERBOSE'] || framework.datastore['VERBOSE']
def vprint_line(msg = '')
print_line(msg) if datastore['VERBOSE'].to_s =~ TRUE_REGEX || (!framework.nil? && framework.datastore['VERBOSE'].to_s =~ TRUE_REGEX)
end
end
18 changes: 10 additions & 8 deletions lib/msf/core/module/ui/message/verbose.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,25 @@
module Msf::Module::UI::Message::Verbose
TRUE_REGEX = /^(y|yes|t|1|true)$/i
# Verbose version of #print_error
def vprint_error(msg='')
print_error(msg) if datastore['VERBOSE'] || (!framework.nil? && framework.datastore['VERBOSE'])
def vprint_error(msg = '')
print_error(msg) if datastore['VERBOSE'].to_s =~ TRUE_REGEX || (!framework.nil? && framework.datastore['VERBOSE'].to_s =~ TRUE_REGEX)
end

alias_method :vprint_bad, :vprint_error
alias vprint_bad vprint_error

# Verbose version of #print_good
def vprint_good(msg='')
def vprint_good(msg = '')
print_good(msg) if datastore['VERBOSE'] || (!framework.nil? && framework.datastore['VERBOSE'])
end
alias vprint_bad vprint_error

# Verbose version of #print_status
def vprint_status(msg='')
print_status(msg) if datastore['VERBOSE'] || (!framework.nil? && framework.datastore['VERBOSE'])
def vprint_status(msg = '')
print_status(msg) if datastore['VERBOSE'].to_s =~ TRUE_REGEX || (!framework.nil? && framework.datastore['VERBOSE'].to_s =~ TRUE_REGEX)
end

# Verbose version of #print_warning
def vprint_warning(msg='')
print_warning(msg) if datastore['VERBOSE'] || (!framework.nil? && framework.datastore['VERBOSE'])
def vprint_warning(msg = '')
print_warning(msg) if datastore['VERBOSE'].to_s =~ TRUE_REGEX || (!framework.nil? && framework.datastore['VERBOSE'].to_s =~ TRUE_REGEX)
end
end
Loading