PenTest/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2025-12-11 02:09:03 +00:00
Code Issues Projects Releases Wiki Activity

Fix handling of brute.retries script arg. Fixes #1004

Browse Source
This commit is contained in:
dmiller
2017-09-06 18:01:45 +00:00
parent 185db9db96
commit afcd81bc7d
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
CHANGELOG
View File

@@ -1,4 +1,9 @@
# Nmap Changelog ($Id$); -*-text-*- #s wa Nmap Changelog ($Id$); -*-text-*-
o [NSE][GH#1004] Fixed handling of brute.retries variable. It was being treated
as the number of tries, not retries, and a value of 0 would result in
infinite retries. Instead, it is now the number of retries, defaulting to 2
(3 total tries), with no option for infinite retries.
o [NSE][GH#987] Adds smb-enum-services.nse. It retrieves the list of services o [NSE][GH#987] Adds smb-enum-services.nse. It retrieves the list of services
running on a remote Windows machine. Modern Windows systems requires a running on a remote Windows machine. Modern Windows systems requires a

12
nselib/brute.lua
View File

@@ -239,7 +239,7 @@
-- @args brute.passonly iterate over passwords only for services that provide -- @args brute.passonly iterate over passwords only for services that provide
-- only a password for authentication. (default: false) -- only a password for authentication. (default: false)
-- @args brute.retries the number of times to retry if recoverable failures -- @args brute.retries the number of times to retry if recoverable failures
-- occur. (default: 3) -- occur. (default: 2)
-- @args brute.delay the number of seconds to wait between guesses (default: 0) -- @args brute.delay the number of seconds to wait between guesses (default: 0)
-- @args brute.threads the number of initial worker threads, the number of -- @args brute.threads the number of initial worker threads, the number of
-- active threads will be automatically adjusted. -- active threads will be automatically adjusted.
@@ -340,7 +340,7 @@ Options = {
o.firstonly = self.checkBoolArg("brute.firstonly", false) o.firstonly = self.checkBoolArg("brute.firstonly", false)
o.passonly = self.checkBoolArg("brute.passonly", false) o.passonly = self.checkBoolArg("brute.passonly", false)
o.killstagnated = self.checkBoolArg("brute.killstagnated", false) o.killstagnated = self.checkBoolArg("brute.killstagnated", false)
o.max_retries = tonumber(nmap.registry.args["brute.retries"]) or 3 o.max_retries = tonumber(nmap.registry.args["brute.retries"]) or 2
o.delay = tonumber(nmap.registry.args["brute.delay"]) or 0 o.delay = tonumber(nmap.registry.args["brute.delay"]) or 0
o.max_guesses = tonumber(nmap.registry.args["brute.guesses"]) or 0 o.max_guesses = tonumber(nmap.registry.args["brute.guesses"]) or 0
@@ -691,7 +691,7 @@ Engine = {
local status, response local status, response
local next_credential = self:get_next_credential() local next_credential = self:get_next_credential()
local retries = self.options.max_retries local tries = self.options.max_retries + 1
local username, password local username, password
local thread_data = Engine.getThreadData(coroutine.running()) local thread_data = Engine.getThreadData(coroutine.running())
assert(thread_data, "Unknown coroutine is running") assert(thread_data, "Unknown coroutine is running")
@@ -755,7 +755,7 @@ Engine = {
c = ("%s"):format(#password > 0 and password or "<empty>") c = ("%s"):format(#password > 0 and password or "<empty>")
end end
local msg = (retries ~= self.options.max_retries) and "Re-trying" or "Trying" local msg = (tries <= self.options.max_retries) and "Re-trying" or "Trying"
stdnse.debug2("%s %s against %s:%d", msg, c, self.host.ip, self.port.number) stdnse.debug2("%s %s against %s:%d", msg, c, self.host.ip, self.port.number)
status, response = driver:login(username, password) status, response = driver:login(username, password)
@@ -771,13 +771,13 @@ Engine = {
end end
retries = retries - 1 tries = tries - 1
-- End if: -- End if:
-- * The guess was successful -- * The guess was successful
-- * The response was not set to retry -- * The response was not set to retry
-- * We've reached the maximum retry attempts -- * We've reached the maximum retry attempts
until status or (response and not (response:isRetry())) or retries == 0 until status or (response and not (response:isRetry())) or tries <= 0
-- Increase the amount of total guesses -- Increase the amount of total guesses
self.counter = self.counter + 1 self.counter = self.counter + 1