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-19 23:24:16 +02:00
parent 127497b5cf
commit 260570b5a8
3 changed files with 71 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Models/Domain.php
View File

@ -7,6 +7,8 @@ use Illuminate\Database\Eloquent\Relations\HasMany;
class Domain extends Model class Domain extends Model
{ {
public $afterCommit = true;
protected $fillable = [ protected $fillable = [
'domain','description','tags', 'domain','description','tags',
'is_active','is_system','is_server', 'is_active','is_system','is_server',

62
app/Observers/DomainObserver.php
View File

@ -37,31 +37,6 @@ class DomainObserver
); );
} }
} }
// public function created(Domain $domain): void
// {
// if ($domain->is_server) {
// return;
// }
//
// $selector = (string) config('mailpool.defaults.dkim_selector', 'mwl1');
// $bits = (int) config('mailpool.defaults.dkim_bits', 2048);
//
// $res = app(\App\Services\DkimService::class)
// ->generateForDomain($domain, $bits, $selector);
//
// // DNS-Records gleich anlegen/aktualisieren
// app(\App\Services\DnsRecordService::class)->provision(
// $domain,
// $dk->selector,
// "v=DKIM1; k=rsa; p={$dk->public_key_txt}",
// [
// 'spf_tail' => \App\Models\Setting::get('mailpool.spf_tail', '~all'),
// 'spf_extra' => \App\Models\Setting::get('mailpool.spf_extra', []),
// 'dmarc_policy' => \App\Models\Setting::get('mailpool.dmarc_policy', 'none'),
// 'rua' => \App\Models\Setting::get('mailpool.rua', null),
// ]
// );
// }
/** /**
* Beim Löschen alle DKIM-Selector dieser Domain aus OpenDKIM entfernen. * Beim Löschen alle DKIM-Selector dieser Domain aus OpenDKIM entfernen.
@ -87,6 +62,38 @@ class DomainObserver
Log::error("Domain delete cleanup failed", ['domain'=>$domain->domain,'error'=>$e->getMessage()]); Log::error("Domain delete cleanup failed", ['domain'=>$domain->domain,'error'=>$e->getMessage()]);
} }
} }
public function forceDeleted(Domain $domain): void
{
$this->deleted($domain);
}
// public function created(Domain $domain): void
// {
// if ($domain->is_server) {
// return;
// }
//
// $selector = (string) config('mailpool.defaults.dkim_selector', 'mwl1');
// $bits = (int) config('mailpool.defaults.dkim_bits', 2048);
//
// $res = app(\App\Services\DkimService::class)
// ->generateForDomain($domain, $bits, $selector);
//
// // DNS-Records gleich anlegen/aktualisieren
// app(\App\Services\DnsRecordService::class)->provision(
// $domain,
// $dk->selector,
// "v=DKIM1; k=rsa; p={$dk->public_key_txt}",
// [
// 'spf_tail' => \App\Models\Setting::get('mailpool.spf_tail', '~all'),
// 'spf_extra' => \App\Models\Setting::get('mailpool.spf_extra', []),
// 'dmarc_policy' => \App\Models\Setting::get('mailpool.dmarc_policy', 'none'),
// 'rua' => \App\Models\Setting::get('mailpool.rua', null),
// ]
// );
// }
// public function deleted(Domain $domain): void // public function deleted(Domain $domain): void
// { // {
// try { // try {
@ -113,9 +120,4 @@ class DomainObserver
// ]); // ]);
// } // }
// } // }
public function forceDeleted(Domain $domain): void
{
$this->deleted($domain);
}
} }

48
app/Services/DkimService.php
View File

@ -159,24 +159,50 @@ class DkimService
return $san; return $san;
} }
// selector optional: wenn null → alle Selector der Domain löschen
public function removeForDomain(Domain|string $domain, ?string $selector = null): void public function removeForDomain(Domain|string $domain, ?string $selector = null): void
{ {
$name = $domain instanceof \App\Models\Domain ? $domain->domain : $domain; $name = $domain instanceof Domain ? $domain->domain : $domain;
$selector = $selector ?: (string) config('mailpool.defaults.dkim_selector', 'mwl1');
// Root-Helper ausführen if (is_null($selector)) {
$p = Process::run([ // alle Selector aus DB holen und nacheinander entfernen
'sudo','-n','/usr/local/sbin/mailwolt-remove-dkim', $keys = $domain instanceof Domain
$name, $selector ? $domain->dkimKeys()->pluck('selector')->all()
]); : \App\Models\DkimKey::whereHas('domain', fn($q) => $q->where('domain', $name))
if (!$p->successful()) { ->pluck('selector')->all();
throw new \RuntimeException('mailwolt-remove-dkim failed: '.$p->errorOutput());
$keys = $keys ?: ['mwl1']; // notfalls versuchen wir Standard
} else {
$keys = [$selector];
} }
// OpenDKIM neu laden foreach ($keys as $sel) {
Process::run(['sudo','-n','/usr/bin/systemctl','reload','opendkim']); Process::run(['sudo','-n','/usr/local/sbin/mailwolt-remove-dkim',$name,$sel]);
}
// Dienst neu laden (ohne Fehler abbrechen)
Process::run(['sudo','-n','/bin/systemctl','reload','opendkim']);
} }
// public function removeForDomain(Domain|string $domain, ?string $selector = null): void
// {
// $name = $domain instanceof \App\Models\Domain ? $domain->domain : $domain;
// $selector = $selector ?: (string) config('mailpool.defaults.dkim_selector', 'mwl1');
//
// // Root-Helper ausführen
// $p = Process::run([
// 'sudo','-n','/usr/local/sbin/mailwolt-remove-dkim',
// $name, $selector
// ]);
// if (!$p->successful()) {
// throw new \RuntimeException('mailwolt-remove-dkim failed: '.$p->errorOutput());
// }
//
// // OpenDKIM neu laden
// Process::run(['sudo','-n','/usr/bin/systemctl','reload','opendkim']);
// }
// public function removeForDomain(Domain|string $domain): void // public function removeForDomain(Domain|string $domain): void
// { // {
// $domainName = $domain instanceof Domain ? $domain->domain : $domain; // $domainName = $domain instanceof Domain ? $domain->domain : $domain;