From be14587011147b539b038cbaa49d14a8793f44ac Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sun, 3 Jan 2021 14:44:57 +0000
Subject: [PATCH] Only warn about json signature failures

---
 inbox.py | 41 +++++++++++++----------------------------
 1 file changed, 13 insertions(+), 28 deletions(-)

diff --git a/inbox.py b/inbox.py
index 297d4ab82..d0c357339 100644
--- a/inbox.py
+++ b/inbox.py
@@ -2703,39 +2703,24 @@ def runInboxQueue(recentPostsCache: {}, maxRecentPosts: int,
         if debug:
             print('DEBUG: http header signature check success')
 
-        hasJsonSig = True
-
         if not queueJson['post'].get('signature'):
             print('WARN: jsonld inbox signature signature missing from ' +
                   keyId)
-            hasJsonSig = False
-
-        if not queueJson['post']['signature'].get('type'):
-            print('WARN: jsonld inbox signature type missing from ' +
-                  keyId)
-            hasJsonSig = False
-
-#        if not jsonldVerify(queueJson['post'], pubKey):
-#            hasJsonSig = False
-#            if debug:
-#                print('**************************************')
-#                print('WARN: jsonld signature check failed ' +
-#                      str(queueJson['post']))
-#                print('--------------------------------------')
-#                print(keyId)
-#                print(pubKey)
-#                print('**************************************')
 #        else:
-#            if debug:
-#                print('jsonld inbox signature check success')
+#            if not jsonldVerify(queueJson['post'], pubKey):
+#                hasJsonSig = False
+#                if debug:
+#                    print('**************************************')
+#                    print('WARN: jsonld signature check failed ' +
+#                          str(queueJson['post']))
+#                    print('--------------------------------------')
+#                    print(keyId)
+#                    print(pubKey)
+#                    print('**************************************')
+#            else:
+#                if debug:
+#                    print('jsonld inbox signature check success')
 #
-        if not hasJsonSig:
-            # json signature check failed
-            if os.path.isfile(queueFilename):
-                os.remove(queueFilename)
-            if len(queue) > 0:
-                queue.pop(0)
-            continue
 
         # set the id to the same as the post filename
         # This makes the filename and the id consistent