explicity open cors

This commit is contained in:
0ceanSlim 2024-08-01 07:54:59 -04:00
parent 5ea0d36ba3
commit 27efacc2e4
2 changed files with 48 additions and 6 deletions

21
main.go
View File

@ -9,9 +9,9 @@ import (
"grain/server/db" "grain/server/db"
"grain/server/nip" "grain/server/nip"
"grain/server/utils" "grain/server/utils"
"log" "log"
"net/http" "net/http"
"time"
"golang.org/x/net/websocket" "golang.org/x/net/websocket"
) )
@ -46,17 +46,26 @@ func main() {
func setupRoutes() *http.ServeMux { func setupRoutes() *http.ServeMux {
mux := http.NewServeMux() mux := http.NewServeMux()
mux.HandleFunc("/", ListenAndServe) mux.HandleFunc("/", utils.WithCORS(ListenAndServe))
mux.Handle("/static/", http.StripPrefix("/static/", http.FileServer(http.Dir("app/static")))) mux.Handle("/static/", utils.WithCORSHandler(http.StripPrefix("/static/", http.FileServer(http.Dir("app/static")))))
mux.HandleFunc("/favicon.ico", func(w http.ResponseWriter, r *http.Request) { mux.HandleFunc("/favicon.ico", utils.WithCORS(func(w http.ResponseWriter, r *http.Request) {
http.ServeFile(w, r, "app/static/img/favicon.ico") http.ServeFile(w, r, "app/static/img/favicon.ico")
}) }))
return mux return mux
} }
func startServer(config *configTypes.ServerConfig, mux *http.ServeMux) { func startServer(config *configTypes.ServerConfig, mux *http.ServeMux) {
server := &http.Server{
Addr: config.Server.Port,
Handler: mux,
ReadTimeout: 10 * time.Second,
WriteTimeout: 10 * time.Second,
IdleTimeout: 120 * time.Second,
}
fmt.Printf("Server is running on http://localhost%s\n", config.Server.Port) fmt.Printf("Server is running on http://localhost%s\n", config.Server.Port)
err := http.ListenAndServe(config.Server.Port, mux) err := server.ListenAndServe()
if err != nil { if err != nil {
fmt.Println("Error starting server:", err) fmt.Println("Error starting server:", err)
} }

33
server/utils/cors.go Normal file
View File

@ -0,0 +1,33 @@
package utils
import "net/http"
func WithCORS(h http.HandlerFunc) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
w.Header().Set("Access-Control-Allow-Origin", "*")
w.Header().Set("Access-Control-Allow-Headers", "Authorization, Content-Type")
w.Header().Set("Access-Control-Allow-Methods", "GET, PUT, DELETE, POST, OPTIONS")
if r.Method == http.MethodOptions {
w.WriteHeader(http.StatusOK)
return
}
h(w, r)
}
}
func WithCORSHandler(h http.Handler) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
w.Header().Set("Access-Control-Allow-Origin", "*")
w.Header().Set("Access-Control-Allow-Headers", "Authorization, Content-Type")
w.Header().Set("Access-Control-Allow-Methods", "GET, PUT, DELETE, POST, OPTIONS")
if r.Method == http.MethodOptions {
w.WriteHeader(http.StatusOK)
return
}
h.ServeHTTP(w, r)
}
}