Commit Graph

251 Commits

Author SHA1 Message Date
Justin Bastress
3f77b4e720 remove empty integration_tests.py 2017-12-18 09:21:39 -05:00
Justin Bastress
031129c45c Merge remote-tracking branch 'origin/aps/feature/addMySQLZGrabModule' into feature/addMySQLZGrabModule 2017-12-18 09:10:43 -05:00
Andrew Sardone
f38d85b71c
Add script to generate new-protocol tests [minor]
Just a minor little utility script for generating shell scripts around
the setup/test/cleanup rhythm of the zgrab integration tests.
2017-12-18 00:56:57 -05:00
Andrew Sardone
f45ab312bb
Move all test scripts into integration_tests/ directory
This is just a very minor directory organization change, but it has the
advantage of keeping a bunch of files out of the root directory and
packaging them together since they are related to each other.

Now, our `integration_tests/` directory has a nice pattern of
setup/cleanup/test.sh scripts at the top global level and at each module
level:

```
❯ tree --dirsfirst integration_tests
integration_tests
├── mysql
│   ├── util
│   │   ├── launch_mysql_container.sh
│   │   └── wait_for_mysqld.sh
│   ├── cleanup.sh
│   ├── setup.sh
│   ├── single_run.sh
│   └── test.sh
├── ssh
│   ├── cleanup.sh
│   ├── setup.sh
│   └── test.sh
├── cleanup.sh
├── setup.sh
└── test.sh

3 directories, 12 files
```

The scripts are runnable via:

```
./integration_tests/setup.sh && ./integration_tests/test.sh && ./integration_tests/cleanup.sh
```
2017-12-18 00:44:06 -05:00
Andrew Sardone
c0b0e7e0cf
Ignore build dependencies & artifacts 2017-12-18 00:31:04 -05:00
Andrew Sardone
0bd08ae0a1
Ignore zgrab output from git
None of this stuff should be checked in, since it's just the results of
zgrab or test runs.
2017-12-18 00:03:04 -05:00
Andrew Sardone
4f85cf41ff
Add baseline gitignore
A gitignore for the project didn't exist until now. While this
doesn't have to do directly with the work of the current PR, it seems
good to me to just have _something_ in place for future gitignores, and
no time like the present.

Throwing a .DS_Store ignore in there to just be extra cautious that
those pesky OS X/macOS files don't make their way into the repo.
2017-12-18 00:01:00 -05:00
Justin Bastress
d49b60f337 log.Warnf -> log.Fatalf for not implemented 2017-12-15 17:14:19 -05:00
Justin Bastress
fcf62fb278 use set +e instead of bash +e 2017-12-15 17:02:42 -05:00
Justin Bastress
8f49912090 move build to install, remove unused checkout 2017-12-15 16:58:59 -05:00
Justin Bastress
de416852a6 pull/use zschema from pip 2017-12-15 16:57:04 -05:00
Justin Bastress
b33a5ec60e remove double 'docker stop' 2017-12-15 13:34:41 -05:00
Justin Bastress
fc41c2e149 clean up error handling 2017-12-15 11:03:06 -05:00
Justin Bastress
359225e635 address TODOs 2017-12-15 10:26:32 -05:00
Justin Bastress
c41a770b6d update verbose docs 2017-12-15 10:19:25 -05:00
Justin Bastress
dc44903ff6 Update ScanStatus comments 2017-12-15 10:02:09 -05:00
Justin Bastress
a0904d6b30 note non-SSL mysql 2017-12-15 09:57:56 -05:00
Justin Bastress
c5f0a94e70 get unquoted string from jp to simplify comparison 2017-12-15 09:56:15 -05:00
Justin Bastress
af1fb2fd57 readme fixes 2017-12-15 09:53:46 -05:00
Justin Bastress
e8609a3bfc fix logging for wait_for_mysqld 2017-12-15 09:39:18 -05:00
Justin Bastress
cc343b1098 fix readme formatting 2017-12-15 09:39:03 -05:00
justinbastress
a244ec15e6 TLS scan prototype + Travis integration (#25)
* Fix typo

* Actually call init per sender for each goroutine

* split out TLS handling

* Rename tls_handshake; update docs

* fix comments

* format fixes

* merge updates

* fix path

* refactor heartbleed logging (now the same as original zgrab)

* add ScanStatus, update modules to return it

* fix threaded for loop; fix styling of dict literal

* fix compile errors, note un-bubbled handshake error

* initial schema commit

* fix comment

* schema cleanup

* comments

* fix TODOs

* first attempt at docker integration in travis; also add schema validation

* add integration_tests.sh

* need sudo?

* try pip install --user

* revert regression

* add docker service again

* chmod +x integration_tests.sh

* fix path of binary

* Dump output file to stdout

* travis work

* use jp's build-self-contained script

* use go get/go build to get jp

* fix jp path

* switch from bogus regex to wildcard

* do all mysql versions; fix version comparison

* re-enable notifications; fix successful version check log message; comment TryGetScanStatus

* move to conf.d layout for integration tests

* update README

* add missing scripts

* add ./ to path
2017-12-15 09:25:17 -05:00
Justin Bastress
87f2825cac fix imports in test-only files 2017-12-08 16:03:31 -05:00
Justin Bastress
c2fb02425c add go get -t, to pull in deps needed for testing, as in https://github.com/zmap/zlint/blob/master/.travis.yml 2017-12-08 15:55:53 -05:00
Justin Bastress
65ed67a2f1 try go get ./... in .travis.yml, so that we don't need to track all new dependencies in here as well 2017-12-08 15:43:54 -05:00
Justin Bastress
577e79cb54 fix zgrab/zgrab2 paths in lib/ssh 2017-12-08 15:42:29 -05:00
Justin Bastress
ab9097838c fix arg handling in test_mysql_version.sh 2017-12-08 15:35:59 -05:00
Justin Bastress
5ca4ef481b add chmod +x to scripts 2017-12-08 14:37:36 -05:00
Justin Bastress
93902ce8c0 add test scripts 2017-12-08 14:34:27 -05:00
Justin Bastress
45ae3c1f0c switch from flagsToList to flagsToSet 2017-12-08 13:39:21 -05:00
Justin Bastress
db19d9c57f chmod +x integration_tests.py 2017-12-07 16:44:58 -05:00
Justin Bastress
283b22b3f3 fix path 2017-12-07 16:41:30 -05:00
Justin Bastress
6d6cb00fc6 add travis skeleton based on zdns's 2017-12-07 16:27:51 -05:00
Justin Bastress
162c71e95e fix ReservedOmitted tags; strip trailing NUL terminator in AuthPluginName; encode AuthPluginData as a []byte not a string 2017-12-07 16:16:53 -05:00
Justin Bastress
b9fdd24b1f Add output conversions; add debug tags to less-useful fields (not currently consumed) 2017-12-07 15:57:40 -05:00
Justin Bastress
d561fcdba7 omitempty on optional values 2017-12-05 21:32:17 -05:00
Justin Bastress
c64cb23fbc switch from a PacketLog list to a ConnectionLog with enumerated entries 2017-12-05 14:02:14 -05:00
Justin Bastress
6dae547826 add usage info 2017-12-04 12:25:57 -05:00
Justin Bastress
e96b7bd419 Omit normal reserved data from output 2017-12-04 12:06:14 -05:00
Justin Bastress
b70c8d84ce remove redundant Packet.GetType() 2017-12-04 11:15:14 -05:00
Justin Bastress
ecf8690e96 Remove GetDescription(); formatting fixes 2017-12-04 10:55:55 -05:00
Justin Bastress
9de9ee9f17 Remove underscores 2017-12-04 10:19:47 -05:00
Justin Bastress
837a4b57da NewConfig -> InitConfig 2017-12-04 09:37:04 -05:00
Justin Bastress
41f3e53069 Link capability flags definitions in MySQL Reference Manual 2017-12-04 09:35:21 -05:00
Justin Bastress
505d2d0281 add MySQL module 2017-11-27 13:00:31 -05:00
Zakir Durumeric
317b32ac9d
Merge pull request #9 from zmap/implementSSHp2
Implement SSH
2017-11-13 13:46:00 -05:00
Alex
e9c71eef84 Remove deprecated flag, make ssh grabber inline 2017-10-26 14:36:02 -04:00
Alex
c6a009d85b Couple of bug fixes, do clientID and verbose 2017-10-22 21:19:49 -04:00
Alex
9bbc2ea8f4 Name changes to library, remove global config 2017-10-22 21:19:49 -04:00
Alex
f99445c05b sed name changes 2017-10-22 21:19:49 -04:00