simono41/ntfy-alertmanager
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Simplify outgoing Basic Authentication

Browse source
This commit is contained in:
Thorben Günther 2023-02-21 14:12:21 +01:00
parent d7fdd85b72
commit 82a22c8959
No known key found for this signature in database
GPG key ID: 415CD778D8C5AFED
2 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
main.go
View file

@ -243,8 +243,7 @@ func (br *bridge) publish(n *notification) error {
// ntfy authentication // ntfy authentication
if br.cfg.ntfy.Password != "" && br.cfg.ntfy.User != "" { 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.SetBasicAuth(br.cfg.ntfy.User, br.cfg.ntfy.Password)
req.Header.Set("Authorization", fmt.Sprintf("Basic %s", auth))
} else if br.cfg.ntfy.AccessToken != "" { } else if br.cfg.ntfy.AccessToken != "" {
req.Header.Set("Authorization", fmt.Sprintf("Bearer %s", br.cfg.ntfy.AccessToken)) req.Header.Set("Authorization", fmt.Sprintf("Bearer %s", br.cfg.ntfy.AccessToken))
} }

4
silence.go
View file

@ -4,7 +4,6 @@ import (
"bytes" "bytes"
"encoding/base64" "encoding/base64"
"encoding/json" "encoding/json"
"fmt"
"io" "io"
"net/http" "net/http"
"time" "time"
@ -104,8 +103,7 @@ func (br *bridge) handleSilences(w http.ResponseWriter, r *http.Request) {
// Basic auth // Basic auth
if br.cfg.am.User != "" && br.cfg.am.Password != "" { 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.SetBasicAuth(br.cfg.am.User, br.cfg.am.Password)
req.Header.Set("Authorization", fmt.Sprintf("Basic %s", auth))
} }
req.Header.Add("Content-Type", "application/json") req.Header.Add("Content-Type", "application/json")