Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
sfu
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Alain Takoudjou
sfu
Commits
2890d21c
Commit
2890d21c
authored
Apr 25, 2020
by
Juliusz Chroboczek
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add group permissions.
parent
cb1782b6
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
136 additions
and
22 deletions
+136
-22
client.go
client.go
+13
-4
group.go
group.go
+108
-16
sfu.go
sfu.go
+3
-0
static/sfu.html
static/sfu.html
+2
-2
static/sfu.js
static/sfu.js
+10
-0
No files found.
client.go
View file @
2890d21c
...
...
@@ -89,6 +89,7 @@ type clientMessage struct {
Id
string
`json:"id,omitempty"`
Username
string
`json:"username,omitempty"`
Password
string
`json:"password,omitempty"`
Permissions
userPermission
`json:"permissions,omitempty"`
Group
string
`json:"group,omitempty"`
Value
string
`json:"value,omitempty"`
Message
string
`json:"message,omitempty"`
...
...
@@ -149,7 +150,7 @@ func startClient(conn *websocket.Conn) (err error) {
c
.
writerDone
=
make
(
chan
struct
{})
go
clientWriter
(
conn
,
c
.
writeCh
,
c
.
writerDone
)
g
,
users
,
err
:=
addClient
(
m
.
Group
,
c
)
g
,
users
,
err
:=
addClient
(
m
.
Group
,
c
,
m
.
Username
,
m
.
Password
)
if
err
!=
nil
{
return
}
...
...
@@ -262,7 +263,7 @@ func addUpConn(c *client, id string) (*upConnection, error) {
clients
:=
c
.
group
.
getClients
(
c
)
for
_
,
cc
:=
range
clients
{
cc
.
action
(
addTrackAction
{
id
,
local
,
u
,
done
})
if
(
done
&&
u
.
label
!=
""
)
{
if
done
&&
u
.
label
!=
""
{
cc
.
action
(
addLabelAction
{
id
,
u
.
label
})
}
}
...
...
@@ -389,7 +390,7 @@ func delDownConn(c *client, id string) {
log
.
Printf
(
"Deleting unknown connection"
)
return
}
conn
:=
c
.
down
[
id
]
;
conn
:=
c
.
down
[
id
]
if
conn
==
nil
{
log
.
Printf
(
"Deleting unknown connection"
)
return
...
...
@@ -667,6 +668,11 @@ func clientLoop(c *client, conn *websocket.Conn) error {
g
:=
c
.
group
c
.
write
(
clientMessage
{
Type
:
"permissions"
,
Permissions
:
c
.
permissions
,
})
for
_
,
cc
:=
range
g
.
getClients
(
c
)
{
cc
.
action
(
pushTracksAction
{
c
})
}
...
...
@@ -721,7 +727,7 @@ func clientLoop(c *client, conn *websocket.Conn) error {
for
_
,
u
:=
range
c
.
up
{
var
done
bool
for
i
,
p
:=
range
u
.
pairs
{
done
=
i
>=
u
.
streamCount
-
1
done
=
i
>=
u
.
streamCount
-
1
a
.
c
.
action
(
addTrackAction
{
u
.
id
,
p
.
local
,
u
,
done
,
...
...
@@ -747,6 +753,9 @@ func clientLoop(c *client, conn *websocket.Conn) error {
func
handleClientMessage
(
c
*
client
,
m
clientMessage
)
error
{
switch
m
.
Type
{
case
"offer"
:
if
!
c
.
permissions
.
Present
{
return
userError
(
"not authorized"
)
}
if
m
.
Offer
==
nil
{
return
protocolError
(
"null offer"
)
}
...
...
group.go
View file @
2890d21c
...
...
@@ -6,7 +6,10 @@
package
main
import
(
"encoding/json"
"log"
"os"
"path/filepath"
"sync"
"github.com/pion/webrtc/v2"
...
...
@@ -34,20 +37,21 @@ type downConnection struct {
}
type
client
struct
{
group
*
group
id
string
username
string
done
chan
struct
{}
writeCh
chan
interface
{}
writerDone
chan
struct
{}
actionCh
chan
interface
{}
down
map
[
string
]
*
downConnection
up
map
[
string
]
*
upConnection
group
*
group
id
string
username
string
permissions
userPermission
done
chan
struct
{}
writeCh
chan
interface
{}
writerDone
chan
struct
{}
actionCh
chan
interface
{}
down
map
[
string
]
*
downConnection
up
map
[
string
]
*
upConnection
}
type
group
struct
{
name
string
public
bool
name
string
description
*
groupDescription
mu
sync
.
Mutex
clients
[]
*
client
...
...
@@ -102,8 +106,13 @@ func addGroup(name string) (*group, error) {
g
:=
groups
.
groups
[
name
]
if
g
==
nil
{
desc
,
err
:=
getDescription
(
name
)
if
err
!=
nil
{
return
nil
,
err
}
g
=
&
group
{
name
:
name
,
name
:
name
,
description
:
desc
,
}
groups
.
groups
[
name
]
=
g
}
...
...
@@ -130,12 +139,18 @@ type userid struct {
username
string
}
func
addClient
(
name
string
,
client
*
client
)
(
*
group
,
[]
userid
,
error
)
{
func
addClient
(
name
string
,
client
*
client
,
user
,
pass
string
)
(
*
group
,
[]
userid
,
error
)
{
g
,
err
:=
addGroup
(
name
)
if
err
!=
nil
{
return
nil
,
nil
,
err
}
perms
,
err
:=
getPermission
(
g
.
description
,
user
,
pass
)
if
err
!=
nil
{
return
nil
,
nil
,
err
}
client
.
permissions
=
perms
var
users
[]
userid
g
.
mu
.
Lock
()
defer
g
.
mu
.
Unlock
()
...
...
@@ -182,8 +197,8 @@ func (g *group) Range(f func(c *client) bool) {
defer
g
.
mu
.
Unlock
()
for
_
,
c
:=
range
g
.
clients
{
ok
:=
f
(
c
)
if
(
!
ok
)
{
break
;
if
!
ok
{
break
}
}
}
...
...
@@ -218,6 +233,83 @@ func (c *client) action(m interface{}) error {
}
}
type
groupUser
struct
{
Username
string
`json:"username,omitempty"`
Password
string
`json:"password,omitempty"`
}
func
matchUser
(
user
,
pass
string
,
users
[]
groupUser
)
(
bool
,
bool
)
{
for
_
,
u
:=
range
users
{
if
(
u
.
Username
==
""
||
u
.
Username
==
user
)
{
return
true
,
(
u
.
Password
==
""
||
u
.
Password
==
pass
)
}
}
return
false
,
false
}
type
groupDescription
struct
{
Public
bool
`json:"public,omitempty"`
AllowAnonymous
bool
`json:"allow-anonymous,omitempty"`
Admin
[]
groupUser
`json:"admin,omitempty"`
Presenter
[]
groupUser
`json:"presenter,omitempty"`
Other
[]
groupUser
`json:"other,omitempty"`
}
func
getDescription
(
name
string
)
(
*
groupDescription
,
error
)
{
r
,
err
:=
os
.
Open
(
filepath
.
Join
(
groupsDir
,
name
+
".json"
))
if
err
!=
nil
{
if
os
.
IsNotExist
(
err
)
{
err
=
userError
(
"group does not exist"
)
}
else
if
os
.
IsPermission
(
err
)
{
err
=
userError
(
"unauthorised"
)
}
return
nil
,
err
}
defer
r
.
Close
()
var
desc
groupDescription
d
:=
json
.
NewDecoder
(
r
)
err
=
d
.
Decode
(
&
desc
)
if
err
!=
nil
{
return
nil
,
err
}
return
&
desc
,
nil
}
type
userPermission
struct
{
Admin
bool
`json:"admin,omitempty"`
Present
bool
`json:"present,omitempty"`
}
func
getPermission
(
desc
*
groupDescription
,
user
,
pass
string
)
(
userPermission
,
error
)
{
var
p
userPermission
if
!
desc
.
AllowAnonymous
&&
user
==
""
{
return
p
,
userError
(
"anonymous users not allowed in this group"
)
}
if
found
,
good
:=
matchUser
(
user
,
pass
,
desc
.
Admin
);
found
{
if
good
{
p
.
Admin
=
true
p
.
Present
=
true
return
p
,
nil
}
return
p
,
userError
(
"not authorized"
)
}
if
found
,
good
:=
matchUser
(
user
,
pass
,
desc
.
Presenter
);
found
{
if
good
{
p
.
Present
=
true
return
p
,
nil
}
return
p
,
userError
(
"not authorized"
)
}
if
found
,
good
:=
matchUser
(
user
,
pass
,
desc
.
Other
);
found
{
if
good
{
return
p
,
nil
}
return
p
,
userError
(
"not authorized"
)
}
return
p
,
userError
(
"not authorized"
)
}
type
publicGroup
struct
{
Name
string
`json:"name"`
ClientCount
int
`json:"clientCount"`
...
...
@@ -228,7 +320,7 @@ func getPublicGroups() []publicGroup {
groups
.
mu
.
Lock
()
defer
groups
.
mu
.
Unlock
()
for
_
,
g
:=
range
groups
.
groups
{
if
g
.
p
ublic
{
if
g
.
description
.
P
ublic
{
gs
=
append
(
gs
,
publicGroup
{
Name
:
g
.
name
,
ClientCount
:
len
(
g
.
clients
),
...
...
sfu.go
View file @
2890d21c
...
...
@@ -22,6 +22,7 @@ import (
var
httpAddr
string
var
staticRoot
string
var
dataDir
string
var
groupsDir
string
var
iceFilename
string
func
main
()
{
...
...
@@ -30,6 +31,8 @@ func main() {
"web server root `directory`"
)
flag
.
StringVar
(
&
dataDir
,
"data"
,
"./data/"
,
"data `directory`"
)
flag
.
StringVar
(
&
groupsDir
,
"groups"
,
"./groups/"
,
"group description `directory`"
)
flag
.
Parse
()
iceFilename
=
filepath
.
Join
(
staticRoot
,
"ice-servers.json"
)
...
...
static/sfu.html
View file @
2890d21c
...
...
@@ -29,9 +29,9 @@
<div
id=
"optionsdiv"
>
<label
for=
"presenterbox"
>
Present:
</label>
<input
id=
"presenterbox"
type=
"checkbox"
/>
<input
id=
"presenterbox"
type=
"checkbox"
/
disabled
>
<label
for=
"sharebox"
>
Share screen:
</label>
<input
id=
"sharebox"
type=
"checkbox"
/>
<input
id=
"sharebox"
type=
"checkbox"
/
disabled
>
</div>
</div>
...
...
static/sfu.js
View file @
2890d21c
...
...
@@ -279,8 +279,10 @@ function serverConnect() {
socket
.
onclose
=
function
(
e
)
{
setConnected
(
false
);
document
.
getElementById
(
'
presenterbox
'
).
checked
=
false
;
document
.
getElementById
(
'
presenterbox
'
).
disabled
=
true
;
setLocalMedia
();
document
.
getElementById
(
'
sharebox
'
).
checked
=
false
;
document
.
getElementById
(
'
sharebox
'
).
disabled
=
true
;
setShareMedia
();
reject
(
new
Error
(
'
websocket close
'
+
e
.
code
+
'
'
+
e
.
reason
));
};
...
...
@@ -305,6 +307,9 @@ function serverConnect() {
case
'
label
'
:
gotLabel
(
m
.
id
,
m
.
value
);
break
;
case
'
permissions
'
:
gotPermissions
(
m
.
permissions
);
break
;
case
'
user
'
:
gotUser
(
m
.
id
,
m
.
username
,
m
.
del
);
break
;
...
...
@@ -483,6 +488,11 @@ function gotUser(id, name, del) {
addUser
(
id
,
name
);
}
function
gotPermissions
(
permissions
)
{
document
.
getElementById
(
'
presenterbox
'
).
disabled
=
!
permissions
.
present
;
document
.
getElementById
(
'
sharebox
'
).
disabled
=
!
permissions
.
present
;
}
const
urlRegexp
=
/https
?
:
\/\/[
-a-zA-Z0-9@:%
/
._
\+
~#=?
]
+
[
-a-zA-Z0-9@:%
/
_
\+
~#=
]
/g
;
function
formatLine
(
line
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment