Skip to content

Fix #76961: vote throws a Server Error over ipv6 #53

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

Closed
petk wants to merge 1 commit into from
Closed

Fix #76961: vote throws a Server Error over ipv6 #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion sql/schema.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ CREATE TABLE bugdb_subscribe (
CREATE TABLE bugdb_votes (
bug int(8) NOT NULL default '0',
ts timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
ip int(10) unsigned NOT NULL default '0',
ip varbinary(16) NOT NULL,
score int(3) NOT NULL default '0',
reproduced int(1) NOT NULL default '0',
tried int(1) NOT NULL default '0',
Expand Down
14 changes: 9 additions & 5 deletions www/vote.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,11 @@ function get_real_ip ()
return ($ip ? $ip : $_SERVER['REMOTE_ADDR']);
}

$ip = ip2long(get_real_ip());
$ip = get_real_ip();
// TODO: check if ip address has been banned. hopefully this will never need to be implemented.

// Check whether the user has already voted on this bug.
$bug_check = $dbh->prepare("SELECT bug, ip FROM bugdb_votes WHERE bug = ? AND ip = ? LIMIT 1")
$bug_check = $dbh->prepare("SELECT bug, ip FROM bugdb_votes WHERE bug = ? AND ip = INET6_ATON(?) LIMIT 1")
->execute([$id, $ip])
->fetchRow();

Expand All @@ -70,21 +70,25 @@ function get_real_ip ()
$dbh->prepare("
INSERT INTO bugdb_votes (bug, ip, score, reproduced, tried, sameos, samever)
VALUES (
{$id}, {$ip}, {$score}, " .
?, INET6_ATON(?), ?, " .
($reproduced == 1 ? "1," : "0,") .
($reproduced != 2 ? "1," : "0,") .
($reproduced ? "$sameos," : "NULL,") .
($reproduced ? "$samever" : "NULL") .
')'
)->execute();
)->execute([
$id,
$ip,
$score
]);

// redirect to the bug page (which will display the success message)
redirect("bug.php?id=$id&thanks=6");
} else {
// As the user has already voted, just update their existing vote.
$dbh->prepare("UPDATE bugdb_votes
SET score = ?, reproduced = ? , tried = ?, sameos = ?, samever = ?
WHERE bug = ? AND ip = ?")
WHERE bug = ? AND ip = INET6_ATON(?)")
->execute([
$score,
($reproduced == 1 ? "1" : "0"),
Expand Down