f49887290d
* remove unnecessary indirection on net.Conn * Ignore *.pyc * fix NPE on nil handshake * refactoring -- move status to status.go; add Open() methods for ScanTarget * cherry-pick .gitignore fix * pull in TLS fix * status.go comments * trim over-generalizations * use /usr/bin/env bash instead of absolute path * remove debug tcpwrap * add integration tests for postgres * hack for cleanup.sh to work on mingw -- use //var/lib instead of /var/lib * cleanup should actually stop the process though * comments / rearrange * Bump up timeout in postgres tests; only pass user if explicitly requested to do so * add schema stubs to new.sh * Integration test fixes -- use /usr/bin/env bash; log all validation failures * add postgres schemas * fill out zcrypto.client_hello schema * handle early get of TLSLog * postgres: return SCAN_SUCCESS on success * cleanup * fix new.sh * fix typo * postgres container cleanup * build.sh docs * standardize container/image names * add not to check for success * shift mysql's connection management to ScanTarget.Open(); wrap Read/Write methods returned by ScanTarget.Open() to enforce timeouts * catch schematically-valid but non-successful scans * postgres: clean up output format; more scanning * cleanup; better error handling; get detailed protocol version error * refactor modules * clean up dangling connections * split gigantic postgres.go * remove unused * ServerParams gets its own type * refactor integration tests: run zgrab2 in its own container, which is linked to the service containers, so that we don't need to keep track of unique ports on the host any more * rename entrypoint; remove duplicate postgres tests * comments for postgres schema * Use param expansion to check for env variable [minor] This is a *very* minor change to `docker-runner/docker-run.sh` checks to see if the environment variable required to run the script has been set to a non-empty string. If not, the script exits with a non-zero status code and displays a default message: ``` ❯ docker-runner/docker-run.sh docker-runner/docker-run.sh: line 7: CONTAINER_NAME: parameter null or not set ``` This was the behavior before, but just uses a one-liner declarative bash idiom. For further reading on parameter expansion, see https://stackoverflow.com/a/307735. @justinbastress can tell me if I did something wrong and broke the intent of the script :-) * Add integration_test targets to makefile; use makefile instead of directly calling go build everywhere; run postgres schema through PEP8 linter * use make in docker-runner entrypoint * add .integration_test_setup to .gitignore * more .gitignore items * Makefile updates: Windows support; add docker-runner target; better cleanup. * docker-runner Dockerfile: start from zgrab2_runner_base image * cleanup postgres setup * make travis use make * add .gitattributes, try to prevent it from overriding lfs with crlfs in shell scripts at least * fix folder name in Makefile * update go (one of our dependencies now works only with >= 1.9) * From travis: `I don't have any idea what to do with '1.9.0'.` * explicit clean make * fix dep order * fix build.sh location * popd * use make to ensure zgrab2_runner exists * Make docker-runner an order-dependency for integration-test-cleanup; don't do a cleanup after each integration test * use explicit tag name for zgrab2_runner * Add container-clean target to Makefile, to remove cyclic dependency on docker; use .id files to track docker images; add servce-base image; use Make to build / track images * use LF in Makefiles; update .gitignore; use zgrab_service_base image in ssh container; fix line endings (?) * remove overzealous cleanup * let setup continue even if some containers are already running * zgrab depends on *.go * docker-runner depends on zgrab2 binary * clean output before running integration tests
61 lines
1.8 KiB
Python
61 lines
1.8 KiB
Python
from zschema.leaves import *
|
|
from zschema.compounds import *
|
|
import zschema.registry
|
|
from collections import defaultdict
|
|
|
|
# Base / shared schema types for zgrab2
|
|
|
|
import schemas.zcrypto as zcrypto
|
|
|
|
# Map of protocol-name -> protocl-schema. This is wrapped in a SubRecord
|
|
# Protocols are responsible for calling register_scan_response_type(protocol_name, schema).
|
|
# Failure to do so will result in a validation exception for any scan results containing that protocol.
|
|
# NOTE: Scans with custom names will cause the validator to fail.
|
|
# TODO: Can this be somehow replaced with the main registry?
|
|
scan_response_types = {}
|
|
|
|
# Placeholder / RFU. Many mysql fields are only included in debug mode.
|
|
def DebugOnly(childType):
|
|
return childType
|
|
|
|
# zgrab2/processing.go: Grab
|
|
grab_result = Record({
|
|
"ip": IPv4Address(required = False),
|
|
"domain": String(required = False),
|
|
"data": SubRecord(scan_response_types, required = True),
|
|
})
|
|
|
|
# zgrab2/module.go: const SCAN_*
|
|
STATUS_VALUES = [
|
|
"success",
|
|
"connection-refused",
|
|
"connection-timeout",
|
|
"connection-closed",
|
|
"io-timeout",
|
|
"protocol-error",
|
|
"application-error",
|
|
"unknown-error"
|
|
]
|
|
|
|
# zgrab2/module.go: ScanResponse
|
|
base_scan_response = SubRecord({
|
|
"status": Enum(values = STATUS_VALUES, required = True),
|
|
"timestamp": DateTime(required = True),
|
|
"result": SubRecord({}, required = False), # This is overridden by the protocols' implementations
|
|
"error": String(required = False)
|
|
# TODO: error_component? domain?
|
|
})
|
|
|
|
# zgrab2/tls.go: TLSLog
|
|
tls_log = SubRecord({
|
|
"handshake_log": zcrypto.tls_handshake,
|
|
"heartbleed_log": zcrypto.heartbleed_log
|
|
})
|
|
|
|
# Register a schema type for responses with the given name.
|
|
def register_scan_response_type(name, schema):
|
|
scan_response_types[name] = schema
|
|
|
|
zschema.registry.register_schema("zgrab2", grab_result)
|
|
|