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

Fix the relay configuration password encryption issue

lotk94f22adbdbe2
diff --git a/core/internal/controller/relay/relay_v1_list_relay_configs.go b/core/internal/controller/relay/relay_v1_list_relay_configs.go
index bdf1ac45..93c25294 100644
--- a/core/internal/controller/relay/relay_v1_list_relay_configs.go
+++ b/core/internal/controller/relay/relay_v1_list_relay_configs.go
@@ -49,6 +49,7 @@ func (c *ControllerV1) ListRelayConfigs(ctx context.Context, req *v1.ListRelayCo
}
for _, config := range configs {
+ password,_ := relay_service.DecryptPassword(ctx,config.AuthPassword)
relayWithSPF := &v1.BmRelayWithSPF{
BmRelay: &v1.BmRelay{
@@ -58,7 +59,7 @@ func (c *ControllerV1) ListRelayConfigs(ctx context.Context, req *v1.ListRelayCo
RelayHost: config.RelayHost,
RelayPort: config.RelayPort,
AuthUser: config.AuthUser,
- AuthPassword: config.AuthPassword,
+ AuthPassword: password,
Ip: config.Ip,
Host: config.Host,
Active: config.Active,
diff --git a/core/internal/controller/relay/relay_v1_update_relay_config.go b/core/internal/controller/relay/relay_v1_update_relay_config.go
index aae92a48..ec35bf79 100644
--- a/core/internal/controller/relay/relay_v1_update_relay_config.go
+++ b/core/internal/controller/relay/relay_v1_update_relay_config.go
@@ -133,6 +133,15 @@ func (c *ControllerV1) UpdateRelayConfig(ctx context.Context, req *v1.UpdateRela
return res, nil
}
} else {
+
+ _, err = tx.Model("bm_relay_domain_mapping").
+ Where("relay_id", req.ID).
+ Delete()
+ if err != nil {
+ res.SetError(gerror.New(public.LangCtx(ctx, "Failed to delete sender domains: {}", err.Error())))
+ return res, nil
+ }
+
var domains_ []string
for _, domain := range req.SenderDomains {
diff --git a/core/internal/service/database_initialization/smtp_relay.go b/core/internal/service/database_initialization/smtp_relay.go
index e8ca4d64..c50b6a0f 100644
--- a/core/internal/service/database_initialization/smtp_relay.go
+++ b/core/internal/service/database_initialization/smtp_relay.go
@@ -67,6 +67,12 @@ func init() {
return
}
}
+
+ if err := cleanupAndIndexRelayDomainMapping(ctx); err != nil {
+ g.Log().Error(ctx, "Failed to cleanup duplicates or create unique index:", err)
+ return
+ }
+
// There is a rename table that has been synchronized. Skip.
existsOld := checkTableExists(ctx, "bm_relay_old")
if existsOld {
@@ -89,6 +95,48 @@ func init() {
})
}
+// cleanupAndIndexRelayDomainMapping
+func cleanupAndIndexRelayDomainMapping(ctx context.Context) error {
+ if !checkTableExists(ctx, "bm_relay_domain_mapping") {
+ return gerror.New("Table bm_relay_domain_mapping does not exist")
+ }
+
+ var exists int
+ err := g.DB().Model("pg_indexes").Fields("1").
+ Where("indexname", "uk_relay_domain").
+ Scan(&exists)
+ if err != nil {
+ return err
+ }
+ if exists == 1 {
+ g.Log().Info(ctx, "Unique index uk_relay_domain already exists, skip cleanup.")
+ return nil
+ }
+
+ _, err = g.DB().Exec(ctx, `
+ DELETE FROM bm_relay_domain_mapping
+ WHERE id NOT IN (
+ SELECT MIN(id)
+ FROM bm_relay_domain_mapping
+ GROUP BY relay_id, sender_domain
+ )
+ `)
+ if err != nil {
+ return gerror.Wrap(err, "Failed to remove duplicates from bm_relay_domain_mapping")
+ }
+
+ _, err = g.DB().Exec(ctx, `
+ CREATE UNIQUE INDEX uk_relay_domain
+ ON bm_relay_domain_mapping(relay_id, sender_domain)
+ `)
+ if err != nil {
+ return gerror.Wrap(err, "Failed to create unique index uk_relay_domain")
+ }
+
+ g.Log().Info(ctx, "Cleanup duplicates and created unique index on bm_relay_domain_mapping")
+ return nil
+}
+
func migrateRelayData(ctx context.Context) error {
existsOld := checkTableExists(ctx, "bm_relay")
diff --git a/core/internal/service/mail_boxes/update_used_space.go b/core/internal/service/mail_boxes/update_used_space.go
index 504ceb68..95d91327 100644
--- a/core/internal/service/mail_boxes/update_used_space.go
+++ b/core/internal/service/mail_boxes/update_used_space.go
@@ -217,7 +217,6 @@ func readMaildirsize(userDir string) (int64, error) {
continue
}
- // <size> <mtime> 或 <size> <mtime> <flags>
sizeStr := parts[0]
sizeStr = strings.TrimSuffix(sizeStr, "S")