From cc6532a2822b58e6e8242a9988c2981e097ff1a3 Mon Sep 17 00:00:00 2001 From: ofir-amir <60230613+ofir-amir@users.noreply.github.com> Date: Sun, 8 Nov 2020 20:48:01 +0200 Subject: [PATCH] Use display-htpasswd-form flag (#778) Co-authored-by: Joel Speed --- CHANGELOG.md | 2 ++ oauthproxy.go | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f272757e..fe82c678 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -48,6 +48,7 @@ - [#722](https://github.com/oauth2-proxy/oauth2-proxy/pull/722) Validate Redis configuration options at startup (@NickMeves) - [#791](https://github.com/oauth2-proxy/oauth2-proxy/pull/791) Remove GetPreferredUsername method from provider interface (@NickMeves) - [#764](https://github.com/oauth2-proxy/oauth2-proxy/pull/764) Document bcrypt encryption for htpasswd (and hide SHA) (@lentzi90) +- [#778](https://github.com/oauth2-proxy/oauth2-proxy/pull/778) Use display-htpasswd-form flag - [#616](https://github.com/oauth2-proxy/oauth2-proxy/pull/616) Add support to ensure user belongs in required groups when using the OIDC provider (@stefansedich) - [#800](https://github.com/oauth2-proxy/oauth2-proxy/pull/800) Fix import path for v7 (@johejo) - [#783](https://github.com/oauth2-proxy/oauth2-proxy/pull/783) Update Go to 1.15 (@johejo) @@ -57,6 +58,7 @@ - [#829](https://github.com/oauth2-proxy/oauth2-proxy/pull/820) Rename test directory to testdata (@johejo) - [#819](https://github.com/oauth2-proxy/oauth2-proxy/pull/819) Improve CI (@johejo) + # v6.1.1 ## Release Highlights diff --git a/oauthproxy.go b/oauthproxy.go index c349172a..30b79dee 100644 --- a/oauthproxy.go +++ b/oauthproxy.go @@ -222,7 +222,7 @@ func NewOAuthProxy(opts *options.Options, validator func(string) bool) (*OAuthPr AllowedGroups: opts.AllowedGroups, basicAuthValidator: basicAuthValidator, - displayHtpasswdForm: basicAuthValidator != nil, + displayHtpasswdForm: basicAuthValidator != nil && opts.DisplayHtpasswdForm, sessionChain: sessionChain, headersChain: headersChain, preAuthChain: preAuthChain,