From 1433d7e93a83ee65d1c5fb1c7b2d9a79481b03a2 Mon Sep 17 00:00:00 2001 From: Alfred Berg Date: Thu, 17 Jan 2019 02:32:27 +0000 Subject: [PATCH 1/2] Added stdin support --- Interlace/lib/core/input.py | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/Interlace/lib/core/input.py b/Interlace/lib/core/input.py index c0254aa..492a2f7 100644 --- a/Interlace/lib/core/input.py +++ b/Interlace/lib/core/input.py @@ -2,6 +2,7 @@ from netaddr import IPNetwork, IPRange, IPGlob from Interlace.lib.core.output import OutputHelper, Level import os.path +import sys from re import compile @@ -81,8 +82,12 @@ def process_commands(arguments): if arguments.target: ranges.add(arguments.target) else: - for target in arguments.target_list: - ranges.add(target.strip()) + targetFile = arguments.target_list + if not sys.stdin.isatty(): + targetFile = sys.stdin + for target in targetFile: + if target.strip(): + ranges.add(target.strip()) # process exclusions first if arguments.exclusions: @@ -182,7 +187,12 @@ def parse(self, argv): def setup_parser(): parser = ArgumentParser() - targets = parser.add_mutually_exclusive_group(required=True) + #Is stdin attached? + requireTargetArg = True + if not sys.stdin.isatty(): + requireTargetArg = False + + targets = parser.add_mutually_exclusive_group(required=requireTargetArg) targets.add_argument( '-t', dest='target', required=False, From 7d358c3e5b5d5545e30502d0f55a9966337b7941 Mon Sep 17 00:00:00 2001 From: Michael Skelton <886344+codingo@users.noreply.github.com> Date: Thu, 17 Jan 2019 17:18:07 +1000 Subject: [PATCH 2/2] Update __version__.py --- Interlace/lib/core/__version__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Interlace/lib/core/__version__.py b/Interlace/lib/core/__version__.py index a842075..35177d8 100644 --- a/Interlace/lib/core/__version__.py +++ b/Interlace/lib/core/__version__.py @@ -1,2 +1,2 @@ -__version__ = '1.1.1' +__version__ = '1.2'