mirror of
https://git.anonymousland.org/anonymousland/synapse-product.git
synced 2024-09-08 12:41:53 +00:00
Check events on backfill too
This commit is contained in:
parent
9b7794262f
commit
e585228860
@ -119,23 +119,14 @@ class FederationHandler(BaseHandler):
|
|||||||
|
|
||||||
# do some initial sanity-checking of the event. In particular, make
|
# do some initial sanity-checking of the event. In particular, make
|
||||||
# sure it doesn't have hundreds of prev_events or auth_events, which
|
# sure it doesn't have hundreds of prev_events or auth_events, which
|
||||||
# could cause a huge state resolution or cascade of event fetches
|
# could cause a huge state resolution or cascade of event fetches.
|
||||||
if len(pdu.prev_events) > 20:
|
try:
|
||||||
logger.warn("Rejecting event %s which has %i prev_events",
|
self._sanity_check_event(pdu)
|
||||||
pdu.event_id, len(pdu.prev_events))
|
except SynapseError as err:
|
||||||
raise FederationError(
|
raise FederationError(
|
||||||
"ERROR",
|
"ERROR",
|
||||||
httplib.BAD_REQUEST,
|
err.code,
|
||||||
"Too many prev_events",
|
err.msg,
|
||||||
affected=pdu.event_id,
|
|
||||||
)
|
|
||||||
if len(pdu.auth_events) > 10:
|
|
||||||
logger.warn("Rejecting event %s which has %i auth_events",
|
|
||||||
pdu.event_id, len(pdu.auth_events))
|
|
||||||
raise FederationError(
|
|
||||||
"ERROR",
|
|
||||||
httplib.BAD_REQUEST,
|
|
||||||
"Too many auth_events",
|
|
||||||
affected=pdu.event_id,
|
affected=pdu.event_id,
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -565,6 +556,9 @@ class FederationHandler(BaseHandler):
|
|||||||
extremities=extremities,
|
extremities=extremities,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
for ev in events:
|
||||||
|
self._sanity_check_event(ev)
|
||||||
|
|
||||||
# Don't bother processing events we already have.
|
# Don't bother processing events we already have.
|
||||||
seen_events = yield self.store.have_events_in_timeline(
|
seen_events = yield self.store.have_events_in_timeline(
|
||||||
set(e.event_id for e in events)
|
set(e.event_id for e in events)
|
||||||
@ -867,6 +861,39 @@ class FederationHandler(BaseHandler):
|
|||||||
|
|
||||||
defer.returnValue(False)
|
defer.returnValue(False)
|
||||||
|
|
||||||
|
def _sanity_check_event(self, ev):
|
||||||
|
"""
|
||||||
|
Do some early sanity checks of a received event
|
||||||
|
|
||||||
|
In particular, checks it doesn't have an excessive number of
|
||||||
|
prev_events or auth_events, which could cause a huge state resolution
|
||||||
|
or cascade of event fetches.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
ev (synapse.events.EventBase): event to be checked
|
||||||
|
|
||||||
|
Returns: None
|
||||||
|
|
||||||
|
Raises:
|
||||||
|
SynapseError if the event does not pass muster
|
||||||
|
"""
|
||||||
|
if len(ev.prev_events) > 20:
|
||||||
|
logger.warn("Rejecting event %s which has %i prev_events",
|
||||||
|
ev.event_id, len(ev.prev_events))
|
||||||
|
raise SynapseError(
|
||||||
|
httplib.BAD_REQUEST,
|
||||||
|
"Too many prev_events",
|
||||||
|
)
|
||||||
|
|
||||||
|
if len(ev.auth_events) > 10:
|
||||||
|
logger.warn("Rejecting event %s which has %i auth_events",
|
||||||
|
ev.event_id, len(ev.auth_events))
|
||||||
|
raise SynapseError(
|
||||||
|
"ERROR",
|
||||||
|
httplib.BAD_REQUEST,
|
||||||
|
"Too many auth_events",
|
||||||
|
)
|
||||||
|
|
||||||
@defer.inlineCallbacks
|
@defer.inlineCallbacks
|
||||||
def send_invite(self, target_host, event):
|
def send_invite(self, target_host, event):
|
||||||
""" Sends the invite to the remote server for signing.
|
""" Sends the invite to the remote server for signing.
|
||||||
|
Loading…
Reference in New Issue
Block a user