From cd4f73bed90a966c15c6f73ca4ac8a65c2326569 Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Wed, 16 Mar 2022 21:02:23 -0600
Subject: [PATCH] Update inbox workers, fixes #3304

---
 app/Jobs/InboxPipeline/InboxValidator.php | 5 ++++-
 app/Jobs/InboxPipeline/InboxWorker.php    | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/Jobs/InboxPipeline/InboxValidator.php b/app/Jobs/InboxPipeline/InboxValidator.php
index bfc3457d..4fc1b75a 100644
--- a/app/Jobs/InboxPipeline/InboxValidator.php
+++ b/app/Jobs/InboxPipeline/InboxValidator.php
@@ -59,7 +59,7 @@ class InboxValidator implements ShouldQueue
                 // Job processed already
                 return 1;
             }
-            Cache::put($lockKey, 1, 300);
+            Cache::put($lockKey, 1, 3600);
         }
 
         if(!isset($headers['signature']) || !isset($headers['date'])) {
@@ -155,6 +155,9 @@ class InboxValidator implements ShouldQueue
        ) {
             return;
         }
+        if(!isset($bodyDecoded['id'])) {
+        	return;
+        }
         $signatureData = HttpSignature::parseSignatureHeader($signature);
         $keyId = Helpers::validateUrl($signatureData['keyId']);
         $id = Helpers::validateUrl($bodyDecoded['id']);
diff --git a/app/Jobs/InboxPipeline/InboxWorker.php b/app/Jobs/InboxPipeline/InboxWorker.php
index a888fd3c..44e3a1cb 100644
--- a/app/Jobs/InboxPipeline/InboxWorker.php
+++ b/app/Jobs/InboxPipeline/InboxWorker.php
@@ -55,7 +55,7 @@ class InboxWorker implements ShouldQueue
                 // Job processed already
                 return 1;
             }
-            Cache::put($lockKey, 1, 300);
+            Cache::put($lockKey, 1, 3600);
         }
 
         if(!isset($headers['signature']) || !isset($headers['date'])) {
@@ -145,6 +145,9 @@ class InboxWorker implements ShouldQueue
        ) {
             return;
         }
+        if(!isset($bodyDecoded['id'])) {
+        	return;
+        }
         $signatureData = HttpSignature::parseSignatureHeader($signature);
         $keyId = Helpers::validateUrl($signatureData['keyId']);
         $id = Helpers::validateUrl($bodyDecoded['id']);