perdedora/leftypol
1
0
Fork 0
forked from leftypol/leftypol
Code Pull requests Activity

anti-bot.php: refactor antibot transaction handling

Browse source
This commit is contained in:
Zankaria 2024-12-08 18:19:35 +01:00
parent 7fed118b1d
commit efec014bd1
1 changed files with 33 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

72
inc/anti-bot.php
View file

@ -204,49 +204,43 @@ function _create_antibot($pdo, $board, $thread) {
purge_old_antispam(); purge_old_antispam();
} }
retry_on_deadlock(4, function() use($config, $board, $thread) { // Keep the now invalid timestamps around for a bit to enable users to post if they're still on an old version of
// Keep the now invalid timestamps around for a bit to enable users to post if they're still on an old version of // the HTML page.
// the HTML page. // By virtue of existing, we know that we're making a new version of the page, and the user from now on may just reload.
// By virtue of existing, we know that we're making a new version of the page, and the user from now on may just reload. if ($thread) {
if ($thread) { $query = prepare('UPDATE ``antispam`` SET `expires` = UNIX_TIMESTAMP() + :expires WHERE `board` = :board AND `thread` = :thread AND `expires` IS NULL');
$query = prepare('UPDATE ``antispam`` SET `expires` = UNIX_TIMESTAMP() + :expires WHERE `board` = :board AND `thread` = :thread AND `expires` IS NULL'); } else {
} else { $query = prepare('UPDATE ``antispam`` SET `expires` = UNIX_TIMESTAMP() + :expires WHERE `board` = :board AND `thread` IS NULL AND `expires` IS NULL');
$query = prepare('UPDATE ``antispam`` SET `expires` = UNIX_TIMESTAMP() + :expires WHERE `board` = :board AND `thread` IS NULL AND `expires` IS NULL');
}
$query->bindValue(':board', $board);
if ($thread) {
$query->bindValue(':thread', $thread);
}
$query->bindValue(':expires', $config['spam']['hidden_inputs_expire']);
// Throws on error.
$query->execute();
});
try {
$hash = $antibot->hash();
retry_on_deadlock(2, function() use($board, $thread, $hash) {
// Insert an antispam with infinite life as the HTML page of a thread might last well beyond the expiry date.
$query = prepare('INSERT INTO ``antispam`` VALUES (:board, :thread, :hash, UNIX_TIMESTAMP(), NULL, 0)');
$query->bindValue(':board', $board);
$query->bindValue(':thread', $thread);
$query->bindValue(':hash', $hash);
// Throws on error.
$query->execute();
});
} catch(\PDOException $e) {
if ($e->errorInfo === null || $e->errorInfo[1] != MYSQL_ER_LOCK_DEADLOCK) {
throw $e;
} else {
error_log('Multiple deadlocks on _create_antibot while inserting, skipping');
}
} }
$query->bindValue(':board', $board);
if ($thread) {
$query->bindValue(':thread', $thread);
}
$query->bindValue(':expires', $config['spam']['hidden_inputs_expire']);
// Throws on error.
$query->execute();
$hash = $antibot->hash();
// Insert an antispam with infinite life as the HTML page of a thread might last well beyond the expiry date.
$query = prepare('INSERT INTO ``antispam`` VALUES (:board, :thread, :hash, UNIX_TIMESTAMP(), NULL, 0)');
$query->bindValue(':board', $board);
$query->bindValue(':thread', $thread);
$query->bindValue(':hash', $hash);
// Throws on error.
$query->execute();
$pdo->commit();
} catch (\PDOException $e) { } catch (\PDOException $e) {
$pdo->rollBack(); $pdo->rollBack();
throw $e; if ($e->errorInfo === null || $e->errorInfo[1] != MYSQL_ER_LOCK_DEADLOCK) {
throw $e;
} else {
error_log('Deadlock on _create_antibot while inserting, skipping');
}
} }
$pdo->commit();
return $antibot; return $antibot;
} }