Skip to content

Fix acls and then some... #491

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
krulis-martin merged 2 commits into from
Jun 9, 2025
Merged

Fix acls and then some... #491

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
47333f6
Allow regular supervisors see IP addresses of exam locks.
krulis-martin Jun 9, 2025
ddd4e5a
Normalize line endings in file content previews.
krulis-martin Jun 9, 2025
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
1 change: 1 addition & 0 deletions app/V1Module/presenters/UploadedFilesPresenter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,7 @@ public function actionContent(string $id, ?string $entry = null)
// Remove UTF BOM prefix...
$utf8bom = "\xef\xbb\xbf";
$contents = Strings::replace($contents, "~^$utf8bom~");
$contents = str_replace("\r\n", "\n", $contents); // normalize line endings

$fixedContents = @mb_convert_encoding($contents, 'UTF-8', 'UTF-8');

Expand Down
2 changes: 1 addition & 1 deletion app/config/permissions.neon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ permissions:

- allow: true
resource: group
role: empowered-supervisor
role: supervisor
actions:
- viewExamLocksIPs
conditions:
Expand Down
31 changes: 0 additions & 31 deletions tests/Presenters/GroupsPresenter.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1788,40 +1788,9 @@ class TestGroupsPresenter extends Tester\TestCase
);
}

public function testGetExamLocks()
{
$group = $this->prepExamGroup(); // logged in as supervisor
$student = $this->presenter->users->getByEmail("demoGroupMember1@example.com");

$now = (new DateTime())->getTimestamp();
$begin = $now - 7200;
$end = $now - 3600;
$group->setExamPeriod(DateTime::createFromFormat('U', $begin), DateTime::createFromFormat('U', $end));
$this->presenter->groups->persist($group);

$exam = new GroupExam($group, DateTime::createFromFormat('U', $begin), DateTime::createFromFormat('U', $end), false);
$this->presenter->groupExams->persist($exam);

$lock = new GroupExamLock($exam, $student, '1.2.3.4');
$this->presenter->groupExamLocks->persist($lock);

$payload = PresenterTestHelper::performPresenterRequest(
$this->presenter,
'V1:Groups',
'GET',
['action' => 'getExamLocks', 'id' => $group->getId(), 'examId' => $exam->getId()],
);

Assert::count(1, $payload);
Assert::equal($exam->getId(), $payload[0]['groupExamId']);
Assert::equal($student->getId(), $payload[0]['studentId']);
Assert::false(array_key_exists('remoteAddr', $payload[0])); // supervisor cannot se IPs
}

public function testGetExamLocksWithIPs()
{
$group = $this->prepExamGroup();
PresenterTestHelper::loginDefaultAdmin($this->container); // admin can see IPs
$student = $this->presenter->users->getByEmail("demoGroupMember1@example.com");

$now = (new DateTime())->getTimestamp();
Expand Down