Skip to content

BillionMail gives you open-source MailServer, NewsLetter, Email Marketing — fully self-hosted, dev-friendly, and free from monthly fees. Join the discord: https://discord.gg/asfXzBUhZr

fixed rspamd not add DKIM header on email sending, file permission denied.

Jack7bfbd699fac4
diff --git a/core/internal/service/domains/domains.go b/core/internal/service/domains/domains.go
index ade03908..04879ac0 100644
--- a/core/internal/service/domains/domains.go
+++ b/core/internal/service/domains/domains.go
@@ -232,7 +232,7 @@ func GetDKIMRecord(domain string, validateImmediate bool) (record v1.DNSRecord,
// Check if directory exists
if !public.IsDir(dkimPath) {
- _ = os.MkdirAll(dkimPath, 0644)
+ _ = os.MkdirAll(dkimPath, 0755)
}
// Check if DKIM private and public key files exist
@@ -272,6 +272,13 @@ func GetDKIMRecord(domain string, validateImmediate bool) (record v1.DNSRecord,
}
}
+ // update dkim private key file permission to 0644
+ err = os.Chmod(dkimPriPath, 0644)
+ if err != nil {
+ err = fmt.Errorf("Failed to change DKIM private key permissions: %v", err)
+ return
+ }
+
// build DKIM Sign config
signConf := fmt.Sprintf(`#%s_DKIM_BEGIN
%s {
@@ -551,6 +558,11 @@ func GetRecordsInCache(domain string) (records v1.DNSRecords) {
// RepairDKIMSigningConfig repairs the DKIM signing configuration file.
func RepairDKIMSigningConfig(ctx context.Context) error {
+ g.Log().Debug(ctx, "Repairing DKIM signing config...")
+ defer func() {
+ g.Log().Debug(ctx, "Repairing DKIM signing config completed.")
+ }()
+
// Read the DKIM signing configuration file
signConfPath := public.AbsPath(filepath.Join(consts.RSPAMD_LOCAL_D_PATH, "dkim_signing.conf"))
signContent, err := public.ReadFile(signConfPath)
@@ -574,5 +586,44 @@ func RepairDKIMSigningConfig(ctx context.Context) error {
return fmt.Errorf("Failed to write DKIM signing config: %v", err)
}
+ // update dkim files permission to 0644
+ filepath.Walk(filepath.Join(public.AbsPath(consts.RSPAMD_LIB_PATH), "dkim"), func(path string, info os.FileInfo, err error) error {
+ if err != nil {
+ return err
+ }
+
+ if info.IsDir() {
+ // set directory permission to 0755
+ err = os.Chmod(path, 0755)
+
+ if err != nil {
+ return fmt.Errorf("Failed to change DKIM directory permissions: %v", err)
+ }
+ }
+
+ if strings.HasSuffix(path, ".private") || strings.HasSuffix(path, ".pub") {
+ err = os.Chmod(path, 0644)
+
+ if err != nil {
+ return fmt.Errorf("Failed to change DKIM file permissions: %v", err)
+ }
+ }
+
+ return nil
+ })
+
+ // Restart rspamd service
+ dk, err := docker.NewDockerAPI()
+ if err != nil {
+ return fmt.Errorf("Failed to connect to Docker API: %v", err)
+ }
+
+ defer dk.Close()
+
+ err = dk.RestartContainerByName(ctx, "billionmail-rspamd-billionmail-1")
+ if err != nil {
+ return fmt.Errorf("Failed to restart rspamd container: %v", err)
+ }
+
return nil
}
diff --git a/core/internal/service/public/self_signed_cert.go b/core/internal/service/public/self_signed_cert.go
index 2a9ca5c3..88388ba8 100644
--- a/core/internal/service/public/self_signed_cert.go
+++ b/core/internal/service/public/self_signed_cert.go
@@ -53,7 +53,7 @@ func (sp *selfSignedCertProvider) Generate() {
// createOffline creates self-signed certificate offline
func (sp *selfSignedCertProvider) createOffline() error {
// Ensure ssl directory exists
- err := os.MkdirAll(filepath.Dir(sp.certFile), 0644)
+ err := os.MkdirAll(filepath.Dir(sp.certFile), 0755)
if err != nil {
g.Log().Error(context.Background(), "Failed to generate self-signed certificate:", err)