Merge pull request #886 from owncloud/show-basic-auth-warning-on-star…

…tup-only Show basic_auth warning only on startup
owncloud · Nov 18, 2020 · a643ad4 · a643ad4
2 parents bd6b335 + 79e7f85
commit a643ad4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/changelog/unreleased/dont-nag-about-basicauth.md b/changelog/unreleased/dont-nag-about-basicauth.md
@@ -0,0 +1,6 @@
+Enhancement: Show basic-auth warning only once
+
+Show basic-auth warning only on startup instead on every request.
+
+
+https://github.com/owncloud/ocis/pull/886
diff --git a/proxy/pkg/middleware/basic_auth.go b/proxy/pkg/middleware/basic_auth.go
@@ -15,6 +15,9 @@ const publicFilesEndpoint = "/remote.php/dav/public-files/"
 // BasicAuth provides a middleware to check if BasicAuth is provided
 func BasicAuth(optionSetters ...Option) func(next http.Handler) http.Handler {
 	options := newOptions(optionSetters...)
+	if options.EnableBasicAuth {
+		options.Logger.Warn().Msg("basic auth enabled, use only for testing or development")
+	}
 
 	return func(next http.Handler) http.Handler {
 		return &basicAuth{
@@ -41,8 +44,6 @@ func (m basicAuth) ServeHTTP(w http.ResponseWriter, req *http.Request) {
 		return
 	}
 
-	m.logger.Warn().Msg("basic auth enabled, use only for testing or development")
-
 	login, password, _ := req.BasicAuth()
 
 	account, status := getAccount(m.logger, m.accountsClient, fmt.Sprintf("login eq '%s' and password eq '%s'", strings.ReplaceAll(login, "'", "''"), strings.ReplaceAll(password, "'", "''")))