dearsky/ntfy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1338 from wunter8/websockets-401

Browse Source 
Websocket http error codes
This commit is contained in:
Philipp C. Heckel
2025-05-21 20:26:32 -04:00
committed by GitHub
parent 09c2b4bdca cdae5493e2
commit 7e916516e0
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
server/server.go
View File

@@ -413,7 +413,8 @@ func (s *Server) handleError(w http.ResponseWriter, r *http.Request, v *visitor,
} else { } else {
ev.Info("WebSocket error: %s", err.Error()) ev.Info("WebSocket error: %s", err.Error())
} }
return // Do not attempt to write to upgraded connection w.WriteHeader(httpErr.HTTPCode)
return // Do not attempt to write any body to upgraded connection
} }
if isNormalError { if isNormalError {
ev.Debug("Connection closed with HTTP %d (ntfy error %d)", httpErr.HTTPCode, httpErr.Code) ev.Debug("Connection closed with HTTP %d (ntfy error %d)", httpErr.HTTPCode, httpErr.Code)
@@ -1886,14 +1887,14 @@ func (s *Server) transformMatrixJSON(next handleFunc) handleFunc {
} }
func (s *Server) authorizeTopicWrite(next handleFunc) handleFunc { func (s *Server) authorizeTopicWrite(next handleFunc) handleFunc {
return s.autorizeTopic(next, user.PermissionWrite) return s.authorizeTopic(next, user.PermissionWrite)
} }
func (s *Server) authorizeTopicRead(next handleFunc) handleFunc { func (s *Server) authorizeTopicRead(next handleFunc) handleFunc {
return s.autorizeTopic(next, user.PermissionRead) return s.authorizeTopic(next, user.PermissionRead)
} }
func (s *Server) autorizeTopic(next handleFunc, perm user.Permission) handleFunc { func (s *Server) authorizeTopic(next handleFunc, perm user.Permission) handleFunc {
return func(w http.ResponseWriter, r *http.Request, v *visitor) error { return func(w http.ResponseWriter, r *http.Request, v *visitor) error {
if s.userManager == nil { if s.userManager == nil {
return next(w, r, v) return next(w, r, v)