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

Override permissions for disk recording.

Browse source
This commit is contained in:
Juliusz Chroboczek 2020-10-01 13:38:09 +02:00
parent 3bd9a1db4e
commit 9ce591e4c5
4 changed files with 25 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
disk/disk.go
View file

@ -53,6 +53,10 @@ func (client *Client) Credentials() group.ClientCredentials {
return group.ClientCredentials{"RECORDING", ""} return group.ClientCredentials{"RECORDING", ""}
} }
func (client *Client) OverridePermissions(g *group.Group) bool {
return true
}
func (client *Client) SetPermissions(perms group.ClientPermissions) { func (client *Client) SetPermissions(perms group.ClientPermissions) {
return return
} }

1
group/client.go
View file

@ -20,6 +20,7 @@ type Client interface {
Id() string Id() string
Credentials() ClientCredentials Credentials() ClientCredentials
SetPermissions(ClientPermissions) SetPermissions(ClientPermissions)
OverridePermissions(*Group) bool
PushConn(id string, conn conn.Up, tracks []conn.UpTrack, label string) error PushConn(id string, conn conn.Up, tracks []conn.UpTrack, label string) error
PushClient(id, username string, add bool) error PushClient(id, username string, add bool) error
} }

7
group/group.go
View file

@ -271,16 +271,19 @@ func AddClient(name string, c Client) (*Group, error) {
return nil, err return nil, err
} }
override := c.OverridePermissions(g)
g.mu.Lock() g.mu.Lock()
defer g.mu.Unlock() defer g.mu.Unlock()
perms, err := g.description.GetPermission(c.Credentials()) perms, err := g.description.GetPermission(c.Credentials())
if err != nil { if !override && err != nil {
return nil, err return nil, err
} }
c.SetPermissions(perms) c.SetPermissions(perms)
if !override {
if !perms.Op && g.locked != nil { if !perms.Op && g.locked != nil {
m := *g.locked m := *g.locked
if m == "" { if m == "" {
@ -294,6 +297,8 @@ func AddClient(name string, c Client) (*Group, error) {
return nil, UserError("too many users") return nil, UserError("too many users")
} }
} }
}
if g.clients[c.Id()] != nil { if g.clients[c.Id()] != nil {
return nil, ProtocolError("duplicate client id") return nil, ProtocolError("duplicate client id")
} }

4
rtpconn/webclient.go
View file

@ -73,6 +73,10 @@ func (c *webClient) SetPermissions(perms group.ClientPermissions) {
c.permissions = perms c.permissions = perms
} }
func (c *webClient) OverridePermissions(g *group.Group) bool {
return false
}
func (c *webClient) PushClient(id, username string, add bool) error { func (c *webClient) PushClient(id, username string, add bool) error {
kind := "add" kind := "add"
if !add { if !add {