johanels/photoprism
1
0
Fork 0
mirror of https://github.com/photoprism/photoprism.git synced 2025-12-12 00:34:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Only send full clientConfig if authenticated #216

Browse Source 
Signed-off-by: Michael Mayer <michael@liquidbytes.net>
This commit is contained in:
Michael Mayer
2020-01-23 07:39:04 +01:00
parent 2794fec513
commit 2f4840f9c2
10 changed files with 117 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
internal/api/websocket.go
View File

@@ -19,7 +19,7 @@ var wsConnection = websocket.Upgrader{
return true
},
}
var wsTimeout = 60 * time.Second
var wsTimeout = 90 * time.Second
type clientInfo struct {
SessionToken string `json:"session"`
@@ -33,7 +33,7 @@ var wsAuth = struct {
mutex sync.RWMutex
}{authenticated: make(map[string]bool)}
func wsReader(ws *websocket.Conn, connId string) {
func wsReader(ws *websocket.Conn, connId string, conf *config.Config) {
defer ws.Close()
ws.SetReadLimit(512)
@@ -54,19 +54,25 @@ func wsReader(ws *websocket.Conn, connId string) {
if err := json.Unmarshal(m, &info); err != nil {
log.Error(err)
} else {
log.Debugf("websocket: %+v", info)
if session.Exists(info.SessionToken) {
log.Debug("websocket: authenticated")
wsAuth.mutex.Lock()
wsAuth.authenticated[connId] = true
wsAuth.mutex.Unlock()
ws.SetWriteDeadline(time.Now().Add(30 * time.Second))
if err := ws.WriteJSON(gin.H{"event": "config.updated", "data": event.Data(conf.ClientConfig())}); err != nil {
log.Error(err)
}
}
}
}
}
func wsWriter(ws *websocket.Conn, connId string) {
pingTicker := time.NewTicker(10 * time.Second)
pingTicker := time.NewTicker(15 * time.Second)
s := event.Subscribe("log.*", "notify.*", "index.*", "upload.*", "import.*", "config.*", "count.*")
defer func() {
@@ -82,7 +88,7 @@ func wsWriter(ws *websocket.Conn, connId string) {
for {
select {
case <-pingTicker.C:
ws.SetWriteDeadline(time.Now().Add(10 * time.Second))
ws.SetWriteDeadline(time.Now().Add(30 * time.Second))
if err := ws.WriteMessage(websocket.PingMessage, []byte{}); err != nil {
return
}
@@ -92,7 +98,7 @@ func wsWriter(ws *websocket.Conn, connId string) {
wsAuth.mutex.RUnlock()
if auth {
ws.SetWriteDeadline(time.Now().Add(10 * time.Second))
ws.SetWriteDeadline(time.Now().Add(30 * time.Second))
if err := ws.WriteJSON(gin.H{"event": msg.Name, "data": msg.Fields}); err != nil {
log.Debug(err)
@@ -139,6 +145,6 @@ func Websocket(router *gin.RouterGroup, conf *config.Config) {
go wsWriter(ws, connId)
wsReader(ws, connId)
wsReader(ws, connId, conf)
})
}