Safe handling of old timestamps

Author: benmod

README.md

@@ -7,6 +7,10 @@ This repository contains the Python library for using implementing the different
     alt="Project Status"
     src="https://img.shields.io/badge/Project%20Status-beta-orange"
   >
+  <img
+    alt="GitHub Workflow Status"
+    src="https://img.shields.io/github/actions/workflow/status/EnAccess/OpenPAYGO-python/ci-cd.yml"
+  >
   <a href="https://github.com/EnAccess/OpenPAYGO-python/blob/main/LICENSE" target="_blank">
     <img
       alt="License"
@@ -313,6 +317,9 @@ def device_data():
 
 ## Changelog
 
+### 2023-10-13 - v0.5.4
+- Safe handling of datetime before UNIX timestamp minimum when generating answer timestamp
+
 ### 2023-10-13 - v0.5.3
 - Fix handling of `last_request_timestamp` when checking auth
 

openpaygo/metrics_response.py

@@ -103,9 +103,14 @@ def expects_time_answer(self):
     def add_time_to_answer(self, target_datetime):
         data = self._get_simple_data()
         if data.get('active_until_timestamp_requested', False):
-            self.response_dict['active_until_timestamp'] = target_datetime.timestamp()
+            target_timestamp = 0
+            if target_datetime:
+                if target_datetime.year > 1970:
+                    target_timestamp = target_datetime.timestamp()
+            self.response_dict['active_until_timestamp'] = target_timestamp
         elif data.get('active_seconds_left_requested', False):
-            self.response_dict['active_seconds_left'] = (datetime.now() - target_datetime).total_seconds()
+            seconds_left = (datetime.now() - target_datetime).total_seconds() if target_datetime else 0
+            self.response_dict['active_seconds_left'] = seconds_left if seconds_left > 0 else 0
         else:
             raise ValueError('No time requested')
 

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = openpaygo
-version = 0.5.3
+version = 0.5.4
 description = OpenPAYGO library in Python
 long_description = file: README.md
 long_description_content_type = text/markdown