From 97d228cc36797eef6765eae0b08433a0dc081a0d Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@libreserver.org>
Date: Thu, 24 Nov 2022 23:26:15 +0000
Subject: [PATCH] Revert "Exception handling on dates"

This reverts commit 58b5a51b05d0edf696fc65cee2ca5a67c2a1df8c.
---
 httpsig.py | 40 +++++-----------------------------------
 1 file changed, 5 insertions(+), 35 deletions(-)

diff --git a/httpsig.py b/httpsig.py
index 067c2ed25..2d80023e8 100644
--- a/httpsig.py
+++ b/httpsig.py
@@ -77,13 +77,7 @@ def sign_post_headers(date_str: str, private_key_pem: str,
     to_domain = get_full_domain(to_domain, to_port)
 
     if not date_str:
-        try:
-            date_str = strftime("%a, %d %b %Y %H:%M:%S %Z", gmtime())
-        except BaseException as ex:
-            print('EX: sign_post_headers date ' +
-                  str(ex) + ' ' +
-                  str(gmtime()) + " %a, %d %b %Y %H:%M:%S %Z")
-            return ''
+        date_str = strftime("%a, %d %b %Y %H:%M:%S %Z", gmtime())
     if nickname != domain and nickname.lower() != 'actor':
         key_id = local_actor_url(http_prefix, nickname, domain)
     else:
@@ -165,21 +159,9 @@ def sign_post_headers_new(date_str: str, private_key_pem: str,
     time_format = "%a, %d %b %Y %H:%M:%S %Z"
     if not date_str:
         curr_time = gmtime()
-        try:
-            date_str = strftime(time_format, curr_time)
-        except BaseException as ex:
-            print('EX: sign_post_headers_new date 1 ' +
-                  str(ex) + ' ' +
-                  time_format + ' ' + curr_time)
-            return '', ''
+        date_str = strftime(time_format, curr_time)
     else:
-        try:
-            curr_time = datetime.datetime.strptime(date_str, time_format)
-        except BaseException as ex:
-            print('EX: sign_post_headers_new date 2 ' +
-                  str(ex) + ' ' +
-                  date_str + ' ' + time_format)
-            return '', ''
+        curr_time = datetime.datetime.strptime(date_str, time_format)
     seconds_since_epoch = \
         int((curr_time - datetime.datetime(1970, 1, 1)).total_seconds())
     key_id = local_actor_url(http_prefix, nickname, domain) + '#main-key'
@@ -266,13 +248,7 @@ def create_signed_header(date_str: str, private_key_pem: str, nickname: str,
 
     # if no date is given then create one
     if not date_str:
-        try:
-            date_str = strftime("%a, %d %b %Y %H:%M:%S %Z", gmtime())
-        except BaseException as ex:
-            print('EX: create_signed_header date ' +
-                  str(ex) + ' ' +
-                  "%a, %d %b %Y %H:%M:%S %Z " + str(gmtime()))
-            return {}
+        date_str = strftime("%a, %d %b %Y %H:%M:%S %Z", gmtime())
 
     # Content-Type or Accept header
     if not content_type:
@@ -319,13 +295,7 @@ def _verify_recent_signature(signed_date_str: str) -> bool:
     """
     curr_date = datetime.datetime.utcnow()
     date_format = "%a, %d %b %Y %H:%M:%S %Z"
-    try:
-        signed_date = datetime.datetime.strptime(signed_date_str, date_format)
-    except BaseException as ex:
-        print('EX: _verify_recent_signature date ' +
-              str(ex) + ' ' +
-              signed_date_str + ' ' + date_format)
-        return False
+    signed_date = datetime.datetime.strptime(signed_date_str, date_format)
     time_diff_sec = (curr_date - signed_date).seconds
     # 12 hours tollerance
     if time_diff_sec > 43200: