Commit Graph

203 Commits

Author SHA1 Message Date
Zakir Durumeric
801ddf3ead allow users to specify a comma-delimited list of ciphers to send 2018-03-22 11:09:51 -05:00
justinbastress
ec2d01a541
Merge pull request #84 from zmap/feature/closeConnections
zgrab2: Close connections, add missing files
2018-03-22 11:25:39 -04:00
Justin Bastress
83212a722e add dnp3.go 2018-03-21 17:17:38 -04:00
Justin Bastress
04db34a3af Merge branch 'master' into feature/closeConnections 2018-03-21 17:17:23 -04:00
Justin Bastress
087337935b clean up connections before exiting 2018-03-21 17:16:58 -04:00
justinbastress
7b26ae30c5
Merge pull request #83 from zmap/feature/portDNP3Module
zgrab2: port DNP3 scanner from zgrab
2018-03-21 17:14:09 -04:00
Justin Bastress
735cb3a4c3 port DNP3 scanner 2018-03-21 16:52:53 -04:00
justinbastress
6ef616c073
Merge pull request #82 from zmap/feature/portScadaModule
zgrab2: port BACNet from zgrab
2018-03-21 16:44:32 -04:00
Justin Bastress
1c84990382 port BACNet from zgrab 2018-03-21 16:27:28 -04:00
justinbastress
75de499312
Merge pull request #81 from zmap/feature/portModbusFromZGrab
zgrab2: Port modbus from zgrab
2018-03-21 13:32:53 -04:00
Justin Bastress
45a96cf40a make requestID configurable 2018-03-21 11:49:26 -04:00
Justin Bastress
6f55be0fbb fix schema 2018-03-21 11:00:22 -04:00
Justin Bastress
c2aefe4ecd remove debug 2018-03-21 10:39:56 -04:00
Justin Bastress
0f7a265bdd add modbus scanner 2018-03-21 10:36:58 -04:00
justinbastress
eb52aeb439
Merge pull request #80 from zmap/feature/updateSMBLibrary
zgrab2: Update SMB library
2018-03-16 14:52:37 -04:00
Justin Bastress
199fe5d8e5 PEP8 updates; fix NTLM typo 2018-03-16 14:39:06 -04:00
Justin Bastress
1024fb4619 break out early if !setup-session; make debug configurable 2018-03-16 14:34:15 -04:00
Justin Bastress
586992cb15 More comments; make old zgrab behavior the default 2018-03-16 14:00:12 -04:00
Justin Bastress
d47c97d830 remove debug code 2018-03-16 13:36:53 -04:00
Justin Bastress
65d1789860 comments; update schema 2018-03-16 13:21:05 -04:00
Justin Bastress
c05c00a743 Pull in updated SMB library, modify it to take logs, use it in scanner 2018-03-16 12:08:59 -04:00
Justin Bastress
70314ce92b Port SMB (???) scanner from ZGrab 2018-03-15 16:58:57 -04:00
justinbastress
85f4b8f06a
Merge pull request #78 from zmap/feature/portIMAPModule
zgrab2: Port IMAP scanner from zgrab
2018-03-15 15:28:21 -04:00
justinbastress
46737b418c
Merge pull request #77 from zmap/feature/addSMTPModule
zgrab2/SMTP: add SMTPS support
2018-03-15 14:50:22 -04:00
Justin Bastress
aa4c966d0d add basic IMAP scanning 2018-03-15 14:35:35 -04:00
justinbastress
5a7f9c3bda
Merge pull request #76 from zmap/feature/portPOP3Module
zgrab2: Port POP3 module from zgrab
2018-03-15 13:41:29 -04:00
Justin Bastress
d12eb17aa4 add SMTPS support 2018-03-15 13:35:58 -04:00
Justin Bastress
0fbf68b9e9 fix input flags 2018-03-15 13:25:53 -04:00
Justin Bastress
8dd7a62768 remove port forwarding from pop3 container 2018-03-15 13:17:52 -04:00
Justin Bastress
f1c9bfbc89 merge master 2018-03-15 13:12:21 -04:00
justinbastress
1a1059e124
Merge pull request #75 from zmap/feature/addSMTPModule
zgrab2: Port SMTP module from ZGrab
2018-03-15 13:10:39 -04:00
Justin Bastress
ad6295f421 port POP3 2018-03-15 13:10:10 -04:00
Justin Bastress
57bc835bcf Add integration tests; Post PR comment updates: stray further from original ZGrab input/output in favor of more zgrab2-like input/output; make QUIT optional (default off). 2018-03-15 11:07:18 -04:00
Justin Bastress
89911eff01 merge master 2018-03-14 17:22:12 -04:00
Justin Bastress
eebe727686 update schema 2018-03-14 17:20:47 -04:00
Justin Bastress
37b54205f8 lint/comment SMTP 2018-03-14 17:19:27 -04:00
justinbastress
14572887ab
Merge pull request #74 from zmap/feature/addTelnetModule
zgrab2: port telnet module from zgrab
2018-03-14 11:12:01 -04:00
Justin Bastress
03b5bb2a5e TelnetOptions get encoded to name/value, not String(name) 2018-03-14 10:59:41 -04:00
Justin Bastress
23607e39cd TelnetOptions get encoded to name/value, not String(name) 2018-03-14 10:46:38 -04:00
Justin Bastress
33cd6941e4 TelnetOptions get encoded to name/value, not String(name) 2018-03-14 10:34:52 -04:00
Justin Bastress
52a43d0d47 fix schema case 2018-03-14 10:16:06 -04:00
Justin Bastress
20cde3441d add missing telnet.go 2018-03-14 09:59:46 -04:00
Justin Bastress
b52d4c47bc chmod +x shell scripts 2018-03-14 09:20:03 -04:00
Justin Bastress
f09d31c65a add SMTP 2018-03-14 09:18:54 -04:00
Justin Bastress
fa6a7ce50c port telnet module from zgrab; add basic integration tests and schema 2018-03-13 15:23:57 -04:00
justinbastress
824533b118
Merge pull request #72 from zmap/feature/storeProtocolInResult
Include scanner protocol in response
2018-03-13 13:18:09 -04:00
Justin Bastress
17a5c0e85c Scanner modules return the protocol ID, scan returns the protocol in the results. 2018-03-12 13:36:11 -04:00
justinbastress
7eb3536b19
Merge pull request #71 from zmap/feature/fixHeartbleedCheck
Fix heartbleed check
2018-03-09 09:38:25 -05:00
Justin Bastress
98a868381d tls.HeartbleedError means no error? Copying behavior from zgrab/zlib/conn.go. 2018-03-08 14:07:32 -05:00
justinbastress
b06d9bbc85
pull zflags from the zmap project (#69) 2018-03-07 11:04:16 -05:00