yolinlin/aowow
1
0
Fork 0
mirror of https://github.com/Sarjuuk/aowow.git synced 2025-11-29 15:58:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

CLI/FileAccess

Browse Source 
* fix deep file/dir creation
 * also edited file permissions again and left a note so it doen't happen again .. maybe
This commit is contained in:
Sarjuuk
2024-06-17 15:41:42 +02:00
parent 0117916da9
commit d03448b053
1 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
includes/utilities.php
View File

@@ -495,11 +495,17 @@ class Timer
abstract class Util abstract class Util
{ {
const FILE_ACCESS = 0755; /* NOTE!
const DIR_ACCESS = 0777; * FILE_ACCESS should be 0755 or less, but CLI and web interface both access the same files. While in CLI php is executed with the current users perms,
* while the web interface is always executed by www-data (or whoever runs the web server) who does not own the files previously created via CLI.
* And thus web interface actions fail with permission denied, unless the files are flagged +wx for everyone.
* This probably has to be solved on the system level by having www-data and the CLI user share a group or something.
*/
public const FILE_ACCESS = 0777;
public const DIR_ACCESS = 0777;
const GEM_SCORE_BASE_WOTLK = 16; // rare quality wotlk gem score private const GEM_SCORE_BASE_WOTLK = 16; // rare quality wotlk gem score
const GEM_SCORE_BASE_BC = 8; // rare quality bc gem score private const GEM_SCORE_BASE_BC = 8; // rare quality bc gem score
private static $perfectGems = null; private static $perfectGems = null;
@@ -1294,25 +1300,32 @@ abstract class Util
trigger_error('could not create file', E_USER_ERROR); trigger_error('could not create file', E_USER_ERROR);
if ($success) if ($success)
@chmod($file, Util::FILE_ACCESS); @chmod($file, self::FILE_ACCESS);
return $success; return $success;
} }
public static function writeDir($dir) public static function writeDir(string $dir, bool &$exist = true) : bool
{ {
// remove multiple slashes // remove multiple slashes; trailing slashes
$dir = preg_replace('|/+|', '/', $dir); $dir = preg_replace(['/\/+/', '/\/$/'], ['/', ''], $dir);
$exist = is_dir($dir);
if (is_dir($dir)) if ($exist)
{ {
if (!is_writable($dir) && !@chmod($dir, Util::DIR_ACCESS)) if (fileperms($dir) != self::DIR_ACCESS && !@chmod($dir, self::DIR_ACCESS))
trigger_error('cannot write into directory', E_USER_ERROR); trigger_error(CLI::bold($dir) . ' may be inaccessible to the web service.', E_USER_WARNING);
return is_writable($dir); return is_writable($dir);
} }
if (@mkdir($dir, Util::DIR_ACCESS, true)) // apparently chmod can't edit a whole path at once
$path = '';
foreach(explode('/', $dir) as $segment)
if (is_dir($path .= $segment.'/') && fileperms($path) != self::DIR_ACCESS)
@chmod($path, self::DIR_ACCESS);
if (@mkdir($dir, self::DIR_ACCESS, true))
return true; return true;
trigger_error('could not create directory', E_USER_ERROR); trigger_error('could not create directory', E_USER_ERROR);