fixed dates not stixed

Author: epilehpsy

backend/app.py

@@ -10,6 +10,7 @@
 import re
 import secrets
 from base64 import b64encode, b64decode
+import datetime
 
 DISARM_MATRIX_PATH = path.join(path.dirname(__file__), 'data', 'DISARM.json')
 DEFAULT_PAGE = 1
@@ -365,14 +366,22 @@ def top_locations():
 def stix2_objects_endpoint():
     # Fetch all the STIX2 objects stored in the database
     newer_than = request.args.get('newer_than', default=None, type=str)
+    newer_than = datetime.datetime.fromisoformat(newer_than.rstrip("Z") + "+00:00") if newer_than else None
+    app.logger.info(f"Fetching STIX2 objects newer than {newer_than}")
     # Fetch the incidents from the database
     if newer_than:
         total_objects = stix2_objects.count_documents({"modified": {"$gt": newer_than}})
         objects_cursor = stix2_objects.find({"modified": {"$gt": newer_than}})
     else:
         total_objects = stix2_objects.count_documents({})
         objects_cursor = stix2_objects.find({})
-    return build_paginated_json(request, objects_cursor, total_objects), 200
+    
+    objects = list(objects_cursor)
+    # Remove the _id field from the documents
+    for object in objects:
+        object.pop('_id', None)
+    bundle = Bundle(objects=objects, allow_custom=True)
+    return bundle.serialize(), 200, {'Content-Type': 'application/json'}
 
 
 '''

backend/app_readonly.py

@@ -10,6 +10,7 @@
 import re
 import secrets
 from base64 import b64encode, b64decode
+import datetime
 
 DISARM_MATRIX_PATH = path.join(path.dirname(__file__), 'data', 'DISARM.json')
 DEFAULT_PAGE = 1
@@ -204,14 +205,22 @@ def threat_actor(threat_actor_id):
 def stix2_objects_endpoint():
     # Fetch all the STIX2 objects stored in the database
     newer_than = request.args.get('newer_than', default=None, type=str)
+    newer_than = datetime.datetime.fromisoformat(newer_than.rstrip("Z") + "+00:00") if newer_than else None
+    app.logger.info(f"Fetching STIX2 objects newer than {newer_than}")
     # Fetch the incidents from the database
     if newer_than:
         total_objects = stix2_objects.count_documents({"modified": {"$gt": newer_than}})
         objects_cursor = stix2_objects.find({"modified": {"$gt": newer_than}})
     else:
         total_objects = stix2_objects.count_documents({})
         objects_cursor = stix2_objects.find({})
-    return build_paginated_json(request, objects_cursor, total_objects), 200
+    
+    objects = list(objects_cursor)
+    # Remove the _id field from the documents
+    for object in objects:
+        object.pop('_id', None)
+    bundle = Bundle(objects=objects, allow_custom=True)
+    return bundle.serialize(), 200, {'Content-Type': 'application/json'}
 
 @app.route('/threat-actors/top', methods=['GET'])
 def top_threat_actors():

public-api/app.py

@@ -51,18 +51,11 @@ def incidents():
     response = requests.get(BACKEND_ROOT + 'stix2-objects', params={'newer_than': newer_than})
     if response.status_code != 200:
         return jsonify({'message': 'Error getting incidents from the DISINFOX backend server'}), 500
-    response_json = response.json()
-    incidents = response_json.get('objects', [])
-    next_link = response_json['links'].get('next', None)
-    # Gather all the incidents from the paginated responses
-    while next_link:
-        response = requests.get(next_link)
-        if response.status_code != 200:
-            return jsonify({'message': 'Error getting incidents from the DISINFOX backend server'}), 500
-        response_json = response.json()
-        incidents.extend(response_json['objects'])
-        next_link = response_json['links'].get('next', None)
-    return jsonify({'incidents': incidents})
+    bundle = response.json()
+    app.logger.info("Returning incidents " +  str(bundle) + " to the client")
+    if 'objects' not in bundle:
+        return jsonify({}), 200, {'Content-Type': 'application/json'}
+    return jsonify(bundle), 200, {'Content-Type': 'application/json'}