GitHub/ergo
3
0
Fork 0
mirror of https://github.com/ergochat/ergo.git synced 2024-12-22 18:52:41 +01:00
Code Issues Projects Releases Wiki Activity

Don't send error messages for bad channels in NAMES

Browse Source 
"There is no error reply for bad channel names."
<https://tools.ietf.org/html/rfc2812#section-3.2.5>
This commit is contained in:
Shivaram Lingamneni 2018-02-25 05:02:42 -05:00
parent 9d163a4ba2
commit 784a3bbf52
1 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
irc/handlers.go
View File

@ -1594,16 +1594,14 @@ func motdHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *Resp
return false return false
} }
// NAMES [<channel>{,<channel>}] // NAMES [<channel>{,<channel>} [target]]
func namesHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *ResponseBuffer) bool { func namesHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *ResponseBuffer) bool {
var channels []string var channels []string
if len(msg.Params) > 0 { if len(msg.Params) > 0 {
channels = strings.Split(msg.Params[0], ",") channels = strings.Split(msg.Params[0], ",")
} }
//var target string
//if len(msg.Params) > 1 { // TODO: in a post-federation world, process `target` (server to forward request to)
// target = msg.Params[1]
//}
if len(channels) == 0 { if len(channels) == 0 {
for _, channel := range server.channels.Channels() { for _, channel := range server.channels.Channels() {
@ -1612,21 +1610,13 @@ func namesHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *Res
return false return false
} }
// limit regular users to only listing one channel
if !client.flags[modes.Operator] {
channels = channels[:1]
}
for _, chname := range channels { for _, chname := range channels {
casefoldedChname, err := CasefoldChannel(chname) channel := server.channels.Get(chname)
channel := server.channels.Get(casefoldedChname) if channel != nil {
if err != nil || channel == nil { channel.Names(client, rb)
if len(chname) > 0 { } else if chname != "" {
rb.Add(nil, server.name, ERR_NOSUCHCHANNEL, client.nick, chname, client.t("No such channel")) rb.Add(nil, server.name, RPL_ENDOFNAMES, client.Nick(), chname, client.t("End of NAMES list"))
}
continue
} }
channel.Names(client, rb)
} }
return false return false
} }