fix args.quiet and status msgs

pull/98/head
raw-data 2017-07-03 21:16:38 +01:00
parent 10d5d629f4
commit 8b90a85254
1 changed files with 15 additions and 8 deletions

View File

@ -1,6 +1,14 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
"""
https://github.com/raw-data/pymisp-suricata_search
2017.06.28 start
2017.07.03 fixed args.quiet and status msgs
"""
import argparse
import os
import queue
@ -16,7 +24,6 @@ except ImportError as err:
sys.stderr.write("\t[try] with pip3 install pymisp\n")
sys.exit(1)
HEADER = """
#This part might still contain bugs, use and your own risk and report any issues.
#
@ -150,7 +157,9 @@ def format_request(param, term, misp, quiet, output, thread, noevent):
kwargs = {param: term}
if not quiet:
print ("[+] Searching for: {}".format(kwargs))
search(misp, quiet, noevent, **kwargs)
# collect Suricata rules
@ -181,7 +190,7 @@ if __name__ == "__main__":
args = parser.parse_args()
if args.output is not None and os.path.exists(args.output):
if args.output is not None and os.path.exists(args.output) and not args.quiet:
try:
check = input("[!] Output file {} exists, do you want to continue [Y/n]? ".format(args.output))
if check not in ["Y","y"]:
@ -191,7 +200,6 @@ if __name__ == "__main__":
if not args.quiet:
print ("[i] Connecting to MISP instance: {}".format(misp_url))
print ("[i] Note: duplicated IDS rules will be removed")
# Based on # of terms, format request
@ -201,7 +209,6 @@ if __name__ == "__main__":
misp = init()
format_request(args.param, term, misp, args.quiet, args.output, args.thread, args.noevent)
else:
if not args.quiet:
misp = init()
format_request(args.param, args.search, misp, args.quiet, args.output, args.thread, args.noevent)