Mercurial > gemma
changeset 559:f827dc4f3e95
Use stdlib for basic auth instead og home brew in GeoServer config.
author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
---|---|
date | Mon, 03 Sep 2018 18:00:38 +0200 |
parents | b3baa2a98f55 |
children | 66073a476baf |
files | cmd/gemma/geoserver.go pkg/misc/encode.go |
diffstat | 2 files changed, 1 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/cmd/gemma/geoserver.go Mon Sep 03 17:47:56 2018 +0200 +++ b/cmd/gemma/geoserver.go Mon Sep 03 18:00:38 2018 +0200 @@ -9,7 +9,6 @@ "strings" "gemma.intevation.de/gemma/pkg/config" - "gemma.intevation.de/gemma/pkg/misc" "gemma.intevation.de/gemma/pkg/models" ) @@ -26,9 +25,8 @@ ) func basicAuth(user, password string) func(req *http.Request) { - auth := "Basic " + misc.BasicAuth(user, password) return func(req *http.Request) { - req.Header.Add("Authorization", auth) + req.SetBasicAuth(user, password) } }
--- a/pkg/misc/encode.go Mon Sep 03 17:47:56 2018 +0200 +++ b/pkg/misc/encode.go Mon Sep 03 18:00:38 2018 +0200 @@ -1,7 +1,6 @@ package misc import ( - "encoding/base64" "encoding/binary" "io" ) @@ -69,8 +68,3 @@ w.Err = binary.Write(w.Writer, binary.BigEndian, []byte(s)) } } - -func BasicAuth(user, password string) string { - auth := user + ":" + password - return base64.StdEncoding.EncodeToString([]byte(auth)) -}