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

Add ban support to UserRemove message.

Browse source
This commit is contained in:
Mikkel Krautz 2011-05-14 17:48:33 +02:00
parent c1861a4312
commit 6295adad98
1 changed files with 25 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

32
message.go
View file

@ -13,6 +13,7 @@ import (
"fmt" "fmt"
"grumble/ban" "grumble/ban"
"grumble/blobstore" "grumble/blobstore"
"time"
) )
// These are the different kinds of messages // These are the different kinds of messages
@ -502,25 +503,36 @@ func (server *Server) handleUserRemoveMessage(client *Client, msg *Message) {
return return
} }
ban := false isBan := false
if userremove.Ban != nil { if userremove.Ban != nil {
ban = *userremove.Ban isBan = *userremove.Ban
} }
// Check client's permissions // Check client's permissions
perm := Permission(KickPermission) perm := Permission(KickPermission)
if ban { if isBan {
perm = Permission(BanPermission) perm = Permission(BanPermission)
} }
if removeClient.IsSuperUser() || !server.HasPermission(client, server.root, perm) { if removeClient.IsSuperUser() || !server.HasPermission(client, server.root, perm) {
client.sendPermissionDenied(client, server.root, perm) client.sendPermissionDenied(client, server.root, perm)
return return
} }
if ban { if isBan {
// fixme(mkrautz): Implement banning. ban := ban.Ban{}
server.Printf("handleUserRemove: Banning is not yet implemented.") ban.IP = removeClient.conn.RemoteAddr().(*net.TCPAddr).IP
ban.Mask = 128
if userremove.Reason != nil {
ban.Reason = *userremove.Reason
}
ban.Username = removeClient.ShownName()
ban.CertHash = removeClient.CertHash
ban.Start = time.Seconds()
ban.Duration = 0
server.banlock.Lock()
server.Bans = append(server.Bans, ban)
server.banlock.Unlock()
} }
userremove.Actor = proto.Uint32(uint32(client.Session)) userremove.Actor = proto.Uint32(uint32(client.Session))
@ -529,6 +541,12 @@ func (server *Server) handleUserRemoveMessage(client *Client, msg *Message) {
return return
} }
if isBan {
client.Printf("Kick-banned %v (%v)", removeClient.ShownName(), removeClient.Session)
} else {
client.Printf("Kicked %v (%v)", removeClient.ShownName(), removeClient.Session)
}
removeClient.ForceDisconnect() removeClient.ForceDisconnect()
} }