sevenhill/QSfera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

replace strings.Title with cases.Title

Browse Source
This commit is contained in:
David Christofas
2022-08-22 15:26:00 +02:00
parent 12d42e0074
commit dfe703291f
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/proxy/pkg/middleware/authentication.go
+9 -4
View File
@@ -7,6 +7,8 @@ import (
"strings" "strings"
"github.com/owncloud/ocis/v2/services/proxy/pkg/webdav" "github.com/owncloud/ocis/v2/services/proxy/pkg/webdav"
"golang.org/x/text/cases"
"golang.org/x/text/language"
) )
var ( var (
@@ -96,10 +98,11 @@ func Authentication(auths []Authenticator, opts ...Option) func(next http.Handle
if !isPublicPath(r.URL.Path) { if !isPublicPath(r.URL.Path) {
// Failed basic authentication attempts receive the Www-Authenticate header in the response // Failed basic authentication attempts receive the Www-Authenticate header in the response
var touch bool var touch bool
caser := cases.Title(language.Und)
for k, v := range options.CredentialsByUserAgent { for k, v := range options.CredentialsByUserAgent {
if strings.Contains(k, r.UserAgent()) { if strings.Contains(k, r.UserAgent()) {
removeSuperfluousAuthenticate(w) removeSuperfluousAuthenticate(w)
w.Header().Add("Www-Authenticate", fmt.Sprintf("%v realm=\"%s\", charset=\"UTF-8\"", strings.Title(v), r.Host)) w.Header().Add("Www-Authenticate", fmt.Sprintf("%v realm=\"%s\", charset=\"UTF-8\"", caser.String(v), r.Host))
touch = true touch = true
break break
} }
@@ -175,8 +178,9 @@ func configureSupportedChallenges(options Options) {
} }
func writeSupportedAuthenticateHeader(w http.ResponseWriter, r *http.Request) { func writeSupportedAuthenticateHeader(w http.ResponseWriter, r *http.Request) {
caser := cases.Title(language.Und)
for _, s := range SupportedAuthStrategies { for _, s := range SupportedAuthStrategies {
w.Header().Add(WwwAuthenticate, fmt.Sprintf("%v realm=\"%s\", charset=\"UTF-8\"", strings.Title(s), r.Host)) w.Header().Add(WwwAuthenticate, fmt.Sprintf("%v realm=\"%s\", charset=\"UTF-8\"", caser.String(s), r.Host))
} }
} }
@@ -213,12 +217,13 @@ func evalRequestURI(l userAgentLocker, r regexp.Regexp) {
if !r.MatchString(l.r.RequestURI) { if !r.MatchString(l.r.RequestURI) {
return return
} }
caser := cases.Title(language.Und)
for k, v := range l.locks { for k, v := range l.locks {
if strings.Contains(k, l.r.UserAgent()) { if strings.Contains(k, l.r.UserAgent()) {
removeSuperfluousAuthenticate(l.w) removeSuperfluousAuthenticate(l.w)
l.w.Header().Add(WwwAuthenticate, fmt.Sprintf("%v realm=\"%s\", charset=\"UTF-8\"", strings.Title(v), l.r.Host)) l.w.Header().Add(WwwAuthenticate, fmt.Sprintf("%v realm=\"%s\", charset=\"UTF-8\"", caser.String(v), l.r.Host))
return return
} }
} }
l.w.Header().Add(WwwAuthenticate, fmt.Sprintf("%v realm=\"%s\", charset=\"UTF-8\"", strings.Title(l.fallback), l.r.Host)) l.w.Header().Add(WwwAuthenticate, fmt.Sprintf("%v realm=\"%s\", charset=\"UTF-8\"", caser.String(l.fallback), l.r.Host))
} }