1
Fork 0
mirror of https://github.com/jech/galene.git synced 2024-11-22 08:35:57 +01:00

Implement autolock.

This commit is contained in:
Juliusz Chroboczek 2021-01-14 03:56:37 +01:00
parent bd287dbb0c
commit 6098d4af9d
5 changed files with 48 additions and 18 deletions

2
README
View file

@ -235,6 +235,8 @@ the group.
- `allow-anonymous`: if true, then users may connect with an empty username;
- `allow-subgroups`: if true, then subgroups of the form `group/subgroup`
are automatically created when first accessed;
- `autolock`: if true, the group will start locked and become locked
whenever there are no clients with operator privileges;
- `redirect`: if set, then attempts to join the group will be redirected
to the given URL; most other fields are ignored in this case;
- `codecs`: this is a list of codecs allowed in this group. The default

View file

@ -67,6 +67,10 @@ func (client *Client) SetPermissions(perms group.ClientPermissions) {
return
}
func (client *Client) Permissions() group.ClientPermissions {
return group.ClientPermissions{}
}
func (client *Client) PushClient(id, username string, add bool) error {
return nil
}

View file

@ -96,6 +96,7 @@ type Client interface {
Group() *Group
Id() string
Challengeable
Permissions() ClientPermissions
SetPermissions(ClientPermissions)
OverridePermissions(*Group) bool
PushConn(g *Group, id string, conn conn.Up, tracks []conn.UpTrack) error

View file

@ -293,6 +293,7 @@ func Add(name string, desc *description) (*Group, error) {
timestamp: time.Now(),
api: APIFromNames(desc.Codecs),
}
autolock(g, g.getClientsUnlocked(nil))
groups.groups[name] = g
return g, nil
}
@ -302,27 +303,24 @@ func Add(name string, desc *description) (*Group, error) {
if desc != nil {
g.description = desc
g.api = APIFromNames(desc.Codecs)
} else if time.Since(g.description.loadTime) < 5*time.Second {
return g, nil
} else if !descriptionChanged(name, g.description) {
g.description.loadTime = time.Now()
return g, nil
}
if time.Since(g.description.loadTime) > 5*time.Second {
if descriptionChanged(name, g.description) {
desc, err := GetDescription(name)
if err != nil {
if !os.IsNotExist(err) {
log.Printf("Reading group %v: %v",
name, err)
}
deleteUnlocked(g)
return nil, err
}
g.description = desc
g.api = APIFromNames(desc.Codecs)
} else {
g.description.loadTime = time.Now()
desc, err = GetDescription(name)
if err != nil {
if !os.IsNotExist(err) {
log.Printf("Reading group %v: %v", name, err)
}
deleteUnlocked(g)
return nil, err
}
g.description = desc
g.api = APIFromNames(desc.Codecs)
autolock(g, g.getClientsUnlocked(nil))
return g, nil
}
@ -451,7 +449,7 @@ func AddClient(group string, c Client) (*Group, error) {
if !perms.Op && g.locked != nil {
m := *g.locked
if m == "" {
m = "group is locked"
m = "this group is locked"
}
return nil, UserError(m)
}
@ -483,6 +481,22 @@ func AddClient(group string, c Client) (*Group, error) {
return g, nil
}
// called locked
func autolock(g *Group, clients []Client) {
if g.locked == nil && g.description.Autolock {
lock := true
for _, c := range clients {
if c.Permissions().Op {
lock = false
}
}
if lock {
m := "this group is locked"
g.locked = &m
}
}
}
func DelClient(c Client) {
g := c.Group()
if g == nil {
@ -498,11 +512,15 @@ func DelClient(c Client) {
delete(g.clients, c.Id())
g.timestamp = time.Now()
clients := g.getClientsUnlocked(nil)
go func(clients []Client) {
for _, cc := range clients {
cc.PushClient(c.Id(), c.Username(), false)
}
}(g.getClientsUnlocked(nil))
}(clients)
autolock(g, clients)
}
func (g *Group) GetClients(except Client) []Client {
@ -668,6 +686,7 @@ type description struct {
AllowAnonymous bool `json:"allow-anonymous,omitempty"`
AllowRecording bool `json:"allow-recording,omitempty"`
AllowSubgroups bool `json:"allow-subgroups,omitempty"`
Autolock bool `json:"autolock,omitempty"`
Op []ClientCredentials `json:"op,omitempty"`
Presenter []ClientCredentials `json:"presenter,omitempty"`
Other []ClientCredentials `json:"other,omitempty"`

View file

@ -93,6 +93,10 @@ func (c *webClient) Challenge(group string, creds group.ClientCredentials) bool
return m
}
func (c *webClient) Permissions() group.ClientPermissions {
return c.permissions
}
func (c *webClient) SetPermissions(perms group.ClientPermissions) {
c.permissions = perms
}