1
0
mirror of https://github.com/nmap/nmap.git synced 2025-12-28 18:39:03 +00:00
Commit Graph

5079 Commits

Author SHA1 Message Date
david
a9a5869173 Normalize tab.lua usage so that a call to tab.nextrow comes after (not
before) each group of tab.add, and there is no tab.nextrow before or
after tab.addrow. Also remove manual indenting that was accomplished by
padding the first column with spaces; this is done by
stdnse.format_output now.
2010-12-30 21:08:25 +00:00
david
04210ef88f When an entry in stdnse.format_output has multiple lines, insert the
indent and prefix before each line, not just at the beginning. If the
indent was ">>>>", then formatting the line "AB\nCD" would result in

| >>>>  AB
|_CD

Now it will be

| >>>>  AB
|_>>>>  CD

Some script were working around this by relying on an invisible blank
first line and manually indenting following lines.
2010-12-30 21:08:24 +00:00
david
190ca31c6c Don't pad the last item in each row in tab.lua. This prevents one long
line from making all other lines wrap with blanks.
2010-12-30 21:08:22 +00:00
david
974d6061b3 Change t['rows'] to t.current_row, because it may not be equal to the
number of rows that are actually in the table (may be one greater).
2010-12-30 21:08:21 +00:00
david
1ee0fae3d1 Insert an empty row table when tab.nextrow is called and there is
nothing in the current row yet. This allows using #t or ipairs to get
the number of rows that have been filled by the user. t.rows is the
index number of the next row that will be filled in, or the one that is
currently being filled in if something has already been entered.
t.rows == #t + 1 means that we've finished with the previous row, but we
don't want to count a new (blank) row until we've started filling
something in.
2010-12-30 21:08:19 +00:00
david
357c15a165 Remove the "cols" parameter from calls to tab.new. 2010-12-30 21:08:18 +00:00
david
396481c1b8 Remove the "cols" attribute of tab.lua tables. Just calculate it
dynamically when dumping.
2010-12-30 21:08:17 +00:00
david
086b043cde Remove the single-string special case in stdnse.format_output.
This should be handled by the generic case, and I don't think it was
used anyway because the logic was wrong:

if(indent == nil and #data == 1 and type(data) == 'string' and not(data['name']) and not(data['warning'])) then
  return data[1]
end

This seems to be checking for a one-element table whose single element
is a string. But the test "#data == 1 and type(data) == 'string'" is
actually testing for a one-byte string. I think this is supposed to be
"type(data[1]) == 'string'", but anyway it should be handled by the
generic case.
2010-12-30 21:08:15 +00:00
david
d9d47eb93d Use sock:receive when neither the "lines" nor "bytes" option is given to
comm.exchange. Previously it was acting as if it got bytes=1, which
could return as few as one bytes. sock:receive will read until timeout
or EOF.
2010-12-29 22:44:03 +00:00
david
1046dcab57 Patch to hddtemp-info by Toni Ruotto that keeps reading past the first
byte if there's a delay and supports different separator characters.
2010-12-29 22:37:20 +00:00
david
77c5cd9d9a Use ftp.read_reply in ftp-proftpd-backdoor. Also, do a read_reply after
sending the magic shell string but before sending a shell command.
Michael Meyer reported that the script would sometimes fail to report a
backdoor; I tracked this down to the sends happening in too-close
succession. The ProFTPD process could receive both sends
("HELP ACIDBITCHEZ\r\nid;\r\n"), read the first line, and execute the
shell, but then the shell would get no input because the "id;\r\n" had
already been read.

This causes a delay up to the timeout when there is a backdoor, but it
still returns right away when there is no backdoor.
2010-12-29 21:24:53 +00:00
david
e2f8d1f5cb Move the read_reply function out of ftp-anon.nse and into a new library
ftp.lua.
2010-12-29 21:24:52 +00:00
david
0f105fbfbf Capitalization of "Mak" in CHANGELOG. 2010-12-29 21:24:50 +00:00
david
be20b513af Update @output of gopher-ls. 2010-12-29 18:47:17 +00:00
david
e6c8691007 Whitespace in gopher-ls.nse. 2010-12-29 18:46:20 +00:00
david
80f7754d01 Separate gopher-ls entries with newlines instead of commas. 2010-12-29 18:46:18 +00:00
david
0658e53070 Add gopher-ls.nse by Toni Ruotto. 2010-12-29 18:46:16 +00:00
tomsellers
fda466c417 Corrected an issue where the service detection type was set twice if the
service was probed and found to be TCPWRAPPED.  The second type entry
was incorrect (set it to table) and has been removed.
2010-12-29 17:25:57 +00:00
david
497f725ba6 Add a TODO to make --exec work with --proxy in Ncat. 2010-12-29 17:14:12 +00:00
tomsellers
43d1a0516b Summary of changes to the XSL since work started on 11/11 -
General:
- Added support for Pre and Post scan NSE output.  Index links at top only appear if 
  the sections exist.

- Host that are offline are now in a collapsible div element and collapsed by default.

- Added HTML Doctype of HTML 4.01 Strict, tidies up parsing 

- The display for closed and filtered ports has been changed. By default the information 
  for closed and filtered ports is filtered from the tables if JavaScript is enabled.  
  The column header now has clickable links that will display each.  The links indicate 
  the counts of each type (closed vs filtered) in the current table so that the user 
  can see at a glance if there is anything hidden. When printing the document the 
  printout will reflect the current status (hidden vs unhidden) of the ports.  The 
  clickable links themselves are also not output when printing.

- There is also a floating box in the lower right hand corner of the display that contains
  links that will toggle showing and hiding of ports in these states for the entire 
  document.  This floating box contains a link to the top of the document as well.

- Traceroute - rearranged output, now uses a collapsible div element that is collapsed
  by default.

- Host / Ping results section has been moved to a collapsible div element named Misc 
  Results.  This element is collapsed by default.

- Remote OS Detection OS match wording is now more like Nmap normal output - 
  OS type (accuracy) instead of separate lines for os match and accuracy

- Changed how host index HTML anchors are created in order to deal with a warning about 
  the name attribute being deprecated

- Fixed a bug in the port script output that caused it to only span 5 columns instead of 
  6. Tested this with various levels of debug, verbosity, etc to make sure that the 
  number of columns does not change.

- Changed nmap_xsl_version variable from 9b to 9c, Changed the last updated date in the 
  header to be today's date (2010.12.28)

- Added Nmap version number to Scan summary section

- Wording of verbosity/debug levels changed/simplified.

- HTML title and  first header wording changed.

- Added MAC vendor to host address section

- Changed host index to the format of hostname (IP) where preference is given to the 
  user supplied hostname.


General Style Changes:
- Changed color of script output cells in port table as well as hostscript and prescan
  result tables slightly to make visual parsing easier
- First header (Nmap Scan Report..) color changed to use Nmap purple
- Closed and Filters ports - background color is now grey
- Down hosts are now denoted with a grey background in both the host index (top) and 
  body of results


OS Fingerprint:

- Fingerprint block now uses a collapsible div element.  The block is collapsed by 
  default if the OS fingerprint is only present due to increased verbosity or debugging.
- Removed referenced fingerprint data ( reference fingerprint line number: 1000 )
- Reworded some sections of text for flow and readability.


Removed elements:
- Scan info Section - code was in place but has not been visible for some time. After 
  testing a few arrangements it was decided to just remove the data and code altogether.

- Runstats section, replaced by standard nmap completion string in the Scan Summary section


Open items:
1.  Device types - currently have issues with output data consistency and formatting when
    pulling a distinct list.

2.  What criteria / counts should be used in situations described below? For example, 
    how many fingerprints are too many? How do we know if the fingerprint is high enough 
    quality to submit given that it may just be present due to the use of -v or -d?

>  o It would be great to describe the OS detection results better.
>    For example, if there are no exact matches, normal Nmap says "No
>    exact OS matches for host ", followed up with "(test conditions
>    non-ideal)" if that is the case.  I think we should give a warning
>    like this.  Also, in the case that there are too many matches,
>    normal Nmap says "Too many fingerprints match this host to give
>    specific OS details"

>  o If there are no exact matches, and Nmap feels that the quality is
>    high enough for a submission, it would be great if the OS
>    detection section would encourage the user to submit, just like
>    normal Nmap does.

3.  Does the OS fingerprint need to be printed (to paper/PDF) at all? The only scenario 
    that I could think of where this would be useful would be if the file was 'printed'
    to digital media such as PDF.

4.  Does the table of ports need to be changed so that closed and and filtered ports 
    are always printed (to paper/PDF) as opposed to printing in the format that is 
    currently displayed?  My concern here is processes that automatically convert 
    documents, for example to PDF format.
2010-12-28 23:32:29 +00:00
fyodor
0913bfc4a3 Some updates from chat w/David 2010-12-28 22:38:20 +00:00
fyodor
b3f2e187a1 prepare for 5.36TEST3 test release 2010-12-28 22:02:12 +00:00
david
12b762517d Canonicalize some nmap-service-probes entries using the
nmap-service-probes-report.py script.
2010-12-28 20:58:33 +00:00
david
1ec4e5233f A couple of OS corrections that came from service corrections. 2010-12-28 18:52:33 +00:00
david
c77761b0b1 All 10 service corrections. 2010-12-28 18:52:31 +00:00
david
84fb8f2bb3 A few miscellaneous service probe changes. 2010-12-28 18:52:30 +00:00
david
016bea6276 Rearrange the ssh match lines so that the uncategorized ones are towards
the bottom of the file. This is how other blocks of matches are
arranged.
2010-12-28 18:52:28 +00:00
tomsellers
54657f0fc4 Added IBM HTTP Server match line, improved consistency among the
match output for this product.
2010-12-28 18:36:53 +00:00
david
68f14b9f5a The last 100 service submissions. 2010-12-28 05:52:02 +00:00
david
da6ed2d39a 100 service submissions. 2010-12-28 03:16:00 +00:00
david
4b14ccf8f8 100 service submissions. 2010-12-27 17:41:05 +00:00
robert
c2305f23a5 Added hashes for PHP 5.2.15 and 5.2.16. 2010-12-26 13:48:06 +00:00
fyodor
ff9f7766be Add a task for improving the service fingerprint submitter 2010-12-22 02:27:54 +00:00
david
c6721aae80 100 service submissions. 2010-12-21 16:59:46 +00:00
david
0b21a33414 100 more miscellaneous service submissions. 2010-12-21 05:04:45 +00:00
david
e36fe37c87 A bunch of miscellaneous service submissions. 2010-12-21 00:51:45 +00:00
david
3b849d64e1 upnp service submissions; also reclassify some "http" as "upnp". 2010-12-19 18:57:02 +00:00
david
f448f62b82 The last of the http service submissions. 2010-12-18 15:20:47 +00:00
david
bb55769fb4 More http submissions. 2010-12-18 05:02:37 +00:00
david
1a2a892610 This is about 75% of the http service submissions. 2010-12-17 05:25:40 +00:00
david
87d8a793f3 Use stdnse.get_script_args for modbus-discover.aggressive. 2010-12-16 08:59:19 +00:00
david
41a81e1789 Documentation and whitespace in modbus-discover.nse. 2010-12-16 08:59:18 +00:00
david
ad40df2c9b Add modbus-discover.nse from Alexander Rudakov. 2010-12-16 08:59:16 +00:00
david
dd7f04aebc Service submissions for
bittorrent pop3 afp imap time backupexec-remote backupexec beremote.exe
domain vnc-http vnc teamviewer mysql irc irc-proxy skype rtorrent nessus
bitcoin printer icecast 3dm-http.
2010-12-16 06:00:39 +00:00
david
3f2a6606af Add "vnc-http" and port 5800 to shortport.http. 2010-12-16 02:00:23 +00:00
david
57bdde922e Allow the first line of a service fingerprint to wrap.
Service fingerprints are supposed to be wrapped at 74 columns. The first
line was sometimes 148 columns because the preamble,
SF-Port1234-TCP:V=5.36TEST2%I=7%D=12/15%Time=4D096053%P=i686-pc-windows-windows
wasn't allowed to be wrapped, so this problem occurred whenever the
preamble was longer than 74 bytes.
2010-12-16 00:44:04 +00:00
david
0a87cb378a Whitespace. 2010-12-15 23:54:06 +00:00
david
4e018f1638 unknown and ssl service submissions. 2010-12-15 20:13:40 +00:00
david
ddf05d7e1f Whitespace in lexmark-config.nse. 2010-12-15 18:57:22 +00:00
patrik
c9ba464c28 Renamed domino-enum-passwords script to http-domino-enum-passwords 2010-12-15 08:52:31 +00:00