mirror/php-adminer
1
0
Fork 0
mirror of https://github.com/vrana/adminer.git synced 2025-08-30 09:39:51 +02:00
Code Issues Releases Wiki Activity

Refactor working with a locked file

Browse Source
This commit is contained in:
Peter Knut
2024-10-07 22:20:32 +02:00
parent a494827dc5
commit a63fadd503
3 changed files with 40 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
adminer/include/auth.inc.php
View File

@@ -82,11 +82,11 @@ function build_http_url($server, $username, $password, $defaultServer, $defaultP
function add_invalid_login() { function add_invalid_login() {
global $adminer; global $adminer;
$fp = file_open_lock(get_temp_dir() . "/adminer.invalid"); $file = open_file_with_lock(get_temp_dir() . "/adminer.invalid");
if (!$fp) { if (!$file) {
return; return;
} }
$invalids = unserialize(stream_get_contents($fp)); $invalids = unserialize(stream_get_contents($file));
$time = time(); $time = time();
if ($invalids) { if ($invalids) {
foreach ($invalids as $ip => $val) { foreach ($invalids as $ip => $val) {
@@ -100,7 +100,7 @@ function add_invalid_login() {
$invalid = array($time + 30*60, 0); // active for 30 minutes $invalid = array($time + 30*60, 0); // active for 30 minutes
} }
$invalid[1]++; $invalid[1]++;
file_write_unlock($fp, serialize($invalids)); write_and_unlock_file($file, serialize($invalids));
} }
function check_invalid_login() { function check_invalid_login() {

6
adminer/include/bootstrap.inc.php
View File

@@ -32,9 +32,9 @@ if (isset($_GET["file"])) {
} }
if ($_GET["script"] == "version") { if ($_GET["script"] == "version") {
$fp = file_open_lock(get_temp_dir() . "/adminer.version"); $file = open_file_with_lock(get_temp_dir() . "/adminer.version");
if ($fp) { if ($file) {
file_write_unlock($fp, serialize(array("signature" => $_POST["signature"], "version" => $_POST["version"]))); write_and_unlock_file($file, serialize(["signature" => $_POST["signature"], "version" => $_POST["version"]]));
} }
exit; exit;
} }

55
adminer/include/functions.inc.php
View File

@@ -1215,33 +1215,42 @@ function get_temp_dir() {
return $return; return $return;
} }
/** Open and exclusively lock a file /**
* @param string * Opens and exclusively lock a file.
* @return resource or null for error *
* @param string $filename
* @return resource|null
*/ */
function file_open_lock($filename) { function open_file_with_lock($filename)
$fp = @fopen($filename, "r+"); // @ - may not exist {
if (!$fp) { // c+ is available since PHP 5.2.6 $file = fopen($filename, "c+");
$fp = @fopen($filename, "w"); // @ - may not be writable if (!$file) {
if (!$fp) { return null;
return;
}
chmod($filename, 0660);
}
flock($fp, LOCK_EX);
return $fp;
} }
/** Write and unlock a file chmod($filename, 0660);
* @param resource
* @param string if (!flock($file, LOCK_EX)) {
fclose($file);
return null;
}
return $file;
}
/**
* Writes and unlocks a file.
*
* @param resource $file
* @param string $data
*/ */
function file_write_unlock($fp, $data) { function write_and_unlock_file($file, $data)
rewind($fp); {
fwrite($fp, $data); rewind($file);
ftruncate($fp, strlen($data)); fwrite($file, $data);
flock($fp, LOCK_UN); ftruncate($file, strlen($data));
fclose($fp); flock($file, LOCK_UN);
fclose($file);
} }
/** /**