GitHub/ergo
3
0
Fork 0
mirror of https://github.com/ergochat/ergo.git synced 2024-11-25 21:39:25 +01:00
Code Issues Projects Releases Wiki Activity

Check restricted nicknames against skeletons

Browse Source 
Fixes #519
This commit is contained in:
Chris Smith 2019-05-24 16:59:42 +01:00
parent 02d635d3eb
commit a6164cd9c4
No known key found for this signature in database
GPG Key ID: 3A2D4BBDC4A3C9A9
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
irc/nickname.go
View File

@ -17,7 +17,7 @@ import (
) )
var ( var (
// anything added here MUST be casefolded: // anything added here MUST be skeleton'd:
restrictedNicknames = map[string]bool{ restrictedNicknames = map[string]bool{
"=scene=": true, // used for rp commands "=scene=": true, // used for rp commands
"histserv": true, // TODO(slingamn) this should become a real service "histserv": true, // TODO(slingamn) this should become a real service
@ -27,7 +27,7 @@ var (
// returns whether the change succeeded or failed // returns whether the change succeeded or failed
func performNickChange(server *Server, client *Client, target *Client, session *Session, newnick string, rb *ResponseBuffer) bool { func performNickChange(server *Server, client *Client, target *Client, session *Session, newnick string, rb *ResponseBuffer) bool {
nickname := strings.TrimSpace(newnick) nickname := strings.TrimSpace(newnick)
cfnick, err := CasefoldName(nickname) skeleton, err := Skeleton(nickname)
currentNick := client.Nick() currentNick := client.Nick()
if len(nickname) < 1 { if len(nickname) < 1 {
@ -35,7 +35,7 @@ func performNickChange(server *Server, client *Client, target *Client, session *
return false return false
} }
if err != nil || len(nickname) > server.Config().Limits.NickLen || restrictedNicknames[cfnick] { if err != nil || len(nickname) > server.Config().Limits.NickLen || restrictedNicknames[skeleton] {
rb.Add(nil, server.name, ERR_ERRONEUSNICKNAME, currentNick, nickname, client.t("Erroneous nickname")) rb.Add(nil, server.name, ERR_ERRONEUSNICKNAME, currentNick, nickname, client.t("Erroneous nickname"))
return false return false
} }
@ -68,7 +68,7 @@ func performNickChange(server *Server, client *Client, target *Client, session *
} }
histItem.Params[0] = nickname histItem.Params[0] = nickname
client.server.logger.Debug("nick", fmt.Sprintf("%s changed nickname to %s [%s]", origNickMask, nickname, cfnick)) client.server.logger.Debug("nick", fmt.Sprintf("%s changed nickname to %s [%s]", origNickMask, nickname, skeleton))
if hadNick { if hadNick {
if client == target { if client == target {
target.server.snomasks.Send(sno.LocalNicks, fmt.Sprintf(ircfmt.Unescape("$%s$r changed nickname to %s"), details.nick, nickname)) target.server.snomasks.Send(sno.LocalNicks, fmt.Sprintf(ircfmt.Unescape("$%s$r changed nickname to %s"), details.nick, nickname))