fix: Checking if both timestamps are datetime to avoid comparison issues

- One could still be str if it is not properly formatted
chrisr3d · Mar 29, 2024 · cdd96fa · cdd96fa
1 parent 3faacb1
commit cdd96fa
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/stix2validator/v20/musts.py b/stix2validator/v20/musts.py
@@ -74,7 +74,10 @@ def timestamp(instance):
 
 def compare_timestamps(modified, created):
     if TIMESTAMP_FORMAT_RE.match(modified) and TIMESTAMP_FORMAT_RE.match(created):
-        return datetime_from_str(modified) < datetime_from_str(created)
+        created_datetime = datetime_from_str(created)
+        modified_datetime = datetime_from_str(modified)
+        if isinstance(created_datetime, datetime) and isinstance(modified_datetime, datetime):
+            return modified_datetime < created_datetime
     return modified < created
 
 

diff --git a/stix2validator/v21/musts.py b/stix2validator/v21/musts.py
@@ -111,7 +111,10 @@ def timestamp(instance):
 def compare(first, op, second):
     comp = getattr(operator, op)
     if TIMESTAMP_FORMAT_RE.match(first) and TIMESTAMP_FORMAT_RE.match(second):
-        return comp(datetime_from_str(first), datetime_from_str(second))
+        created_datetime = datetime_from_str(first)
+        modified_datetime = datetime_from_str(second)
+        if isinstance(created_datetime, datetime) and isinstance(modified_datetime, datetime):
+            return comp(created_datetime, modified_datetime)
     return comp(first, second)