diagnostics: updated serving ui port (#11740)

- Changed UI serving port to 5137 as 6060 is busy with diag API - Refactored request headers to be set in middleware
erigontech · Aug 26, 2024 · 03293de · 03293de
1 parent b42b555
commit 03293de
Show file tree

Hide file tree

Showing 17 changed files with 13 additions and 26 deletions.
diff --git a/cmd/diag/ui/ui.go b/cmd/diag/ui/ui.go
@@ -40,7 +40,7 @@ var (
 		Name:     "ui.addr",
 		Usage:    "URL to serve UI web application",
 		Required: false,
-		Value:    "127.0.0.1:6060",
+		Value:    "127.0.0.1:5137",
 	}
 )
 

diff --git a/diagnostics/block_body_download_stats.go b/diagnostics/block_body_download_stats.go
@@ -31,7 +31,6 @@ func SetupBlockBodyDownload(metricsMux *http.ServeMux) {
 	}
 
 	metricsMux.HandleFunc("/block_body_download", func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Access-Control-Allow-Origin", "*")
 		writeBlockBodyDownload(w, r)
 	})
 }

diff --git a/diagnostics/bodies_info.go b/diagnostics/bodies_info.go
@@ -28,7 +28,6 @@ func SetupBodiesAccess(metricsMux *http.ServeMux, diag *diaglib.DiagnosticClient
 	}
 
 	metricsMux.HandleFunc("/bodies", func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Access-Control-Allow-Origin", "*")
 		w.Header().Set("Content-Type", "application/json")
 		writeBodies(w, diag)
 	})

diff --git a/diagnostics/bootnodes.go b/diagnostics/bootnodes.go
@@ -29,7 +29,6 @@ func SetupBootnodesAccess(metricsMux *http.ServeMux, node *node.ErigonNode) {
 	}
 
 	metricsMux.HandleFunc("/bootnodes", func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Access-Control-Allow-Origin", "*")
 		w.Header().Set("Content-Type", "application/json")
 
 		bootnodes := node.Node().Config().P2P.BootstrapNodesV5

diff --git a/diagnostics/cmd_line.go b/diagnostics/cmd_line.go
@@ -29,7 +29,6 @@ func SetupCmdLineAccess(metricsMux *http.ServeMux) {
 	}
 
 	metricsMux.HandleFunc("/cmdline", func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Access-Control-Allow-Origin", "*")
 		w.Header().Set("Content-Type", "application/json")
 
 		var space []byte

diff --git a/diagnostics/db.go b/diagnostics/db.go
@@ -43,12 +43,10 @@ func SetupDbAccess(ctx *cli.Context, metricsMux *http.ServeMux) {
 		dataDir = paths.DataDirForNetwork(paths.DefaultDataDir(), ctx.String("chain"))
 	}
 	metricsMux.HandleFunc("/dbs", func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Access-Control-Allow-Origin", "*")
 		w.Header().Set("Content-Type", "application/json")
 		writeDbList(w, dataDir)
 	})
 	metricsMux.HandleFunc("/dbs/", func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Access-Control-Allow-Origin", "*")
 
 		urlPath := r.URL.Path
 

diff --git a/diagnostics/flags.go b/diagnostics/flags.go
@@ -29,7 +29,6 @@ func SetupFlagsAccess(ctx *cli.Context, metricsMux *http.ServeMux) {
 	}
 
 	metricsMux.HandleFunc("/flags", func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Access-Control-Allow-Origin", "*")
 		w.Header().Set("Content-Type", "application/json")
 		flags := map[string]interface{}{}
 

diff --git a/diagnostics/header_downloader_stats.go b/diagnostics/header_downloader_stats.go
@@ -31,7 +31,6 @@ func SetupHeaderDownloadStats(metricsMux *http.ServeMux) {
 	}
 
 	metricsMux.HandleFunc("/headers_download", func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Access-Control-Allow-Origin", "*")
 		writeHeaderDownload(w, r)
 	})
 }

diff --git a/diagnostics/headers.go b/diagnostics/headers.go
@@ -28,7 +28,6 @@ func SetupHeadersAccess(metricsMux *http.ServeMux, diag *diaglib.DiagnosticClien
 	}
 
 	metricsMux.HandleFunc("/headers", func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Access-Control-Allow-Origin", "*")
 		w.Header().Set("Content-Type", "application/json")
 		writeHeaders(w, diag)
 	})

diff --git a/diagnostics/logs.go b/diagnostics/logs.go
@@ -51,11 +51,9 @@ func SetupLogsAccess(ctx *cli.Context, metricsMux *http.ServeMux) {
 		return
 	}
 	metricsMux.HandleFunc("/logs", func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Access-Control-Allow-Origin", "*")
 		writeLogsList(w, dirPath)
 	})
 	metricsMux.HandleFunc("/logs/", func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Access-Control-Allow-Origin", "*")
 		writeLogsRead(w, r, dirPath)
 	})
 }

diff --git a/diagnostics/mem.go b/diagnostics/mem.go
@@ -29,7 +29,6 @@ func SetupMemAccess(metricsMux *http.ServeMux) {
 	}
 
 	metricsMux.HandleFunc("/mem", func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Access-Control-Allow-Origin", "*")
 		w.Header().Set("Content-Type", "application/json")
 		writeMem(w)
 	})

diff --git a/diagnostics/nodeinfo.go b/diagnostics/nodeinfo.go
@@ -29,7 +29,6 @@ func SetupNodeInfoAccess(metricsMux *http.ServeMux, node *node.ErigonNode) {
 	}
 
 	metricsMux.HandleFunc("/nodeinfo", func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Access-Control-Allow-Origin", "*")
 		writeNodeInfo(w, node)
 	})
 }

diff --git a/diagnostics/peers.go b/diagnostics/peers.go
@@ -58,7 +58,6 @@ func SetupPeersAccess(ctxclient *cli.Context, metricsMux *http.ServeMux, node *n
 	}
 
 	metricsMux.HandleFunc("/peers", func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Access-Control-Allow-Origin", "*")
 		w.Header().Set("Content-Type", "application/json")
 		writePeers(w, ctxclient, node, diag)
 	})

diff --git a/diagnostics/setup.go b/diagnostics/setup.go
@@ -114,6 +114,18 @@ func SetupMiddleMuxHandler(mux *http.ServeMux, middleMux *http.ServeMux, path st
 	middleMux.HandleFunc(path+"/", func(w http.ResponseWriter, r *http.Request) {
 		r.URL.Path = strings.TrimPrefix(r.URL.Path, path)
 		r.URL.RawPath = strings.TrimPrefix(r.URL.RawPath, path)
+
+		// Set CORS headers
+		w.Header().Set("Access-Control-Allow-Origin", "*")
+		w.Header().Set("Access-Control-Allow-Methods", "GET, POST, PUT, DELETE, OPTIONS")
+		w.Header().Set("Access-Control-Allow-Headers", "Content-Type, Authorization")
+
+		// Handle preflight requests
+		if r.Method == "OPTIONS" {
+			w.WriteHeader(http.StatusOK)
+			return
+		}
+
 		mux.ServeHTTP(w, r)
 	})
 }

diff --git a/diagnostics/snapshot_sync.go b/diagnostics/snapshot_sync.go
@@ -28,31 +28,26 @@ func SetupStagesAccess(metricsMux *http.ServeMux, diag *diaglib.DiagnosticClient
 	}
 
 	metricsMux.HandleFunc("/snapshot-sync", func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Access-Control-Allow-Origin", "*")
 		w.Header().Set("Content-Type", "application/json")
 		writeStages(w, diag)
 	})
 
 	metricsMux.HandleFunc("/snapshot-files-list", func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Access-Control-Allow-Origin", "*")
 		w.Header().Set("Content-Type", "application/json")
 		writeFilesList(w, diag)
 	})
 
 	metricsMux.HandleFunc("/resources-usage", func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Access-Control-Allow-Origin", "*")
 		w.Header().Set("Content-Type", "application/json")
 		writeResourcesUsage(w, diag)
 	})
 
 	metricsMux.HandleFunc("/network-speed", func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Access-Control-Allow-Origin", "*")
 		w.Header().Set("Content-Type", "application/json")
 		writeNetworkSpeed(w, diag)
 	})
 
 	metricsMux.HandleFunc("/sync-stages", func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Access-Control-Allow-Origin", "*")
 		w.Header().Set("Content-Type", "application/json")
 		writeSyncStages(w, diag)
 	})

diff --git a/diagnostics/sysinfo.go b/diagnostics/sysinfo.go
@@ -32,31 +32,26 @@ func SetupSysInfoAccess(metricsMux *http.ServeMux, diag *diaglib.DiagnosticClien
 	}
 
 	metricsMux.HandleFunc("/hardware-info", func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Access-Control-Allow-Origin", "*")
 		w.Header().Set("Content-Type", "application/json")
 		writeHardwareInfo(w, diag)
 	})
 
 	metricsMux.HandleFunc("/cpu-usage", func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Access-Control-Allow-Origin", "*")
 		w.Header().Set("Content-Type", "application/json")
 		writeCPUUsage(w)
 	})
 
 	metricsMux.HandleFunc("/processes-info", func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Access-Control-Allow-Origin", "*")
 		w.Header().Set("Content-Type", "application/json")
 		writeProcessesInfo(w)
 	})
 
 	metricsMux.HandleFunc("/memory-info", func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Access-Control-Allow-Origin", "*")
 		w.Header().Set("Content-Type", "application/json")
 		writeMemoryInfo(w)
 	})
 
 	metricsMux.HandleFunc("/heap-profile", func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Access-Control-Allow-Origin", "*")
 		w.Header().Set("Content-Type", "aplication/profile")
 		writeHeapProfile(w)
 	})

diff --git a/diagnostics/version.go b/diagnostics/version.go
@@ -31,7 +31,6 @@ func SetupVersionAccess(metricsMux *http.ServeMux) {
 	}
 
 	metricsMux.HandleFunc("/version", func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Access-Control-Allow-Origin", "*")
 		w.Header().Set("Content-Type", "application/json")
 		json.NewEncoder(w).Encode(struct {
 			Node int    `json:"nodeVersion"`