Merge pull request #9 from CiscoSecurity/release-1.0.2

Release 1.0.2

code/api/enrich.py

@@ -19,12 +19,6 @@
 get_observables = partial(get_json, schema=ObservableSchema(many=True))
 
 
-@enrich_api.route('/deliberate/observables', methods=['POST'])
-def deliberate_observables():
-    # Not implemented
-    return jsonify_data({})
-
-
 @enrich_api.route('/observe/observables', methods=['POST'])
 def observe_observables():
     def query_qradar(obs):

code/api/rest_api_client.py

@@ -6,7 +6,7 @@
     QRadarUnexpectedError,
     AuthorizationError,
 )
-from .utils import handle_connection_error
+from .utils import handle_connection_error, handle_auth_errors
 
 
 class RestApiClient:
@@ -35,6 +35,7 @@ def _get_response_data(response):
                 raise QRadarUnexpectedError(response)
 
     @handle_connection_error
+    @handle_auth_errors
     def _get(self, endpoint, headers=None, params=None):
         response = requests.get(
             f'https://{self.server_ip}{self.base_uri}{endpoint}',
@@ -43,13 +44,15 @@ def _get(self, endpoint, headers=None, params=None):
         return self._get_response_data(response)
 
     @handle_connection_error
+    @handle_auth_errors
     def _post(self, endpoint, data=None):
         response = requests.post(
             f'https://{self.server_ip}{self.base_uri}{endpoint}',
             data, headers=self.headers, verify=False, auth=self.credentials)
         return self._get_response_data(response)
 
     @handle_connection_error
+    @handle_auth_errors
     def _delete(self, endpoint, headers):
         response = requests.delete(
             f'https://{self.server_ip}{self.base_uri}{endpoint}',

code/api/utils.py

@@ -162,3 +162,13 @@ def filter_observables(relay_input):
             observables.append(value)
 
     return observables
+
+
+def handle_auth_errors(func):
+    def wrapper(self, *args, **kwargs):
+        try:
+            return func(self, *args, **kwargs)
+        except UnicodeEncodeError:
+            raise AuthorizationError()
+
+    return wrapper

code/app.py

@@ -1,3 +1,5 @@
+import traceback
+
 from flask import Flask, jsonify, g
 
 from api.enrich import enrich_api
@@ -23,21 +25,23 @@
 
 @app.errorhandler(Exception)
 def handle_error(exception):
-    app.logger.error(exception)
     code = getattr(exception, 'code', 500)
     message = getattr(exception, 'description', 'Something went wrong.')
     reason = '.'.join([
         exception.__class__.__module__,
         exception.__class__.__name__,
     ])
 
+    if code != 404:
+        app.logger.error(traceback.format_exc())
+
     response = jsonify(code=code, message=message, reason=reason)
     return response, code
 
 
 @app.errorhandler(CTRBaseError)
 def handle_tr_formatted_error(error):
-    app.logger.error(error.json)
+    app.logger.error(traceback.format_exc())
     g.errors = [error.json]
     return jsonify_result()
 

code/container_settings.json

@@ -1,4 +1,4 @@
 {
-  "VERSION": "1.0.1",
+  "VERSION": "1.0.2",
   "NAME": "QRadar"
 }

code/tests/unit/test_app.py

@@ -14,7 +14,6 @@ def calls():
     yield Call('DELETE', '/delete', HTTPStatus.NOT_FOUND)
 
     yield Call('GET', '/health', HTTPStatus.METHOD_NOT_ALLOWED)
-    yield Call('GET', '/deliberate/observables', HTTPStatus.METHOD_NOT_ALLOWED)
     yield Call('GET', '/observe/observables', HTTPStatus.METHOD_NOT_ALLOWED)
     yield Call('GET', '/refer/observables', HTTPStatus.METHOD_NOT_ALLOWED)
     yield Call('GET', '/respond/observables', HTTPStatus.METHOD_NOT_ALLOWED)