Commit Graph

508 Commits

Author SHA1 Message Date
justinbastress
1461f2d48d
Merge pull request #164 from zmap/jb/zcrypto-update-fixes
Fix for zcrypto updates
2018-09-05 18:03:06 -04:00
Justin Bastress
c51faaf8f5 use functions introduced in https://github.com/zmap/zcrypto/pull/178 in place of functions removed in https://github.com/zmap/zcrypto/pull/173/files 2018-09-05 16:26:05 -04:00
Justin Bastress
45a4cb0e90 re #163 -- add outer whole-connection timeout to TimeoutConnection, and add scan-target-wide timeout to HTTP scanner (adding a max time spent across redirects, too) 2018-09-05 14:33:59 -04:00
parkanzky
24e4b4b4fc
Merge pull request #162 from zmap/paul/mongodb-fix-ismaster-BSON-case
BSON tag is case sensitive - s/isMaster/ismaster
2018-08-30 09:36:03 -04:00
Paul A. Parkanzky
bb9324e00d BSON tag is case sensitive - s/isMaster/ismaster 2018-08-29 16:45:27 -04:00
parkanzky
ad2fe2c924
Merge pull request #161 from zmap/paul/mongodb-msglen-zero
Fix possible index error on malformed msg
2018-08-28 16:41:33 -04:00
Paul A. Parkanzky
1a1aa96793 Put upper limit on buffer size alloc 2018-08-28 16:13:35 -04:00
Paul A. Parkanzky
a7ddf61d74 Fix possible index error on malformed msg 2018-08-28 14:34:18 -04:00
parkanzky
264b811a72
Merge pull request #156 from zmap/paul/mongodb
Add MongoDB scanner.
2018-08-22 13:54:28 -04:00
Paul A. Parkanzky
d9aec0ae40 Improve partial results for mongodb scanner
* Separate out isMaster and buildInfo commands
* Return results of both in separate sub-structs
* Include isMaster results regardless of whether buildInfo succeeds
2018-08-22 11:49:17 -04:00
justinbastress
3327114cd0
Merge pull request #160 from zmap/jb/addMissingPostgresErrorType
add missing 'constraint' field for postgres_error
2018-08-22 10:15:17 -04:00
Justin Bastress
a139cc9349 add missing 'constraint' field for postgres_error 2018-08-22 10:07:59 -04:00
Paul A. Parkanzky
68bb3e9790 Return appropriate short write error 2018-08-21 17:08:01 -04:00
Paul A. Parkanzky
7419796cfc Address more PR comments
* Add error message to invalid BSON log msg
* Use snake case for json output
* Update affect integration tests
2018-08-21 16:34:35 -04:00
Paul A. Parkanzky
8b9c23f122 Fix typo and integration test which tested for it 2018-08-21 16:01:40 -04:00
Paul A. Parkanzky
f891880db4 Make some PR-requested changes
* Generate static messages in Scanner Init()
* s/panic/log.Fatal/
* Remove unnecessary casting
* Use stack var and pass slice to avoid unnecessary alloc
2018-08-21 14:51:48 -04:00
Paul A. Parkanzky
7386c5d3fa Fix script #! invocations 2018-08-21 13:33:56 -04:00
Paul A. Parkanzky
2f316b2242 Add mongodb integration tests. 2018-08-21 13:11:34 -04:00
Chris Dzombak
d8bba99313
Stop marking fields as “required” (#158)
This causes problems when trying to load data into BigQuery if, for example, an entire protocol or subrecord is unpopulated.
2018-08-21 12:33:26 -04:00
Paul A. Parkanzky
72cbe9ae63 Add support for mongodb >= 4.1 2018-08-20 16:16:05 -04:00
justinbastress
268294c16b
Merge pull request #157 from zmap/jb/fixCertTypeId
Fix CertType
2018-08-20 12:21:44 -04:00
Justin Bastress
ecbd12f11a note source location 2018-08-20 12:04:35 -04:00
Justin Bastress
1e4f4b9b51 Enums are Strings, but this value is actually a uint32 2018-08-20 12:03:18 -04:00
Paul A. Parkanzky
becec08234 Call the wrapped Write() method. 2018-08-17 15:17:26 -04:00
Paul A. Parkanzky
51b3763456 Go get module package dependencies. 2018-08-17 14:31:31 -04:00
Paul A. Parkanzky
784a186b39 Add MongoDB scanner. 2018-08-17 12:04:38 -04:00
justinbastress
e3e5189068 Replace Strings with WhitespaceAnalyzedStrings
https://github.com/zmap/zgrab2/pull/155
2018-08-14 14:37:39 -04:00
Clayton Zimmerman
8318aae089
Changes CertType's id field to an Enum of strings, as ES expects. (#154) 2018-08-03 13:59:05 -04:00
justinbastress
2e5d029946
Merge pull request #153 from zmap/feature/ipp-improve-scan
Finalize Before 1% Scan
2018-07-16 09:52:37 -04:00
Clayton Zimmerman
26e22bad97 Makes redirect response chain (currently unused) a debug field. 2018-07-12 16:47:26 -04:00
Clayton Zimmerman
dc3d7d1cb7 Adds bounds checks to avoid panic when value-less attributes have the correct name to be recorded directly in results. 2018-07-11 14:57:22 -04:00
Clayton Zimmerman
9d1265db8b Avoids skipping retry when an application error is encountered. 2018-07-11 14:45:46 -04:00
Clayton Zimmerman
6cffb7a888
IPP: document output fields (#151)
Documents fields of IPP scan results in schema.
2018-07-11 13:31:34 -04:00
justinbastress
96d3b8375f
Merge pull request #152 from zmap/feature/ipp-tls-retry
Try TLS before plaintext when using ipps-retry
2018-07-11 13:08:40 -04:00
Clayton Zimmerman
2c47dfc1f2 Makes Attributes default output (rather than debug). 2018-07-11 11:52:13 -04:00
Clayton Zimmerman
f9eb6e00db Rename tls-retry option to ipps-retry 2018-07-11 10:38:42 -04:00
Clayton Zimmerman
b407bb2aaf
Fix read all attributes (#150)
Parses empty attribute-groups correctly by skipping to the next one.
Also, compensates for change in Scanner.config.BaseFlags.Timeout's type.
2018-07-10 17:10:39 -04:00
clayzim
1fa9b886e4 Changes TLS-Retry to attempt TLS before plaintext, ideally gathering more information. 2018-07-10 16:07:28 -04:00
Chris Dzombak
d406a85a58 Add Python gitignore entries (#149) 2018-07-10 14:18:41 -05:00
clayzim
3fa42bef49 Parses empty attribute-groups correctly by skipping to the next one. 2018-07-10 15:16:30 -04:00
clayzim
544652de9d Resolves merge conflict to fix timeouts. 2018-07-10 15:10:24 -04:00
justinbastress
a05ff49d39
Merge pull request #148 from zmap/jb/fix-ipp-timeout
BaseFlags.Timeout is already a duration
2018-07-10 14:51:00 -04:00
Justin Bastress
2a4ffcc3d9 BaseFlags.Timeout is already a duration 2018-07-10 14:25:25 -04:00
clayzim
e77e11cb7f Compensates for change in Scanner.config.BaseFlags.Timeout's type. No longer casts to time.Duration. 2018-07-10 14:05:20 -04:00
Clayton Zimmerman
c11be290dc
Feature/IPP: Fix Retry-TLS and Collect All IPP Attributes (#143)
* Correctly enables TLS only during retry grab when retry-tls flag is set.
* Fixes evaluation which caused too many arguments error in IPP integration test.
* Updates IPP zgrab2 schema to reflect storing all attributes in response.
* Adds Attributes member to ScanResults
* Ensures tryReadAttributes only reads attributes in the case of a postive detection. Cleans up isIPP
* Reads all attributes in IPP response
* Detects invalid length errors when reading IPP attributes.
* Returns the correct amount of uris, ipp versions, and cups versions in ScanResults.
2018-07-09 14:39:54 -04:00
Justin Bastress
811eb38754 Add GetTLSConfigForTarget and GetTLSConnectionForTarget methods (allowing SNI to work without an explicit --server-name); Add scanTarget.OpenTLS() to give a uniform interface; Document TLS scan; use target.OpenTLS(), correctly report successful/failed detections 2018-07-05 14:34:17 -04:00
Alex Halderman
db6bf4c8b6
Merge pull request #144 from zmap/ah/io_module
Input/output extensibility
2018-07-05 13:21:29 -04:00
Alex Halderman
1f5e4b0f22 Provides a framework for modularized target input and result output functions. 2018-07-05 12:41:34 -04:00
Alex Holland
4f046b3085 Implement timeout to accept float value (#111)
* Implement timeout as a float value vs int

* remove unnecessary second multiplier

* whoops, missed one

* Switch type to time.Duration

* Fixup integration tests, change default and description

* Whoops, bad merge

* fix build
2018-07-02 13:00:45 -04:00
Alex Halderman
a3a1d7edd1
Merge pull request #141 from zmap/ah/trigger
Add support for Tags and Triggers.
Add proper CSV input.
2018-06-29 12:27:20 +02:00