Skip to content

[stable13] don't blame randome people for background email updates #10763

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
rullzer merged 3 commits into from
Aug 22, 2018
Merged

[stable13] don't blame randome people for background email updates #10763

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
7dfb837
don't blame email address changers
blizzz Aug 14, 2018
0f958bf
don't force LDAP updates on userExists anymore
blizzz Aug 14, 2018
bd31fe7
fix unit tests
blizzz Aug 20, 2018
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
27 changes: 19 additions & 8 deletions apps/admin_audit/lib/Actions/UserManagement.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,14 +70,25 @@ public function delete(array $params) {
* @param array $params
*/
public function change(array $params) {
if ($params['feature'] === 'enabled') {
$this->log(
$params['value'] === 'true' ? 'User enabled: "%s"' : 'User disabled: "%s"',
['user' => $params['user']->getUID()],
[
'user',
]
);
switch($params['feature']) {
case 'enabled':
$this->log(
$params['value'] === 'true' ? 'User enabled: "%s"' : 'User disabled: "%s"',
['user' => $params['user']->getUID()],
[
'user',
]
);
break;
case 'eMailAddress':
$this->log(
'Email address changed for user %s',
['user' => $params['user']->getUID()],
[
'user',
]
);
break;
}
}

Expand Down
10 changes: 1 addition & 9 deletions apps/user_ldap/lib/User_LDAP.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,19 +317,14 @@ public function userExistsOnLDAP($user) {
$dn = $user->getDN();
//check if user really still exists by reading its entry
if(!is_array($this->access->readAttribute($dn, '', $this->access->connection->ldapUserFilter))) {
$lcr = $this->access->connection->getConnectionResource();
if(is_null($lcr)) {
throw new \Exception('No LDAP Connection to server ' . $this->access->connection->ldapHost);
}

try {
$uuid = $this->access->getUserMapper()->getUUIDByDN($dn);
if (!$uuid) {
return false;
}
$newDn = $this->access->getUserDnByUuid($uuid);
//check if renamed user is still valid by reapplying the ldap filter
if (!is_array($this->access->readAttribute($newDn, '', $this->access->connection->ldapUserFilter))) {
if ($newDn === $dn || !is_array($this->access->readAttribute($newDn, '', $this->access->connection->ldapUserFilter))) {
return false;
}
$this->access->getUserMapper()->setDNbyUUID($newDn, $uuid);
Expand Down Expand Up @@ -375,9 +370,6 @@ public function userExists($uid) {

$result = $this->userExistsOnLDAP($user);
$this->access->connection->writeToCache('userExists'.$uid, $result);
if($result === true) {
$user->update();
}
return $result;
}

Expand Down
58 changes: 47 additions & 11 deletions apps/user_ldap/tests/User_LDAPTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -558,14 +558,17 @@ public function testUserExists() {
$this->assertTrue($result);
}

/**
* @expectedException \Exception
*/
public function testUserExistsForDeleted() {
$access = $this->getAccessMock();
$backend = new UserLDAP($access, $this->createMock(IConfig::class), $this->createMock(INotificationManager::class), $this->createMock(Session::class), $this->getDefaultPluginManagerMock());
$this->prepareMockForUserExists($access);

$mapper = $this->createMock(UserMapping::class);
$mapper->expects($this->any())
->method('getUUIDByDN')
->with('dnOfFormerUser,dc=test')
->willReturn('45673458748');

$access->expects($this->any())
->method('readAttribute')
->will($this->returnCallback(function($dn) {
Expand All @@ -574,14 +577,25 @@ public function testUserExistsForDeleted() {
}
return false;
}));
$access->expects($this->any())
->method('getUserMapper')
->willReturn($mapper);
$access->expects($this->once())
->method('getUserDnByUuid')
->willThrowException(new \Exception());

$user = $this->createMock(User::class);
$user->expects($this->any())
->method('getDN')
->willReturn('dnOfFormerUser,dc=test');

$access->userManager = $this->createMock(Manager::class);
$access->userManager->expects($this->atLeastOnce())
->method('get')
->willReturn($this->createMock(User::class));
->willReturn($user);

//test for deleted user
$backend->userExists('formerUser');
$this->assertFalse($backend->userExists('formerUser'));
}

public function testUserExistsForNeverExisting() {
Expand Down Expand Up @@ -634,15 +648,18 @@ public function testUserExistsPublicAPI() {
$this->assertTrue($result);
}

/**
* @expectedException \Exception
*/
public function testUserExistsPublicAPIForDeleted() {
$access = $this->getAccessMock();
$backend = new UserLDAP($access, $this->createMock(IConfig::class), $this->createMock(INotificationManager::class), $this->createMock(Session::class), $this->getDefaultPluginManagerMock());
$this->prepareMockForUserExists($access);
\OC_User::useBackend($backend);

$mapper = $this->createMock(UserMapping::class);
$mapper->expects($this->any())
->method('getUUIDByDN')
->with('dnOfFormerUser,dc=test')
->willReturn('45673458748');

$access->expects($this->any())
->method('readAttribute')
->will($this->returnCallback(function($dn) {
Expand All @@ -651,13 +668,24 @@ public function testUserExistsPublicAPIForDeleted() {
}
return false;
}));
$access->userManager = $this->createMock(Manager::class);
$access->expects($this->any())
->method('getUserMapper')
->willReturn($mapper);
$access->expects($this->once())
->method('getUserDnByUuid')
->willThrowException(new \Exception());

$user = $this->createMock(User::class);
$user->expects($this->any())
->method('getDN')
->willReturn('dnOfFormerUser,dc=test');

$access->userManager->expects($this->atLeastOnce())
->method('get')
->willReturn($this->createMock(User::class));
->willReturn($user);

//test for deleted user
\OCP\User::userExists('formerUser');
$this->assertFalse(\OC::$server->getUserManager()->userExists('formerUser'));
}

public function testUserExistsPublicAPIForNeverExisting() {
Expand Down Expand Up @@ -818,6 +846,14 @@ public function testGetHomeNoPath() {
return false;
}
}));
$access->connection->expects($this->any())
->method('getFromCache')
->willReturnCallback(function($key) {
if($key === 'userExistsnewyorker') {
return true;
}
return null;
});

$user = $this->createMock(User::class);
$user->expects($this->any())
Expand Down
13 changes: 5 additions & 8 deletions settings/Hooks.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@ public function onChangeEmail(IUser $user, $oldMailAddress) {

$actor = $this->userSession->getUser();
if ($actor instanceof IUser) {
$subject = Provider::EMAIL_CHANGED_SELF;
if ($actor->getUID() !== $user->getUID()) {
$this->l = $this->languageFactory->get(
'settings',
Expand All @@ -173,15 +174,11 @@ public function onChangeEmail(IUser $user, $oldMailAddress) {
$this->config->getSystemValue('default_language', 'en')
)
);

$text = $this->l->t('%1$s changed your email address on %2$s.', [$actor->getDisplayName(), $instanceUrl]);
$event->setAuthor($actor->getUID())
->setSubject(Provider::EMAIL_CHANGED_BY, [$actor->getUID()]);
} else {
$text = $this->l->t('Your email address on %s was changed.', [$instanceUrl]);
$event->setAuthor($actor->getUID())
->setSubject(Provider::EMAIL_CHANGED_SELF);
$subject = Provider::EMAIL_CHANGED;
}
$text = $this->l->t('Your email address on %s was changed.', [$instanceUrl]);
$event->setAuthor($actor->getUID())
->setSubject($subject);
} else {
$text = $this->l->t('Your email address on %s was changed by an administrator.', [$instanceUrl]);
$event->setSubject(Provider::EMAIL_CHANGED);
Expand Down