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

USER: disallow usernames that break the protocol

Browse Source
This commit is contained in:
Daniel Oaks 2016-06-30 23:55:44 +10:00
parent 19c2bb69fc
commit 199f8bd8ae
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
irc/client.go
View File

@ -88,7 +88,6 @@ func NewClient(server *Server, conn net.Conn, isTLS bool) *Client {
//TODO(dan): replace this with IsUsername/IsIRCName? //TODO(dan): replace this with IsUsername/IsIRCName?
if Name(username).IsNickname() { if Name(username).IsNickname() {
client.Notice("*** Found your username") client.Notice("*** Found your username")
//TODO(dan): we do a bunch of user replacing in server.go userHandler, do we need that here?
client.username = Name(username) client.username = Name(username)
// we don't need to updateNickMask here since nickMask is not used for anything yet // we don't need to updateNickMask here since nickMask is not used for anything yet
} else { } else {

7
irc/server.go
View File

@ -400,6 +400,13 @@ func userHandler(server *Server, client *Client, msg ircmsg.IrcMessage) bool {
return false return false
} }
// confirm that username is valid
//
if !Name(msg.Params[0]).IsNickname() {
client.Send(nil, "", "ERROR", "Malformed username")
return true
}
// set user info and log client in // set user info and log client in
//TODO(dan): Could there be a race condition here with adding/removing the client? //TODO(dan): Could there be a race condition here with adding/removing the client?
//TODO(dan): we should do something like server.clients.Replace(client) instead //TODO(dan): we should do something like server.clients.Replace(client) instead