Merge branch 'master' into try-gookikt-config

CHANGELOG.md

@@ -7,6 +7,7 @@ The following sections list the changes for unreleased.
 ## Summary
 
 * Bugfix - Don't allow empty password: [#197](https://github.com/owncloud/product/issues/197)
+* Bugfix - Fix basic auth config: [#2719](https://github.com/owncloud/ocis/pull/2719)
 * Bugfix - Fix oCIS startup ony systems with IPv6: [#2698](https://github.com/owncloud/ocis/pull/2698)
 * Bugfix - Fix error logging when there is no thumbnail for a file: [#2702](https://github.com/owncloud/ocis/pull/2702)
 * Bugfix - Don't announce resharing via capabilities: [#2690](https://github.com/owncloud/ocis/pull/2690)
@@ -20,6 +21,14 @@ The following sections list the changes for unreleased.
 
    https://github.com/owncloud/product/issues/197
 
+* Bugfix - Fix basic auth config: [#2719](https://github.com/owncloud/ocis/pull/2719)
+
+   Users could authenticate using basic auth even though `PROXY_ENABLE_BASIC_AUTH` was set to
+   false.
+
+   https://github.com/owncloud/ocis/issues/2466
+   https://github.com/owncloud/ocis/pull/2719
+
 * Bugfix - Fix oCIS startup ony systems with IPv6: [#2698](https://github.com/owncloud/ocis/pull/2698)
 
    We've fixed failing startup of oCIS on systems with IPv6 addresses.

changelog/unreleased/fix-basic-auth-config.md

@@ -0,0 +1,6 @@
+Bugfix: Fix basic auth config
+
+Users could authenticate using basic auth even though `PROXY_ENABLE_BASIC_AUTH` was set to false.
+
+https://github.com/owncloud/ocis/pull/2719
+https://github.com/owncloud/ocis/issues/2466

storage/pkg/command/frontend.go

@@ -162,6 +162,7 @@ func frontendConfigFromStruct(c *cli.Context, cfg *config.Config, filesCfg map[s
 				},
 				"auth": map[string]interface{}{
 					"credentials_by_user_agent": cfg.Reva.Frontend.Middleware.Auth.CredentialsByUserAgent,
+					"credential_chain":          []string{"bearer"},
 				},
 			},
 			// TODO build services dynamically