Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2025-01-27 04:34:18 +01:00
Code Issues Projects Releases Wiki Activity

irclib: Copy messages before altering them at all

Browse Source 
Fixes a bug triggered by Relay when it relays to a network that supports
labeled-response and an other that doesn't
This commit is contained in:
Valentin Lorentz 2021-04-02 20:53:38 +02:00
parent b030a7bb76
commit c28d517d6f
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/irclib.py
View File

@ -1451,6 +1451,14 @@ class Irc(IrcCommandDispatcher, log.Firewalled):
self.queueMsg(ircmsgs.ping(now)) self.queueMsg(ircmsgs.ping(now))
if msg: if msg:
# Copy the msg before altering it back. Without a copy, it
# can cause all sorts of issues if the msg is reused (eg. Relay
# sends the same message object to the same network, so when
# sending the msg for the second time, it would already be
# tagged with emulatedEcho and fail the assertion; or it can be
# added a label because we have labeled-response on a network)
msg = ircmsgs.IrcMsg(msg=msg)
if msg.command.upper() == 'BATCH': if msg.command.upper() == 'BATCH':
if not conf.supybot.protocols.irc.experimentalExtensions(): if not conf.supybot.protocols.irc.experimentalExtensions():
log.error('Dropping outgoing batch. ' log.error('Dropping outgoing batch. '
@ -1505,15 +1513,8 @@ class Irc(IrcCommandDispatcher, log.Firewalled):
if not world.testing: if not world.testing:
assert not msg.tagged('emulatedEcho') assert not msg.tagged('emulatedEcho')
# Copy the msg before echoing it back. Without a copy, it msg.tag('emulatedEcho', True)
# can cause all sorts of issues if the msg is reused (eg. Relay self.feedMsg(msg, tag=False)
# sends the same message object to the same network, so when
# sending the msg for the second time, it would already be
# tagged with emulatedEcho and fail the assertion above)
echo_msg = ircmsgs.IrcMsg(msg=msg)
echo_msg.tag('emulatedEcho', True)
self.feedMsg(echo_msg, tag=False)
else: else:
# I don't think we should do this. Why should it matter? If it's # I don't think we should do this. Why should it matter? If it's
# something important, then the server will send it back to us, # something important, then the server will send it back to us,