mirror/galene
1
Fork 0
mirror of https://github.com/jech/galene.git synced 2024-11-22 16:45:58 +01:00
Code Activity

Use a dedicated error value for anonymous users.

Browse source
This commit is contained in:
Juliusz Chroboczek 2021-09-09 22:24:39 +02:00
parent d33e4dea9b
commit f683675ab4
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
group/group.go
View file

@ -22,6 +22,7 @@ var UseMDNS bool
var UDPMin, UDPMax uint16 var UDPMin, UDPMax uint16
var ErrNotAuthorised = errors.New("not authorised") var ErrNotAuthorised = errors.New("not authorised")
var ErrAnonymousNotAuthorised = errors.New("anonymous users not authorised in this group")
type UserError string type UserError string
@ -966,7 +967,7 @@ func GetDescription(name string) (*Description, error) {
func (desc *Description) GetPermission(group string, c Challengeable) (ClientPermissions, error) { func (desc *Description) GetPermission(group string, c Challengeable) (ClientPermissions, error) {
var p ClientPermissions var p ClientPermissions
if !desc.AllowAnonymous && c.Username() == "" { if !desc.AllowAnonymous && c.Username() == "" {
return p, UserError("anonymous users not allowed in this group, please choose a username") return p, ErrAnonymousNotAuthorised
} }
if found, good := matchClient(group, c, desc.Op); found { if found, good := matchClient(group, c, desc.Op); found {
if good { if good {

2
rtpconn/webclient.go
View file

@ -1351,6 +1351,8 @@ func handleClientMessage(c *webClient, m clientMessage) error {
} else if err == group.ErrNotAuthorised { } else if err == group.ErrNotAuthorised {
s = "not authorised" s = "not authorised"
time.Sleep(200 * time.Millisecond) time.Sleep(200 * time.Millisecond)
} else if err == group.ErrAnonymousNotAuthorised {
s = "please choose a username"
} else if e, ok := err.(group.UserError); ok { } else if e, ok := err.(group.UserError); ok {
s = string(e) s = string(e)
} else { } else {