mirror of
https://github.com/nmap/nmap.git
synced 2025-12-06 04:31:29 +00:00
again. Here are the items which were merged: ------------------------------------------------------------------------ r13971 | jah | 2009-06-29 14:30:27 -0700 (Mon, 29 Jun 2009) | 2 lines Improved a pattern for matching HTTP status-line, tidy away some variables and fix a typo. ------------------------------------------------------------------------ r13967 | daniel | 2009-06-29 13:47:04 -0700 (Mon, 29 Jun 2009) | 5 lines o Added a convenience top-level BSD makefile redirecting BSD make to GNU make on BSD systems. This should help prevent bogus error reports when users run "make" instead of "gmake" on BSD systems. [Daniel Roethlisberger] ------------------------------------------------------------------------ r13965 | batrick | 2009-06-29 06:50:11 -0700 (Mon, 29 Jun 2009) | 14 lines [NSE] The NSE Nsock Library binding no longer relies on garbage collection to monitor the use of socket "slots". A thread (script) attempting to connect must first obtain one of a limited number of available socket locks (usually 10 or --max-parallelism). The binding would use garbage collection of sockets to determine when a thread has finished using its allocated sockets. This is unfortunately slow and requires us to constantly run the garbage collector to cause timely reallocation. I have changed the binding to now regularly inspect allocated sockets in the nsock_loop function. Available sockets slots are now immediately reallocated and done with far less execution time. See [1] for benchmarks and further explanation. [1] http://seclists.org/nmap-dev/2009/q2/0624.html ------------------------------------------------------------------------ r13964 | batrick | 2009-06-29 06:37:49 -0700 (Mon, 29 Jun 2009) | 10 lines [NSE] Fixed a rare (and usually undetectable) bug that can cause a SEGFAULT. The NSE nsock library binding may attempt to push values on the stack of a thread that ended due to an error. It is possible that the internal Lua stack was completely full and any further pushed values would result in a segmentation memory violation. This bug is very hard to reproduce with a SEGFAULT but is usually visible when Lua assertion checks are turned on. A socket handler routine must be called AFTER a thread has ended in error. ------------------------------------------------------------------------ r13963 | batrick | 2009-06-29 05:51:20 -0700 (Mon, 29 Jun 2009) | 3 lines Fixed some global scoped variables to be local. This caused a many scripts to overwrite each others' sockets, options, etc. ------------------------------------------------------------------------ r13939 | joao | 2009-06-27 16:07:35 -0700 (Sat, 27 Jun 2009) | 2 lines Fixed port rule to include ssl pop3 port, now that pop3.lua supports SSL connections in function capabilities ------------------------------------------------------------------------ r13938 | joao | 2009-06-27 16:06:28 -0700 (Sat, 27 Jun 2009) | 2 lines Added transparent SSL support using comm.tryssl ------------------------------------------------------------------------ r13937 | joao | 2009-06-27 16:05:19 -0700 (Sat, 27 Jun 2009) | 2 lines Added transparent SSL support using comm.tryssl ------------------------------------------------------------------------ r13936 | joao | 2009-06-27 16:03:50 -0700 (Sat, 27 Jun 2009) | 2 lines Added SSL transparent support using comm.tryssl ------------------------------------------------------------------------ r13935 | joao | 2009-06-27 16:02:39 -0700 (Sat, 27 Jun 2009) | 2 lines Added SSL transparent support using comm.tryssl ------------------------------------------------------------------------ r13934 | joao | 2009-06-27 16:01:38 -0700 (Sat, 27 Jun 2009) | 2 lines Added SSL transparent support using comm.tryssl ------------------------------------------------------------------------ r13933 | joao | 2009-06-27 16:00:27 -0700 (Sat, 27 Jun 2009) | 2 lines SSL transparent support using comm.tryssl ------------------------------------------------------------------------ r13932 | joao | 2009-06-27 15:19:58 -0700 (Sat, 27 Jun 2009) | 2 lines Included transparent ssl support to function pop3.capabilities using comm.tryssl ------------------------------------------------------------------------ r13931 | joao | 2009-06-27 15:19:06 -0700 (Sat, 27 Jun 2009) | 3 lines New version of comm.lua with function tryssl, that transparently adds support to ssl connections ------------------------------------------------------------------------ r13930 | joao | 2009-06-27 14:50:38 -0700 (Sat, 27 Jun 2009) | 6 lines Fixed buffering problem exposed by david on nmap-dev list. The problem was solved using a buffer to receive the data, making the script work fine in cases where the ssh packets are fragmented. A very similar solution was applied to ssh1.lua. ------------------------------------------------------------------------ r13928 | batrick | 2009-06-27 04:43:12 -0700 (Sat, 27 Jun 2009) | 18 lines [NSE] We now propogate a NSE initiated yield on a script through all user coroutines so that NSE may resume control. Previously, scripts that would yield in a child coroutine (e.g. a script's child coroutine generated by Lua's coroutine.create function) would give control back to the script. A script would yield in this way by making a blocking socket operation. NSE would be unable to correctly resume child coroutine when the socket operation is finished processing. By yielding the chain of coroutines a script has operating, we allow to NSE to handle the socket operation properly. NSE would then resume the entire chain so execution may correctly resume at the coroutine which initiated the socket operation. This restores the "illusion" that a script executes without interruption. See [1] for more information, further explanation, and some use cases. [1] http://seclists.org/nmap-dev/2009/q2/0586.html ------------------------------------------------------------------------ r13817 | david | 2009-06-18 15:57:29 -0700 (Thu, 18 Jun 2009) | 3 lines Improve an OS fingerprint with a model number and broader matching. Based on a follow-up report from a submitter. ------------------------------------------------------------------------ r13814 | josh | 2009-06-17 21:34:15 -0700 (Wed, 17 Jun 2009) | 3 lines [zenmap] Added support to zenmap for the new SCTP options: -PY, -sY and -sZ ------------------------------------------------------------------------ r13797 | ron | 2009-06-17 11:02:18 -0700 (Wed, 17 Jun 2009) | 1 line Applied a patch from Mak Kolibabi that enhances the output of smb-enum-processes. The output is now modeled after the output of the 'ps' tool for higher verbosity levels. ------------------------------------------------------------------------ r13795 | david | 2009-06-17 09:05:21 -0700 (Wed, 17 Jun 2009) | 6 lines The configure script now allows cross-compiling by assuming that libpcap is recent enough. Previously it would quit because a test program could not be run. libpcap will always be recent enough when the included copy is used. The patch was contributed by Mike Frysinger.
134 lines
4.3 KiB
Lua
134 lines
4.3 KiB
Lua
description = [[
|
|
Attempts to use EHLO and HELP to gather the Extended commands supported by an
|
|
SMTP server.
|
|
]]
|
|
|
|
---
|
|
-- @output
|
|
-- 25/tcp open smtp
|
|
-- | smtp-commands: EHLO uninvited.example.net Hello root at localhost [127.0.0.1], SIZE 52428800, PIPELINING, HELP
|
|
-- |_ HELP Commands supported: AUTH HELO EHLO MAIL RCPT DATA NOOP QUIT RSET HELP
|
|
|
|
-- Version History
|
|
-- 1.1.0.0 - 2007-10-12
|
|
-- + added HELP command in addition to EHLO
|
|
|
|
-- 1.2.0.0 - 2008-05-19
|
|
-- + made output single line, comma-delimited, instead of
|
|
-- CR LF delimited on multi-lines
|
|
-- + was able to use regular text and not hex codes
|
|
|
|
-- 1.3.0.0 - 2008-05-21
|
|
-- + more robust handling of problems
|
|
-- + uses verbosity and debugging to decide if you need to
|
|
-- see certain errors and if the output is in a line or
|
|
-- in , for lack of a better word, fancy format
|
|
-- + I am not able to do much testing because my new ISP blocks
|
|
-- traffic going to port 25 other than to their mail servers as
|
|
-- a "security" measure.
|
|
|
|
-- 1.3.1.0 - 2008-05-22
|
|
-- + minor tweaks to get it working when one of the requests fails
|
|
-- but not both of them.
|
|
|
|
-- 1.5.0.0 - 2008-08-15
|
|
-- + updated to use the nsedoc documentation system
|
|
|
|
-- 1.6.0.0 - 2008-10-06
|
|
-- + Updated gsubs to handle different formats, pulls out extra spaces
|
|
-- and normalizes line endings
|
|
|
|
-- 1.7.0.0 - 2008-11-10
|
|
-- + Better normalization of output, remove "250 " from EHLO output,
|
|
-- don't comma-separate HELP output.
|
|
|
|
-- Cribbed heavily from Thomas Buchanan's SQL version detection
|
|
-- script and from Arturo 'Buanzo' Busleiman's SMTP open relay
|
|
-- detector script.
|
|
|
|
author = "Jason DePriest <jrdepriest@gmail.com>"
|
|
license = "Same as Nmap--See http://nmap.org/book/man-legal.html"
|
|
categories = {"default", "discovery", "safe"}
|
|
|
|
require "shortport"
|
|
require "stdnse"
|
|
require "comm"
|
|
|
|
portrule = shortport.port_or_service({25, 587, 465}, "smtp")
|
|
|
|
action = function(host, port)
|
|
|
|
local socket = nmap.new_socket()
|
|
socket:set_timeout(5000)
|
|
|
|
local result
|
|
local resultEHLO
|
|
local resultHELP
|
|
|
|
local catch = function()
|
|
socket:close()
|
|
--return
|
|
end
|
|
|
|
local try = nmap.new_try(catch)
|
|
|
|
opt = {timeout=4000, recv_before=true}
|
|
|
|
socket = comm.tryssl(host, port, "\n", opt)
|
|
if not socket then
|
|
stdnse.print_debug("Problem connecting to " .. host.ip .. " on port " .. port.number .. " using ssl and tcp protocols.")
|
|
return
|
|
end
|
|
|
|
local query = "EHLO example.org\r\n"
|
|
try(socket:send(query))
|
|
resultEHLO = try(socket:receive_lines(1))
|
|
|
|
if not (string.match(resultEHLO, "^250")) then
|
|
-- stdnse.print_debug("1","%s",resultEHLO)
|
|
-- stdnse.print_debug("1","EHLO with errors or timeout. Enable --script-trace to see what is happening.")
|
|
resultEHLO = ""
|
|
end
|
|
|
|
if resultEHLO ~= "" then
|
|
|
|
resultEHLO = string.gsub(resultEHLO, "250 OK[\r\n]", "") -- 250 OK (needed to have the \r\n in there)
|
|
-- get rid of the 250- at the beginning of each line in the response
|
|
resultEHLO = string.gsub(resultEHLO, "250%-", "") -- 250-
|
|
resultEHLO = string.gsub(resultEHLO, "250 ", "") -- 250
|
|
resultEHLO = string.gsub(resultEHLO, "\r\n", "\n") -- normalize CR LF
|
|
resultEHLO = string.gsub(resultEHLO, "\n\r", "\n") -- normalize LF CR
|
|
resultEHLO = string.gsub(resultEHLO, "^\n+", "") -- no initial LF
|
|
resultEHLO = string.gsub(resultEHLO, "\n+$", "") -- no final LF
|
|
resultEHLO = string.gsub(resultEHLO, "\n", ", ") -- LF to comma
|
|
resultEHLO = string.gsub(resultEHLO, "%s+", " ") -- get rid of extra spaces
|
|
resultEHLO = "\nEHLO " .. resultEHLO
|
|
end
|
|
|
|
local query = "HELP\r\n"
|
|
try(socket:send(query))
|
|
resultHELP = try(socket:receive_lines(1))
|
|
|
|
if not (string.match(resultHELP, "^214")) then
|
|
-- stdnse.print_debug("1","%s",resultHELP)
|
|
-- stdnse.print_debug("1","HELP with errors or timeout. Enable --script-trace to see what is happening.")
|
|
resultHELP = ""
|
|
end
|
|
if resultHELP ~= "" then
|
|
resultHELP = string.gsub(resultHELP, "214%-", "") -- 214-
|
|
-- get rid of the 214 at the beginning of the lines in the response
|
|
resultHELP = string.gsub(resultHELP, "214 ", "") -- 214
|
|
resultHELP = string.gsub(resultHELP, "^%s+", "") -- no initial space
|
|
resultHELP = string.gsub(resultHELP, "%s+$", "") -- no final space
|
|
resultHELP = string.gsub(resultHELP, "%s+", " ") -- get rid of extra spaces
|
|
resultHELP = "\nHELP " .. resultHELP
|
|
end
|
|
|
|
result = resultEHLO .. resultHELP
|
|
|
|
socket:close()
|
|
|
|
return result
|
|
|
|
end
|