mirror/Arsse
1
1
Fork 0
mirror of https://code.mensbeam.com/MensBeam/Arsse.git synced 2024-12-22 13:12:41 +00:00
Code Issues Activity

Refine some exceptions

Browse source
This commit is contained in:
J. King 2021-06-21 19:51:27 -04:00
parent b9fd9ac32e
commit 5b3e8fbef0
2 changed files with 19 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/AbstractException.php
View file

@ -109,6 +109,10 @@ abstract class AbstractException extends \Exception {
"Service/Exception.pidUnreadable" => 10805, "Service/Exception.pidUnreadable" => 10805,
"Service/Exception.pidUnwritable" => 10806, "Service/Exception.pidUnwritable" => 10806,
"Service/Exception.pidUncreatable" => 10807, "Service/Exception.pidUncreatable" => 10807,
"Service/Exception.pidCorrupt" => 10808,
"Service/Exception.pidDuplicate" => 10809,
"Service/Exception.pidLocked" => 10810,
"Service/Exception.pidInaccessible" => 10811,
]; ];
protected $symbol; protected $symbol;

24
lib/Service/Daemon.php
View file

@ -7,6 +7,8 @@ declare(strict_types=1);
namespace JKingWeb\Arsse\Service; namespace JKingWeb\Arsse\Service;
class Daemon { class Daemon {
protected const PID_PATTERN = "/^(?:[1-9]\d{0,77})*$/s"; // no more than 78 digits (256-bit unsigned integer), starting with a digit other than zero
/** Daemonizes the process via the traditional sysvinit double-fork procedure /** Daemonizes the process via the traditional sysvinit double-fork procedure
* *
* @codeCoverageIgnore * @codeCoverageIgnore
@ -20,7 +22,7 @@ class Daemon {
# Reset all signal handlers to their default. This is best done by iterating through the available signals up to the limit of _NSIG and resetting them to SIG_DFL. # Reset all signal handlers to their default. This is best done by iterating through the available signals up to the limit of _NSIG and resetting them to SIG_DFL.
// We have not yet set any signal handlers, so this should be fine // We have not yet set any signal handlers, so this should be fine
# Reset the signal mask using sigprocmask(). # Reset the signal mask using sigprocmask().
// Not possible to my knowledge pcntl_sigprocmask(\SIG_SETMASK, []);
# Sanitize the environment block, removing or resetting environment variables that might negatively impact daemon runtime. # Sanitize the environment block, removing or resetting environment variables that might negatively impact daemon runtime.
//Not necessary; we don't use the environment //Not necessary; we don't use the environment
# Call fork(), to create a background process. # Call fork(), to create a background process.
@ -77,10 +79,12 @@ class Daemon {
protected function checkPID(string $pidfile) { protected function checkPID(string $pidfile) {
if (file_exists($pidfile)) { if (file_exists($pidfile)) {
$pid = (string) @file_get_contents($pidfile); $pid = (string) @file_get_contents($pidfile);
if (preg_match("/^\d+$/s", $pid)) { if (preg_match(static::PID_PATTERN, $pid)) {
if ($this->processExists((int) $pid)) { if (strlen($pid) && $this->processExists((int) $pid)) {
throw new \Exception("Process already exists"); throw new Exception("pidDuplicate", ['pid' => $pid]);
} }
} else {
throw new Exception("pidCorrupt", ['pidfile' => $pidfile]);
} }
} }
} }
@ -89,11 +93,13 @@ class Daemon {
if ($f = @fopen($pidfile, "c+")) { if ($f = @fopen($pidfile, "c+")) {
if (@flock($f, \LOCK_EX | \LOCK_NB)) { if (@flock($f, \LOCK_EX | \LOCK_NB)) {
// confirm that some other process didn't get in before us // confirm that some other process didn't get in before us
$pid = fread($f, 100); $pid = fread($f, 80);
if (preg_match("/^\d+$/s", (string) $pid)) { if (preg_match(static::PID_PATTERN, (string) $pid)) {
if ($this->processExists((int) $pid)) { if ($this->processExists((int) $pid)) {
throw new \Exception("Process already exists"); throw new Exception("pidDuplicate", ['pid' => $pid]);
} }
} else {
throw new Exception("pidCorrupt", ['pidfile' => $pidfile]);
} }
// write the PID to the pidfile // write the PID to the pidfile
rewind($f); rewind($f);
@ -101,10 +107,10 @@ class Daemon {
fwrite($f, (string) posix_getpid()); fwrite($f, (string) posix_getpid());
fclose($f); fclose($f);
} else { } else {
throw new \Exception("Process already exists"); throw new Exception("pidLocked", ['pidfile' => $pidfile]);
} }
} else { } else {
throw new \Exception("Could not write to PID file"); throw new Exception("pidInaccessible", ['pidfile' => $pidfile]);
} }
} }