mirror
/
galene
mirror of https://github.com/jech/galene.git
1
Fork 0
Code

Publish websocket endpoint in group status.

This commit is contained in:
Juliusz Chroboczek 2022-09-01 14:55:52 +02:00
parent 4e275a63b4
commit 4bc873a574
4 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
group/group.go
View File

@ -1177,6 +1177,7 @@ func (desc *Description) GetPermission(group string, creds ClientCredentials) (s
type Status struct { type Status struct {
Name string `json:"name"` Name string `json:"name"`
Endpoint string `json:"endpoint"`
DisplayName string `json:"displayName,omitempty"` DisplayName string `json:"displayName,omitempty"`
Description string `json:"description,omitempty"` Description string `json:"description,omitempty"`
AuthServer string `json:"authServer,omitempty"` AuthServer string `json:"authServer,omitempty"`
@ -1185,10 +1186,11 @@ type Status struct {
ClientCount *int `json:"clientCount,omitempty"` ClientCount *int `json:"clientCount,omitempty"`
} }
func (g *Group) Status(authentified bool) Status { func (g *Group) Status(authentified bool, endpoint string) Status {
desc := g.Description() desc := g.Description()
d := Status{ d := Status{
Name: g.name, Name: g.name,
Endpoint: endpoint,
DisplayName: desc.DisplayName, DisplayName: desc.DisplayName,
AuthServer: desc.AuthServer, AuthServer: desc.AuthServer,
AuthPortal: desc.AuthPortal, AuthPortal: desc.AuthPortal,
@ -1209,7 +1211,7 @@ func GetPublic() []Status {
gs := make([]Status, 0) gs := make([]Status, 0)
Range(func(g *Group) bool { Range(func(g *Group) bool {
if g.Description().Public { if g.Description().Public {
gs = append(gs, g.Status(false)) gs = append(gs, g.Status(false, ""))
} }
return true return true
}) })

4
rtpconn/webclient.go
View File

@ -1148,7 +1148,7 @@ func handleAction(c *webClient, a interface{}) error {
if a.group != "" { if a.group != "" {
g := group.Get(a.group) g := group.Get(a.group)
if g != nil { if g != nil {
s := g.Status(true) s := g.Status(true, "")
status = &s status = &s
data = g.Data() data = g.Data()
} }
@ -1170,7 +1170,7 @@ func handleAction(c *webClient, a interface{}) error {
return errors.New("Permissions changed in no group") return errors.New("Permissions changed in no group")
} }
perms := append([]string(nil), c.permissions...) perms := append([]string(nil), c.permissions...)
status := g.Status(true) status := g.Status(true, "")
c.write(clientMessage{ c.write(clientMessage{
Type: "joined", Type: "joined",
Kind: "change", Kind: "change",

7
static/galene.js
View File

@ -3431,7 +3431,12 @@ async function serverConnect() {
serverConnection.onusermessage = gotUserMessage; serverConnection.onusermessage = gotUserMessage;
serverConnection.onfiletransfer = gotFileTransfer; serverConnection.onfiletransfer = gotFileTransfer;
let url = `ws${location.protocol === 'https:' ? 's' : ''}://${location.host}/ws`; let url = groupStatus.endpoint;
if(!url) {
console.warn("no endpoint in status");
url = `ws${location.protocol === 'https:' ? 's' : ''}://${location.host}/ws`;
}
try { try {
await serverConnection.connect(url); await serverConnection.connect(url);
} catch(e) { } catch(e) {

15
webserver/webserver.go
View File

@ -102,7 +102,7 @@ func cspHeader(w http.ResponseWriter, connect string) {
c = "connect-src " + connect + " ws: wss: 'self';" c = "connect-src " + connect + " ws: wss: 'self';"
} }
w.Header().Add("Content-Security-Policy", w.Header().Add("Content-Security-Policy",
c + " img-src data: 'self'; media-src blob: 'self'; default-src 'self'") c+" img-src data: 'self'; media-src blob: 'self'; default-src 'self'")
} }
func notFound(w http.ResponseWriter) { func notFound(w http.ResponseWriter) {
@ -327,7 +327,7 @@ func groupHandler(w http.ResponseWriter, r *http.Request) {
return return
} }
status := g.Status(false) status := g.Status(false, "")
cspHeader(w, status.AuthServer) cspHeader(w, status.AuthServer)
serveFile(w, r, filepath.Join(StaticRoot, "galene.html")) serveFile(w, r, filepath.Join(StaticRoot, "galene.html"))
} }
@ -351,7 +351,16 @@ func groupStatusHandler(w http.ResponseWriter, r *http.Request) {
return return
} }
d := g.Status(false) scheme := "wss"
if Insecure {
scheme = "ws"
}
endpoint := url.URL{
Scheme: scheme,
Host: r.Host,
Path: "/ws",
}
d := g.Status(false, endpoint.String())
w.Header().Set("content-type", "application/json") w.Header().Set("content-type", "application/json")
w.Header().Set("cache-control", "no-cache") w.Header().Set("cache-control", "no-cache")