Revert "Headscale: Added an option to set an Access-Control-Allow-Origin response header to enable Cross-Origin Resource Sharing (CORS)"

This reverts commit 4183039.

Author: Jisse-Meruma

config-example.yaml

@@ -40,13 +40,6 @@ grpc_listen_addr: 127.0.0.1:50443
 # are doing.
 grpc_allow_insecure: false
 
-# The Access-Control-Allow-Origin header specifies which origins are allowed to access resources.
-# Options:
-# - "*" to allow access from any origin (not recommended for sensitive data).
-# - "http://example.com" to only allow access from a specific origin.
-# - "" to disable Cross-Origin Resource Sharing (CORS).
-Access-Control-Allow-Origin: ""
-
 # The Noise section includes specific configuration for the
 # TS2021 Noise protocol
 noise:

hscontrol/app.go

@@ -454,21 +454,10 @@ func (h *Headscale) ensureUnixSocketIsAbsent() error {
 	return os.Remove(h.cfg.UnixSocket)
 }
 
-func (h *Headscale) corsHeadersMiddleware(next http.Handler) http.Handler {
-	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Access-Control-Allow-Origin", h.cfg.AccessControlAllowOrigins)
-		next.ServeHTTP(w, r)
-	})
-}
-
 func (h *Headscale) createRouter(grpcMux *grpcRuntime.ServeMux) *mux.Router {
 	router := mux.NewRouter()
 	router.Use(prometheusMiddleware)
 
-	if h.cfg.AccessControlAllowOrigins != "" {
-		router.Use(h.corsHeadersMiddleware)
-	}
-
 	router.HandleFunc(ts2021UpgradePath, h.NoiseUpgradeHandler).Methods(http.MethodPost, http.MethodGet)
 
 	router.HandleFunc("/health", h.HealthHandler).Methods(http.MethodGet)

hscontrol/types/config.go

@@ -63,8 +63,6 @@ type Config struct {
 	Log                            LogConfig
 	DisableUpdateCheck             bool
 
-	AccessControlAllowOrigins string
-
 	Database DatabaseConfig
 
 	DERP DERPConfig
@@ -305,8 +303,6 @@ func LoadConfig(path string, isFile bool) error {
 	viper.SetDefault("tuning.batch_change_delay", "800ms")
 	viper.SetDefault("tuning.node_mapsession_buffered_chan_size", 30)
 
-	viper.SetDefault("Access-Control-Allow-Origin", "")
-
 	viper.SetDefault("prefixes.allocation", string(IPAllocationStrategySequential))
 
 	if err := viper.ReadInConfig(); err != nil {
@@ -872,8 +868,6 @@ func LoadServerConfig() (*Config, error) {
 		GRPCAllowInsecure:  viper.GetBool("grpc_allow_insecure"),
 		DisableUpdateCheck: false,
 
-		AccessControlAllowOrigins: viper.GetString("Access-Control-Allow-Origin"),
-
 		PrefixV4:     prefix4,
 		PrefixV6:     prefix6,
 		IPAllocation: IPAllocationStrategy(alloc),