Merge pull request #18183 from nextcloud/backport/18135/stable16

rullzer · web-flow · commit 05f40475ccce · 2019-12-02T13:55:34.000+01:00
[stable16] Trim the login name
diff --git a/core/Controller/LoginController.php b/core/Controller/LoginController.php
@@ -284,6 +284,7 @@ public function tryLogin($user, $password, $redirect_url, $remember_login = true
 		if(!is_string($user)) {
 			throw new \InvalidArgumentException('Username must be string');
 		}
+		$user = trim($user);
 
 		// If the user is already logged in and the CSRF check does not pass then
 		// simply redirect the user to the correct page as required. This is the

Original file line number	Diff line number	Diff line change
`@@ -284,6 +284,7 @@ public function tryLogin($user, $password, $redirect_url, $remember_login = true`
`284`	`284`	`if(!is_string($user)) {`
`285`	`285`	`throw new \InvalidArgumentException('Username must be string');`
`286`	`286`	`}`
	`287`	`+ $user = trim($user);`
`287`	`288`
`288`	`289`	`// If the user is already logged in and the CSRF check does not pass then`
`289`	`290`	`// simply redirect the user to the correct page as required. This is the`