Merge pull request #33 from ZaaS/mingxia/only_GET_allowed

leopoldjuergen · GitHub Enterprise · commit 8de147f8c56f · 2019-09-10T14:20:35.000+02:00
Disable http methods other than GET
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 /spectrum-virtualize-exporter
-/temp.yaml
+/temp.yaml
+/.vscode
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,5 @@
+* [CHANGE] Disable http methods other than GET
+
 ## 0.8.0 / 2019-07-30
 * [BUGFIX] Fix formulas of volume usage.
 * [FEATURE] Enhance error logging and response examples
diff --git a/collector/collector.go b/collector/collector.go
@@ -138,7 +138,6 @@ func (c *SVCCollector) collectForHost(host utils.Targets, ch chan<- prometheus.M
 				requestErrorCount++
 				success = 0
 				return
-
 			}
 			authTokenCache.Store(host.IpAddress, authtoken)
 			result, _ := authTokenCache.Load(host.IpAddress)
diff --git a/main.go b/main.go
@@ -56,13 +56,17 @@ func main() {
 	http.Handle(*metricsPath, newHandler(!*disableExporterMetrics))
 
 	http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
-		w.Write([]byte(`<html>
+		if r.Method == "GET" {
+			w.Write([]byte(`<html>
 			<head><title>Spectrum Virtualize exporter</title></head>
 			<body>
 				<h1>Spectrum Virtualize exporter</h1>
 				<p><a href='` + *metricsPath + `'>Metrics</a></p>
 			</body>
 		</html>`))
+		} else {
+			http.Error(w, "403 Forbidden", 403)
+		}
 	})
 	// http.Handle(*metricsPath, prometheus.Handler()) // Normal metrics endpoint for Spectrum Virtualize exporter itself.
 
@@ -76,14 +80,13 @@ func targetsForRequest(r *http.Request) ([]utils.Targets, error) {
 	if reqTarget == "" {
 		return cfg.Targets, nil
 	}
-
 	for _, t := range cfg.Targets {
 		if t.IpAddress == reqTarget {
 			return []utils.Targets{t}, nil
 		}
 	}
 
-	return nil, fmt.Errorf("the target '%s' os not defined in the configuration file", reqTarget)
+	return nil, fmt.Errorf("The target '%s' os not defined in the configuration file", reqTarget)
 }
 
 func newHandler(includeExporterMetrics bool) *handler {
@@ -104,21 +107,24 @@ func newHandler(includeExporterMetrics bool) *handler {
 
 // ServeHTTP implements http.Handler.
 func (h *handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
-
-	targets, err := targetsForRequest(r)
-	if err != nil {
-		http.Error(w, err.Error(), 400)
-	}
-
-	handler, err := h.innerHandler(targets...)
-	if err != nil {
-		log.Warnln("Couldn't create  metrics handler:", err)
-		w.WriteHeader(http.StatusBadRequest)
-		w.Write([]byte(fmt.Sprintf("Couldn't create  metrics handler: %s", err)))
-		return
+	if r.Method == "GET" {
+		targets, err := targetsForRequest(r)
+		if err != nil {
+			http.Error(w, err.Error(), 400)
+			return
+		} else {
+			handler, err := h.innerHandler(targets...)
+			if err != nil {
+				log.Warnln("Couldn't create  metrics handler:", err)
+				w.WriteHeader(http.StatusBadRequest)
+				w.Write([]byte(fmt.Sprintf("Couldn't create  metrics handler: %s", err)))
+				return
+			}
+			handler.ServeHTTP(w, r)
+		}
+	} else {
+		http.Error(w, "403 Forbidden", 403)
 	}
-	handler.ServeHTTP(w, r)
-
 }
 
 func (h *handler) innerHandler(targets ...utils.Targets) (http.Handler, error) {

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+* [CHANGE] Disable http methods other than GET`
	`2`	`+`
`1`	`3`	`## 0.8.0 / 2019-07-30`
`2`	`4`	`* [BUGFIX] Fix formulas of volume usage.`
`3`	`5`	`* [FEATURE] Enhance error logging and response examples`
Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,6 @@ func (c *SVCCollector) collectForHost(host utils.Targets, ch chan<- prometheus.M`
`138`	`138`	`requestErrorCount++`
`139`	`139`	`success = 0`
`140`	`140`	`return`
`141`		`-`
`142`	`141`	`}`
`143`	`142`	`authTokenCache.Store(host.IpAddress, authtoken)`
`144`	`143`	`result, _ := authTokenCache.Load(host.IpAddress)`