Merge remote-tracking branch 'upstream/master' (bbadb7b0) · Commits · nimrod / masscan

.travis.yml

0 → 100644

+13 −0

Original line number	Diff line number	Diff line
		# This is a build/test script for "travis-ci", a continuous
		# integration website that will build and test this project
		# every time something is submitted, and send me email if
		# the test breaks
		language: c
		compiler:
		- gcc
		- clang
		before_install:
		- sudo apt-get install -y libpcap-dev
		script: make && make test

src/in-binary.c

+51 −10

Original line number	Diff line number	Diff line
		@@ -81,7 +81,9 @@ parse_status(struct Output *out,
		static void
		parse_status2(struct Output *out,
		enum PortStatus status, /* open/closed */
		const unsigned char *buf, size_t buf_length)
		const unsigned char *buf, size_t buf_length,
		const struct RangeList *ips,
		const struct RangeList *ports)
		{
		struct MasscanRecord record;

		@@ -99,6 +101,18 @@ parse_status2(struct Output *out,
		if (out->when_scan_started == 0)
		out->when_scan_started = record.timestamp;

		/*
		* Filter
		*/
		if (ips && ips->count) {
		if (!rangelist_is_contains(ips, record.ip))
		return;
		}
		if (ports && ports->count) {
		if (!rangelist_is_contains(ports, record.port))
		return;
		}

		/*
		* Now report the result
		*/
		@@ -193,7 +207,10 @@ parse_banner4(struct Output out, unsigned char buf, size_t buf_length)
		/***************************************************************************
		***************************************************************************/
		static void
		parse_banner9(struct Output out, unsigned char buf, size_t buf_length)
		parse_banner9(struct Output out, unsigned char buf, size_t buf_length,
		const struct RangeList *ips,
		const struct RangeList *ports,
		const struct RangeList *btypes)
		{
		struct MasscanRecord record;

		@@ -213,6 +230,22 @@ parse_banner9(struct Output out, unsigned char buf, size_t buf_length)
		if (out->when_scan_started == 0)
		out->when_scan_started = record.timestamp;

		/*
		* Filter
		*/
		if (ips && ips->count) {
		if (!rangelist_is_contains(ips, record.ip))
		return;
		}
		if (ports && ports->count) {
		if (!rangelist_is_contains(ports, record.port))
		return;
		}
		if (btypes && btypes->count) {
		if (!rangelist_is_contains(btypes, record.app_proto))
		return;
		}

		/*
		* Now print the output
		*/
		@@ -232,7 +265,10 @@ parse_banner9(struct Output out, unsigned char buf, size_t buf_length)
		* Read in the file, one record at a time.
		***************************************************************************/
		static uint64_t
		parse_file(struct Output out, const char filename)
		parse_file(struct Output out, const char filename,
		const struct RangeList *ips,
		const struct RangeList *ports,
		const struct RangeList *btypes)
		{
		FILE *fp = 0;
		unsigned char *buf = 0;
		@@ -339,9 +375,11 @@ parse_file(struct Output out, const char filename)
		/* Depending on record type, do something different */
		switch (type) {
		case 1: /* STATUS: open */
		if (!btypes->count)
		parse_status(out, PortStatus_Open, buf, bytes_read);
		break;
		case 2: /* STATUS: closed */
		if (!btypes->count)
		parse_status(out, PortStatus_Closed, buf, bytes_read);
		break;
		case 3: /* BANNER */
		@@ -359,13 +397,15 @@ parse_file(struct Output out, const char filename)
		parse_banner4(out, buf, bytes_read);
		break;
		case 6: /* STATUS: open */
		parse_status2(out, PortStatus_Open, buf, bytes_read);
		if (!btypes->count)
		parse_status2(out, PortStatus_Open, buf, bytes_read, ips, ports);
		break;
		case 7: /* STATUS: closed */
		parse_status2(out, PortStatus_Closed, buf, bytes_read);
		if (!btypes->count)
		parse_status2(out, PortStatus_Closed, buf, bytes_read, ips, ports);
		break;
		case 9:
		parse_banner9(out, buf, bytes_read);
		parse_banner9(out, buf, bytes_read, ips, ports, btypes);
		break;
		case 'm': /* FILEHEADER */
		//goto end;
		@@ -395,7 +435,7 @@ end:
		* other formats. This preserves the original timestamps.
		*****************************************************************************/
		void
		convert_binary_files(struct Masscan *masscan,
		read_binary_scanfile(struct Masscan *masscan,
		int arg_first, int arg_max, char *argv[])
		{
		struct Output *out;
		@@ -420,7 +460,8 @@ convert_binary_files(struct Masscan *masscan,
		* Then arg_first=3 and arg_max=5.
		*/
		for (i=arg_first; i<arg_max; i++) {
		parse_file(out, argv[i]);
		parse_file(out, argv[i], &masscan->targets, &masscan->ports,
		&masscan->banner_types);
		}

		output_destroy(out);

src/in-binary.h

+9 −1

Original line number	Diff line number	Diff line
		#ifndef IN_BINARY_H
		#define IN_BINARY_H
		struct Masscan;

		/**
		* Read that output of previous scans that were saved in the binary format
		* (i.e. using the -oB parameter or the '--output-format binary' parameter).
		* The intent is that the user can then re-output in another format like
		* JSON or XML.
		*/
		void
		convert_binary_files(struct Masscan masscan, int arg_first, int arg_max, char argv[]);
		read_binary_scanfile(struct Masscan *masscan,
		int arg_first, int arg_max, char *argv[]);

		#endif

src/main-conf.c

+18 −0

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@
		#include "templ-port.h"
		#include "crypto-base64.h"
		#include "script.h"
		#include "masscan-app.h"

		#include <ctype.h>
		#include <limits.h>
		@@ -317,6 +318,7 @@ masscan_echo(struct Masscan masscan, FILE fp)
		case Output_Binary: fprintf(fp, "output-format = binary\n"); break;
		case Output_Grepable: fprintf(fp, "output-format = grepable\n"); break;
		case Output_JSON: fprintf(fp, "output-format = json\n"); break;
		case Output_Certs: fprintf(fp, "output-format = certs\n"); break;
		case Output_None: fprintf(fp, "output-format = none\n"); break;
		case Output_Redis:
		fprintf(fp, "output-format = redis\n");
		@@ -989,6 +991,21 @@ masscan_set_parameter(struct Masscan *masscan,
		if (masscan->op == 0)
		masscan->op = Operation_Scan;
		}
		else if (EQUALS("banner-types", name) \|\| EQUALS("banner-type", name)
		\|\| EQUALS("banner-apps", name) \|\| EQUALS("banner-app", name)
		) {
		enum ApplicationProtocol app;

		app = masscan_string_to_app(value);

		if (app)
		rangelist_add_range(&masscan->banner_types, app, app);
		else {
		LOG(0, "FAIL: bad banner app: %s\n", value);
		fprintf(stderr, "err\n");
		exit(1);
		}
		}
		else if (EQUALS("exclude-ports", name) \|\| EQUALS("exclude-port", name)) {
		unsigned is_error = 0;
		rangelist_parse_ports(&masscan->exclude_port, value, &is_error);
		@@ -1360,6 +1377,7 @@ masscan_set_parameter(struct Masscan *masscan,
		else if (EQUALS("greppable", value)) x = Output_Grepable;
		else if (EQUALS("grepable", value)) x = Output_Grepable;
		else if (EQUALS("json", value)) x = Output_JSON;
		else if (EQUALS("certs", value)) x = Output_Certs;
		else if (EQUALS("none", value)) x = Output_None;
		else if (EQUALS("redis", value)) x = Output_Redis;
		else {

src/main.c

+5 −1

Original line number	Diff line number	Diff line
		@@ -1523,7 +1523,11 @@ int main(int argc, char *argv[])
		for (stop=start+1; stop<(unsigned)argc && argv[stop][0] != '-'; stop++)
		;

		convert_binary_files(masscan, start, stop, argv);
		/*
		* read the binary files, and output them again depending upon
		* the output parameters
		*/
		read_binary_scanfile(masscan, start, stop, argv);

		}
		break;