Merge remote-tracking branch 'upstream/master'

tumi8 · Mar 13, 2021 · 2da6cf3 · 2da6cf3
2 parents dd31295 + fbc1e2b
commit 2da6cf3
Show file tree

Hide file tree

Showing 74 changed files with 866 additions and 1,016 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,32 @@
+---
+name: Bug report
+about: ZMap is sending or receiving packets incorrectly
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is. Inability to get ZMap to run on a specific platform or network is not considered a bug.
+
+**CLI Arguments**
+Please paste your ZMap invocation below
+
+```
+# Paste Here
+```
+
+**Example Target IP**
+
+Please list any IPs that can be used for testing behavior.
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Environment:**
+ - OS: [e.g. Ubuntu Server 18.04]
+ - Version: [e.g. from package manager, Github HEAD]
+
+**Additional context**
+Add any other context about the problem here.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,6 @@
 language: c
 os: linux
-dist: trusty
+dist: xenial
 addons:
   apt:
     packages:
@@ -34,10 +34,4 @@ script:
   - make
   - cd $TRAVIS_BUILD_DIR
   - python ./scripts/check_manfile.py
-  - ./checkFormat.sh
 compiler: clang
-notifications:
-  email:
-  - zmap-devel@umich.edu
-  slack:
-    secure: gLiX4zUhlYMJ0l7kJlb5Wf5CmAynj+WQufThSBPP7XlLZddl6Vql72sJuqwl1ZV75xEsqP05QDulBMJc9AaED7BP53vhngHHgWLwjt026ne5sbA/s98U735jT/qwwFvKWBCYPZ5BQdTmJO3KCyuBJH+tQnptiolog9abksG1WZk=
diff --git a/10gigE.md b/10gigE.md
@@ -50,7 +50,7 @@ DO NOT TAKE THIS LIGHTLY!
 
 Running ZMap at 10Gbps hits every /16 on the Internet over 200 times a second.
 Even if you have a large source IP range to scan from, it's very obvious that
-you're scanning. As always, follow scanning best practices, honor blacklist
+you're scanning. As always, follow scanning best practices, honor blocklist
 requests, and signal benign/research intent via domain names and websites on
 your scan IPs.
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -72,15 +72,15 @@
 
 ## FEATURE
 * Autodetect number of sender threads.
-* Add ignore-invalid-hosts option for blacklist.
+* Add ignore-invalid-hosts option for blocklist.
 
 # 2.1.0	2015-09-02
 ## BUGFIX
 * ZMap now filters out packets that are from the local MAC instead of only capturing packets from the local gateway. The prior approach caused valid responses to be dropped for a fair number of users.
 * ZMap would sometimes segfault if the number of threads was greater than the number of destination hosts.
 * ZMap did not crash when it was unable to write to the output file. This would cause ZMap to continue running when it was piped into another application and that application died. We not log_fatal if the output is no longer accessible per ferror.
 * Pcap filter captures outgoing packets.
-* Install overwrites blacklist file.
+* Install overwrites blocklist file.
 * Output is sometimes colored.
 * Use correct email for Zakir in AUTHORS.
 * Random-number generator is now thread safe.
@@ -94,15 +94,15 @@
 * Output to `stdout` by default.
 * Remove space in csv output header.
 * Build with JSON support by default.
-* Don't print blacklisted CIDR blocks to log. These are available in `--metadata-file` and end up flooding the log with a ton of metadata.
+* Don't print blocklisted CIDR blocks to log. These are available in `--metadata-file` and end up flooding the log with a ton of metadata.
 * Remove type field from JSON output module and get rid of header.
 * Remove `--summary`. This has been replaced by `--metadata-file`.
 * JSON metadata now uses ISO-8601 compatible timestamps instead of proprietary log format.
 * Remove buggy and never officially-released DNS probe module.
 * Add icmp-echo-time probe module for measuring RTT MongoDB output module.
 
 ## FEATURE
-* zblacklist (a standalone utility that allows you to efficiently check IP addresses against a ZMap compatible whitelist and blacklist. This is helpful if you are doing something like ```cat list-of-ips | zgrab``` and to make sure that you're still following your blacklist.
+* zblocklist (a standalone utility that allows you to efficiently check IP addresses against a ZMap compatible whitelist and blocklist. This is helpful if you are doing something like ```cat list-of-ips | zgrab``` and to make sure that you're still following your blocklist.
 * ztee (a standalone utility that buffers between ZMap and ZGrab) and allows extracting just IP address from a larger ZMap output in order to complete follow up handshakes without losing any data.
 * NTP probe module.
 * Status-updates-file (monitor output as a csv).

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -74,6 +74,7 @@ if(JSON_FOUND)
 else()
     message(FATAL_ERROR "Did not find libjson")
 endif()
+string(REPLACE ";" " " JSON_CFLAGS "${JSON_CFLAGS}")
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${JSON_CFLAGS}")
 
 if(WITH_REDIS)

diff --git a/README.md b/README.md
@@ -20,16 +20,7 @@ Installation
 ------------
 
 The latest stable release of ZMap is version 2.1.1 and supports Linux, macOS, and
-BSD. It can be installed through the built-in package managers on the following
-operating systems:
-
-| OS                                        |                             |
-| ----------------------------------------- | --------------------------- |
-| Debian and Ubuntu                         | `sudo apt install zmap`     |
-| Fedora, CentOS, and RHEL                  | `sudo yum install zmap`     |
-| Gentoo                                    | `sudo emerge zmap`          |
-| macOS (using [Homebrew](https://brew.sh)) | `brew install zmap`         |
-| Arch Linux                                | `sudo pacman -S zmap`       |
+BSD. We recommend installing ZMap from HEAD rather than using a distro package manager.
 
 **Instructions on building ZMap from source** can be found in [INSTALL](INSTALL.md).
 

diff --git a/conf/blacklist.conf → conf/blocklist.conf b/conf/blacklist.conf → conf/blocklist.conf
diff --git a/conf/zmap.conf b/conf/zmap.conf
@@ -12,11 +12,11 @@
 #bandwidth 1M	# 1mbps
 
 
-### Blacklist file to use. We encourage you to exclude
+### Blocklist file to use. We encourage you to exclude
 ### RFC1918, IANA reserved, and multicast networks,
 ### in addition to those who have opted out of your
 ### network scans.
-blacklist-file "/etc/zmap/blacklist.conf"
+blocklist-file "/etc/zmap/blocklist.conf"
 
 ### Optionally print a summary at the end
 #summary
diff --git a/examples/udp-probes/chargen_19.pkt b/examples/udp-probes/chargen_19.pkt
@@ -0,0 +1 @@
+
diff --git a/examples/udp-probes/qotd_17.pkt b/examples/udp-probes/qotd_17.pkt
@@ -0,0 +1 @@
+
diff --git a/examples/udp-probes/sip_5060.pkt b/examples/udp-probes/sip_5060.pkt
@@ -0,0 +1 @@
+OPTIONS
diff --git a/examples/udp-probes/ssdp_1900.pkt b/examples/udp-probes/ssdp_1900.pkt
@@ -0,0 +1,5 @@
+M-SEARCH * HTTP/1.1
+HOST:239.255.255.250:1900
+ST:ssdp:all
+MAN:"ssdp:discover"
+
diff --git a/examples/udp-probes/tftp_69.pkt b/examples/udp-probes/tftp_69.pkt
diff --git a/examples/udp-probes/wsd_malformed_3702.pkt b/examples/udp-probes/wsd_malformed_3702.pkt
@@ -0,0 +1 @@
+<:/>
diff --git a/examples/udp-probes/xdmcp_177.pkt b/examples/udp-probes/xdmcp_177.pkt
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
@@ -1,5 +1,5 @@
 SET(LIB_SOURCES
-    blacklist.c
+    blocklist.c
     constraint.c
     logger.c
     pbm.c

diff --git a/lib/blacklist.h b/lib/blacklist.h