Skip to content

[stable23] Do not send display name twice for saving #33144

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Pytal merged 3 commits into from
Jul 6, 2022
Merged

[stable23] Do not send display name twice for saving #33144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e218746
Do not save invalid display name to the database
Pytal Jun 28, 2022
be7a936
Prevent duplicate set display name request
Pytal Jun 28, 2022
a06f027
Fix unit tests
nickvergessen Jul 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion apps/provisioning_api/lib/Controller/UsersController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -837,7 +837,9 @@ public function editUser(string $userId, string $key, string $value): DataRespon
switch ($key) {
case self::USER_FIELD_DISPLAYNAME:
case IAccountManager::PROPERTY_DISPLAYNAME:
$targetUser->setDisplayName($value);
if (!$targetUser->setDisplayName($value)) {
throw new OCSException('Invalid displayname', 102);
}
break;
case self::USER_FIELD_QUOTA:
$quota = $value;
Expand Down
3 changes: 2 additions & 1 deletion apps/provisioning_api/tests/Controller/UsersControllerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1486,7 +1486,8 @@ public function testEditUserRegularUserSelfEditChangeDisplayName() {
$targetUser
->expects($this->once())
->method('setDisplayName')
->with('NewDisplayName');
->with('NewDisplayName')
->willReturn(true);
$targetUser
->expects($this->any())
->method('getUID')
Expand Down
3 changes: 2 additions & 1 deletion apps/settings/js/federationsettingsview.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,8 @@
_.each(this._inputFields, function(field) {
if (
field === 'avatar' ||
field === 'email'
field === 'email' ||
field === 'displayname'
) {
return;
}
Expand Down
4 changes: 4 additions & 0 deletions lib/private/User/Database.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,10 @@ public function setPassword(string $uid, string $password): bool {
* Change the display name of a user
*/
public function setDisplayName(string $uid, string $displayName): bool {
if (mb_strlen($displayName) > 64) {
return false;
}

$this->fixDI();

if ($this->userExists($uid)) {
Expand Down