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

Fix baseURL check

pull/118/head
Philipp Heckel 2022-01-21 14:17:59 -05:00
parent 8af9a97518
commit aab705f4a4
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/serve.go
View File

@ -124,7 +124,7 @@ func execServe(c *cli.Context) error {
return errors.New("if smtp-server-listen is set, smtp-server-domain must also be set") return errors.New("if smtp-server-listen is set, smtp-server-domain must also be set")
} else if attachmentCacheDir != "" && baseURL == "" { } else if attachmentCacheDir != "" && baseURL == "" {
return errors.New("if attachment-cache-dir is set, base-url must also be set") return errors.New("if attachment-cache-dir is set, base-url must also be set")
} else if baseURL != "" && (strings.HasPrefix(baseURL, "http://") || strings.HasPrefix(baseURL, "https://")) { } else if baseURL != "" && !strings.HasPrefix(baseURL, "http://") && !strings.HasPrefix(baseURL, "https://") {
return errors.New("if set, base-url must start with http:// or https://") return errors.New("if set, base-url must start with http:// or https://")
} }

4
server/server.go
View File

@ -269,7 +269,7 @@ func (s *Server) Run() error {
s.mu.Unlock() s.mu.Unlock()
go s.runManager() go s.runManager()
go s.runAtSender() go s.runAtSender()
go s.runFirebaseKeepliver() go s.runFirebaseKeepaliver()
return <-errChan return <-errChan
} }
@ -1052,7 +1052,7 @@ func (s *Server) runAtSender() {
} }
} }
func (s *Server) runFirebaseKeepliver() { func (s *Server) runFirebaseKeepaliver() {
if s.firebase == nil { if s.firebase == nil {
return return
} }