mirror of
https://github.com/mumble-voip/grumble.git
synced 2025-12-20 06:10:00 -08:00
Correctly receive access tokens from clients.
This commit is contained in:
parent
fd94729d79
commit
e177d4cf89
1 changed files with 12 additions and 0 deletions
12
server.go
12
server.go
|
|
@ -446,6 +446,16 @@ func (server *Server) handleAuthenticate(client *Client, msg *Message) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Set access tokens. Clients can set their access tokens any time
|
||||||
|
// by sending an Authenticate message with he contents of their new
|
||||||
|
// access token list.
|
||||||
|
client.Tokens = auth.Tokens
|
||||||
|
server.ClearACLCache()
|
||||||
|
|
||||||
|
if client.state >= StateClientAuthenticated {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
// Did we get a username?
|
// Did we get a username?
|
||||||
if auth.Username == nil || len(*auth.Username) == 0 {
|
if auth.Username == nil || len(*auth.Username) == 0 {
|
||||||
client.RejectAuth("InvalidUsername", "Please specify a username to log in")
|
client.RejectAuth("InvalidUsername", "Please specify a username to log in")
|
||||||
|
|
@ -845,6 +855,8 @@ func (server *Server) broadcastProtoMessage(kind uint16, msg interface{}) (err o
|
||||||
|
|
||||||
func (server *Server) handleIncomingMessage(client *Client, msg *Message) {
|
func (server *Server) handleIncomingMessage(client *Client, msg *Message) {
|
||||||
switch msg.kind {
|
switch msg.kind {
|
||||||
|
case MessageAuthenticate:
|
||||||
|
server.handleAuthenticate(msg.client, msg)
|
||||||
case MessagePing:
|
case MessagePing:
|
||||||
server.handlePingMessage(msg.client, msg)
|
server.handlePingMessage(msg.client, msg)
|
||||||
case MessageChannelRemove:
|
case MessageChannelRemove:
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue