mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #19316 from nextcloud/backport/19312/stable17 

[stable17] do not overwrite global user auth credentials with empty values
This commit is contained in:
Roeland Jago Douma 2020-02-06 16:19:27 +01:00 committed by GitHub
parent 728dae5962 12ca2e3dd7
commit 55ccfef48e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/files_external/lib/Lib/Auth/Password/UserGlobalAuth.php
View File

@ -50,6 +50,11 @@ class UserGlobalAuth extends AuthMechanism {
} }
public function saveBackendOptions(IUser $user, $id, $backendOptions) { public function saveBackendOptions(IUser $user, $id, $backendOptions) {
// backendOptions are set when invoked via Files app
// but they are not set when invoked via ext storage settings
if(!isset($backendOptions['user']) && !isset($backendOptions['password'])) {
return;
}
// make sure we're not setting any unexpected keys // make sure we're not setting any unexpected keys
$credentials = [ $credentials = [
'user' => $backendOptions['user'], 'user' => $backendOptions['user'],