1
0
mirror of https://github.com/nmap/nmap.git synced 2026-02-06 05:26:34 +00:00
Commit Graph

971 Commits

Author SHA1 Message Date
david
d9b73da3a1 Give sample return values for smb.get_os. 2012-09-08 17:05:33 +00:00
david
e9b2a8aa5d Add stdnse.format_timestamp function.
This function follows RFC 3339 and is going to be the standard formatter
for dates and times in structured output.
2012-09-08 16:09:04 +00:00
david
ac87c9b251 Add stdnse.date_to_timestamp function.
This takes a broken-down date table, as produced by os.date("*t"), and
converts it into an integer number of seconds since the epoch UTC,
interpreting it as a time in a given time zone. Simply passing a date
table to os.time is not good enough, because os.time always assumes the
date table represents a local time; i.e., you will get different results
from running os.time({year=2012,month=1,day=1,hour=12,min=0,sec=0})
depending on what time zone you run it in.
2012-09-08 16:08:58 +00:00
patrik
b8ce3d3274 Removed debug print statement 2012-09-02 22:45:16 +00:00
patrik
f9e457ec7c nse-check-globals cleanup 2012-08-31 15:22:29 +00:00
patrik
13411ab6d1 Fixed a bunch of errors related to inproper responses from webservers. 2012-08-31 15:17:14 +00:00
aca
c13d7c719a Added msrpc-enum script and msrpc lua changes 2012-08-31 10:00:54 +00:00
patrik
0a0db9f835 Fixed library bug, failing to return _ENV; 2012-08-29 19:11:04 +00:00
patrik
6c97e0721d nse-check-globals cleanup 2012-08-29 05:42:27 +00:00
patrik
448bb5a71b fixed a bug in a loop where the script would wait for a condition that was
supposed to be signalled by other threads which were no longer running.
2012-08-29 05:37:56 +00:00
tomsellers
5ba2007d69 Added or enhanced support for the following data types:
SQLTEXT       = 0x23 - text
GUIDTYPE      = 0x24 - uniqueidentifier
NTEXTTYPE     = 0x63 - unicode text (ntext)
BITNTYPE      = 0x68 - boolean
DECIMALNTYPE  = 0x6A - decimal
NUMERICNTYPE  = 0x6C - numeric
FLTNTYPE      = 0x6D - float/real/double
MONEYNTYPE    = 0x6E - money / smallmoeny
BIGBINARYTYPE = 0xAD - binary
BIGCHARTYPE   = 0xAF - char
SQLNCHAR      = 0xEF - unicode char (nchar)

Added detection and handling of null values when processing query responses from the server.
Added DoneProc response token support
Reordered ColumnData and ColumnInfo parsers by data type code to make updates easier.
2012-08-24 10:32:44 +00:00
aca
fd32aec639 Merged http-slowloris-check 2012-08-24 09:19:30 +00:00
jah
0936515cd9 Restored the hyphen character, in get_ips_from_range, to a lua string pattern for ip ranges such as "10.0.0.0 - 10.1.0.0" 2012-08-21 01:16:49 +00:00
dmiller
4728d7437d Fixes to rpc-grind
NSE: rpc-grind Connect(): RPC library does not support: nil protocol
NSE: rpc-grind Connect(): RPC library does not support: rpcbind version
81578896

These errors caused by ChkProgram and ChkVersion called from
rpc.Comm.Connect. Added a dummy program in rpc-grind and a check for
self.checkprogver in ChkVersion, and everything works great.

Also fixed portrule to only fail if the non-rpcbind service name was not
the result of table lookup. Was failing on port 2049 (in nmap-services
as "nfs") without -sV.
2012-08-18 03:32:50 +00:00
patrik
4157e63c9e nse_check_globals fixup 2012-08-17 05:37:59 +00:00
dmiller
9fbd30f191 Use ISO8601 time for smb-os-discovery 2012-08-16 15:46:37 +00:00
dmiller
86d1f0db47 Fix ARP decoder in packetdecoders.lua
Was throwing an exception when parsing a packet with a source IP that
had a fourth octet greater than 127, since the %d format specifier used
in the dups check is for signed integers, and the IP is little-endian.
Switched to %u (unsigned int) and it works great.
2012-08-15 19:25:44 +00:00
kroosec
8ff4cebbf7 Moved EIGRP decoding in packetdecoders.lua to use eigrp.lua library. 2012-08-15 09:17:20 +00:00
kroosec
f4917e6ce9 Added eigrp.lua library. 2012-08-15 01:47:30 +00:00
aca
3a44307320 Copy/paste error 2012-08-14 19:57:58 +00:00
patrik
17e56e8271 nse_check_globals cleanup 2012-08-14 18:47:46 +00:00
david
0c3e0fcc4d Structured script output.
Scripts may now return a key–value table, or such a table in addition to
a string. The table will be automatically formatted for normal output
and will appear as a hierarchy of elements in XML output.

Some history and discussion of this development can be found at
https://secwiki.org/w/Nmap/Structured_Script_Output.

This is a merge of r29484:29569 from /nmap-exp/david/xml-output.
2012-08-14 16:36:25 +00:00
aca
16aa7a938d Merged jdwp library, scripts and java classes into trunk 2012-08-14 11:31:08 +00:00
dmiller
346a495dd0 Squashed commit of the following:
commit 7c26e4de2ab365a30fe6e91f3a531eb38c8dfdba
Author: Daniel Miller <bonsaiviking@gmail.com>
Date:   Tue Aug 7 16:36:54 2012 -0500

    Fix indentation on netbios.lua (no code change)

commit 47dc3e32e6b47bd80620cfbc54e7590193dd0c1a
Author: Daniel Miller <bonsaiviking@gmail.com>
Date:   Tue Jul 31 16:42:27 2012 -0500

    Make smbauth.lua use host, not nmap, registry

commit 3738f8e6d551a1260463609d8cda86918843a372
Author: Daniel Miller <bonsaiviking@gmail.com>
Date:   Tue Jul 31 16:35:45 2012 -0500

    Make netbios.lua use host registry. Functions now can take host table or IP

commit 031cadb9d407ab7fd43aaddffda1a89c24cbdd45
Author: Daniel Miller <bonsaiviking@gmail.com>
Date:   Tue Jul 31 15:54:12 2012 -0500

    Remove mac-geolocation info from snmp-interfaces

commit 2218dbaf8ffd4a33de2bc028def9be7301dfb3a2
Author: Daniel Miller <bonsaiviking@gmail.com>
Date:   Tue Jul 31 15:52:36 2012 -0500

    Make path-mtu.nse use host, not nmap, registry

commit 5a3d006bdb9cd3e981a8e753c92b5ade5059a29b
Author: Daniel Miller <bonsaiviking@gmail.com>
Date:   Tue Jul 31 15:51:53 2012 -0500

    Make cvs-* scripts use host, not nmap, registry
2012-08-07 21:38:48 +00:00
batrick
cc6d7b67bf Fix r29529. Alias was wrong. 2012-08-07 17:37:10 +00:00
batrick
036d28c898 Remove nmap.sleep as we just want to have stdnse.sleep. 2012-08-07 17:25:49 +00:00
patrik
7e85545ea3 Fixed bug in return values for openssl pcall in libraries mssql and smbauth 2012-08-06 00:18:55 +00:00
kroosec
275d739cae ospf.lua: Couple of more bug fixes in how IP values are stored and packed. 2012-08-06 00:01:54 +00:00
perdo
7781d39cdf Textarea's name should not be lowercased. 2012-08-05 22:39:05 +00:00
perdo
ba049718b0 Add digest auth support to http-brute (and to http library). Also fix whitespace in sasl.lua. 2012-08-05 22:23:54 +00:00
patrik
fce517d4b8 add bjnp library and the scripts bjnp-discover and broadcast-bjnp-discover
commit d41a28813e4e4d26aeaab300ad30ad7c4116e37d
Merge: a45e4e2 23fc8f1
Author: Patrik Karlsson <patrik@cqure.net>
Date:   Sun Aug 5 20:53:04 2012 +0200

    Merge branch 'master' into bjnp

    Conflicts:
    	CHANGELOG

commit a45e4e2fd0c2579afc8d5b162bb5484327494b72
Author: Patrik Karlsson <patrik@cqure.net>
Date:   Sun Aug 5 20:44:19 2012 +0200

    add bjnp library and the scripts bjnp-discover and broadcast-bjnp-discover
2012-08-05 18:55:40 +00:00
kroosec
36e2449a8a ospf.lua: Removed debugging print. 2012-08-05 18:44:56 +00:00
kroosec
de920a2afc ospf.lua: Couple of bug fixes in ospf packet conversion to raw string. 2012-08-05 18:41:42 +00:00
patrik
be92f68cad Fixed a bug in afp-brute and the afp library related to missing SSL. 2012-08-05 14:25:53 +00:00
patrik
6f43ac38b2 SSL overhaul fixing OpenSSL related problems when SSL has not been compiled in
* replace require function calls with stndse.silent_require
* fixed a bug in nse_main that would fail creating scripts.db when a script
  fails to load
* reworked some code to provide limited functionality even though SSL is not
  present
2012-08-05 12:05:07 +00:00
kroosec
7864c3cb08 ospf.lua: Corrected header tostring for null authentication packets. 2012-08-05 11:23:16 +00:00
kroosec
93a54ee8b1 ospf.lua: Fixed error in checksum calculation for hello and dbdescription packets. 2012-08-05 11:02:44 +00:00
aca
d80183edab Small refactorization to sslcert.lua, split specialized functions into two, with and without calling reconnect_ssl 2012-08-03 16:11:50 +00:00
patrik
e7cb28619e fixed a bug where any url would be treated as withinhost due to a lacking
return statement in the removewww function
2012-08-03 06:13:57 +00:00
david
21ba9f7b4a Undocument nmap.sleep and undeprecate stdnse.sleep.
There are various functions in the internal nmap.socket and nmap.dnet
libraries that are there for technical reasons:
	http://seclists.org/nmap-dev/2012/q1/318
The sleep function is exposed through the stdnse namespace because it
fits that library better.

Some code comments said that names such as nmap.new_socket were
deprecated in favor of e.g. nmap.socket.new, but the old names were
never formally deprecated, so I removed those comments.
2012-08-03 02:08:44 +00:00
david
bf69c6b5b9 port is part of a url table. 2012-08-02 04:29:56 +00:00
kroosec
17d27f76b0 Updated documentation for rpc.lua latest changes. 2012-08-01 10:02:22 +00:00
kroosec
3cd7f8865d Added ability to disable for program and version support checking in rpc.lua. Authentication now defaults to NULL. 2012-08-01 09:58:48 +00:00
henri
d0e684735a Typo (identfy_404 -> identify_404). 2012-08-01 07:53:16 +00:00
david
a2c2863531 Remove "hardmatched" argument from calls to nmap.set_port_version.
This is the default and can be omitted. Seeing as the value of this
argument was "hardmatched" in 100% of cases, we're better off pretending
the parameter doesn't exist.
2012-07-30 18:58:32 +00:00
kroosec
8c20c04d99 Documentation fixes. Changed host.name and host.targetname by host.ip and host.name 2012-07-30 13:33:05 +00:00
aca
68b2efd3db Merged msrpc changes from my branch, including spoolss functionality 2012-07-30 09:39:23 +00:00
patrik
bca0025032 nse_check_global cleanup 2012-07-29 09:26:23 +00:00
david
1441aea655 Reduce the number of names tried by http-vhosts by default.
Vlatko reported that this script was taking an inordinate amount of time
even in typical scans. This patch reduces the number of domains tried by
default. The new http-vhosts.filelist script argument allows
substituting the original list or another of your choosing.

Patch by Vlatko.
http://seclists.org/nmap-dev/2012/q3/432
2012-07-29 03:39:11 +00:00
dmiller
b868e7f3ce Move caching code to datafiles lib
Scripts no longer need to implement caching of datafiles tables in the
registry, since the datafiles.lua library keeps its own cache in the
registry. A side-effect is that scripts should not change the tables
returned by datafiles.parse_{protocols,rpc,services,mac_prefixes}(), as
doing so will affect all other scripts that use those functions.
2012-07-27 20:07:38 +00:00