tonyair
/
silverstripe-framework
mirror of https://github.com/silverstripe/silverstripe-framework
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch '4.11' into 4

This commit is contained in:
Guy Sartorelli 2022-11-09 10:53:09 +13:00
parent 00d1701d37 27eb390d2b
commit ed63beeeee
No known key found for this signature in database
GPG Key ID: F313E3B9504D496A
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Security/DefaultAdminService.php
View File

@ -171,7 +171,7 @@ class DefaultAdminService
$admin = Member::create();
$admin->FirstName = $name ?: $email;
$admin->Email = $email;
$admin->PasswordEncryption = 'none';
$admin->PasswordEncryption = Security::config()->get('password_encryption_algorithm');
$admin->write();
}

9
tests/php/Security/SecurityDefaultAdminTest.php
View File

@ -77,7 +77,7 @@ class SecurityDefaultAdminTest extends SapphireTest
$this->assertTrue(Permission::checkMember($admin, 'ADMIN'));
$this->assertEquals($admin->Email, DefaultAdminService::getDefaultAdminUsername());
$this->assertTrue(DefaultAdminService::isDefaultAdmin($admin->Email));
$this->assertNull($admin->Password);
$this->assertStringStartsWith('$2y$10$', $admin->Password);
$this->assertArrayHasKey($admin->PasswordEncryption, PasswordEncryptor::get_encryptors());
}
@ -92,7 +92,7 @@ class SecurityDefaultAdminTest extends SapphireTest
$this->assertTrue(Permission::checkMember($admin, 'ADMIN'));
$this->assertEquals('newadmin@example.com', $admin->Email);
$this->assertEquals('Admin Name', $admin->FirstName);
$this->assertNull($admin->Password);
$this->assertStringStartsWith('$2y$10$', $admin->Password);
}
public function testFindAnAdministratorWithoutDefaultAdmin()
@ -112,9 +112,8 @@ class SecurityDefaultAdminTest extends SapphireTest
$admin = $service->findOrCreateDefaultAdmin();
$this->assertTrue(Permission::checkMember($admin, 'ADMIN'));
// User should have Email but no Password
$this->assertEquals('admin', $admin->Email);
$this->assertEmpty($admin->Password);
$this->assertStringStartsWith('$2y$10$', $admin->Password);
}
public function testDefaultAdmin()
@ -127,6 +126,6 @@ class SecurityDefaultAdminTest extends SapphireTest
$this->assertTrue(Permission::checkMember($admin, 'ADMIN'));
$this->assertEquals($admin->Email, DefaultAdminService::getDefaultAdminUsername());
$this->assertTrue(DefaultAdminService::isDefaultAdmin($admin->Email));
$this->assertNull($admin->Password);
$this->assertStringStartsWith('$2y$10$', $admin->Password);
}
}