Fix a bunch of unhandled errors (prometheus#1501)

juliusv · stuartnelson3 · commit 6d0edbe63066 · 2018-08-05T15:38:25.000+02:00
...as discovered by "gosec" (many other ones reported, but not all make
a lot of sense to fix).

Signed-off-by: Julius Volz &lt;julius.volz@gmail.com&gt;
diff --git a/api/api.go b/api/api.go
@@ -59,8 +59,8 @@ func init() {
 	numReceivedAlerts.WithLabelValues("firing")
 	numReceivedAlerts.WithLabelValues("resolved")
 
-	prometheus.Register(numReceivedAlerts)
-	prometheus.Register(numInvalidAlerts)
+	prometheus.MustRegister(numReceivedAlerts)
+	prometheus.MustRegister(numInvalidAlerts)
 }
 
 var corsHeaders = map[string]string{
diff --git a/cli/check_config.go b/cli/check_config.go
@@ -49,7 +49,10 @@ func (c *checkConfigCmd) checkConfig(ctx *kingpin.ParseContext) error {
 
 func CheckConfig(args []string) error {
 	if len(args) == 0 {
-		stat, _ := os.Stdin.Stat()
+		stat, err := os.Stdin.Stat()
+		if err != nil {
+			kingpin.Fatalf("Failed to stat standard input: %v", err)
+		}
 		if (stat.Mode() & os.ModeCharDevice) != 0 {
 			kingpin.Fatalf("Failed to read from standard input")
 		}
diff --git a/cli/format/format_extended.go b/cli/format/format_extended.go
@@ -54,8 +54,7 @@ func (formatter *ExtendedFormatter) FormatSilences(silences []types.Silence) err
 			silence.Comment,
 		)
 	}
-	w.Flush()
-	return nil
+	return w.Flush()
 }
 
 func (formatter *ExtendedFormatter) FormatAlerts(alerts []*client.ExtendedAlert) error {
@@ -73,8 +72,7 @@ func (formatter *ExtendedFormatter) FormatAlerts(alerts []*client.ExtendedAlert)
 			alert.GeneratorURL,
 		)
 	}
-	w.Flush()
-	return nil
+	return w.Flush()
 }
 
 func (formatter *ExtendedFormatter) FormatConfig(status *client.ServerStatus) error {
diff --git a/cli/format/format_simple.go b/cli/format/format_simple.go
@@ -52,8 +52,7 @@ func (formatter *SimpleFormatter) FormatSilences(silences []types.Silence) error
 			silence.Comment,
 		)
 	}
-	w.Flush()
-	return nil
+	return w.Flush()
 }
 
 func (formatter *SimpleFormatter) FormatAlerts(alerts []*client.ExtendedAlert) error {
@@ -69,8 +68,7 @@ func (formatter *SimpleFormatter) FormatAlerts(alerts []*client.ExtendedAlert) e
 			alert.Annotations["summary"],
 		)
 	}
-	w.Flush()
-	return nil
+	return w.Flush()
 }
 
 func (formatter *SimpleFormatter) FormatConfig(status *client.ServerStatus) error {
diff --git a/cli/silence_query.go b/cli/silence_query.go
@@ -148,7 +148,9 @@ func (c *silenceQueryCmd) query(ctx context.Context, _ *kingpin.ParseContext) er
 		if !found {
 			return errors.New("unknown output formatter")
 		}
-		formatter.FormatSilences(displaySilences)
+		if err := formatter.FormatSilences(displaySilences); err != nil {
+			return fmt.Errorf("error formatting silences: %v", err)
+		}
 	}
 	return nil
 }
diff --git a/cli/silence_update.go b/cli/silence_update.go
@@ -118,7 +118,9 @@ func (c *silenceUpdateCmd) update(ctx context.Context, _ *kingpin.ParseContext)
 		if !found {
 			return fmt.Errorf("unknown output formatter")
 		}
-		formatter.FormatSilences(updatedSilences)
+		if err := formatter.FormatSilences(updatedSilences); err != nil {
+			return fmt.Errorf("error formatting silences: %v", err)
+		}
 	}
 	return nil
 }
diff --git a/client/client.go b/client/client.go
@@ -138,7 +138,10 @@ type httpStatusAPI struct {
 func (h *httpStatusAPI) Get(ctx context.Context) (*ServerStatus, error) {
 	u := h.client.URL(epStatus, nil)
 
-	req, _ := http.NewRequest(http.MethodGet, u.String(), nil)
+	req, err := http.NewRequest(http.MethodGet, u.String(), nil)
+	if err != nil {
+		return nil, fmt.Errorf("error creating request: %v", err)
+	}
 
 	_, body, err := h.client.Do(ctx, req)
 	if err != nil {
@@ -207,7 +210,10 @@ func (h *httpAlertAPI) List(ctx context.Context, filter, receiver string, silenc
 	params.Add("receiver", receiver)
 	u.RawQuery = params.Encode()
 
-	req, _ := http.NewRequest(http.MethodGet, u.String(), nil)
+	req, err := http.NewRequest(http.MethodGet, u.String(), nil)
+	if err != nil {
+		return nil, fmt.Errorf("error creating request: %v", err)
+	}
 
 	_, body, err := h.client.Do(ctx, req)
 	if err != nil {
@@ -228,9 +234,12 @@ func (h *httpAlertAPI) Push(ctx context.Context, alerts ...Alert) error {
 		return err
 	}
 
-	req, _ := http.NewRequest(http.MethodPost, u.String(), &buf)
+	req, err := http.NewRequest(http.MethodPost, u.String(), &buf)
+	if err != nil {
+		return fmt.Errorf("error creating request: %v", err)
+	}
 
-	_, _, err := h.client.Do(ctx, req)
+	_, _, err = h.client.Do(ctx, req)
 	return err
 }
 
@@ -260,7 +269,10 @@ func (h *httpSilenceAPI) Get(ctx context.Context, id string) (*types.Silence, er
 		"id": id,
 	})
 
-	req, _ := http.NewRequest(http.MethodGet, u.String(), nil)
+	req, err := http.NewRequest(http.MethodGet, u.String(), nil)
+	if err != nil {
+		return nil, fmt.Errorf("error creating request: %v", err)
+	}
 
 	_, body, err := h.client.Do(ctx, req)
 	if err != nil {
@@ -278,9 +290,12 @@ func (h *httpSilenceAPI) Expire(ctx context.Context, id string) error {
 		"id": id,
 	})
 
-	req, _ := http.NewRequest(http.MethodDelete, u.String(), nil)
+	req, err := http.NewRequest(http.MethodDelete, u.String(), nil)
+	if err != nil {
+		return fmt.Errorf("error creating request: %v", err)
+	}
 
-	_, _, err := h.client.Do(ctx, req)
+	_, _, err = h.client.Do(ctx, req)
 	return err
 }
 
@@ -292,7 +307,10 @@ func (h *httpSilenceAPI) Set(ctx context.Context, sil types.Silence) (string, er
 		return "", err
 	}
 
-	req, _ := http.NewRequest(http.MethodPost, u.String(), &buf)
+	req, err := http.NewRequest(http.MethodPost, u.String(), &buf)
+	if err != nil {
+		return "", fmt.Errorf("error creating request: %v", err)
+	}
 
 	_, body, err := h.client.Do(ctx, req)
 	if err != nil {
@@ -315,7 +333,10 @@ func (h *httpSilenceAPI) List(ctx context.Context, filter string) ([]*types.Sile
 	}
 	u.RawQuery = params.Encode()
 
-	req, _ := http.NewRequest(http.MethodGet, u.String(), nil)
+	req, err := http.NewRequest(http.MethodGet, u.String(), nil)
+	if err != nil {
+		return nil, fmt.Errorf("error creating request: %v", err)
+	}
 
 	_, body, err := h.client.Do(ctx, req)
 	if err != nil {
diff --git a/cmd/alertmanager/main.go b/cmd/alertmanager/main.go
@@ -267,7 +267,9 @@ func main() {
 		ctx, cancel := context.WithTimeout(context.Background(), *settleTimeout)
 		defer func() {
 			cancel()
-			peer.Leave(10 * time.Second)
+			if err := peer.Leave(10 * time.Second); err != nil {
+				level.Warn(logger).Log("msg", "unable to leave gossip mesh", "err", err)
+			}
 		}()
 		go peer.Settle(ctx, *gossipInterval*10)
 	}
diff --git a/examples/webhook/echo.go b/examples/webhook/echo.go
@@ -22,7 +22,7 @@ import (
 )
 
 func main() {
-	http.ListenAndServe(":5001", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+	log.Fatal(http.ListenAndServe(":5001", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		b, err := ioutil.ReadAll(r.Body)
 		if err != nil {
 			panic(err)
@@ -33,5 +33,5 @@ func main() {
 			panic(err)
 		}
 		log.Println(buf.String())
-	}))
+	})))
 }
diff --git a/inhibit/inhibit.go b/inhibit/inhibit.go
@@ -116,7 +116,9 @@ func (ih *Inhibitor) Run() {
 		runCancel()
 	})
 
-	g.Run()
+	if err := g.Run(); err != nil {
+		level.Warn(ih.logger).Log("msg", "error running inhibitor", "err", err)
+	}
 }
 
 // Stop the Inhibitor's background processing.
diff --git a/notify/impl.go b/notify/impl.go
@@ -989,7 +989,10 @@ func (n *Wechat) Notify(ctx context.Context, as ...*types.Alert) (bool, error) {
 	}
 	defer resp.Body.Close()
 
-	body, _ := ioutil.ReadAll(resp.Body)
+	body, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		return true, err
+	}
 	level.Debug(n.logger).Log("msg", "response: "+string(body), "incident", key)
 
 	if resp.StatusCode != 200 {
diff --git a/notify/notify.go b/notify/notify.go
@@ -86,9 +86,9 @@ func init() {
 	notificationLatencySeconds.WithLabelValues("webhook")
 	notificationLatencySeconds.WithLabelValues("victorops")
 
-	prometheus.Register(numNotifications)
-	prometheus.Register(numFailedNotifications)
-	prometheus.Register(notificationLatencySeconds)
+	prometheus.MustRegister(numNotifications)
+	prometheus.MustRegister(numFailedNotifications)
+	prometheus.MustRegister(notificationLatencySeconds)
 }
 
 type notifierConfig interface {
diff --git a/test/acceptance.go b/test/acceptance.go
@@ -301,16 +301,22 @@ func (am *Alertmanager) Start() {
 // Terminate kills the underlying Alertmanager process and remove intermediate
 // data.
 func (am *Alertmanager) Terminate() {
-	syscall.Kill(am.cmd.Process.Pid, syscall.SIGTERM)
+	if err := syscall.Kill(am.cmd.Process.Pid, syscall.SIGTERM); err != nil {
+		am.t.Fatalf("Error sending SIGTERM to Alertmanager process: %v", err)
+	}
 }
 
 // Reload sends the reloading signal to the Alertmanager process.
 func (am *Alertmanager) Reload() {
-	syscall.Kill(am.cmd.Process.Pid, syscall.SIGHUP)
+	if err := syscall.Kill(am.cmd.Process.Pid, syscall.SIGHUP); err != nil {
+		am.t.Fatalf("Error sending SIGHUP to Alertmanager process: %v", err)
+	}
 }
 
 func (am *Alertmanager) cleanup() {
-	os.RemoveAll(am.confFile.Name())
+	if err := os.RemoveAll(am.confFile.Name()); err != nil {
+		am.t.Errorf("Error removing test config file %q: %v", am.confFile.Name(), err)
+	}
 }
 
 // Push declares alerts that are to be pushed to the Alertmanager

Original file line number	Diff line number	Diff line change
`@@ -59,8 +59,8 @@ func init() {`
`59`	`59`	`numReceivedAlerts.WithLabelValues("firing")`
`60`	`60`	`numReceivedAlerts.WithLabelValues("resolved")`
`61`	`61`
`62`		`- prometheus.Register(numReceivedAlerts)`
`63`		`- prometheus.Register(numInvalidAlerts)`
	`62`	`+ prometheus.MustRegister(numReceivedAlerts)`
	`63`	`+ prometheus.MustRegister(numInvalidAlerts)`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`var corsHeaders = map[string]string{`
Original file line number	Diff line number	Diff line change
`@@ -54,8 +54,7 @@ func (formatter *ExtendedFormatter) FormatSilences(silences []types.Silence) err`
`54`	`54`	`silence.Comment,`
`55`	`55`	`)`
`56`	`56`	`}`
`57`		`- w.Flush()`
`58`		`- return nil`
	`57`	`+ return w.Flush()`
`59`	`58`	`}`
`60`	`59`
`61`	`60`	`func (formatter ExtendedFormatter) FormatAlerts(alerts []client.ExtendedAlert) error {`
`@@ -73,8 +72,7 @@ func (formatter ExtendedFormatter) FormatAlerts(alerts []client.ExtendedAlert)`
`73`	`72`	`alert.GeneratorURL,`
`74`	`73`	`)`
`75`	`74`	`}`
`76`		`- w.Flush()`
`77`		`- return nil`
	`75`	`+ return w.Flush()`
`78`	`76`	`}`
`79`	`77`
`80`	`78`	`func (formatter ExtendedFormatter) FormatConfig(status client.ServerStatus) error {`
Original file line number	Diff line number	Diff line change
`@@ -52,8 +52,7 @@ func (formatter *SimpleFormatter) FormatSilences(silences []types.Silence) error`
`52`	`52`	`silence.Comment,`
`53`	`53`	`)`
`54`	`54`	`}`
`55`		`- w.Flush()`
`56`		`- return nil`
	`55`	`+ return w.Flush()`
`57`	`56`	`}`
`58`	`57`
`59`	`58`	`func (formatter SimpleFormatter) FormatAlerts(alerts []client.ExtendedAlert) error {`
`@@ -69,8 +68,7 @@ func (formatter SimpleFormatter) FormatAlerts(alerts []client.ExtendedAlert) e`
`69`	`68`	`alert.Annotations["summary"],`
`70`	`69`	`)`
`71`	`70`	`}`
`72`		`- w.Flush()`
`73`		`- return nil`
	`71`	`+ return w.Flush()`
`74`	`72`	`}`
`75`	`73`
`76`	`74`	`func (formatter SimpleFormatter) FormatConfig(status client.ServerStatus) error {`
Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,9 @@ func (c silenceQueryCmd) query(ctx context.Context, _ kingpin.ParseContext) er`
`148`	`148`	`if !found {`
`149`	`149`	`return errors.New("unknown output formatter")`
`150`	`150`	`}`
`151`		`- formatter.FormatSilences(displaySilences)`
	`151`	`+ if err := formatter.FormatSilences(displaySilences); err != nil {`
	`152`	`+ return fmt.Errorf("error formatting silences: %v", err)`
	`153`	`+ }`
`152`	`154`	`}`
`153`	`155`	`return nil`
`154`	`156`	`}`
Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,9 @@ func (c silenceUpdateCmd) update(ctx context.Context, _ kingpin.ParseContext)`
`118`	`118`	`if !found {`
`119`	`119`	`return fmt.Errorf("unknown output formatter")`
`120`	`120`	`}`
`121`		`- formatter.FormatSilences(updatedSilences)`
	`121`	`+ if err := formatter.FormatSilences(updatedSilences); err != nil {`
	`122`	`+ return fmt.Errorf("error formatting silences: %v", err)`
	`123`	`+ }`
`122`	`124`	`}`
`123`	`125`	`return nil`
`124`	`126`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ import (`
`22`	`22`	`)`
`23`	`23`
`24`	`24`	`func main() {`
`25`		`- http.ListenAndServe(":5001", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {`
	`25`	`+ log.Fatal(http.ListenAndServe(":5001", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {`
`26`	`26`	`b, err := ioutil.ReadAll(r.Body)`
`27`	`27`	`if err != nil {`
`28`	`28`	`panic(err)`
`@@ -33,5 +33,5 @@ func main() {`
`33`	`33`	`panic(err)`
`34`	`34`	`}`
`35`	`35`	`log.Println(buf.String())`
`36`		`- }))`
	`36`	`+ })))`
`37`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,9 @@ func (ih *Inhibitor) Run() {`
`116`	`116`	`runCancel()`
`117`	`117`	`})`
`118`	`118`
`119`		`- g.Run()`
	`119`	`+ if err := g.Run(); err != nil {`
	`120`	`+ level.Warn(ih.logger).Log("msg", "error running inhibitor", "err", err)`
	`121`	`+ }`
`120`	`122`	`}`
`121`	`123`
`122`	`124`	`// Stop the Inhibitor's background processing.`