Skip to content

Add CORS headers to server APIs #301

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Kern-- wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add CORS headers to server APIs #301

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 16 additions & 7 deletions webserver/webserver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,20 +34,22 @@ var StaticRoot string
var Insecure bool

func Serve(address string, dataDir string) error {
http.Handle("/", &fileHandler{http.Dir(StaticRoot)})
http.HandleFunc("/group/", groupHandler)
http.HandleFunc("/recordings",
serverMux := http.NewServeMux()
serverMux.Handle("/", &fileHandler{http.Dir(StaticRoot)})
serverMux.HandleFunc("/group/", groupHandler)
serverMux.HandleFunc("/recordings",
func(w http.ResponseWriter, r *http.Request) {
http.Redirect(w, r,
"/recordings/", http.StatusPermanentRedirect)
})
http.HandleFunc("/recordings/", recordingsHandler)
http.HandleFunc("/ws", wsHandler)
http.HandleFunc("/public-groups.json", publicHandler)
http.HandleFunc("/galene-api/", apiHandler)
serverMux.HandleFunc("/recordings/", recordingsHandler)
serverMux.HandleFunc("/ws", wsHandler)
serverMux.HandleFunc("/public-groups.json", publicHandler)
serverMux.HandleFunc("/galene-api/", apiHandler)

s := &http.Server{
Addr: address,
Handler: corsHandler(serverMux),
ReadHeaderTimeout: 60 * time.Second,
IdleTimeout: 120 * time.Second,
}
Expand Down Expand Up @@ -89,6 +91,13 @@ func Serve(address string, dataDir string) error {
return nil
}

func corsHandler(next http.Handler) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
CheckOrigin(w, r, false)
next.ServeHTTP(w, r)
})
}

func cspHeader(w http.ResponseWriter, connect string) {
c := "connect-src ws: wss: 'self'; "
if connect != "" {
Expand Down