git.iko.soy/typeable/oauth2-proxy
on master help sign in
Allow html in banner message (#462)

* allow html in banner message * Fix changelog (move under new version)

commitbdc686103e534a24eda0a04f897fe363ef9a90fd authorSiim Tiilen <eritikass@gmail.com> dateSat 4 Apr 2020, 17:01 (7 years ago) parent3f7837b
3 files changed+6−4
compare with master
unifiedsplit
CHANGELOG.md+2 docs/configuration/configuration.md+2−2 oauthproxy.go+2−2
CHANGELOG.md+2
@@ -20,6 +20,7 @@
2020 - Binaries renamed from `oauth2_proxy` to `oauth2-proxy`
2121- [#432](https://github.com/oauth2-proxy/oauth2-proxy/pull/432) Update ruby dependencies for documentation (@theobarberbany)
2222- [#471](https://github.com/oauth2-proxy/oauth2-proxy/pull/471) Add logging in case of invalid redirects (@gargath)
23+- [#462](https://github.com/oauth2-proxy/oauth2-proxy/pull/462) Allow HTML in banner message (@eritikass).
2324
2425# v5.1.0
2526
@@ -53,6 +54,7 @@ N/A
5354- [#405](https://github.com/oauth2-proxy/oauth2-proxy/pull/405) The `/sign_in` page now honors the `rd` query parameter, fixing the redirect after a successful authentication (@ti-mo)
5455- [#434](https://github.com/oauth2-proxy/oauth2-proxy/pull/434) Give the option to prefer email address in the username header when using the -pass-user-headers option (@jordancrawfordnz)
5556
57+
5658# v5.0.0
5759
5860## Release Hightlights
docs/configuration/configuration.md+2−2
@@ -49,8 +49,8 @@ An example [oauth2-proxy.cfg]({{ site.gitweb }}/contrib/oauth2-proxy.cfg.example
4949| `-exclude-logging-paths` | string | comma separated list of paths to exclude from logging, eg: `"/ping,/path2"` |`""` (no paths excluded) |
5050| `-flush-interval` | duration | period between flushing response buffers when streaming responses | `"1s"` |
5151| `-force-https` | bool | enforce https redirect | `false` |
52−| `-banner` | string | custom banner string. Use `"-"` to disable default banner. | |
53−| `-footer` | string | custom footer string. Use `"-"` to disable default footer. | |
52+| `-banner` | string | custom (html) banner string. Use `"-"` to disable default banner. | |
53+| `-footer` | string | custom (html) footer string. Use `"-"` to disable default footer. | |
5454| `-gcp-healthchecks` | bool | will enable `/liveness_check`, `/readiness_check`, and `/` (with the proper user-agent) endpoints that will make it work well with GCP App Engine and GKE Ingresses | false |
5555| `-github-org` | string | restrict logins to members of this organisation | |
5656| `-github-team` | string | restrict logins to members of any of these teams (slug), separated by a comma | |
oauthproxy.go+2−2
@@ -469,7 +469,7 @@ func (p *OAuthProxy) SignInPage(rw http.ResponseWriter, req *http.Request, code
469469
470470 t := struct {
471471 ProviderName string
472− SignInMessage string
472+ SignInMessage template.HTML
473473 CustomLogin bool
474474 Redirect string
475475 Version string
@@ -477,7 +477,7 @@ func (p *OAuthProxy) SignInPage(rw http.ResponseWriter, req *http.Request, code
477477 Footer template.HTML
478478 }{
479479 ProviderName: p.provider.Data().ProviderName,
480− SignInMessage: p.SignInMessage,
480+ SignInMessage: template.HTML(p.SignInMessage),
481481 CustomLogin: p.displayCustomLoginForm(),
482482 Redirect: redirectURL,
483483 Version: VERSION,