CEF/ergo
1
0
Fork 0
forked from External/ergo
Code Pull requests Activity

fix #1876

Browse source 
INVITE did not exempt from +b unless the channel was coincidentally also +i.
This was a regression introduced in v2.4.0.
This commit is contained in:
Shivaram Lingamneni 2021-12-19 18:30:18 -05:00
parent 521b3e9a1c
commit da79533525
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
irc/channel.go
View file

@ -1582,7 +1582,8 @@ func (channel *Channel) Invite(invitee *Client, inviter *Client, rb *ResponseBuf
} }
inviteOnly := channel.flags.HasMode(modes.InviteOnly) inviteOnly := channel.flags.HasMode(modes.InviteOnly)
if inviteOnly && !channel.ClientIsAtLeast(inviter, modes.ChannelOperator) { hasPrivs := channel.ClientIsAtLeast(inviter, modes.ChannelOperator)
if inviteOnly && !hasPrivs {
rb.Add(nil, inviter.server.name, ERR_CHANOPRIVSNEEDED, inviter.Nick(), chname, inviter.t("You're not a channel operator")) rb.Add(nil, inviter.server.name, ERR_CHANOPRIVSNEEDED, inviter.Nick(), chname, inviter.t("You're not a channel operator"))
return return
} }
@ -1592,7 +1593,10 @@ func (channel *Channel) Invite(invitee *Client, inviter *Client, rb *ResponseBuf
return return
} }
if inviteOnly { // #1876: INVITE should override all join restrictions, including +b and +l,
// not just +i. so we need to record it on a per-client basis iff the inviter
// is privileged:
if hasPrivs {
invitee.Invite(chcfname, createdAt) invitee.Invite(chcfname, createdAt)
} }