From 2e2081ec4869eac4a5a67c97f04ee5c03ec871c8 Mon Sep 17 00:00:00 2001
From: Hannah Ward <Hannah.ward9001@gmail.com>
Date: Mon, 18 Feb 2019 11:28:44 +0000
Subject: [PATCH] chg: PEP8 push script

---
 scripts/push_published_to_taxii.py | 52 +++++++++++++++++-------------
 1 file changed, 30 insertions(+), 22 deletions(-)

diff --git a/scripts/push_published_to_taxii.py b/scripts/push_published_to_taxii.py
index 6060083..f8ca786 100644
--- a/scripts/push_published_to_taxii.py
+++ b/scripts/push_published_to_taxii.py
@@ -3,7 +3,6 @@ import zmq
 import sys
 import json
 import pymisp
-import warnings
 from pyaml import yaml
 from cabby import create_client
 from misp_stix_converter.converters import lint_roller
@@ -11,7 +10,8 @@ import logging
 
 # Set up logger
 log = logging.getLogger(__name__)
-formatter = logging.Formatter("%(asctime)s - %(name)s - %(levelname)s - %(message)s")
+formatter = logging.Formatter(
+    "%(asctime)s - %(name)s - %(levelname)s - %(message)s")
 ch = logging.FileHandler("push.log")
 ch.setFormatter(formatter)
 log.addHandler(ch)
@@ -22,9 +22,8 @@ log.info("Starting...")
 if "OPENTAXII_CONFIG" in os.environ:
     config = yaml.load(open(os.environ["OPENTAXII_CONFIG"], "r"))
 else:
-    config = { "domain" : "127.0.0.1:9000" ,
-               "zmq"   : { "host" : "127.0.0.1", "port" : 50000 }
-             }
+    print("OPENTAXII CONFIG NOT EXPORTED")
+    sys.exit()
 
 # Set up our ZMQ socket to recieve MISP JSON on publish
 context = zmq.Context()
@@ -44,22 +43,28 @@ socket.connect("tcp://{}:{}".format(
 socket.setsockopt_string(zmq.SUBSCRIBE, '')
 
 # Connct to TAXII as well
-cli = create_client(discovery_path="{}://{}/services/discovery".format(config.get("protocol", "http"), config["domain"]))
-cli.set_auth(username = config["taxii"]["auth"]["username"], 
-             password = config["taxii"]["auth"]["password"]
-            )
+cli = create_client(
+    discovery_path="{}://{}/services/discovery".format(
+        config.get("protocol", "http"),
+        config["domain"])
+)
+
+cli.set_auth(username=config["taxii"]["auth"]["username"],
+             password=config["taxii"]["auth"]["password"])
+
 if not config.get("verify_ssl", True):
     cli.verify_ssl = False
 
 while True:
     # Wait for something to come in on the ZMQ socket
+    log.info("Waiting...")
     message = socket.recv().decode("utf-8")
     log.info("Recieved a message!")
     topic = message.split(' ', 1)[0]
 
     if topic != 'misp_json':
-      log.info("Ignoring " + topic + "...")
-      continue
+        log.info("Ignoring " + topic + "...")
+        continue
 
     # Process the JSON payload
     log.debug("Processing...")
@@ -76,12 +81,10 @@ while True:
 
     # Convert to STIX
     pkg = pymisp.tools.stix.make_stix_package(ev)
-    
     log.debug("Loaded successfully!")
-    
     # Push the package to TAXII
     for version in config.get("stix_versions", ["1.1.1"]):
-        # Convert to that version 
+        # Convert to that version
         objs = lint_roller.lintRoll(pkg)
         for i in objs:
             # Set the object's version
@@ -92,15 +95,20 @@ while True:
         pkg.version = version
 
         try:
-            log.info("Using binding %s", "urn:stix.mitre.org:xml:{}".format(version))
-            cli.push(content=pkg.to_xml().decode("utf-8"), 
-                     content_binding="urn:stix.mitre.org:xml:{}".format(version), 
-                     uri="{}://{}/services/inbox".format(config.get("protocol", "http"), 
-                                                         config["domain"]),
-                     collection_names=config["taxii"].get("collections", ["collection"]))
+            binding = "urn:stix.mitre.org:xml:{}".format(version)
+            uri = "{}://{}/services/inbox".format(
+                config.get("protocol", "http"),
+                config["domain"])
+            log.info("Using binding %s", binding)
+
+            cli.push(content=pkg.to_xml().decode("utf-8"),
+                     content_binding=binding,
+                     uri=uri,
+                     collection_names=config["taxii"].get(
+                        "collections", ["collection"]))
+
+            log.info("Pushed! (%s)", version)
 
-            log.info("Pushed! (%s)", version)     
-            
         except Exception as ex:
             logging.fatal("COULD NOT PUSH")
             logging.exception(ex)