mirror
/
galene
mirror of https://github.com/jech/galene.git
1
Fork 0
Code

Report username errors to client. 

We now report ErrUsernameRequired and ErrDuplicateUsername
errors by setting the "error" field of messages.
This commit is contained in:
Juliusz Chroboczek 2023-04-01 00:13:20 +02:00
parent 8c1510023f
commit 4c9e00d874
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
rtpconn/webclient.go
View File

@ -1434,8 +1434,14 @@ func handleClientMessage(c *webClient, m clientMessage) error {
time.Sleep(200 * time.Millisecond)
} else if err == group.ErrAnonymousNotAuthorised {
s = "please choose a username"
} else if err, ok := err.(group.UserError); ok {
} else if _, ok := err.(group.UserError); ok {
s = err.Error()
} else if err == token.ErrUsernameRequired {
s = err.Error()
e = "need-username"
} else if err == group.ErrDuplicateUsername {
s = err.Error()
e = "duplicate-username"
} else {
s = "internal server error"
log.Printf("Join group: %v", err)
@ -1738,6 +1744,11 @@ func handleClientMessage(c *webClient, m clientMessage) error {
return terror("error", "token doesn't expire")
}
if tok.Username != nil &&
c.group.UserExists(*tok.Username) {
return terror("error", "that username is taken")
}
for _, p := range tok.Permissions {
if !member(p, c.permissions) {
return terror(