boban
/
mailwolt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rechtebechebung für User mit Sudorechte

main
boban 2025-10-20 00:06:44 +02:00
parent 033ae32538
commit 1516746c01
1 changed files with 50 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
app/Services/DkimService.php
View File

@ -109,31 +109,67 @@ class DkimService
// OpenDKIM einhängen (wenn Helper existiert) // OpenDKIM einhängen (wenn Helper existiert)
$helper = '/usr/local/sbin/mailwolt-install-dkim'; $helper = '/usr/local/sbin/mailwolt-install-dkim';
if (is_executable($helper)) { // if (is_executable($helper)) {
// $cmd = [
// 'sudo','-n', $helper,
// $domain->domain,
// $selKey,
// $privOKAbs, // …/storage/app/private/dkim/<dir>/<selector>.private
// $dnsTxtAbs // …/storage/app/private/dkim/<dir>/<selector>.txt
// ];
//
// $res = Process::timeout(30)->run($cmd);
//
// if ($res->failed()) {
// Log::error('DKIM install failed', [
// 'cmd' => implode(' ', $cmd),
// 'exit' => $res->exitCode(),
// 'out' => $res->output(),
// 'err' => $res->errorOutput(),
// ]);
// throw new RuntimeException(
// 'OpenDKIM-Install fehlgeschlagen: '.$res->errorOutput()
// );
// }
//
// // OpenDKIM neu laden (falls der Helper das nicht selbst tut)
// Process::run(['sudo','-n','systemctl','reload','opendkim']);
// }
$helper = '/usr/local/sbin/mailwolt-install-dkim';
Log::debug('DKIM helper call', [
'as' => trim(Process::run(['whoami'])->output()),
'helper' => $helper,
'exists' => is_file($helper),
// KEINE privaten Keys loggen!
]);
if (is_file($helper)) {
$cmd = [ $cmd = [
'sudo','-n', $helper, 'sudo','-n', $helper,
$domain->domain, $domain->domain,
$selKey, $selKey,
$privOKAbs, // …/storage/app/private/dkim/<dir>/<selector>.private $privOKAbs,
$dnsTxtAbs // …/storage/app/private/dkim/<dir>/<selector>.txt $dnsTxtAbs,
]; ];
$res = Process::timeout(30)->run($cmd); $res = Process::timeout(30)->run($cmd);
Log::info('DKIM install exit', [
'cmd' => implode(' ', $cmd),
'exit' => $res->exitCode(),
'out' => $res->output(),
'err' => $res->errorOutput(),
]);
if ($res->failed()) { if ($res->failed()) {
Log::error('DKIM install failed', [ throw new RuntimeException('OpenDKIM-Install fehlgeschlagen: '.$res->errorOutput());
'cmd' => implode(' ', $cmd),
'exit' => $res->exitCode(),
'out' => $res->output(),
'err' => $res->errorOutput(),
]);
throw new RuntimeException(
'OpenDKIM-Install fehlgeschlagen: '.$res->errorOutput()
);
} }
// OpenDKIM neu laden (falls der Helper das nicht selbst tut) Process::run(['sudo','-n','/usr/bin/systemctl','reload','opendkim']);
Process::run(['sudo','-n','systemctl','reload','opendkim']); } else {
Log::warning('DKIM helper not found', ['path' => $helper]);
} }
return [ return [