jjsm01/kimai2
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Next major version 2 with PHP 8.1, Symfony 6, Tabler UI, 2FA ... (#2902)

Browse Source
This commit is contained in:
Kevin Papst
2022-12-31 21:19:55 +01:00
committed by GitHub
parent 95e06746bd
commit 90a0fd8a22
2164 changed files with 83700 additions and 86426 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
tests/Voter/AbstractVoterTest.php
View File

@@ -32,7 +32,7 @@ abstract class AbstractVoterTest extends TestCase
* @param string|null $role
* @return User
*/
protected function getUser($id, ?string $role)
protected function getUser(int $id, ?string $role)
{
$roles = [];
if (!empty($role)) {
@@ -41,7 +41,7 @@ abstract class AbstractVoterTest extends TestCase
$user = new User();
$user->setRoles($roles);
$user->setUsername($id);
$user->setUserIdentifier((string) $id);
$reflection = new \ReflectionClass($user);
$property = $reflection->getProperty('id');
@@ -52,11 +52,11 @@ abstract class AbstractVoterTest extends TestCase
}
/**
* @param array $permissions
* @param array<string, array<string>> $permissions
* @param bool $overwrite
* @return RolePermissionManager
*/
protected function getRolePermissionManager(array $permissions = [], bool $overwrite = false)
protected function getRolePermissionManager(array $permissions = [], bool $overwrite = false): RolePermissionManager
{
if (!$overwrite) {
$activities = ['view_activity', 'edit_activity', 'budget_activity', 'time_activity', 'delete_activity', 'create_activity'];
@@ -92,7 +92,17 @@ abstract class AbstractVoterTest extends TestCase
$repository = $this->getMockBuilder(RolePermissionRepository::class)->onlyMethods(['getAllAsArray'])->disableOriginalConstructor()->getMock();
$repository->method('getAllAsArray')->willReturn([]);
$names = [];
$perms = [];
foreach ($permissions as $role => $permissionNames) {
$perms[$role] = [];
foreach ($permissionNames as $name) {
$perms[$role][$name] = true;
$names[$name] = true;
}
}
/* @var RolePermissionRepository $repository */
return new RolePermissionManager($repository, $permissions);
return new RolePermissionManager($repository, $perms, $names);
}
}

22
tests/Voter/ActivityVoterTest.php
View File

@@ -33,7 +33,7 @@ class ActivityVoterTest extends AbstractVoterTest
protected function assertVote(User $user, $subject, $attribute, $result)
{
$token = new UsernamePasswordToken($user, 'foo', 'bar', $user->getRoles());
$token = new UsernamePasswordToken($user, 'bar', $user->getRoles());
$sut = $this->getVoter(ActivityVoter::class);
$this->assertEquals($result, $sut->vote($token, $subject, [$attribute]));
@@ -87,14 +87,14 @@ class ActivityVoterTest extends AbstractVoterTest
public function testTeamlead()
{
$team = new Team();
$team = new Team('foo');
$user = new User();
$user->addRole(User::ROLE_TEAMLEAD);
$team->addTeamlead($user);
$activity = new Activity();
$project = new Project();
$customer = new Customer();
$customer = new Customer('foo');
$project->setCustomer($customer);
$activity->setProject($project);
$customer->addTeam($team);
@@ -103,7 +103,7 @@ class ActivityVoterTest extends AbstractVoterTest
$activity = new Activity();
$project = new Project();
$customer = new Customer();
$customer = new Customer('foo');
$project->setCustomer($customer);
$activity->setProject($project);
$project->addTeam($team);
@@ -112,7 +112,7 @@ class ActivityVoterTest extends AbstractVoterTest
$activity = new Activity();
$project = new Project();
$customer = new Customer();
$customer = new Customer('foo');
$project->setCustomer($customer);
$activity->setProject($project);
$activity->addTeam($team);
@@ -126,14 +126,14 @@ class ActivityVoterTest extends AbstractVoterTest
public function testTeamMember()
{
$team = new Team();
$team = new Team('foo');
$user = new User();
$user->addRole(User::ROLE_USER);
$team->addTeamlead($user);
$activity = new Activity();
$project = new Project();
$customer = new Customer();
$customer = new Customer('foo');
$customer->addTeam($team);
$project->setCustomer($customer);
$activity->setProject($project);
@@ -141,13 +141,13 @@ class ActivityVoterTest extends AbstractVoterTest
$this->assertVote($user, $activity, 'edit', VoterInterface::ACCESS_GRANTED);
$activity = new Activity();
$team = new Team();
$team = new Team('foo');
$user = new User();
$user->addRole(User::ROLE_USER);
$team->addUser($user);
$project = new Project();
$customer = new Customer();
$customer = new Customer('foo');
$project->addTeam($team);
$project->setCustomer($customer);
$activity->setProject($project);
@@ -155,13 +155,13 @@ class ActivityVoterTest extends AbstractVoterTest
$this->assertVote($user, $activity, 'edit', VoterInterface::ACCESS_GRANTED);
$activity = new Activity();
$team = new Team();
$team = new Team('foo');
$user = new User();
$user->addRole(User::ROLE_USER);
$team->addUser($user);
$project = new Project();
$customer = new Customer();
$customer = new Customer('foo');
$activity->addTeam($team);
$project->setCustomer($customer);
$activity->setProject($project);

74
tests/Voter/CustomerVoterTest.php
View File

@@ -23,7 +23,7 @@ class CustomerVoterTest extends AbstractVoterTest
{
protected function assertVote(User $user, $subject, $attribute, $result)
{
$token = new UsernamePasswordToken($user, 'foo', 'bar', $user->getRoles());
$token = new UsernamePasswordToken($user, 'bar', $user->getRoles());
$sut = $this->getVoter(CustomerVoter::class);
$actual = $sut->vote($token, $subject, [$attribute]);
@@ -40,16 +40,16 @@ class CustomerVoterTest extends AbstractVoterTest
$result = VoterInterface::ACCESS_GRANTED;
foreach ([$userAdmin, $userSuperAdmin] as $user) {
$this->assertVote($user, new Customer(), 'view', $result);
$this->assertVote($user, new Customer(), 'edit', $result);
$this->assertVote($user, new Customer(), 'budget', $result);
$this->assertVote($user, new Customer(), 'delete', $result);
$this->assertVote($user, new Customer('foo'), 'view', $result);
$this->assertVote($user, new Customer('foo'), 'edit', $result);
$this->assertVote($user, new Customer('foo'), 'budget', $result);
$this->assertVote($user, new Customer('foo'), 'delete', $result);
}
$team = new Team();
$team = new Team('foo');
$team->addTeamlead($userTeamlead);
foreach ([$userTeamlead] as $user) {
$customer = new Customer();
$customer = new Customer('foo');
$team->addCustomer($customer);
$this->assertVote($user, $customer, 'view', $result);
$team->removeCustomer($customer);
@@ -59,24 +59,24 @@ class CustomerVoterTest extends AbstractVoterTest
$result = VoterInterface::ACCESS_DENIED;
foreach ([$userNoRole, $userStandard] as $user) {
$this->assertVote($user, new Customer(), 'view', $result);
$this->assertVote($user, new Customer(), 'edit', $result);
$this->assertVote($user, new Customer(), 'budget', $result);
$this->assertVote($user, new Customer(), 'delete', $result);
$this->assertVote($user, new Customer('foo'), 'view', $result);
$this->assertVote($user, new Customer('foo'), 'edit', $result);
$this->assertVote($user, new Customer('foo'), 'budget', $result);
$this->assertVote($user, new Customer('foo'), 'delete', $result);
}
foreach ([$userTeamlead] as $user) {
$this->assertVote($user, new Customer(), 'edit', $result);
$this->assertVote($user, new Customer(), 'budget', $result);
$this->assertVote($user, new Customer(), 'delete', $result);
$this->assertVote($user, new Customer('foo'), 'edit', $result);
$this->assertVote($user, new Customer('foo'), 'budget', $result);
$this->assertVote($user, new Customer('foo'), 'delete', $result);
}
$result = VoterInterface::ACCESS_ABSTAIN;
foreach ([$userNoRole, $userStandard, $userTeamlead] as $user) {
$this->assertVote($user, new Customer(), 'view_customer', $result);
$this->assertVote($user, new Customer(), 'edit_customer', $result);
$this->assertVote($user, new Customer(), 'budget_customer', $result);
$this->assertVote($user, new Customer(), 'delete_customer', $result);
$this->assertVote($user, new Customer('foo'), 'view_customer', $result);
$this->assertVote($user, new Customer('foo'), 'edit_customer', $result);
$this->assertVote($user, new Customer('foo'), 'budget_customer', $result);
$this->assertVote($user, new Customer('foo'), 'delete_customer', $result);
$this->assertVote($user, new \stdClass(), 'view', $result);
$this->assertVote($user, null, 'edit', $result);
$this->assertVote($user, $user, 'delete', $result);
@@ -85,12 +85,12 @@ class CustomerVoterTest extends AbstractVoterTest
public function testTeamlead()
{
$team = new Team();
$team = new Team('foo');
$user = new User();
$user->addRole(User::ROLE_TEAMLEAD);
$team->addTeamlead($user);
$customer = new Customer();
$customer = new Customer('foo');
$customer->addTeam($team);
$this->assertVote($user, $customer, 'edit', VoterInterface::ACCESS_GRANTED);
@@ -98,22 +98,22 @@ class CustomerVoterTest extends AbstractVoterTest
public function testTeamMember()
{
$team = new Team();
$team = new Team('foo');
$user = new User();
$user->addRole(User::ROLE_USER);
$team->addTeamlead($user);
$customer = new Customer();
$customer = new Customer('foo');
$customer->addTeam($team);
$this->assertVote($user, $customer, 'edit', VoterInterface::ACCESS_GRANTED);
$team = new Team();
$team = new Team('foo');
$user = new User();
$user->addRole(User::ROLE_USER);
$team->addUser($user);
$customer = new Customer();
$customer = new Customer('foo');
$customer->addTeam($team);
$this->assertVote($user, $customer, 'edit', VoterInterface::ACCESS_GRANTED);
@@ -122,45 +122,45 @@ class CustomerVoterTest extends AbstractVoterTest
public function testAccess()
{
// ALLOW: customer has no teams
$this->assertVote(new User(), new Customer(), 'access', VoterInterface::ACCESS_GRANTED);
$this->assertVote(new User(), new Customer('foo'), 'access', VoterInterface::ACCESS_GRANTED);
// ALLOW: customer has no teams
$user = new User();
$user->addTeam(new Team());
$this->assertVote($user, new Customer(), 'access', VoterInterface::ACCESS_GRANTED);
$user->addTeam(new Team('foo'));
$this->assertVote($user, new Customer('foo'), 'access', VoterInterface::ACCESS_GRANTED);
// ALLOW: user and customer are in the same team (as teamlead)
$team = new Team();
$team = new Team('foo');
$user = new User();
$team->addTeamlead($user);
$customer = new Customer();
$customer = new Customer('foo');
$customer->addTeam($team);
$this->assertVote($user, $customer, 'access', VoterInterface::ACCESS_GRANTED);
// ALLOW: user and customer are in the same team (as member)
$team = new Team();
$team = new Team('foo');
$user = new User();
$user->addTeam(new Team());
$user->addTeam(new Team('foo'));
$user->addTeam($team);
$customer = new Customer();
$customer = new Customer('foo');
$customer->addTeam($team);
$this->assertVote($user, $customer, 'access', VoterInterface::ACCESS_GRANTED);
// DENY: customer has a team, user not
$customer = new Customer();
$customer->addTeam(new Team());
$customer = new Customer('foo');
$customer->addTeam(new Team('foo'));
$this->assertVote(new User(), $customer, 'access', VoterInterface::ACCESS_DENIED);
// DENY: user and customer has a team are not in the same team
$user = new User();
$user->addTeam(new Team());
$customer = new Customer();
$customer->addTeam(new Team());
$user->addTeam(new Team('foo'));
$customer = new Customer('foo');
$customer->addTeam(new Team('foo'));
$this->assertVote($user, $customer, 'access', VoterInterface::ACCESS_DENIED);
}

80
tests/Voter/DeprecatedAbstractVoterTest.php
View File

@@ -1,80 +0,0 @@
<?php
/*
* This file is part of the Kimai time-tracking app.
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace App\Tests\Voter;
use App\Entity\User;
use App\Security\AclDecisionManager;
use App\Voter\AbstractVoter;
use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
use Symfony\Component\Security\Core\Authorization\Voter\Voter;
/**
* @covers \App\Voter\AbstractVoter
* @group legacy
*/
class DeprecatedAbstractVoterTest extends AbstractVoterTest
{
protected function getVoter(string $voterClass): Voter
{
$accessManager = $this->getMockBuilder(AclDecisionManager::class)->disableOriginalConstructor()->getMock();
$accessManager->method('isFullyAuthenticated')->willReturn(true);
$class = new \ReflectionClass($voterClass);
/** @var AbstractVoter $voter */
$voter = $class->newInstance($accessManager, $this->getRolePermissionManager());
self::assertInstanceOf(AbstractVoter::class, $voter);
return $voter;
}
protected function assertVote(User $user, $subject, $attribute, $result)
{
$token = new UsernamePasswordToken($user, 'foo', 'bar', $user->getRoles());
$sut = $this->getVoter(DeprecatedVoter::class);
$actual = $sut->vote($token, $subject, [$attribute]);
$this->assertEquals($result, $actual, sprintf('Failed voting "%s" for User with roles %s.', $attribute, implode(', ', $user->getRoles())));
}
public function testMuuu()
{
$userStandard = $this->getUser(1, User::ROLE_USER);
$this->assertVote($userStandard, null, 'view_own_timesheet', true);
}
}
class DeprecatedVoter extends AbstractVoter
{
protected function supports($attribute, $subject)
{
return true;
}
protected function voteOnAttribute($attribute, $subject, TokenInterface $token)
{
if (!$this->isRegisteredPermission($attribute)) {
return false;
}
if (!$this->hasPermission('ROLE_USER', $attribute)) {
return false;
}
/** @var User $user */
$user = $token->getUser();
if (!$this->hasRolePermission($user, $attribute)) {
return false;
}
return $this->isFullyAuthenticated($token);
}
}

6
tests/Voter/EntityMultiRoleVoterTest.php
View File

@@ -27,10 +27,10 @@ class EntityMultiRoleVoterTest extends AbstractVoterTest
*/
public function testVote(User $user, $subject, $attribute, $result)
{
$token = new UsernamePasswordToken($user, 'foo', 'bar', $user->getRoles());
$token = new UsernamePasswordToken($user, 'foo', $user->getRoles());
$sut = $this->getVoter(EntityMultiRoleVoter::class);
$this->assertEquals($result, $sut->vote($token, $subject, [$attribute]), 'Failed on permission "' . $attribute . '" for User ' . $user->getUsername());
$this->assertEquals($result, $sut->vote($token, $subject, [$attribute]), 'Failed on permission "' . $attribute . '" for User ' . $user->getUserIdentifier());
}
public function getTestData()
@@ -43,7 +43,7 @@ class EntityMultiRoleVoterTest extends AbstractVoterTest
$result = VoterInterface::ACCESS_GRANTED;
$allPermissions = ['budget_money', 'budget_time', 'budget_any', 'details'];
$allSubjects = ['project', 'customer', new Project(), new Customer()];
$allSubjects = ['project', 'customer', new Project(), new Customer('foo')];
foreach ($allPermissions as $permission) {
foreach ($allSubjects as $subject) {

20
tests/Voter/ProjectVoterTest.php
View File

@@ -24,11 +24,11 @@ class ProjectVoterTest extends AbstractVoterTest
{
protected function assertVote(User $user, $subject, $attribute, $result)
{
$token = new UsernamePasswordToken($user, 'foo', 'bar', $user->getRoles());
$token = new UsernamePasswordToken($user, 'bar', $user->getRoles());
$sut = $this->getVoter(ProjectVoter::class);
if ($subject instanceof Project && null === $subject->getCustomer()) {
$subject->setCustomer(new Customer());
$subject->setCustomer(new Customer('foo'));
}
$actual = $sut->vote($token, $subject, [$attribute]);
@@ -51,7 +51,7 @@ class ProjectVoterTest extends AbstractVoterTest
$this->assertVote($user, new Project(), 'delete', $result);
}
$team = new Team();
$team = new Team('foo');
$team->addTeamlead($userTeamlead);
foreach ([$userTeamlead] as $user) {
$project = new Project();
@@ -92,20 +92,20 @@ class ProjectVoterTest extends AbstractVoterTest
public function testTeamlead()
{
$team = new Team();
$team = new Team('foo');
$user = new User();
$user->addRole(User::ROLE_TEAMLEAD);
$team->addTeamlead($user);
$project = new Project();
$customer = new Customer();
$customer = new Customer('foo');
$project->setCustomer($customer);
$customer->addTeam($team);
$this->assertVote($user, $project, 'edit', VoterInterface::ACCESS_GRANTED);
$project = new Project();
$customer = new Customer();
$customer = new Customer('foo');
$project->setCustomer($customer);
$project->addTeam($team);
@@ -114,25 +114,25 @@ class ProjectVoterTest extends AbstractVoterTest
public function testTeamMember()
{
$team = new Team();
$team = new Team('foo');
$user = new User();
$user->addRole(User::ROLE_USER);
$team->addTeamlead($user);
$project = new Project();
$customer = new Customer();
$customer = new Customer('foo');
$customer->addTeam($team);
$project->setCustomer($customer);
$this->assertVote($user, $project, 'edit', VoterInterface::ACCESS_GRANTED);
$team = new Team();
$team = new Team('foo');
$user = new User();
$user->addRole(User::ROLE_USER);
$team->addUser($user);
$project = new Project();
$customer = new Customer();
$customer = new Customer('foo');
$project->addTeam($team);
$project->setCustomer($customer);

2
tests/Voter/RolePermissionVoterTest.php
View File

@@ -25,7 +25,7 @@ class RolePermissionVoterTest extends AbstractVoterTest
*/
public function testVote(User $user, $subject, $attribute, $result)
{
$token = new UsernamePasswordToken($user, 'foo', 'bar', $user->getRoles());
$token = new UsernamePasswordToken($user, 'bar', $user->getRoles());
$sut = $this->getVoter(RolePermissionVoter::class);
$actual = $sut->vote($token, $subject, [$attribute]);

4
tests/Voter/TeamVoterTest.php
View File

@@ -25,7 +25,7 @@ class TeamVoterTest extends AbstractVoterTest
*/
public function testVote(User $user, $subject, $attribute, $result)
{
$token = new UsernamePasswordToken($user, 'foo', 'bar', $user->getRoles());
$token = new UsernamePasswordToken($user, 'bar', $user->getRoles());
$sut = $this->getVoter(TeamVoter::class);
$this->assertEquals($result, $sut->vote($token, $subject, [$attribute]));
@@ -39,7 +39,7 @@ class TeamVoterTest extends AbstractVoterTest
$user3 = $this->getUser(3, User::ROLE_ADMIN);
$user4 = $this->getUser(4, User::ROLE_SUPER_ADMIN);
$team = new Team();
$team = new Team('foo');
$result = VoterInterface::ACCESS_ABSTAIN;

14
tests/Voter/TimesheetVoterTest.php
View File

@@ -10,12 +10,12 @@
namespace App\Tests\Voter;
use App\Configuration\ConfigLoaderInterface;
use App\Configuration\SystemConfiguration;
use App\Entity\Activity;
use App\Entity\Customer;
use App\Entity\Project;
use App\Entity\Timesheet;
use App\Entity\User;
use App\Tests\Mocks\SystemConfigurationFactory;
use App\Timesheet\LockdownService;
use App\Voter\TimesheetVoter;
use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
@@ -34,7 +34,7 @@ class TimesheetVoterTest extends AbstractVoterTest
protected function assertVote(User $user, $subject, $attribute, $result)
{
$token = new UsernamePasswordToken($user, 'foo', 'bar', $user->getRoles());
$token = new UsernamePasswordToken($user, 'bar', $user->getRoles());
$sut = $this->getVoter(TimesheetVoter::class);
$this->assertEquals($result, $sut->vote($token, $subject, [$attribute]));
@@ -110,7 +110,7 @@ class TimesheetVoterTest extends AbstractVoterTest
$timesheet->setBegin($begin);
$timesheet->setUser($user);
$token = new UsernamePasswordToken($user, 'foo', 'bar', $user->getRoles());
$token = new UsernamePasswordToken($user, 'bar', $user->getRoles());
$sut = $this->getLockdownVoter($lockdownBegin, $lockdownEnd, $lockdownGrace);
self::assertEquals($expected, $sut->vote($token, $timesheet, [$permission]));
@@ -162,7 +162,9 @@ class TimesheetVoterTest extends AbstractVoterTest
$this->assertVote($user2, $timesheet, 'start', VoterInterface::ACCESS_DENIED);
// cannot start timesheet without activity
$timesheet = new Timesheet();
$timesheet->setUser($user2)->setProject(new Project());
$project = new Project();
$project->setCustomer(new Customer('foo'));
$timesheet->setUser($user2)->setProject($project);
$this->assertVote($user2, $timesheet, 'start', VoterInterface::ACCESS_DENIED);
// cannot start timesheet without project
$timesheet = new Timesheet();
@@ -180,7 +182,7 @@ class TimesheetVoterTest extends AbstractVoterTest
$activity->setProject($project);
$timesheet->setProject($project);
$timesheet->setActivity($activity);
$customer = new Customer();
$customer = new Customer('foo');
$project->setCustomer($customer);
return $timesheet;
@@ -204,7 +206,7 @@ class TimesheetVoterTest extends AbstractVoterTest
protected function getLockdownVoter(?string $lockdownBegin = null, ?string $lockdownEnd = null, ?string $lockdownGrace = null): Voter
{
$loader = $this->createMock(ConfigLoaderInterface::class);
$config = new SystemConfiguration($loader, [
$config = SystemConfigurationFactory::create($loader, [
'timesheet' => [
'rules' => [
'lockdown_period_start' => $lockdownBegin,

8
tests/Voter/UserVoterTest.php
View File

@@ -25,7 +25,7 @@ class UserVoterTest extends AbstractVoterTest
*/
public function testVote(User $user, $subject, $attribute, $result)
{
$token = new UsernamePasswordToken($user, 'foo', 'bar', $user->getRoles());
$token = new UsernamePasswordToken($user, 'bar', $user->getRoles());
$sut = $this->getVoter(UserVoter::class);
$this->assertEquals($result, $sut->vote($token, $subject, [$attribute]));
@@ -92,11 +92,11 @@ class UserVoterTest extends AbstractVoterTest
public function testPasswordIsDeniedForNonInternalUser(string $authType, int $result)
{
$user = new User();
$user->setUsername('admin');
$user->setUserIdentifier('admin');
$user->addRole('ROLE_SUPER_ADMIN');
$subject = new User();
$subject->setUsername('foo');
$subject->setUserIdentifier('foo');
$subject->addRole('ROLE_USER');
$subject->setAuth($authType);
@@ -117,7 +117,7 @@ class UserVoterTest extends AbstractVoterTest
$userMock = $this->createMock(User::class);
$userMock->method('getId')->willReturn(1);
$user = new User();
$token = new UsernamePasswordToken($user, 'foo', 'bar', $user->getRoles());
$token = new UsernamePasswordToken($user, 'bar', $user->getRoles());
$sut = $this->getVoter(UserVoter::class);
$this->assertEquals(VoterInterface::ACCESS_GRANTED, $sut->vote($token, $user, ['view_team_member']));