Skip to content

fix: add missing validation for group name to shield:user addgroup/removegroup #1176

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
merged 2 commits into from
Aug 24, 2024
Merged

fix: add missing validation for group name to shield:user addgroup/removegroup #1176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f8c104c
test: add tests for invalid group name to `addgroup`/`removegroup` co…
kenjis Aug 21, 2024
c003977
fix: add missing validation for group name
kenjis Aug 21, 2024
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
10 changes: 10 additions & 0 deletions src/Commands/User.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -603,6 +603,11 @@ private function addgroup($group = null, $username = null, $email = null): void
$group = $this->prompt('Group', null, 'required');
}

// Validate the group
if (! $this->validateGroup($group)) {
throw new CancelException('Invalid group: "' . $group . '"');
}

$user = $this->findUser('Add user to group', $username, $email);

$confirm = $this->prompt(
Expand Down Expand Up @@ -635,6 +640,11 @@ private function removegroup($group = null, $username = null, $email = null): vo
$group = $this->prompt('Group', null, 'required');
}

// Validate the group
if (! $this->validateGroup($group)) {
throw new CancelException('Invalid group: "' . $group . '"');
}

$user = $this->findUser('Remove user from group', $username, $email);

$confirm = $this->prompt(
Expand Down
44 changes: 44 additions & 0 deletions tests/Commands/UserTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -595,6 +595,24 @@ public function testAddgroup(): void
$this->assertTrue($user->inGroup('admin'));
}

public function testAddgroupWithInvalidGroup(): void
{
$this->createUser([
'username' => 'user10',
'email' => '[email protected]',
'password' => 'secret123',
]);

$this->setMockIo(['y']);

command('shield:user addgroup -n user10 -g invalid');

$this->assertStringContainsString(
'Invalid group: "invalid"',
$this->io->getLastOutput()
);
}

public function testAddgroupCancel(): void
{
$this->createUser([
Expand Down Expand Up @@ -643,6 +661,32 @@ public function testRemovegroup(): void
$this->assertFalse($user->inGroup('admin'));
}

public function testRemovegroupWithInvalidGroup(): void
{
$this->createUser([
'username' => 'user11',
'email' => '[email protected]',
'password' => 'secret123',
]);
$users = model(UserModel::class);
$user = $users->findByCredentials(['email' => '[email protected]']);
$user->addGroup('admin');
$this->assertTrue($user->inGroup('admin'));

$this->setMockIo(['y']);

command('shield:user removegroup -n user11 -g invalid');

$this->assertStringContainsString(
'Invalid group: "invalid"',
$this->io->getLastOutput()
);

$users = model(UserModel::class);
$user = $users->findByCredentials(['email' => '[email protected]']);
$this->assertTrue($user->inGroup('admin'));
}

public function testRemovegroupCancel(): void
{
$this->createUser([
Expand Down