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
TODO: complaintRate (complaintCount / successfulSends)
1leozhao36fafd5c0dad
diff --git a/conf/core/fail2ban_init/filter.d/core-limit-filter.conf b/conf/core/fail2ban_init/filter.d/core-limit-filter.confold mode 100644new mode 100755diff --git a/conf/core/fail2ban_init/filter.d/roundcube-limit-filter.conf b/conf/core/fail2ban_init/filter.d/roundcube-limit-filter.confold mode 100644new mode 100755diff --git a/conf/core/fail2ban_init/jail.d/core-accesslimit.conf b/conf/core/fail2ban_init/jail.d/core-accesslimit.confold mode 100644new mode 100755diff --git a/conf/core/fail2ban_init/jail.d/roundcube-accesslimit.conf b/conf/core/fail2ban_init/jail.d/roundcube-accesslimit.confold mode 100644new mode 100755diff --git a/conf/dovecot/conf.d/10-auth.conf b/conf/dovecot/conf.d/10-auth.confold mode 100644new mode 100755diff --git a/conf/dovecot/conf.d/10-director.conf b/conf/dovecot/conf.d/10-director.confold mode 100644new mode 100755diff --git a/conf/dovecot/conf.d/10-logging.conf b/conf/dovecot/conf.d/10-logging.confold mode 100644new mode 100755diff --git a/conf/dovecot/conf.d/10-mail.conf b/conf/dovecot/conf.d/10-mail.confold mode 100644new mode 100755diff --git a/conf/dovecot/conf.d/10-master.conf b/conf/dovecot/conf.d/10-master.confold mode 100644new mode 100755diff --git a/conf/dovecot/conf.d/10-ssl.conf b/conf/dovecot/conf.d/10-ssl.confold mode 100644new mode 100755diff --git a/conf/dovecot/conf.d/10-tcpwrapper.conf b/conf/dovecot/conf.d/10-tcpwrapper.confold mode 100644new mode 100755diff --git a/conf/dovecot/conf.d/15-lda.conf b/conf/dovecot/conf.d/15-lda.confold mode 100644new mode 100755diff --git a/conf/dovecot/conf.d/15-mailboxes.conf b/conf/dovecot/conf.d/15-mailboxes.confold mode 100644new mode 100755diff --git a/conf/dovecot/conf.d/20-imap.conf b/conf/dovecot/conf.d/20-imap.confold mode 100644new mode 100755diff --git a/conf/dovecot/conf.d/20-lmtp.conf b/conf/dovecot/conf.d/20-lmtp.confold mode 100644new mode 100755diff --git a/conf/dovecot/conf.d/20-pop3.conf b/conf/dovecot/conf.d/20-pop3.confold mode 100644new mode 100755diff --git a/conf/dovecot/conf.d/90-acl.conf b/conf/dovecot/conf.d/90-acl.confold mode 100644new mode 100755diff --git a/conf/dovecot/conf.d/90-plugin.conf b/conf/dovecot/conf.d/90-plugin.confold mode 100644new mode 100755diff --git a/conf/dovecot/conf.d/90-quota.conf b/conf/dovecot/conf.d/90-quota.confold mode 100644new mode 100755diff --git a/conf/dovecot/conf.d/90-sieve-extprograms.conf b/conf/dovecot/conf.d/90-sieve-extprograms.confold mode 100644new mode 100755diff --git a/conf/dovecot/conf.d/90-sieve.conf b/conf/dovecot/conf.d/90-sieve.confold mode 100644new mode 100755diff --git a/conf/dovecot/conf.d/90-sieve_rspamd.conf b/conf/dovecot/conf.d/90-sieve_rspamd.confold mode 100644new mode 100755diff --git a/conf/dovecot/conf.d/auth-checkpassword.conf.ext b/conf/dovecot/conf.d/auth-checkpassword.conf.extold mode 100644new mode 100755diff --git a/conf/dovecot/conf.d/auth-deny.conf.ext b/conf/dovecot/conf.d/auth-deny.conf.extold mode 100644new mode 100755diff --git a/conf/dovecot/conf.d/auth-dict.conf.ext b/conf/dovecot/conf.d/auth-dict.conf.extold mode 100644new mode 100755diff --git a/conf/dovecot/conf.d/auth-ldap.conf.ext b/conf/dovecot/conf.d/auth-ldap.conf.extold mode 100644new mode 100755diff --git a/conf/dovecot/conf.d/auth-master.conf.ext b/conf/dovecot/conf.d/auth-master.conf.extold mode 100644new mode 100755diff --git a/conf/dovecot/conf.d/auth-passwdfile.conf.ext b/conf/dovecot/conf.d/auth-passwdfile.conf.extold mode 100644new mode 100755diff --git a/conf/dovecot/conf.d/auth-sql.conf.ext b/conf/dovecot/conf.d/auth-sql.conf.extold mode 100644new mode 100755diff --git a/conf/dovecot/conf.d/auth-static.conf.ext b/conf/dovecot/conf.d/auth-static.conf.extold mode 100644new mode 100755diff --git a/conf/dovecot/conf.d/auth-system.conf.ext b/conf/dovecot/conf.d/auth-system.conf.extold mode 100644new mode 100755diff --git a/conf/dovecot/dovecot.conf b/conf/dovecot/dovecot.confold mode 100644new mode 100755diff --git a/conf/dovecot/rsyslog.conf b/conf/dovecot/rsyslog.confold mode 100644new mode 100755diff --git a/conf/php/pear.conf b/conf/php/pear.confold mode 100644new mode 100755diff --git a/conf/php/php-fpm.conf b/conf/php/php-fpm.confold mode 100644new mode 100755diff --git a/conf/php/php-fpm.conf.default b/conf/php/php-fpm.conf.defaultold mode 100644new mode 100755diff --git a/conf/php/php-fpm.d/docker.conf b/conf/php/php-fpm.d/docker.confold mode 100644new mode 100755diff --git a/conf/php/php-fpm.d/www.conf b/conf/php/php-fpm.d/www.confold mode 100644new mode 100755diff --git a/conf/php/php-fpm.d/www.conf.default b/conf/php/php-fpm.d/www.conf.defaultold mode 100644new mode 100755diff --git a/conf/php/php/conf.d/docker-fpm.ini b/conf/php/php/conf.d/docker-fpm.iniold mode 100644new mode 100755diff --git a/conf/php/php/conf.d/docker-php-ext-exif.ini b/conf/php/php/conf.d/docker-php-ext-exif.iniold mode 100644new mode 100755diff --git a/conf/php/php/conf.d/docker-php-ext-gd.ini b/conf/php/php/conf.d/docker-php-ext-gd.iniold mode 100644new mode 100755diff --git a/conf/php/php/conf.d/docker-php-ext-imagick.ini b/conf/php/php/conf.d/docker-php-ext-imagick.iniold mode 100644new mode 100755diff --git a/conf/php/php/conf.d/docker-php-ext-intl.ini b/conf/php/php/conf.d/docker-php-ext-intl.iniold mode 100644new mode 100755diff --git a/conf/php/php/conf.d/docker-php-ext-ldap.ini b/conf/php/php/conf.d/docker-php-ext-ldap.iniold mode 100644new mode 100755diff --git a/conf/php/php/conf.d/docker-php-ext-opcache.ini b/conf/php/php/conf.d/docker-php-ext-opcache.iniold mode 100644new mode 100755diff --git a/conf/php/php/conf.d/docker-php-ext-pdo_mysql.ini b/conf/php/php/conf.d/docker-php-ext-pdo_mysql.iniold mode 100644new mode 100755diff --git a/conf/php/php/conf.d/docker-php-ext-pdo_pgsql.ini b/conf/php/php/conf.d/docker-php-ext-pdo_pgsql.iniold mode 100644new mode 100755diff --git a/conf/php/php/conf.d/docker-php-ext-pspell.ini b/conf/php/php/conf.d/docker-php-ext-pspell.iniold mode 100644new mode 100755diff --git a/conf/php/php/conf.d/docker-php-ext-redis.ini b/conf/php/php/conf.d/docker-php-ext-redis.iniold mode 100644new mode 100755diff --git a/conf/php/php/conf.d/docker-php-ext-sodium.ini b/conf/php/php/conf.d/docker-php-ext-sodium.iniold mode 100644new mode 100755diff --git a/conf/php/php/conf.d/docker-php-ext-zip.ini b/conf/php/php/conf.d/docker-php-ext-zip.iniold mode 100644new mode 100755diff --git a/conf/php/php/conf.d/roundcube-defaults.ini b/conf/php/php/conf.d/roundcube-defaults.iniold mode 100644new mode 100755diff --git a/conf/postfix/main.cf b/conf/postfix/main.cfold mode 100644new mode 100755index 514143c1..3f8cb179--- a/conf/postfix/main.cf+++ b/conf/postfix/main.cf@@ -71,3 +71,7 @@ message_size_limit = 102400000## Do not delete the following identification configuration# Overrides-configuration #+++# User Overrides-configuration+myhostname = mail.example.comdiff --git a/conf/postfix/master.cf b/conf/postfix/master.cfold mode 100644new mode 100755diff --git a/conf/postfix/rsyslog.conf b/conf/postfix/rsyslog.confold mode 100644new mode 100755diff --git a/conf/redis/redis-conf.sh b/conf/redis/redis-conf.shold mode 100644new mode 100755diff --git a/conf/rspamd/local.d/milter_headers.conf b/conf/rspamd/local.d/milter_headers.confold mode 100644new mode 100755diff --git a/conf/rspamd/rspamd.conf b/conf/rspamd/rspamd.confold mode 100644new mode 100755diff --git a/conf/rspamd/statistic.conf b/conf/rspamd/statistic.confold mode 100644new mode 100755diff --git a/conf/webmail/custom.inc.php b/conf/webmail/custom.inc.phpold mode 100644new mode 100755diff --git a/conf/webmail/mime.types b/conf/webmail/mime.typesold mode 100644new mode 100755diff --git a/core/internal/service/database_initialization/maillog_stat.go b/core/internal/service/database_initialization/maillog_stat.goindex 24c34cba..9b72729c 100644--- a/core/internal/service/database_initialization/maillog_stat.go+++ b/core/internal/service/database_initialization/maillog_stat.go@@ -132,6 +132,19 @@ func init() {CREATE INDEX IF NOT EXISTS clicked_postfixMessageId_logTime_url ON mailstat_clicked (postfix_message_id, log_time, url)`,`CREATE INDEX IF NOT EXISTS clicked_logTime_millis ON mailstat_clicked (log_time_millis)`,`CREATE INDEX IF NOT EXISTS clicked_campaignId_logTime_url_recipient ON mailstat_clicked (campaign_id, log_time, url, recipient)`,++ `-- Mail complaint/FBL records+ CREATE TABLE IF NOT EXISTS mailstat_complaints (+ id SERIAL PRIMARY KEY,+ postfix_message_id TEXT NOT NULL DEFAULT '',+ recipient TEXT NOT NULL DEFAULT '',+ log_time_millis BIGINT NOT NULL DEFAULT (EXTRACT(EPOCH FROM CURRENT_TIMESTAMP)::INTEGER),+ log_time INTEGER GENERATED ALWAYS AS (log_time_millis / 1000) STORED+ )`,++ `-- Indexes+ CREATE INDEX IF NOT EXISTS complaints_postfixMessageId_logTime ON mailstat_complaints (postfix_message_id, log_time)`,+ `CREATE INDEX IF NOT EXISTS complaints_logTime_millis ON mailstat_complaints (log_time_millis)`,}for _, sql := range sqlList {diff --git a/core/internal/service/warmup/sender_ip_mail_provider.go b/core/internal/service/warmup/sender_ip_mail_provider.goindex e91417aa..1b32ac90 100644--- a/core/internal/service/warmup/sender_ip_mail_provider.go+++ b/core/internal/service/warmup/sender_ip_mail_provider.go@@ -149,7 +149,7 @@ func (s *SenderIpMailProviderService) EvaluateScoreForProvider(ctx context.ContedeferredSends := 0openedCount := 0clickedCount := 0- // complaintCount := 0 // TODO: Complaint rate+ complaintCount := 0if len(relevantPmids) > 0 {// 1. Get sending statistics (mailstat_send_mails)@@ -207,6 +207,14 @@ func (s *SenderIpMailProviderService) EvaluateScoreForProvider(ctx context.ConteWhere("log_time_millis >= ?", evaluationWindowStartMillis).Fields("DISTINCT postfix_message_id").Count()++ // Get complaintCount (FBL/abuse complaints)+ complaintCount, _ = g.DB().Model("mailstat_complaints").+ Ctx(ctx).+ WhereIn("postfix_message_id", relevantPmids).+ Where("log_time_millis >= ?", evaluationWindowStartMillis).+ Fields("DISTINCT postfix_message_id").+ Count()}currentScore := float64(providerStatus.Score)@@ -243,8 +251,15 @@ func (s *SenderIpMailProviderService) EvaluateScoreForProvider(ctx context.ConteclickRate := float64(clickedCount) / float64(openedCount)currentScore += clickRate * 20 // 2.5% click rate benchmark}++ // Complaint rate penalty+ complaintRate := 0.0+ if complaintCount > 0 {+ complaintRate = float64(complaintCount) / float64(successfulSends)+ // Penalty: each 0.1% complaint rate reduces score by 2 points (tunable)+ currentScore -= complaintRate * 200+ }}- // TODO: complaintRate (complaintCount / successfulSends)} else { // totalSent == 0 for this provider groupvar warmupStatus *entity.SenderIpWarmupwarmupStatus, err = s.ipWarmupService.InitializeOrGetWarmupStatus(ctx, senderIp)diff --git a/ssl-self-signed/cert.pem b/ssl-self-signed/cert.pemold mode 100644new mode 100755diff --git a/ssl-self-signed/dh.pem b/ssl-self-signed/dh.pemold mode 100644new mode 100755diff --git a/ssl-self-signed/key.pem b/ssl-self-signed/key.pemold mode 100644new mode 100755