minor updates to conne connector.

Inc version

cb-fireeye-connector.spec

@@ -1,16 +1,24 @@
 a = Analysis(['scripts/cb-fireeye-connector'],
              pathex=['.'],
-             hiddenimports=['unicodedata', 'requests'],
+             hiddenimports=['unicodedata'],
+             datas=[ (HOMEPATH + '/cbapi/response/models/*', 'cbapi/response/models/'),
+                     (HOMEPATH + '/cbapi/protection/models/*', 'cbapi/protection/models/'),
+                     (HOMEPATH + '/cbapi/defense/models/*', 'cbapi/defense/models/') ],
              hookspath=None,
              runtime_hooks=None)
 pyz = PYZ(a.pure)
 exe = EXE(pyz,
           a.scripts,
-          a.binaries,
-          a.zipfiles,
-          a.datas,
+          exclude_binaries=True,
           name='cb-fireeye-connector',
           debug=False,
-          strip=False,
+          strip=None,
           upx=True,
-          console=True )
+          console=True )
+coll = COLLECT(exe,
+               a.binaries,
+               a.zipfiles,
+               a.datas,
+               strip=None,
+               upx=True,
+               name='cb-fireeye-connector')

cbfireeyebridge/bridge.py

@@ -81,7 +81,7 @@ def __init__(self, name, configfile, **kwargs):
             self.data_dir = "/usr/share/cb/integrations/fireeye/received_alerts"
 
         CbIntegrationDaemon.__init__(self, name, configfile=configfile, **kwargs)
-        self.flask_feed = cbint.utils.flaskfeed.FlaskFeed(__name__, use_wgsi_body_helper=True)
+        self.flask_feed = cbint.utils.flaskfeed.FlaskFeed(__name__)
         self.bridge_options = {}
         self.debug = False
         self.feed_name = "FireEye"

requirements.txt

@@ -1,5 +1,4 @@
 cbfeeds == 0.8.0
-cbint == 0.8.10
+cbint == 0.8.12
 requests >= 2.7.0
-simplejson
 pyinstaller == 3.1.1

scripts/cb-fireeye-connector

@@ -3,7 +3,7 @@
 import os
 import sys
 
-import cbfireeyebridge.bridge
+from cbfireeyebridge.bridge import CarbonBlackFireEyeBridge
 import cbfireeyebridge.version
 
 if __name__ == "__main__":
@@ -13,7 +13,7 @@ if __name__ == "__main__":
         os.environ["REQUESTS_CA_BUNDLE"] = cacert_pem_path
 
     name = "fireeye"
-    daemon = cbfireeyebridge.bridge.CarbonBlackFireEyeBridge(name, "/etc/cb/integrations/fireeye/connector.conf")
+    daemon = CarbonBlackFireEyeBridge(name, "/etc/cb/integrations/fireeye/connector.conf")
     if len(sys.argv) == 2:
         if 'start' == sys.argv[1]:
             daemon.start()

setup.py

@@ -143,8 +143,8 @@ def get_data_files(rootdir):
 
 setup(
     name='python-cb-fireeye-connector',
-    version='1.2',
-    packages=['cbopensource', 'cbopensource.connectors', 'cbopensource.connectors.fireeye'],
+    version='1.1',
+    packages=['cbfireeyebridge'],
     url='https://github.com/carbonblack/cb-fireeye-connector',
     license='MIT',
     author='Carbon Black Developer Network',