aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Zotlabs/Daemon/Notifier.php1
-rw-r--r--Zotlabs/Lib/Libzot.php5
2 files changed, 5 insertions, 1 deletions
diff --git a/Zotlabs/Daemon/Notifier.php b/Zotlabs/Daemon/Notifier.php
index 4f0538965..d5fe7ee6d 100644
--- a/Zotlabs/Daemon/Notifier.php
+++ b/Zotlabs/Daemon/Notifier.php
@@ -334,7 +334,6 @@ class Notifier {
$m = get_iconfig($target_item, 'activitypub', 'signed_data');
// Re-use existing signature unless the activity type changed to a Tombstone, which won't verify.
if ($m && (!intval($target_item['item_deleted']))) {
- hz_syslog('notifier existing');
self::$encoded_item = json_decode($m, true);
}
else {
diff --git a/Zotlabs/Lib/Libzot.php b/Zotlabs/Lib/Libzot.php
index 709c9dc94..129ac6b56 100644
--- a/Zotlabs/Lib/Libzot.php
+++ b/Zotlabs/Lib/Libzot.php
@@ -1583,6 +1583,11 @@ class Libzot {
* There's a chance the current delivery could take place before the cloned copy arrives
* hence the item could have the wrong ACL and *could* be used in subsequent deliveries or
* access checks.
+ *
+ * 30.3.23: block all incoming items from ourselves except if the origin is local.
+ * This is to prevent multiple relay delivery of items that arrive via sync.
+ * They have already been relayed at the origin location.
+ *
*/
if ($sender === $channel['channel_hash'] && $arr['author_xchan'] === $channel['channel_hash'] && !str_starts_with($arr['mid'], z_root())) {