From 293133221fe1a3d53844e6c280bd75b6f6e1ef01 Mon Sep 17 00:00:00 2001
From: Kegan Dougal <kegan@matrix.org>
Date: Wed, 17 Jun 2020 18:25:11 +0100
Subject: [PATCH] /send auth errors are silent

---
 federationapi/routing/send.go | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/federationapi/routing/send.go b/federationapi/routing/send.go
index cf71b8ba0..c80ab89f3 100644
--- a/federationapi/routing/send.go
+++ b/federationapi/routing/send.go
@@ -176,9 +176,17 @@ func (t *txnReq) processTransaction() (*gomatrixserverlib.RespSend, error) {
 				util.GetLogger(t.context).Warnf("Processing %s failed fatally: %s", e.EventID(), err)
 				return nil, err
 			} else {
-				util.GetLogger(t.context).WithError(err).WithField("event_id", e.EventID()).Warn("Failed to process incoming federation event, skipping")
+				// Auth errors mean the event is 'rejected' which have to be silent to appease sytest
+				_, rejected := err.(*gomatrixserverlib.NotAllowed)
+				errMsg := err.Error()
+				if rejected {
+					errMsg = ""
+				}
+				util.GetLogger(t.context).WithError(err).WithField("event_id", e.EventID()).WithField("rejected", rejected).Warn(
+					"Failed to process incoming federation event, skipping",
+				)
 				results[e.EventID()] = gomatrixserverlib.PDUResult{
-					Error: err.Error(),
+					Error: errMsg,
 				}
 			}
 		} else {