Merge pull request #117 from hubblestack/develop

Merge to master (prep v2017.9.1)
hubblestack · Sep 28, 2017 · eb7d7c8 · eb7d7c8
2 parents ff73f27 + d525636
commit eb7d7c8
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,15 @@
 Please create any issues on the [Hubble](https://github.com/hubblestack/hubble)
 repo.
 
+*NOTE FROM [@basepi](https://github.com/basepi)*: As we continue to add
+features to hubble, I'm finding more and more instances where the flexibility
+of not being tied to salt gives me the freedom to do more with hubble. As a
+result, [hubble](https://github.com/hubblestack/hubble) is slowly surpassing
+hubble-salt in available features. While I have no plans to deprecate
+hubble-salt, I do recommend checking out
+[hubble](https://github.com/hubblestack/hubble) if you're interested in these
+additional features (such as support for topfiles in pulsar).
+
 Table of Contents
 =================
 
@@ -59,7 +68,7 @@ gitfs_remotes:
   - https://github.com/hubblestack/hubblestack_data.git:
     - root: ''
   - https://github.com/hubblestack/hubble-salt.git:
-    - base: v2017.9.0
+    - base: v2017.9.1
     - root: ''
 ```
 

diff --git a/_beacons/pulsar.py b/_beacons/pulsar.py
@@ -39,7 +39,7 @@
     DEFAULT_MASK = None
 
 __virtualname__ = 'pulsar'
-__version__ = 'v2017.9.0'
+__version__ = 'v2017.9.1'
 CONFIG = None
 CONFIG_STALENESS = 0
 

diff --git a/_modules/hubble.py b/_modules/hubble.py
@@ -35,7 +35,7 @@
 from nova_loader import NovaLazyLoader
 
 __nova__ = {}
-__version__ = 'v2017.9.0'
+__version__ = 'v2017.9.1'
 
 
 def audit(configs=None,
@@ -453,7 +453,7 @@ def top(topfile='top.nova',
     # tag.
     data_by_tag = {}
     for data in top_data:
-        if isinstance(data, str):
+        if isinstance(data, basestring):
             if '*' not in data_by_tag:
                 data_by_tag['*'] = []
             data_by_tag['*'].append(data)
@@ -466,7 +466,7 @@ def top(topfile='top.nova',
             if 'Errors' not in results:
                 results['Errors'] = {}
             error_log = 'topfile malformed, list entries must be strings or '\
-                        'dicts: {0}'.format(data)
+                        'dicts: {0} | {1}'.format(data, type(data))
             results['Errors'][topfile] = {'error': error_log}
             log.error(error_log)
             continue

diff --git a/_modules/nebula_osquery.py b/_modules/nebula_osquery.py
@@ -41,7 +41,7 @@
 
 log = logging.getLogger(__name__)
 
-__version__ = 'v2017.9.0'
+__version__ = 'v2017.9.1'
 __virtualname__ = 'nebula'
 
 

diff --git a/_modules/win_pulsar.py b/_modules/win_pulsar.py
@@ -28,7 +28,7 @@
 CONFIG = None
 CONFIG_STALENESS = 0
 
-__version__ = 'v2017.9.0'
+__version__ = 'v2017.9.1'
 
 
 def __virtual__():

diff --git a/_returners/slack_pulsar_returner.py b/_returners/slack_pulsar_returner.py
@@ -69,7 +69,7 @@
 # Import Salt Libs
 import salt.returners
 
-__version__ = 'v2017.9.0'
+__version__ = 'v2017.9.1'
 
 log = logging.getLogger(__name__)
 

diff --git a/_returners/splunk_nebula_return.py b/_returners/splunk_nebula_return.py
@@ -50,7 +50,7 @@
 
 import logging
 
-__version__ = 'v2017.9.0'
+__version__ = 'v2017.9.1'
 
 _max_content_bytes = 100000
 http_event_collector_SSL_verify = False

diff --git a/_returners/splunk_nova_return.py b/_returners/splunk_nova_return.py
@@ -49,7 +49,7 @@
 
 import logging
 
-__version__ = 'v2017.9.0'
+__version__ = 'v2017.9.1'
 
 _max_content_bytes = 100000
 http_event_collector_SSL_verify = False

diff --git a/_returners/splunk_pulsar_return.py b/_returners/splunk_pulsar_return.py
@@ -51,7 +51,7 @@
 
 import logging
 
-__version__ = 'v2017.9.0'
+__version__ = 'v2017.9.1'
 
 _max_content_bytes = 100000
 http_event_collector_SSL_verify = False

diff --git a/hubblestack_nova/cve_scan_v2.py b/hubblestack_nova/cve_scan_v2.py
@@ -295,7 +295,7 @@ def _get_cve_vulnerabilities(query_results, os_version):
 
             for pkg in report['_source']['affectedPackage']:
                 #_source:affectedPackages
-                if pkg['OSVersion'] in ['any', os_version]: #Only use matching os
+                if pkg['OSVersion'] in ['any', str(__grains__.get('osmajorrelease', None)), str(__grains__.get('osrelease', None))]: #Only use matching os
                     pkg_obj = VulnerablePkg(title, pkg['packageName'], pkg['packageVersion'], \
                                  score, pkg['operator'], reporter, href, cve_list)
                     if pkg_obj.pkg not in vulnerable_pkgs: