~xenrox/ntfy-alertmanager

82a22c89595703b757d3778c4c5d5ea8491b37c4 — Thorben Günther 1 year, 2 months ago d7fdd85
Simplify outgoing Basic Authentication
2 files changed, 2 insertions(+), 5 deletions(-)

M main.go
M silence.go
M main.go => main.go +1 -2
@@ 243,8 243,7 @@ func (br *bridge) publish(n *notification) error {

	// ntfy authentication
	if br.cfg.ntfy.Password != "" && br.cfg.ntfy.User != "" {
		auth := base64.StdEncoding.EncodeToString([]byte(fmt.Sprintf("%s:%s", br.cfg.ntfy.User, br.cfg.ntfy.Password)))
		req.Header.Set("Authorization", fmt.Sprintf("Basic %s", auth))
		req.SetBasicAuth(br.cfg.ntfy.User, br.cfg.ntfy.Password)
	} else if br.cfg.ntfy.AccessToken != "" {
		req.Header.Set("Authorization", fmt.Sprintf("Bearer %s", br.cfg.ntfy.AccessToken))
	}

M silence.go => silence.go +1 -3
@@ 4,7 4,6 @@ import (
	"bytes"
	"encoding/base64"
	"encoding/json"
	"fmt"
	"io"
	"net/http"
	"time"


@@ 104,8 103,7 @@ func (br *bridge) handleSilences(w http.ResponseWriter, r *http.Request) {

	// Basic auth
	if br.cfg.am.User != "" && br.cfg.am.Password != "" {
		auth := base64.StdEncoding.EncodeToString([]byte(fmt.Sprintf("%s:%s", br.cfg.am.User, br.cfg.am.Password)))
		req.Header.Set("Authorization", fmt.Sprintf("Basic %s", auth))
		req.SetBasicAuth(br.cfg.am.User, br.cfg.am.Password)
	}

	req.Header.Add("Content-Type", "application/json")