the-djmaze/snappymail
1
1
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2025-03-15 09:14:29 +08:00
Code Issues Projects Releases Packages Wiki Activity

Move generating admin_password RainLoop\Actions to RainLoop\ActionsAdmin

Browse source
This commit is contained in:
the-djmaze 2022-05-08 11:03:39 +02:00
parent 944b4ae856
commit fb95174f67
2 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php
View file

@ -748,18 +748,6 @@ class Actions
'UserBackgroundHash' => '' 'UserBackgroundHash' => ''
); );
$oSettings = null;
$passfile = APP_PRIVATE_DATA.'admin_password.txt';
$sPassword = $oConfig->Get('security', 'admin_password', '');
if (!$sPassword) {
$sPassword = \substr(\base64_encode(\random_bytes(16)), 0, 12);
Utils::saveFile($passfile, $sPassword . "\n");
// \chmod($passfile, 0600);
$oConfig->SetPassword($sPassword);
$oConfig->Save();
}
$sLanguage = $oConfig->Get('webmail', 'language', 'en'); $sLanguage = $oConfig->Get('webmail', 'language', 'en');
$UserLanguageRaw = $this->detectUserLanguage($bAdmin); $UserLanguageRaw = $this->detectUserLanguage($bAdmin);

15
snappymail/v/0.0.0/app/libraries/RainLoop/ActionsAdmin.php
View file

@ -660,6 +660,21 @@ class ActionsAdmin extends Actions
return $this->DefaultResponse(__FUNCTION__, true); return $this->DefaultResponse(__FUNCTION__, true);
} }
public function AppData(bool $bAdmin): array
{
$oConfig = $this->oConfig;
$passfile = APP_PRIVATE_DATA.'admin_password.txt';
$sPassword = $oConfig->Get('security', 'admin_password', '');
if (!$sPassword) {
$sPassword = \substr(\base64_encode(\random_bytes(16)), 0, 12);
Utils::saveFile($passfile, $sPassword . "\n");
// \chmod($passfile, 0600);
$oConfig->SetPassword($sPassword);
$oConfig->Save();
}
return parent::AppData($bAdmin);
}
private function setAdminAuthToken(string $sToken) : void private function setAdminAuthToken(string $sToken) : void
{ {
Utils::SetCookie(static::$AUTH_ADMIN_TOKEN_KEY, $sToken, 0); Utils::SetCookie(static::$AUTH_ADMIN_TOKEN_KEY, $sToken, 0);