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

GH-114: Lock down bug tracker to developers only #120

Merged
merged 4 commits into from
Aug 1, 2024
Merged

GH-114: Lock down bug tracker to developers only #120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
de2cc8c
GH-114: Lock down bug tracker to developers only
cmb69 Jul 20, 2024
156851d
Disallow users to comment
cmb69 Jul 20, 2024
511cbc9
Disable voting (fixes #112)
cmb69 Jul 20, 2024
1ead289
We still may need the package list
cmb69 Jul 31, 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
23 changes: 10 additions & 13 deletions www/bug.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,11 +210,10 @@
// Check if session answer is set, then compare it with the post captcha value.
// If it's not the same, then it's an incorrect password.
if (!$logged_in) {
if (!isset($_SESSION['answer'])) {
$errors[] = 'Please enable cookies so the Captcha system can work';
} elseif ($_POST['captcha'] != $_SESSION['answer']) {
$errors[] = 'Incorrect Captcha';
}
response_header('Developers only');
display_bug_error('Only developers are allowed to comment; if you are the original reporter use the Edit tab');
response_footer();
exit;
}

$ncomment = trim($_POST['ncomment']);
Expand Down Expand Up @@ -719,7 +718,6 @@
if ($bug_id !== 'PREVIEW') {
echo '<div class="controls">', "\n",
control(0, 'View'),
($bug['private'] == 'N' ? control(3, 'Add Comment') : ''),
control(1, 'Developer'),
(!$email || $bug['email'] == $email? control(2, 'Edit') : ''),
'</div>', "\n";
Expand Down Expand Up @@ -804,9 +802,7 @@
<?php if (!isset($_POST['in'])) { ?>
Welcome back! If you're the original bug submitter, here's
where you can edit the bug or add additional notes.<br>
If this is not your bug, you can
<a href="bug.php?id=<?php echo $bug_id; ?>&amp;edit=3">add a comment by following this link</a>.<br>
If this is your bug, but you forgot your password, <a href="bug-pwd-finder.php?id=<?php echo $bug_id; ?>">you can retrieve your password here</a>.<br>
If you forgot your password, <a href="bug-pwd-finder.php?id=<?php echo $bug_id; ?>">you can retrieve your password here</a>.<br>
<?php } ?>

<table>
Expand All @@ -831,8 +827,7 @@
?>
<div class="explain">
Welcome! If you don't have a Git account, you can't do anything here.<br>
You can <a href="bug.php?id=<?php echo $bug_id; ?>&amp;edit=3">add a comment by following this link</a>
or if you reported this bug, you can <a href="bug.php?id=<?php echo $bug_id; ?>&amp;edit=2">edit this bug over here</a>.
If you reported this bug, you can <a href="bug.php?id=<?php echo $bug_id; ?>&amp;edit=2">edit this bug over here</a>.
<div class="details">
<label for="svnuser">php.net Username:</label>
<input type="text" id="svnuser" name="user" value="<?php echo htmlspecialchars($user); ?>" size="10" maxlength="20">
Expand Down Expand Up @@ -1109,7 +1104,9 @@
<br>
OUTPUT;
}
echo "<p><a href='patch-add.php?bug_id={$bug_id}'>Add a Patch</a></p>";
if ($logged_in) {
echo "<p><a href='patch-add.php?bug_id={$bug_id}'>Add a Patch</a></p>";
}
Comment on lines -1112 to +1109
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Only show "add a patch" button for developers, now.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also tested, and fine.

There is also still a link "add pull request" in the same fashion though (line 1116 below), but I guess we can leave that one?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is an open issue in the OP's todo list. I think we should still allow to link PRs (they do no real harm), although that is debatable.


$pullRequestRepository = $container->get(PullRequestRepository::class);
$pulls = $pullRequestRepository->findAllByBugId($bug_id);
Expand Down Expand Up @@ -1291,5 +1288,5 @@ function control($num, $desc)

function canvote($thanks, $status)
{
return ($thanks != 4 && $thanks != 6 && $status != 'Closed' && $status != 'Not a bug' && $status != 'Duplicate');
return false;
}
3 changes: 1 addition & 2 deletions www/fix.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,7 @@
<?php } else { ?>
<div class="explain">
Welcome! If you don't have a Git account, you can't do anything here.<br>
You can <a href="bug.php?id=<?php echo $bug_id; ?>&amp;edit=3">add a comment by following this link</a>
or if you reported this bug, you can <a href="bug.php?id=<?php echo $bug_id; ?>&amp;edit=2">edit this bug over here</a>.
If you reported this bug, you can <a href="bug.php?id=<?php echo $bug_id; ?>&amp;edit=2">edit this bug over here</a>.
<div class="details">
<label for="svnuser">php.net Username:</label>
<input type="text" id="svnuser" name="user" value="<?php echo htmlspecialchars($user) ?>" size="10" maxlength="20">
Expand Down
7 changes: 7 additions & 0 deletions www/patch-add.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,13 @@
// Authenticate
bugs_authenticate($user, $pw, $logged_in, $user_flags);

if (!$logged_in) {
response_header('Developers only');
display_bug_error('Only developers are allowed to add patches');
response_footer();
exit;
}

$canpatch = true;

/// Input vars
Expand Down
2 changes: 2 additions & 0 deletions www/vote.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
use App\Repository\BugRepository;
use App\Repository\VoteRepository;

die('Voting on tickets is disabled');

// Obtain common includes
require_once '../include/prepend.php';

Expand Down