Skip to content
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

Jump to bottom

Enforce Style/RedundantBegin for new modules #15192

Merged
merged 1 commit into from May 17, 2021
Merged

Enforce Style/RedundantBegin for new modules #15192

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 2 additions & 14 deletions .rubocop.yml
View file
Open in desktop
Expand Up @@ -359,8 +359,7 @@ Layout/EmptyLinesAroundClassBody:
Description: 'these are used to increase readability'

Layout/EmptyLinesAroundMethodBody:
Enabled: false
Description: 'these are used to increase readability'
Enabled: true
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Without this, the following code:

def cleanup
  begin
    disconnect
  rescue StandardError
    nil
  end
end

Is automatically fixed to:

def cleanup

  disconnect
rescue StandardError
  nil

end

It's also not a bad rule to enable either


Layout/ExtraSpacingWithBinDataIgnored:
Description: 'Do not use unnecessary spacing.'
Expand Down Expand Up @@ -405,18 +404,7 @@ Style/PercentLiteralDelimiters:
VersionChanged: '0.48.1'

Style/RedundantBegin:
Exclude:
# this pattern is very common and somewhat unavoidable
# def run_host(ip)
# begin
# ...
# rescue ...
# ...
# ensure
# disconnect
# end
# end
- 'modules/**/*'
Enabled: true

Style/SafeNavigation:
Description: >-
Expand Down
1 change: 0 additions & 1 deletion modules/auxiliary/admin/http/tomcat_ghostcat.rb
View file
Open in desktop
Expand Up @@ -146,7 +146,6 @@ def int2byte(data, byte_len = 1)
end

def make_forward_request_package(method, headers, attributes)

prefix_code_int = 2
prefix_code_bytes = int2byte(prefix_code_int)
method_bytes = int2byte(method2code(method))
Expand Down
52 changes: 25 additions & 27 deletions modules/auxiliary/admin/networking/cisco_asa_extrabacon.rb
View file
Open in desktop
Expand Up @@ -170,38 +170,36 @@ def build_payload(vers_string, mode)
end

def run
begin
vers_string = retrieve_asa_version
vers_string = retrieve_asa_version

print_status("Building #{action.name} payload for version #{vers_string}...")
overflow = build_payload(vers_string, action.name)
payload = SNMP::ObjectId.new(overflow)
print_status("Building #{action.name} payload for version #{vers_string}...")
overflow = build_payload(vers_string, action.name)
payload = SNMP::ObjectId.new(overflow)

print_status('Sending SNMP payload...')
response = snmp.get_bulk(0, 1, [SNMP::VarBind.new(payload)])
print_status('Sending SNMP payload...')
response = snmp.get_bulk(0, 1, [SNMP::VarBind.new(payload)])

if response.varbind_list
print_good('Clean return detected!')
if action.name == 'PASS_DISABLE'
print_warning("Don't forget to run PASS_ENABLE after logging in!")
print_warning(' set ACTION PASS_ENABLE')
end
if response.varbind_list
print_good('Clean return detected!')
if action.name == 'PASS_DISABLE'
print_warning("Don't forget to run PASS_ENABLE after logging in!")
print_warning(' set ACTION PASS_ENABLE')
end
rescue ::Rex::ConnectionError
print_error('Connection Error: Is the target up?')
rescue ::SNMP::RequestTimeout
print_error('SNMP Error: Request Timeout, Cisco ASA may have crashed :/')
rescue ::SNMP::UnsupportedVersion
print_error('SNMP Error: Version 2c is not supported by target.')
rescue ::NoMethodError
print_error("Error: No payload available for version #{vers_string}")
rescue ::Interrupt
raise $ERROR_INFO
rescue ::StandardError => e
print_error("Error: #{e.class} #{e} #{e.backtrace}")
ensure
disconnect_snmp
end
rescue ::Rex::ConnectionError
print_error('Connection Error: Is the target up?')
rescue ::SNMP::RequestTimeout
print_error('SNMP Error: Request Timeout, Cisco ASA may have crashed :/')
rescue ::SNMP::UnsupportedVersion
print_error('SNMP Error: Version 2c is not supported by target.')
rescue ::NoMethodError
print_error("Error: No payload available for version #{vers_string}")
rescue ::Interrupt
raise $ERROR_INFO
rescue ::StandardError => e
print_error("Error: #{e.class} #{e} #{e.backtrace}")
ensure
disconnect_snmp
end

def retrieve_asa_version
Expand Down
1 change: 0 additions & 1 deletion modules/auxiliary/admin/networking/f5_config.rb
View file
Open in desktop
Expand Up @@ -26,7 +26,6 @@ def initialize(info = {})
Opt::RPORT(22)
]
)

end

def run
Expand Down
1 change: 0 additions & 1 deletion modules/auxiliary/admin/networking/juniper_config.rb
View file
Open in desktop
Expand Up @@ -34,7 +34,6 @@ def initialize(info = {})
Opt::RPORT(22)
]
)

end

def run
Expand Down
1 change: 0 additions & 1 deletion modules/auxiliary/admin/networking/mikrotik_config.rb
View file
Open in desktop
Expand Up @@ -32,7 +32,6 @@ def initialize(info = {})
Opt::RPORT(22)
]
)

end

def run
Expand Down
1 change: 0 additions & 1 deletion modules/auxiliary/admin/networking/ubiquiti_config.rb
View file
Open in desktop
Expand Up @@ -32,7 +32,6 @@ def initialize(info = {})
Opt::RPORT(22)
]
)

end

def i_file
Expand Down
4 changes: 0 additions & 4 deletions modules/auxiliary/admin/sap/sap_igs_xmlchart_xxe.rb
View file
Open in desktop
Expand Up @@ -215,7 +215,6 @@ def analyze_first_response(html_response)
end

def check

# Set up variables
os_release = ''
os_release_file = '/etc/os-release'
Expand Down Expand Up @@ -294,7 +293,6 @@ def run
end

def action_file_read

# Set up XML data for HTTP request
setup_xml_and_variables
make_post_data(@file, dos: false)
Expand Down Expand Up @@ -349,7 +347,6 @@ def action_file_read
end

def action_dos

# Set up XML data for HTTP request
setup_xml_and_variables
make_post_data(@file, dos: true)
Expand Down Expand Up @@ -389,7 +386,6 @@ def action_dos

# Check HTTP response
fail_with(Failure::NotVulnerable, 'The target responded with a 200 OK response code. The DoS attempt was unsuccessful.') unless dos_response.code != 200

end

end
34 changes: 16 additions & 18 deletions modules/auxiliary/dos/http/cable_haunt_websocket_dos.rb
View file
Open in desktop
Expand Up @@ -75,24 +75,22 @@ def run
print_status('Opened connection')

EM::Timer.new(1) do
begin
print_status('Sending payload')
payload = Rex::Text.rand_text_alphanumeric(7000..8000)
driver.send({
jsonrpc: '2.0',
method: 'Frontend::GetFrontendSpectrumData',
params: {
coreID: 0,
fStartHz: payload,
fStopHz: 1000000000,
fftSize: 1024,
gain: 1
},
id: '0'
}.to_json)
rescue StandardError
fail_with(Failure::Unreachable, 'Could not establish websocket connection')
end
print_status('Sending payload')
payload = Rex::Text.rand_text_alphanumeric(7000..8000)
driver.send({
jsonrpc: '2.0',
method: 'Frontend::GetFrontendSpectrumData',
params: {
coreID: 0,
fStartHz: payload,
fStopHz: 1000000000,
fftSize: 1024,
gain: 1
},
id: '0'
}.to_json)
rescue StandardError
fail_with(Failure::Unreachable, 'Could not establish websocket connection')
end
end

Expand Down
1 change: 0 additions & 1 deletion modules/auxiliary/gather/ldap_hashdump.rb
View file
Open in desktop
Expand Up @@ -229,7 +229,6 @@ def pillage(ldif, base_dn)
end

print_good("#{peer} Saved LDAP data to #{ldif_filename}")

end

def decode_pwdhistory(hash)
Expand Down
56 changes: 27 additions & 29 deletions modules/auxiliary/gather/redis_extractor.rb
View file
Open in desktop
Expand Up @@ -68,39 +68,37 @@ def value_for_key(key)

# Connect to Redis and ensure compatibility.
def redis_connect
begin
connect
# NOTE: Full INFO payload fails occasionally. Using server filter until Redis library can be fixed
if (info_data = redis_command('INFO', 'server')) && /redis_version:(?<redis_version>\S+)/ =~ info_data
print_good("Connected to Redis version #{redis_version}")
end

# Some connection attempts such as incorrect password set fail silently in the Redis library.
if !info_data
print_error('Unable to connect to Redis')
print_error('Set verbose true to troubleshoot') if !datastore['VERBOSE']
return
end

# Ensure version compatability
if (Rex::Version.new(redis_version) < Rex::Version.new(MIN_REDIS_VERSION))
print_status("Module supports Redis #{MIN_REDIS_VERSION} or higher.")
return
end
connect
# NOTE: Full INFO payload fails occasionally. Using server filter until Redis library can be fixed
if (info_data = redis_command('INFO', 'server')) && /redis_version:(?<redis_version>\S+)/ =~ info_data
print_good("Connected to Redis version #{redis_version}")
end

# Connection was sucessful
return info_data
rescue Msf::Auxiliary::Failed => e
# This error trips when auth is required but password not set
print_error('Unable to connect to Redis: ' + e.message)
return
rescue Rex::ConnectionTimeout
print_error('Timed out trying to connect to Redis')
# Some connection attempts such as incorrect password set fail silently in the Redis library.
if !info_data
print_error('Unable to connect to Redis')
print_error('Set verbose true to troubleshoot') if !datastore['VERBOSE']
return
rescue StandardError
print_error('Unknown error trying to connect to Redis')
end

# Ensure version compatability
if (Rex::Version.new(redis_version) < Rex::Version.new(MIN_REDIS_VERSION))
print_status("Module supports Redis #{MIN_REDIS_VERSION} or higher.")
return
end

# Connection was sucessful
return info_data
rescue Msf::Auxiliary::Failed => e
# This error trips when auth is required but password not set
print_error('Unable to connect to Redis: ' + e.message)
return
rescue Rex::ConnectionTimeout
print_error('Timed out trying to connect to Redis')
return
rescue StandardError
print_error('Unknown error trying to connect to Redis')
return
end

def check_host(_ip)
Expand Down
1 change: 0 additions & 1 deletion modules/auxiliary/scanner/http/nagios_xi_scanner.rb
View file
Open in desktop
Expand Up @@ -79,7 +79,6 @@ def parse_version(nagios_version)
end

return 'unsupported'

end

def rce_check(version, real_target: false)
Expand Down
77 changes: 37 additions & 40 deletions modules/auxiliary/scanner/http/synology_forget_passwd_user_enum.rb
View file
Open in desktop
Expand Up @@ -108,48 +108,45 @@ def report_cred(opts)
end

def do_enum(username)
begin
vprint_status("Attempting #{username}")
res = send_request_cgi({
'uri' => normalize_uri(target_uri.path, 'webman', 'forget_passwd.cgi'),
'method' => 'GET',
'vars_get' => {
'user' => username
}
})
unless res
print_error('Connection to host refused')
fail_with(Failure::Unreachable, 'Connection to host refused')
end
j = res.get_json_document
if j['msg'] == 5
fail_with(Failure::Disconnected, 'You have been locked out. Retry later or increase DELAY')
end
if j['msg'] == 3
fail_with(Failure::UnexpectedReply, 'Device patched or feature disabled')
end
if j['msg'] == 2 || j['msg'] == 1
print_good("#{username} - #{j['info']}")
@users_found[username] = :reported
report_cred(
ip: rhost,
port: rport,
service_name: (ssl ? 'https' : 'http'),
proof: res.body
)
end
# msg 1 means user can login to GUI
# msg 2 means user exists but no GUI login
# msg 3 means not supported/disabled/patched
# msg 4 means no user
# msg 5 means auto block is enabled and youre blocked. Default is 10 login attempts, and these
# count as lgin attempts.
rescue Rex::ConnectionRefused, Rex::HostUnreachable, Rex::ConnectionTimeout, Rex::ConnectionError
vprint_status("Attempting #{username}")
res = send_request_cgi({
'uri' => normalize_uri(target_uri.path, 'webman', 'forget_passwd.cgi'),
'method' => 'GET',
'vars_get' => {
'user' => username
}
})
unless res
print_error('Connection to host refused')
fail_with(Failure::Unreachable, 'Connection to host refused')
rescue Timeout::Error, Errno::EPIPE
fail_with(Failure::Unreachable, 'Connection issue')
end

j = res.get_json_document
if j['msg'] == 5
fail_with(Failure::Disconnected, 'You have been locked out. Retry later or increase DELAY')
end
if j['msg'] == 3
fail_with(Failure::UnexpectedReply, 'Device patched or feature disabled')
end
if j['msg'] == 2 || j['msg'] == 1
print_good("#{username} - #{j['info']}")
@users_found[username] = :reported
report_cred(
ip: rhost,
port: rport,
service_name: (ssl ? 'https' : 'http'),
proof: res.body
)
end
# msg 1 means user can login to GUI
# msg 2 means user exists but no GUI login
# msg 3 means not supported/disabled/patched
# msg 4 means no user
# msg 5 means auto block is enabled and youre blocked. Default is 10 login attempts, and these
# count as lgin attempts.
rescue Rex::ConnectionRefused, Rex::HostUnreachable, Rex::ConnectionTimeout, Rex::ConnectionError
print_error('Connection to host refused')
fail_with(Failure::Unreachable, 'Connection to host refused')
rescue Timeout::Error, Errno::EPIPE
fail_with(Failure::Unreachable, 'Connection issue')
end
end