1
0
mirror of https://github.com/nmap/nmap.git synced 2026-01-03 05:09:14 +00:00
Commit Graph

9379 Commits

Author SHA1 Message Date
dmiller
d05e9c628e Integrate some more service fingerprints 2014-10-18 19:08:52 +00:00
paulino
6acfb753c3 Updates script database after the removal of 'db2-discover.nse' 2014-10-18 04:44:26 +00:00
paulino
97c56e3e57 Adds fingerprints for ASUS RT-N10U and motorola RF switch 2014-10-18 04:09:05 +00:00
dmiller
bfa0b57394 Integrate more services (xmpp/jabber, domain, vnc, elasticsearch) 2014-10-17 19:07:24 +00:00
dmiller
55f66d6a4f Integrate more service fingerprints (afp, imap, dlna) 2014-10-17 03:33:19 +00:00
dmiller
917842059b Check TLS body protocol for compatibility in ssl-enum-ciphers
Haven't seen this, and it shouldn't happen, but it's possible for a
server to send the same protocol version in the record, but a different
one in the body. This wouldn't be valid, so we should reject it.
2014-10-16 04:07:07 +00:00
dmiller
9e199c0213 Add Docker probe and matchlines
Probe and output from Claudio Criscione: http://seclists.org/nmap-dev/2014/q4/69
2014-10-16 03:54:51 +00:00
dmiller
d07e7b88b2 Integrate a few more service fingerprints (pop3, minecraft) 2014-10-15 22:38:31 +00:00
dmiller
cdd61aa874 Fix a bug in ssl-enum-ciphers
If the last chunk of ciphers was rejected, then all results were
discarded.
2014-10-15 21:52:36 +00:00
dmiller
ead3649ac5 Remove db2-discover.nse
Service probe does the same work. See
http://seclists.org/nmap-dev/2014/q3/415
2014-10-15 18:52:08 +00:00
dmiller
8005bfe83f Improvements and fixes to http-rfi-spider
patch from nnposter: http://seclists.org/nmap-dev/2014/q3/443
2014-10-15 18:38:16 +00:00
dmiller
5952b9745b Move url-encoding to url.build_query
patch from nnposter: http://seclists.org/nmap-dev/2014/q3/427
2014-10-15 18:12:58 +00:00
dmiller
a318db04b3 Normalize ms-sql-s fingerprints and add a few 2014-10-14 19:34:58 +00:00
dmiller
cdadc8641d Integrate upnp and postgres service submissions
Reordered postgres matches to put language matches below version matches, and
wildcarded language that would be gettext-translated. Should detect versions
better, but only detect language when the version match fails.
2014-10-14 05:28:52 +00:00
dmiller
f60bf5fbc6 Correct CRLF in ftp-brute 2014-10-14 02:30:02 +00:00
dmiller
639a58a880 Integrate rtsp and unknown service fingerprints 2014-10-13 19:13:10 +00:00
dmiller
ed5fdfacb1 Integrate sip, smtp service submissions, do a little cleanup. 2014-10-10 19:55:02 +00:00
dmiller
90b461792b Integrate remaining *http* service fingerprints 2014-10-09 13:37:49 +00:00
dmiller
2ad3aafa71 Integrate 584 service submissions (http) 2014-10-08 14:33:45 +00:00
sophron
4651a8f4ae [NSE] Updated http-robtex-* scripts to match current robtex API. 2014-10-08 01:39:30 +00:00
dmiller
b4988f1f5b Improvements to http-server-header
If service scan failed to find a match, the probe responses are cached.
Now http-server-header will look through those responses before sending
a probe of its own. This should result in better detection with fewer
probes sent.

Also changed the Server header string match to case-insensitive.
2014-10-01 19:54:34 +00:00
dmiller
58f1b845d6 Let lpeg-utility.escaped_quote only remove escaped escapes and quotes 2014-10-01 17:56:19 +00:00
dmiller
092c19a702 Integrate 84 service fingerprint submissions (ftp, ftp-proxy) 2014-09-30 14:05:33 +00:00
dmiller
a93781df6f run sv-tidy and correct some errors 2014-09-29 12:09:49 +00:00
dmiller
6bb3a7ae34 Integrate 363 service fingerprint submissions (ssh & telnet) 2014-09-29 01:37:09 +00:00
dmiller
f9abb3108c Streamline starttls functions for smtp, pop3, and imap 2014-09-24 20:31:47 +00:00
dmiller
3e2ac00e55 Leverage ftp and comm libs in sslcert.lua
This should result in faster (comm.lua's timeouts) and more reliable
(ftp.lua's response processing) STARTTLS for FTP
2014-09-24 20:31:45 +00:00
dmiller
278450ce94 Fix a script crash when comm.opencon was called without opts 2014-09-24 20:31:44 +00:00
dmiller
23d4abd5e9 New docker-version script
http://seclists.org/nmap-dev/2014/q3/265
2014-09-24 20:31:42 +00:00
dmiller
a472ea34ab Major improvements to http-form-brute
Credit nnposter: http://seclists.org/nmap-dev/2014/q3/479
2014-09-23 13:42:00 +00:00
dmiller
99cc5102c3 Correct a typo: tables don't work like strings 2014-09-23 13:41:58 +00:00
dmiller
e42409be93 XML structured output for brute.lua and creds.lua
The @xmloutput section documentation is not done, and I'm not sure how
to best do it, since it will be the same for all brute.lua scripts. This
is how it looks:

metasploit-msgrpc-brute:
<table key="Accounts">
  <table>
    <elem key="username">root</elem>
    <elem key="state">Valid credentials</elem>
    <elem key="password">root</elem>
  </table>
</table>
<elem key="Statistics">Performed 3 guesses in 4 seconds, average tps: 0</elem>

creds-summary:
<table key="127.0.0.1">
  <table key="9929/nping-echo">
    <table>
      <elem key="password">123456</elem>
      <elem key="state">Valid credentials</elem>
    </table>
  </table>
  <table key="55553/unknown">
    <table>
      <elem key="username">root</elem>
      <elem key="state">Valid credentials</elem>
      <elem key="password">root</elem>
    </table>
  </table>
</table>
2014-09-23 05:23:19 +00:00
dmiller
aaf7838b10 Improve error handling in comm.opencon and tryssl 2014-09-23 05:23:17 +00:00
dmiller
b8d2327c5e Correct some field typos in creds.Account 2014-09-23 05:23:16 +00:00
dmiller
f37ac44380 Move brute.Account to creds.Account
In addition to fitting better (brute library is the verb, creds library
is the noun), this will allow creds.lua to use creds.Account internally
where necessary (see subsequent commits)

Also change old references to string argument "OPEN" into
creds.State.VALID.
2014-09-23 05:23:13 +00:00
dmiller
379759d539 Avoid __pairs metamethod in stdnse.keys
This allows stdnse.keys to be used in a __pairs metamethod to, for
instance, yield keys in sorted order. Using next() bypasses the __pairs
metamethod that would be called when pairs() was used. Otherwise,
infinite recursion was possible.
2014-09-23 05:23:06 +00:00
fyodor
4312ef5133 Add docker ports 2014-09-22 18:08:14 +00:00
dmiller
a101e58a4c Abstract case-insensititive html tag searching 2014-09-20 14:49:57 +00:00
dmiller
ed9ecc54ea Improve html form parsing, patch from nnposter
http://seclists.org/nmap-dev/2014/q3/418
2014-09-20 14:49:55 +00:00
dmiller
1d5da8bccb Get rid of redundant/useless tonumber()s in script arg processing 2014-09-20 06:03:25 +00:00
dmiller
47d31171b0 Some NSE globals cleanup. 2014-09-20 05:40:49 +00:00
dmiller
0224e0515a Make http-vuln-wnr1000-creds actually return something 2014-09-20 05:40:47 +00:00
dmiller
bf457ee12c Normalize some timeouts in scripts
Added use of stdnse.parse_timespec for timeout args. Used comm.lua
default timeouts in a couple cases. Corrected 2 cases of incorrect
documentation ("Default 60" when the default was 30 seconds).
2014-09-20 05:40:46 +00:00
dmiller
5db940fc70 Update http-server-header in a few ways
1. Use "softmatched" to let Nmap print the service fingerprint for the
user to submit.

2. Run even if version detection got a good match. This allows it to be
run by-name, or to provide additional info if available. Existing match
will not be clobbered, though.

3. Use comm.lua's default timeouts. Also, no need to pass port.protocol,
since comm.tryssl will use the port table directly.

4. XML output
2014-09-20 05:40:44 +00:00
dmiller
d50436def8 Let scripts set/preserve port.version.service_fp
Previously, calling nmap.set_port_version would delete a service
fingerprint if it existed. Now, setting probestate to anything but
"hardmatched" will preserve the fingerprint, if it exists. This allows
scripts (like http-server-header) to use "softmatched" to set version
info but still encourage users to submit fingerprints.
2014-09-20 05:40:43 +00:00
fyodor
0351db35b9 Update copyright year to 2014 2014-09-19 04:32:58 +00:00
dmiller
791566faf0 Let imap and pop3 use shorter connect timeouts 2014-09-19 03:10:10 +00:00
dmiller
45ff211483 Refactor smtp.connect to use comm.opencon 2014-09-19 03:10:09 +00:00
dmiller
004851bb06 Reindent comm.lua (whitespace-only) 2014-09-19 03:10:07 +00:00
dmiller
77a1c5c79c Some comm.lua internal changes
1. export the comm.opencon function. Does all the connect/request
timeout, recv_before, and first data payload stuff that tryssl does, but
without trying SSL. Ought to save some boilerplate in some scripts

2. Make opencon use setup_connect instead of duplicating code.

3. Move a debug message about tryssl to tryssl from opencon

4. Transparently handle UDP in tryssl, in case someone does that. Debug
message about DTLS not being supported is printed, but otherwise just
connects with opencon. Previously, doing this would result in a
connection to the TCP version of the port, even if you passed in a port
table with port.protocol=="udp".
2014-09-19 03:10:06 +00:00