External/grumble
1
0
Fork 1
mirror of https://github.com/mumble-voip/grumble.git synced 2025-12-19 21:59:59 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix minor errors breaking ACL groups

Browse source 
* ACL groups incorrectly instantiated without userid -1 leading to many
 spurious SuperUser ACLs
 * Regular user anti-lockout had incorrect logic
This commit is contained in:
rubenseyer 2020-06-10 21:50:56 +02:00
parent 6f8c2bf2f5
commit 7ecc4d724f
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cmd/grumble/freeze.go
View file

@ -262,7 +262,7 @@ func (c *Channel) Unfreeze(fc *freezer.Channel) {
if fgrp.Name == nil {
continue
}
g := acl.Group{}
g := acl.EmptyGroupWithName(fgrp.GetName())
if fgrp.Inherit != nil {
g.Inherit = *fgrp.Inherit
}

4
cmd/grumble/message.go
View file

@ -1211,6 +1211,7 @@ func (server *Server) handleAclMessage(client *Client, msg *Message) {
if pbacl.UserId != nil {
chanacl.UserId = int(*pbacl.UserId)
} else {
chanacl.UserId = -1
chanacl.Group = *pbacl.Group
}
chanacl.Deny = acl.Permission(*pbacl.Deny & acl.AllPermissions)
@ -1223,13 +1224,14 @@ func (server *Server) handleAclMessage(client *Client, msg *Message) {
server.ClearCaches()
// Regular user?
if !acl.HasPermission(&channel.ACL, client, acl.WritePermission) && client.IsRegistered() || client.HasCertificate() {
if !acl.HasPermission(&channel.ACL, client, acl.WritePermission) && (client.IsRegistered() || client.HasCertificate()) {
chanacl := acl.ACL{}
chanacl.ApplyHere = true
chanacl.ApplySubs = false
if client.IsRegistered() {
chanacl.UserId = client.UserId()
} else if client.HasCertificate() {
chanacl.UserId = -1
chanacl.Group = "$" + client.CertHash()
}
chanacl.Deny = acl.Permission(acl.NonePermission)