Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2024-11-19 17:09:27 +01:00
Code Issues Projects Releases Wiki Activity

Seen: require caller to be in target channel when using commands in this plugin.

Browse Source 
This fixes information leakage from private channels.

Conflicts:
	plugins/Seen/plugin.py
This commit is contained in:
Daniel Folkinshteyn 2012-02-25 12:28:27 -05:00 committed by Valentin Lorentz
parent e557541de1
commit 38ff1a1137
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
plugins/Seen/plugin.py
View File

@ -221,6 +221,9 @@ class Seen(callbacks.Plugin):
saying. <channel> is only necessary if the message isn't sent on the saying. <channel> is only necessary if the message isn't sent on the
channel itself. <nick> may contain * as a wildcard. channel itself. <nick> may contain * as a wildcard.
""" """
if msg.nick not in irc.state.channels[channel].users:
irc.error(format('You must be in %s to use this command.', channel))
return
self._seen(irc, channel, name) self._seen(irc, channel, name)
seen = wrap(seen, ['channel', 'something']) seen = wrap(seen, ['channel', 'something'])
@ -235,6 +238,9 @@ class Seen(callbacks.Plugin):
and returns the last time user was active in <channel>. <channel> is and returns the last time user was active in <channel>. <channel> is
only necessary if the message isn't sent on the channel itself. only necessary if the message isn't sent on the channel itself.
""" """
if msg.nick not in irc.state.channels[channel].users:
irc.error(format('You must be in %s to use this command.', channel))
return
if name and optlist: if name and optlist:
raise callbacks.ArgumentError raise callbacks.ArgumentError
elif name: elif name:
@ -269,6 +275,9 @@ class Seen(callbacks.Plugin):
Returns the last thing said in <channel>. <channel> is only necessary Returns the last thing said in <channel>. <channel> is only necessary
if the message isn't sent in the channel itself. if the message isn't sent in the channel itself.
""" """
if msg.nick not in irc.state.channels[channel].users:
irc.error(format('You must be in %s to use this command.', channel))
return
self._last(irc, channel) self._last(irc, channel)
last = wrap(last, ['channel']) last = wrap(last, ['channel'])
@ -295,6 +304,9 @@ class Seen(callbacks.Plugin):
<channel> is only necessary if the message isn't sent in the channel <channel> is only necessary if the message isn't sent in the channel
itself. itself.
""" """
if msg.nick not in irc.state.channels[channel].users:
irc.error(format('You must be in %s to use this command.', channel))
return
self._user(irc, channel, user) self._user(irc, channel, user)
user = wrap(user, ['channel', 'otherUser']) user = wrap(user, ['channel', 'otherUser'])
@ -313,6 +325,8 @@ class Seen(callbacks.Plugin):
irc.error(format(_('%s must be in %s to use this command.'), irc.error(format(_('%s must be in %s to use this command.'),
('You' if nick == msg.nick else nick), channel)) ('You' if nick == msg.nick else nick), channel))
return return
if nick is None:
nick = msg.nick
end = None # By default, up until the most recent message. end = None # By default, up until the most recent message.
for (i, m) in utils.seq.renumerate(irc.state.history): for (i, m) in utils.seq.renumerate(irc.state.history):
if end is None and m.command == 'JOIN' and \ if end is None and m.command == 'JOIN' and \