diff options
author | Matthew Holt <mholt@users.noreply.github.com> | 2020-01-07 08:50:18 -0700 |
---|---|---|
committer | Matthew Holt <mholt@users.noreply.github.com> | 2020-01-07 08:50:18 -0700 |
commit | 78e98c40d35c0b3bc933886ce11cbf2d0cf44c99 (patch) | |
tree | ef29268a26da93ac3c0ce998b5adb7b89f80644e /modules/caddyhttp/caddyauth/caddyfile.go | |
parent | 5c99267dd870936a02f942130302b76b1f15efa2 (diff) |
basicauth: Accept placeholders; move base64 decoding to provision
See https://caddy.community/t/v2-basicauth-bug/6738?u=matt
Diffstat (limited to 'modules/caddyhttp/caddyauth/caddyfile.go')
-rw-r--r-- | modules/caddyhttp/caddyauth/caddyfile.go | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/modules/caddyhttp/caddyauth/caddyfile.go b/modules/caddyhttp/caddyauth/caddyfile.go index 8a33e6f..31acd61 100644 --- a/modules/caddyhttp/caddyauth/caddyfile.go +++ b/modules/caddyhttp/caddyauth/caddyfile.go @@ -15,8 +15,6 @@ package caddyauth import ( - "encoding/base64" - "github.com/caddyserver/caddy/v2" "github.com/caddyserver/caddy/v2/caddyconfig" "github.com/caddyserver/caddy/v2/caddyconfig/httpcaddyfile" @@ -76,22 +74,10 @@ func parseCaddyfile(h httpcaddyfile.Helper) (caddyhttp.MiddlewareHandler, error) return nil, h.Err("username and password cannot be empty or missing") } - pwd, err := base64.StdEncoding.DecodeString(b64Pwd) - if err != nil { - return nil, h.Errf("decoding password: %v", err) - } - var salt []byte - if b64Salt != "" { - salt, err = base64.StdEncoding.DecodeString(b64Salt) - if err != nil { - return nil, h.Errf("decoding salt: %v", err) - } - } - ba.AccountList = append(ba.AccountList, Account{ Username: username, - Password: pwd, - Salt: salt, + Password: b64Pwd, + Salt: b64Salt, }) } } |