Skip to content
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

Jump to bottom

[WIP] Dont allow reusing usernames #27105

Closed
wants to merge 11 commits into from
Closed

[WIP] Dont allow reusing usernames #27105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
39974ac
Dont allow reusing usernames
LukasReschke May 25, 2021
4abf122
Adjust tests to use different user IDs
LukasReschke May 26, 2021
1d5cbd3
Flush duplicate usernames for integration tests
LukasReschke May 26, 2021
dfd9d5f
Use self::getUniqueID instead of uniqid
LukasReschke Jun 2, 2021
aef3f7c
Use single quotes instead double quotes
LukasReschke Jun 2, 2021
9ed3522
else if -> elseif
LukasReschke Jun 2, 2021
37543c0
Use MockObject instead of PHPUnit_Framework_MockObject_MockObject
LukasReschke Jun 2, 2021
e09c99c
Nest migration code
LukasReschke Jun 2, 2021
4b48154
Import namespaced MockObject
LukasReschke Jun 2, 2021
4cc3180
Move null user test first
LukasReschke Jun 2, 2021
a4f6e19
Disable testing app only conditionally
LukasReschke Jun 2, 2021
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
2 changes: 1 addition & 1 deletion apps/dav/tests/unit/Connector/Sabre/FileTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ protected function setUp(): void {

\OC_Hook::clear();

$this->user = 'test_user';
$this->user = self::getUniqueID('test_user');
$this->createUser($this->user, 'pass');

$this->loginAsUser($this->user);
Expand Down
6 changes: 3 additions & 3 deletions apps/federatedfilesharing/tests/FederatedShareProviderTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -892,8 +892,8 @@ public function testGetSharesInFolder() {
$userManager = \OC::$server->getUserManager();
$rootFolder = \OC::$server->getRootFolder();

$u1 = $userManager->createUser('testFed', md5(time()));
$u2 = $userManager->createUser('testFed2', md5(time()));
$u1 = $userManager->createUser(self::getUniqueID('testFed'), md5(time()));
$u2 = $userManager->createUser(self::getUniqueID('testFed2'), md5(time()));

$folder1 = $rootFolder->getUserFolder($u1->getUID())->newFolder('foo');
$file1 = $folder1->newFile('bar1');
Expand Down Expand Up @@ -946,7 +946,7 @@ public function testGetAccessList() {
$userManager = \OC::$server->getUserManager();
$rootFolder = \OC::$server->getRootFolder();

$u1 = $userManager->createUser('testFed', md5(time()));
$u1 = $userManager->createUser(self::getUniqueID('testFed'), md5(time()));

$folder1 = $rootFolder->getUserFolder($u1->getUID())->newFolder('foo');
$file1 = $folder1->newFile('bar1');
Expand Down
10 changes: 5 additions & 5 deletions apps/federatedfilesharing/tests/TestCase.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,24 +50,24 @@ public static function setUpBeforeClass(): void {
// create users
$backend = new \Test\Util\User\Dummy();
\OC_User::useBackend($backend);
$backend->createUser(self::TEST_FILES_SHARING_API_USER1, self::TEST_FILES_SHARING_API_USER1);
$backend->createUser(self::TEST_FILES_SHARING_API_USER2, self::TEST_FILES_SHARING_API_USER2);
$backend->createUser($this->TEST_FILES_SHARING_API_USER1, $this->TEST_FILES_SHARING_API_USER1);
$backend->createUser($this->TEST_FILES_SHARING_API_USER2, $this->TEST_FILES_SHARING_API_USER2);
}

protected function setUp(): void {
parent::setUp();

//login as user1
self::loginHelper(self::TEST_FILES_SHARING_API_USER1);
self::loginHelper($this->TEST_FILES_SHARING_API_USER1);
}

public static function tearDownAfterClass(): void {
// cleanup users
$user = \OC::$server->getUserManager()->get(self::TEST_FILES_SHARING_API_USER1);
$user = \OC::$server->getUserManager()->get($this->TEST_FILES_SHARING_API_USER1);
if ($user !== null) {
$user->delete();
}
$user = \OC::$server->getUserManager()->get(self::TEST_FILES_SHARING_API_USER2);
$user = \OC::$server->getUserManager()->get($this->TEST_FILES_SHARING_API_USER2);
if ($user !== null) {
$user->delete();
}
Expand Down
Loading