重命名项目并补充插件与安全整改文档

This commit is contained in:
xuans committed 2026-08-24 15:27:19 +08:00
1 parent a6049bf052
commit e91a64136b
131 files changed
+1306 -771

No files matched your search

+1 -1
View File
@@ -6,7 +6,7 @@
"sslType": "0",
"SSLPrivateKeyPath": "config/ssl/private.key",
"SSLPublicKeyPath": "config/ssl/public.crt",
"dbDSN": "./config/pmail.db",
"dbDSN": "./config/smail.db",
"dbType": "sqlite",
"spamFilterLevel": 2,
"httpPort": 80,
+5 -5
View File
@@ -9,9 +9,9 @@ import (
"encoding/json"
"encoding/pem"
"fmt"
"github.com/Jinnrry/pmail/utils/context"
"github.com/Jinnrry/pmail/utils/errors"
"github.com/Jinnrry/pmail/utils/file"
"git.pcux.cn/xuans/Smail/utils/context"
"git.pcux.cn/xuans/Smail/utils/errors"
"git.pcux.cn/xuans/Smail/utils/file"
log "github.com/sirupsen/logrus"
"os"
"path/filepath"
@@ -55,8 +55,8 @@ var ROOT_PATH = ""
func init() {
envs := os.Environ()
for _, env := range envs {
if strings.HasPrefix(env, "PMail_ROOT=") {
ROOT_PATH = strings.TrimSpace(strings.ReplaceAll(env, "PMail_ROOT=", ""))
if strings.HasPrefix(env, "SMAIL_ROOT=") {
ROOT_PATH = strings.TrimSpace(strings.ReplaceAll(env, "SMAIL_ROOT=", ""))
if !strings.HasSuffix(ROOT_PATH, "/") {
ROOT_PATH += "/"
}
+1 -1
View File
@@ -7,7 +7,7 @@
"sslType": "1",
"SSLPrivateKeyPath": "./config/ssl/private.key",
"SSLPublicKeyPath": "./config/ssl/public.crt",
"dbDSN": "./config/pmail_temp.db",
"dbDSN": "./config/smail_temp.db",
"dbType": "sqlite",
"httpsEnabled": 2,
"spamFilterLevel": 0,
+1 -1
View File
@@ -6,7 +6,7 @@
"sslType": "0",
"SSLPrivateKeyPath": "config/ssl/private.key",
"SSLPublicKeyPath": "config/ssl/public.crt",
"dbDSN": "root:root@tcp(127.0.0.1:3306)/pmail?parseTime=True&loc=Local",
"dbDSN": "root:root@tcp(127.0.0.1:3306)/smail?parseTime=True&loc=Local",
"dbType": "mysql",
"spamFilterLevel": 1,
"httpPort": 80,
+3 -3
View File
@@ -2,9 +2,9 @@ package controllers
import (
"fmt"
"github.com/Jinnrry/pmail/dto/response"
"github.com/Jinnrry/pmail/services/attachments"
"github.com/Jinnrry/pmail/utils/context"
"git.pcux.cn/xuans/Smail/dto/response"
"git.pcux.cn/xuans/Smail/services/attachments"
"git.pcux.cn/xuans/Smail/utils/context"
"github.com/spf13/cast"
"net/http"
"strings"
+1 -1
View File
@@ -1,7 +1,7 @@
package controllers
import (
"github.com/Jinnrry/pmail/utils/context"
"git.pcux.cn/xuans/Smail/utils/context"
"net/http"
)
+3 -3
View File
@@ -2,9 +2,9 @@ package email
import (
"encoding/json"
"github.com/Jinnrry/pmail/dto/response"
"github.com/Jinnrry/pmail/services/del_email"
"github.com/Jinnrry/pmail/utils/context"
"git.pcux.cn/xuans/Smail/dto/response"
"git.pcux.cn/xuans/Smail/services/del_email"
"git.pcux.cn/xuans/Smail/utils/context"
log "github.com/sirupsen/logrus"
"io"
"net/http"
+3 -3
View File
@@ -2,9 +2,9 @@ package email
import (
"encoding/json"
"github.com/Jinnrry/pmail/dto/response"
"github.com/Jinnrry/pmail/services/detail"
"github.com/Jinnrry/pmail/utils/context"
"git.pcux.cn/xuans/Smail/dto/response"
"git.pcux.cn/xuans/Smail/services/detail"
"git.pcux.cn/xuans/Smail/utils/context"
log "github.com/sirupsen/logrus"
"io"
"net/http"
+5 -5
View File
@@ -2,11 +2,11 @@ package email
import (
"encoding/json"
"github.com/Jinnrry/pmail/dto"
"github.com/Jinnrry/pmail/dto/parsemail"
"github.com/Jinnrry/pmail/dto/response"
"github.com/Jinnrry/pmail/services/list"
"github.com/Jinnrry/pmail/utils/context"
"git.pcux.cn/xuans/Smail/dto"
"git.pcux.cn/xuans/Smail/dto/parsemail"
"git.pcux.cn/xuans/Smail/dto/response"
"git.pcux.cn/xuans/Smail/services/list"
"git.pcux.cn/xuans/Smail/utils/context"
log "github.com/sirupsen/logrus"
"github.com/spf13/cast"
"io"
+4 -4
View File
@@ -2,10 +2,10 @@ package email
import (
"encoding/json"
"github.com/Jinnrry/pmail/dto/response"
"github.com/Jinnrry/pmail/models"
"github.com/Jinnrry/pmail/services/group"
"github.com/Jinnrry/pmail/utils/context"
"git.pcux.cn/xuans/Smail/dto/response"
"git.pcux.cn/xuans/Smail/models"
"git.pcux.cn/xuans/Smail/services/group"
"git.pcux.cn/xuans/Smail/utils/context"
log "github.com/sirupsen/logrus"
"io"
"net/http"
+3 -3
View File
@@ -2,9 +2,9 @@ package email
import (
"encoding/json"
"github.com/Jinnrry/pmail/dto/response"
"github.com/Jinnrry/pmail/services/detail"
"github.com/Jinnrry/pmail/utils/context"
"git.pcux.cn/xuans/Smail/dto/response"
"git.pcux.cn/xuans/Smail/services/detail"
"git.pcux.cn/xuans/Smail/utils/context"
log "github.com/sirupsen/logrus"
"io"
"net/http"
+12 -12
View File
@@ -4,18 +4,18 @@ import (
"database/sql"
"encoding/base64"
"encoding/json"
"github.com/Jinnrry/pmail/config"
"github.com/Jinnrry/pmail/db"
"github.com/Jinnrry/pmail/dto/parsemail"
"github.com/Jinnrry/pmail/dto/response"
"github.com/Jinnrry/pmail/hooks"
"github.com/Jinnrry/pmail/hooks/framework"
"github.com/Jinnrry/pmail/i18n"
"github.com/Jinnrry/pmail/models"
"github.com/Jinnrry/pmail/utils/array"
"github.com/Jinnrry/pmail/utils/async"
"github.com/Jinnrry/pmail/utils/context"
"github.com/Jinnrry/pmail/utils/send"
"git.pcux.cn/xuans/Smail/config"
"git.pcux.cn/xuans/Smail/db"
"git.pcux.cn/xuans/Smail/dto/parsemail"
"git.pcux.cn/xuans/Smail/dto/response"
"git.pcux.cn/xuans/Smail/hooks"
"git.pcux.cn/xuans/Smail/hooks/framework"
"git.pcux.cn/xuans/Smail/i18n"
"git.pcux.cn/xuans/Smail/models"
"git.pcux.cn/xuans/Smail/utils/array"
"git.pcux.cn/xuans/Smail/utils/async"
"git.pcux.cn/xuans/Smail/utils/context"
"git.pcux.cn/xuans/Smail/utils/send"
log "github.com/sirupsen/logrus"
"github.com/spf13/cast"
"io"
+7 -7
View File
@@ -2,13 +2,13 @@ package controllers
import (
"encoding/json"
"github.com/Jinnrry/pmail/dto"
"github.com/Jinnrry/pmail/dto/response"
"github.com/Jinnrry/pmail/i18n"
"github.com/Jinnrry/pmail/models"
"github.com/Jinnrry/pmail/services/group"
"github.com/Jinnrry/pmail/utils/array"
"github.com/Jinnrry/pmail/utils/context"
"git.pcux.cn/xuans/Smail/dto"
"git.pcux.cn/xuans/Smail/dto/response"
"git.pcux.cn/xuans/Smail/i18n"
"git.pcux.cn/xuans/Smail/models"
"git.pcux.cn/xuans/Smail/services/group"
"git.pcux.cn/xuans/Smail/utils/array"
"git.pcux.cn/xuans/Smail/utils/context"
log "github.com/sirupsen/logrus"
"io"
"net/http"
+1 -1
View File
@@ -1,7 +1,7 @@
package controllers
import (
"github.com/Jinnrry/pmail/config"
"git.pcux.cn/xuans/Smail/config"
"net/http"
)
+10 -10
View File
@@ -3,16 +3,16 @@ package controllers
import (
"database/sql"
"encoding/json"
"github.com/Jinnrry/pmail/config"
"github.com/Jinnrry/pmail/db"
"github.com/Jinnrry/pmail/dto/response"
"github.com/Jinnrry/pmail/i18n"
"github.com/Jinnrry/pmail/models"
"github.com/Jinnrry/pmail/session"
"github.com/Jinnrry/pmail/utils/array"
"github.com/Jinnrry/pmail/utils/context"
"github.com/Jinnrry/pmail/utils/errors"
"github.com/Jinnrry/pmail/utils/password"
"git.pcux.cn/xuans/Smail/config"
"git.pcux.cn/xuans/Smail/db"
"git.pcux.cn/xuans/Smail/dto/response"
"git.pcux.cn/xuans/Smail/i18n"
"git.pcux.cn/xuans/Smail/models"
"git.pcux.cn/xuans/Smail/session"
"git.pcux.cn/xuans/Smail/utils/array"
"git.pcux.cn/xuans/Smail/utils/context"
"git.pcux.cn/xuans/Smail/utils/errors"
"git.pcux.cn/xuans/Smail/utils/password"
log "github.com/sirupsen/logrus"
"io"
"net/http"
+1 -1
View File
@@ -1,7 +1,7 @@
package controllers
import (
"github.com/Jinnrry/pmail/dto/response"
"git.pcux.cn/xuans/Smail/dto/response"
"net/http"
)
+3 -3
View File
@@ -1,9 +1,9 @@
package controllers
import (
"github.com/Jinnrry/pmail/dto/response"
"github.com/Jinnrry/pmail/hooks"
"github.com/Jinnrry/pmail/utils/context"
"git.pcux.cn/xuans/Smail/dto/response"
"git.pcux.cn/xuans/Smail/hooks"
"git.pcux.cn/xuans/Smail/utils/context"
"io"
"net/http"
"strings"
+10 -10
View File
@@ -2,16 +2,16 @@ package controllers
import (
"encoding/json"
"github.com/Jinnrry/pmail/db"
"github.com/Jinnrry/pmail/dto"
"github.com/Jinnrry/pmail/dto/response"
"github.com/Jinnrry/pmail/i18n"
"github.com/Jinnrry/pmail/models"
"github.com/Jinnrry/pmail/services/rule"
"github.com/Jinnrry/pmail/utils/address"
"github.com/Jinnrry/pmail/utils/array"
"github.com/Jinnrry/pmail/utils/context"
"github.com/Jinnrry/pmail/utils/errors"
"git.pcux.cn/xuans/Smail/db"
"git.pcux.cn/xuans/Smail/dto"
"git.pcux.cn/xuans/Smail/dto/response"
"git.pcux.cn/xuans/Smail/i18n"
"git.pcux.cn/xuans/Smail/models"
"git.pcux.cn/xuans/Smail/services/rule"
"git.pcux.cn/xuans/Smail/utils/address"
"git.pcux.cn/xuans/Smail/utils/array"
"git.pcux.cn/xuans/Smail/utils/context"
"git.pcux.cn/xuans/Smail/utils/errors"
log "github.com/sirupsen/logrus"
"io"
"net/http"
+5 -5
View File
@@ -2,11 +2,11 @@ package controllers
import (
"encoding/json"
"github.com/Jinnrry/pmail/db"
"github.com/Jinnrry/pmail/dto/response"
"github.com/Jinnrry/pmail/i18n"
"github.com/Jinnrry/pmail/utils/context"
"github.com/Jinnrry/pmail/utils/password"
"git.pcux.cn/xuans/Smail/db"
"git.pcux.cn/xuans/Smail/dto/response"
"git.pcux.cn/xuans/Smail/i18n"
"git.pcux.cn/xuans/Smail/utils/context"
"git.pcux.cn/xuans/Smail/utils/password"
log "github.com/sirupsen/logrus"
"io"
"net/http"
+5 -5
View File
@@ -2,11 +2,11 @@ package controllers
import (
"encoding/json"
"github.com/Jinnrry/pmail/config"
"github.com/Jinnrry/pmail/dto/response"
"github.com/Jinnrry/pmail/services/setup"
"github.com/Jinnrry/pmail/services/setup/ssl"
"github.com/Jinnrry/pmail/utils/context"
"git.pcux.cn/xuans/Smail/config"
"git.pcux.cn/xuans/Smail/dto/response"
"git.pcux.cn/xuans/Smail/services/setup"
"git.pcux.cn/xuans/Smail/services/setup/ssl"
"git.pcux.cn/xuans/Smail/utils/context"
log "github.com/sirupsen/logrus"
"github.com/spf13/cast"
"io"
+7 -7
View File
@@ -2,13 +2,13 @@ package controllers
import (
"encoding/json"
"github.com/Jinnrry/pmail/config"
"github.com/Jinnrry/pmail/db"
"github.com/Jinnrry/pmail/dto/response"
"github.com/Jinnrry/pmail/models"
"github.com/Jinnrry/pmail/utils/array"
"github.com/Jinnrry/pmail/utils/context"
"github.com/Jinnrry/pmail/utils/password"
"git.pcux.cn/xuans/Smail/config"
"git.pcux.cn/xuans/Smail/db"
"git.pcux.cn/xuans/Smail/dto/response"
"git.pcux.cn/xuans/Smail/models"
"git.pcux.cn/xuans/Smail/utils/array"
"git.pcux.cn/xuans/Smail/utils/context"
"git.pcux.cn/xuans/Smail/utils/password"
log "github.com/sirupsen/logrus"
"github.com/spf13/cast"
"io"
+4 -4
View File
@@ -4,10 +4,10 @@ import (
"fmt"
"time"
"github.com/Jinnrry/pmail/config"
"github.com/Jinnrry/pmail/models"
"github.com/Jinnrry/pmail/utils/context"
"github.com/Jinnrry/pmail/utils/errors"
"git.pcux.cn/xuans/Smail/config"
"git.pcux.cn/xuans/Smail/models"
"git.pcux.cn/xuans/Smail/utils/context"
"git.pcux.cn/xuans/Smail/utils/errors"
_ "github.com/go-sql-driver/mysql"
_ "github.com/lib/pq"
log "github.com/sirupsen/logrus"
+12 -12
View File
@@ -28,27 +28,27 @@ func TestSQLiteDSNOptions(t *testing.T) {
}{
{
name: "plain filename gets default timeout",
dsn: "/tmp/pmail.db",
dsn: "/tmp/smail.db",
wantBusyTimeout: "busy_timeout(1000)",
},
{
name: "timeout at cap is preserved byte for byte",
dsn: "file:pmail.db?_txlock=deferred&_pragma=BUSY_TIMEOUT%20%3D%201000&mode=memory",
wantDSN: "file:pmail.db?_txlock=deferred&_pragma=BUSY_TIMEOUT%20%3D%201000&mode=memory",
dsn: "file:smail.db?_txlock=deferred&_pragma=BUSY_TIMEOUT%20%3D%201000&mode=memory",
wantDSN: "file:smail.db?_txlock=deferred&_pragma=BUSY_TIMEOUT%20%3D%201000&mode=memory",
wantBusyTimeout: "BUSY_TIMEOUT = 1000",
wantTxLock: "deferred",
},
{
name: "explicit timeout is capped and other options are preserved",
dsn: "file:pmail.db?mode=memory&_pragma=journal_mode(WAL)&_pragma=busy_timeout%20%3D%20600000&_txlock=deferred",
dsn: "file:smail.db?mode=memory&_pragma=journal_mode(WAL)&_pragma=busy_timeout%20%3D%20600000&_txlock=deferred",
wantBusyTimeout: "busy_timeout(1000)",
wantJournalMode: "journal_mode(WAL)",
wantTxLock: "deferred",
},
{
name: "negative timeout is preserved byte for byte",
dsn: "file:pmail.db?cache=shared&_pragma=%20busy_timeout%20%28%20-1%20%29%20",
wantDSN: "file:pmail.db?cache=shared&_pragma=%20busy_timeout%20%28%20-1%20%29%20",
dsn: "file:smail.db?cache=shared&_pragma=%20busy_timeout%20%28%20-1%20%29%20",
wantDSN: "file:smail.db?cache=shared&_pragma=%20busy_timeout%20%28%20-1%20%29%20",
wantBusyTimeout: " busy_timeout ( -1 ) ",
},
}
@@ -94,23 +94,23 @@ func TestSQLiteDSNRejectsInvalidBusyTimeout(t *testing.T) {
}{
{
name: "duplicate timeout pragmas",
dsn: "file:pmail.db?_pragma=busy_timeout(10)&_pragma=BUSY_TIMEOUT%20%3D%2020",
dsn: "file:smail.db?_pragma=busy_timeout(10)&_pragma=BUSY_TIMEOUT%20%3D%2020",
},
{
name: "missing timeout value",
dsn: "file:pmail.db?_pragma=busy_timeout",
dsn: "file:smail.db?_pragma=busy_timeout",
},
{
name: "nonnumeric timeout",
dsn: "file:pmail.db?_pragma=busy_timeout(forever)",
dsn: "file:smail.db?_pragma=busy_timeout(forever)",
},
{
name: "timeout with trailing junk",
dsn: "file:pmail.db?_pragma=busy_timeout(10)%20milliseconds",
dsn: "file:smail.db?_pragma=busy_timeout(10)%20milliseconds",
},
{
name: "overflowing timeout",
dsn: "file:pmail.db?_pragma=busy_timeout(9223372036854775808)",
dsn: "file:smail.db?_pragma=busy_timeout(9223372036854775808)",
},
}
@@ -135,7 +135,7 @@ func TestSQLiteDSNWarnsWhenBusyTimeoutIsCapped(t *testing.T) {
logger.SetLevel(originalLevel)
})
if _, err := sqliteDSNWithReliabilityOptions("file:pmail.db?_pragma=busy_timeout(600000)"); err != nil {
if _, err := sqliteDSNWithReliabilityOptions("file:smail.db?_pragma=busy_timeout(600000)"); err != nil {
t.Fatalf("sqliteDSNWithReliabilityOptions() error = %v", err)
}
for _, want := range []string{"600000ms", "1000ms"} {
+3 -3
View File
@@ -6,9 +6,9 @@ import (
"crypto/x509"
"encoding/pem"
"fmt"
"github.com/Jinnrry/pmail/config"
"github.com/Jinnrry/pmail/utils/consts"
"github.com/Jinnrry/pmail/utils/context"
"git.pcux.cn/xuans/Smail/config"
"git.pcux.cn/xuans/Smail/utils/consts"
"git.pcux.cn/xuans/Smail/utils/context"
"github.com/emersion/go-msgauth/dkim"
log "github.com/sirupsen/logrus"
"golang.org/x/crypto/ed25519"
+3 -3
View File
@@ -13,9 +13,9 @@ import (
"strings"
"time"
"github.com/Jinnrry/pmail/config"
"github.com/Jinnrry/pmail/models"
"github.com/Jinnrry/pmail/utils/context"
"git.pcux.cn/xuans/Smail/config"
"git.pcux.cn/xuans/Smail/models"
"git.pcux.cn/xuans/Smail/utils/context"
"github.com/emersion/go-message"
_ "github.com/emersion/go-message/charset"
"github.com/emersion/go-message/mail"
@@ -3,7 +3,7 @@ package parsemail
import (
"testing"
"github.com/Jinnrry/pmail/models"
"git.pcux.cn/xuans/Smail/models"
)
func TestNewEmailAuthentication(t *testing.T) {
+3 -3
View File
@@ -5,9 +5,9 @@ import (
"strings"
"testing"
"github.com/Jinnrry/pmail/config"
"github.com/Jinnrry/pmail/models"
"github.com/Jinnrry/pmail/utils/context"
"git.pcux.cn/xuans/Smail/config"
"git.pcux.cn/xuans/Smail/models"
"git.pcux.cn/xuans/Smail/utils/context"
"github.com/emersion/go-message/mail"
)
+1 -1
View File
@@ -9,7 +9,7 @@ import (
"testing"
"time"
"github.com/Jinnrry/pmail/models"
"git.pcux.cn/xuans/Smail/models"
"github.com/emersion/go-message"
)
+1 -1
View File
@@ -1,6 +1,6 @@
package response
import "github.com/Jinnrry/pmail/models"
import "git.pcux.cn/xuans/Smail/models"
type EmailResponseData struct {
models.Email `xorm:"extends"`
+1 -1
View File
@@ -2,7 +2,7 @@ package dto
import (
"encoding/json"
"github.com/Jinnrry/pmail/models"
"git.pcux.cn/xuans/Smail/models"
)
type RuleType int
+1 -1
View File
@@ -1,4 +1,4 @@
module github.com/Jinnrry/pmail
module git.pcux.cn/xuans/Smail
go 1.24.0
+5 -5
View File
@@ -4,10 +4,10 @@ import (
oContext "context"
"encoding/json"
"fmt"
"github.com/Jinnrry/pmail/dto/parsemail"
"github.com/Jinnrry/pmail/hooks/framework"
"github.com/Jinnrry/pmail/models"
"github.com/Jinnrry/pmail/utils/context"
"git.pcux.cn/xuans/Smail/dto/parsemail"
"git.pcux.cn/xuans/Smail/hooks/framework"
"git.pcux.cn/xuans/Smail/models"
"git.pcux.cn/xuans/Smail/utils/context"
log "github.com/sirupsen/logrus"
"io"
"net"
@@ -220,7 +220,7 @@ func Init(serverVersion string) {
os.Remove(socketPath)
//socketPath = "/PMail/server/hooks/spam_block/1555.socket" //debug
//socketPath = "/Smail/server/hooks/spam_block/1555.socket" //debug
log.Infof("[%s] Plugin Load", info.Name())
p, err := os.StartProcess(path, []string{
+4 -4
View File
@@ -2,10 +2,10 @@ package main
import (
"fmt"
"github.com/Jinnrry/pmail/dto/parsemail"
"github.com/Jinnrry/pmail/hooks/framework"
"github.com/Jinnrry/pmail/models"
"github.com/Jinnrry/pmail/utils/context"
"git.pcux.cn/xuans/Smail/dto/parsemail"
"git.pcux.cn/xuans/Smail/hooks/framework"
"git.pcux.cn/xuans/Smail/models"
"git.pcux.cn/xuans/Smail/utils/context"
)
type Debug struct {
+5 -5
View File
@@ -4,9 +4,9 @@ import (
"bytes"
"encoding/json"
"fmt"
"github.com/Jinnrry/pmail/dto/parsemail"
"github.com/Jinnrry/pmail/models"
"github.com/Jinnrry/pmail/utils/context"
"git.pcux.cn/xuans/Smail/dto/parsemail"
"git.pcux.cn/xuans/Smail/models"
"git.pcux.cn/xuans/Smail/utils/context"
log "github.com/sirupsen/logrus"
"io"
"net"
@@ -34,7 +34,7 @@ type EmailHook interface {
SettingsHtml(ctx *context.Context, url string, requestData string) string
}
// HookDTO PMail 主程序和插件通信的结构体
// HookDTO Smail 主程序和插件通信的结构体
type HookDTO struct {
ServerVersion string // 服务端程序版本
Ctx *context.Context // 上下文
@@ -216,7 +216,7 @@ func (p *Plugin) Run() {
}
func getExePath() string {
//return "/PMail/server/hooks/spam_block" //debug socket path
//return "/Smail/server/hooks/spam_block" //debug socket path
ex, err := os.Executable()
if err != nil {
+1 -1
View File
@@ -4,7 +4,7 @@ import (
"encoding/json"
"testing"
"github.com/Jinnrry/pmail/dto/parsemail"
"git.pcux.cn/xuans/Smail/dto/parsemail"
)
func TestHookDTOIncludesEmailAuthentication(t *testing.T) {
+5 -5
View File
@@ -10,11 +10,11 @@ Request的形式提交机器学习的各类样本数据。
你可以给testData和trainData这两个文件夹下面的csv文件提交PR,CSV文件每行的第一个数字表示数据类型,0表示正常邮件,1表示广告邮件,2表示诈骗邮件。
你可以使用export.go这个脚本或者从Release中下载[email_export工具](https://github.com/Jinnrry/PMail/releases/tag/v2.6.1)导出你全部的邮件数据,过滤掉隐私内容并且标记好分类后提交上来。
你可以使用export.go这个脚本或者从Release中下载[email_export工具](https://git.pcux.cn/xuans/Smail/releases/tag/v2.6.1)导出你全部的邮件数据,过滤掉隐私内容并且标记好分类后提交上来。
# 如何运行
1、下载[emotion_model.zip](https://github.com/Jinnrry/PMail/releases/tag/v2.8.3)或者自己训练模型
1、下载[emotion_model.zip](https://git.pcux.cn/xuans/Smail/releases/tag/v2.8.3)或者自己训练模型
2、使用docker运行tensorflow模型
`docker run -d -p 127.0.0.1:8501:8501 \
@@ -50,13 +50,13 @@ curl -X POST http://localhost:8501/v1/models/emotion_model:predict -d '{
}
```
4、将spam_block插件移动到pmail插件目录
4、将spam_block插件移动到Smail插件目录
5、设置插件
PMail后台->右上角设置按钮->插件设置->SpamBlock
Smail后台->右上角设置按钮->插件设置->SpamBlock
接口地址表示模型api访问地址,如果你是使用Docker部署,PMail和tensorflow/serving容器需要设置为相同网络才能通信,并且需要把localhost替换为tensorflow/serving的容器名称
接口地址表示模型api访问地址,如果你是使用Docker部署,Smail和tensorflow/serving容器需要设置为相同网络才能通信,并且需要把localhost替换为tensorflow/serving的容器名称
# 模型效果
+4 -4
View File
@@ -2,10 +2,10 @@ package main
import (
"fmt"
"github.com/Jinnrry/pmail/config"
"github.com/Jinnrry/pmail/db"
"github.com/Jinnrry/pmail/hooks/spam_block/tools"
"github.com/Jinnrry/pmail/models"
"git.pcux.cn/xuans/Smail/config"
"git.pcux.cn/xuans/Smail/db"
"git.pcux.cn/xuans/Smail/hooks/spam_block/tools"
"git.pcux.cn/xuans/Smail/models"
"github.com/spf13/cast"
"os"
)
+5 -5
View File
@@ -4,11 +4,11 @@ import (
_ "embed"
"encoding/json"
"fmt"
"github.com/Jinnrry/pmail/dto/parsemail"
"github.com/Jinnrry/pmail/hooks/framework"
"github.com/Jinnrry/pmail/hooks/spam_block/tools"
"github.com/Jinnrry/pmail/models"
"github.com/Jinnrry/pmail/utils/context"
"git.pcux.cn/xuans/Smail/dto/parsemail"
"git.pcux.cn/xuans/Smail/hooks/framework"
"git.pcux.cn/xuans/Smail/hooks/spam_block/tools"
"git.pcux.cn/xuans/Smail/models"
"git.pcux.cn/xuans/Smail/utils/context"
log "github.com/sirupsen/logrus"
"github.com/spf13/cast"
"io"
+1 -1
View File
@@ -3,7 +3,7 @@ package main
import (
"testing"
"github.com/Jinnrry/pmail/utils/context"
"git.pcux.cn/xuans/Smail/utils/context"
)
func TestSettingsHtmlRejectsNonAdminSave(t *testing.T) {
+5 -5
View File
@@ -3,11 +3,11 @@ package main
import (
"encoding/json"
"fmt"
"github.com/Jinnrry/pmail/config"
"github.com/Jinnrry/pmail/dto/parsemail"
"github.com/Jinnrry/pmail/hooks/framework"
"github.com/Jinnrry/pmail/models"
"github.com/Jinnrry/pmail/utils/context"
"git.pcux.cn/xuans/Smail/config"
"git.pcux.cn/xuans/Smail/dto/parsemail"
"git.pcux.cn/xuans/Smail/hooks/framework"
"git.pcux.cn/xuans/Smail/models"
"git.pcux.cn/xuans/Smail/utils/context"
log "github.com/sirupsen/logrus"
"github.com/spf13/cast"
"io"
+3 -3
View File
@@ -1,9 +1,9 @@
package cron_server
import (
"github.com/Jinnrry/pmail/config"
"github.com/Jinnrry/pmail/services/setup/ssl"
"github.com/Jinnrry/pmail/signal"
"git.pcux.cn/xuans/Smail/config"
"git.pcux.cn/xuans/Smail/services/setup/ssl"
"git.pcux.cn/xuans/Smail/signal"
log "github.com/sirupsen/logrus"
"time"
// 新增:HTTP 就绪探测
+4 -4
View File
@@ -3,10 +3,10 @@ package http_server
import (
"errors"
"fmt"
"github.com/Jinnrry/pmail/config"
"github.com/Jinnrry/pmail/controllers"
"github.com/Jinnrry/pmail/controllers/email"
"github.com/Jinnrry/pmail/session"
"git.pcux.cn/xuans/Smail/config"
"git.pcux.cn/xuans/Smail/controllers"
"git.pcux.cn/xuans/Smail/controllers/email"
"git.pcux.cn/xuans/Smail/session"
log "github.com/sirupsen/logrus"
"io/fs"
"net/http"
+10 -10
View File
@@ -5,16 +5,16 @@ import (
"encoding/json"
"errors"
"fmt"
"github.com/Jinnrry/pmail/config"
"github.com/Jinnrry/pmail/controllers"
"github.com/Jinnrry/pmail/db"
"github.com/Jinnrry/pmail/dto/response"
"github.com/Jinnrry/pmail/i18n"
"github.com/Jinnrry/pmail/models"
"github.com/Jinnrry/pmail/session"
"github.com/Jinnrry/pmail/utils/context"
"github.com/Jinnrry/pmail/utils/id"
"github.com/Jinnrry/pmail/utils/password"
"git.pcux.cn/xuans/Smail/config"
"git.pcux.cn/xuans/Smail/controllers"
"git.pcux.cn/xuans/Smail/db"
"git.pcux.cn/xuans/Smail/dto/response"
"git.pcux.cn/xuans/Smail/i18n"
"git.pcux.cn/xuans/Smail/models"
"git.pcux.cn/xuans/Smail/session"
"git.pcux.cn/xuans/Smail/utils/context"
"git.pcux.cn/xuans/Smail/utils/id"
"git.pcux.cn/xuans/Smail/utils/password"
olog "log"
"net/http"
"strings"
+3 -3
View File
@@ -4,9 +4,9 @@ import (
"errors"
"flag"
"fmt"
"github.com/Jinnrry/pmail/config"
"github.com/Jinnrry/pmail/controllers"
"github.com/Jinnrry/pmail/utils/ip"
"git.pcux.cn/xuans/Smail/config"
"git.pcux.cn/xuans/Smail/controllers"
"git.pcux.cn/xuans/Smail/utils/ip"
log "github.com/sirupsen/logrus"
"github.com/spf13/cast"
"io/fs"
+1 -1
View File
@@ -2,7 +2,7 @@ package imap_server
import (
"crypto/tls"
"github.com/Jinnrry/pmail/config"
"git.pcux.cn/xuans/Smail/config"
"github.com/emersion/go-imap/v2"
"github.com/emersion/go-imap/v2/imapserver"
log "github.com/sirupsen/logrus"
@@ -3,12 +3,12 @@ package imap_server
import (
"bufio"
"crypto/tls"
"github.com/Jinnrry/pmail/config"
"github.com/Jinnrry/pmail/db"
"github.com/Jinnrry/pmail/models"
"github.com/Jinnrry/pmail/utils/array"
pcontext "github.com/Jinnrry/pmail/utils/context"
"github.com/Jinnrry/pmail/utils/password"
"git.pcux.cn/xuans/Smail/config"
"git.pcux.cn/xuans/Smail/db"
"git.pcux.cn/xuans/Smail/models"
"git.pcux.cn/xuans/Smail/utils/array"
pcontext "git.pcux.cn/xuans/Smail/utils/context"
"git.pcux.cn/xuans/Smail/utils/password"
"github.com/emersion/go-imap/v2"
"github.com/emersion/go-imap/v2/imapclient"
"github.com/emersion/go-message/charset"
+2 -2
View File
@@ -1,8 +1,8 @@
package imap_server
import (
"github.com/Jinnrry/pmail/utils/context"
"github.com/Jinnrry/pmail/utils/id"
"git.pcux.cn/xuans/Smail/utils/context"
"git.pcux.cn/xuans/Smail/utils/id"
"github.com/emersion/go-imap/v2"
log "github.com/sirupsen/logrus"
"sync"
+7 -7
View File
@@ -1,13 +1,13 @@
package imap_server
import (
"github.com/Jinnrry/pmail/consts"
"github.com/Jinnrry/pmail/db"
"github.com/Jinnrry/pmail/dto/response"
"github.com/Jinnrry/pmail/models"
"github.com/Jinnrry/pmail/services/group"
"github.com/Jinnrry/pmail/services/list"
"github.com/Jinnrry/pmail/utils/context"
"git.pcux.cn/xuans/Smail/consts"
"git.pcux.cn/xuans/Smail/db"
"git.pcux.cn/xuans/Smail/dto/response"
"git.pcux.cn/xuans/Smail/models"
"git.pcux.cn/xuans/Smail/services/group"
"git.pcux.cn/xuans/Smail/services/list"
"git.pcux.cn/xuans/Smail/utils/context"
"github.com/emersion/go-imap/v2"
"github.com/spf13/cast"
)
+1 -1
View File
@@ -1,7 +1,7 @@
package imap_server
import (
"github.com/Jinnrry/pmail/services/group"
"git.pcux.cn/xuans/Smail/services/group"
"github.com/emersion/go-imap/v2"
"strings"
)
+1 -1
View File
@@ -1,7 +1,7 @@
package imap_server
import (
"github.com/Jinnrry/pmail/services/group"
"git.pcux.cn/xuans/Smail/services/group"
"github.com/emersion/go-imap/v2"
"strings"
)
+1 -1
View File
@@ -1,7 +1,7 @@
package imap_server
import (
"github.com/Jinnrry/pmail/services/del_email"
"git.pcux.cn/xuans/Smail/services/del_email"
"github.com/emersion/go-imap/v2"
"github.com/emersion/go-imap/v2/imapserver"
"github.com/spf13/cast"
+6 -6
View File
@@ -7,12 +7,12 @@ import (
"strings"
"time"
"github.com/Jinnrry/pmail/config"
"github.com/Jinnrry/pmail/dto/parsemail"
"github.com/Jinnrry/pmail/dto/response"
"github.com/Jinnrry/pmail/services/detail"
"github.com/Jinnrry/pmail/services/list"
"github.com/Jinnrry/pmail/utils/context"
"git.pcux.cn/xuans/Smail/config"
"git.pcux.cn/xuans/Smail/dto/parsemail"
"git.pcux.cn/xuans/Smail/dto/response"
"git.pcux.cn/xuans/Smail/services/detail"
"git.pcux.cn/xuans/Smail/services/list"
"git.pcux.cn/xuans/Smail/utils/context"
"github.com/emersion/go-imap/v2"
"github.com/emersion/go-imap/v2/imapserver"
"github.com/spf13/cast"
+3 -3
View File
@@ -1,9 +1,9 @@
package imap_server
import (
"github.com/Jinnrry/pmail/models"
"github.com/Jinnrry/pmail/services/group"
"github.com/Jinnrry/pmail/utils/context"
"git.pcux.cn/xuans/Smail/models"
"git.pcux.cn/xuans/Smail/services/group"
"git.pcux.cn/xuans/Smail/utils/context"
"github.com/emersion/go-imap/v2/imapserver"
"github.com/spf13/cast"
"sync"
+5 -5
View File
@@ -1,9 +1,9 @@
package imap_server
import (
"github.com/Jinnrry/pmail/db"
"github.com/Jinnrry/pmail/models"
"github.com/Jinnrry/pmail/utils/context"
"git.pcux.cn/xuans/Smail/db"
"git.pcux.cn/xuans/Smail/models"
"git.pcux.cn/xuans/Smail/utils/context"
"github.com/emersion/go-imap/v2"
"github.com/emersion/go-imap/v2/imapserver"
log "github.com/sirupsen/logrus"
@@ -17,7 +17,7 @@ func matchGroup(ctx *context.Context, w *imapserver.ListWriter, basePath, patter
//w.WriteList(&imap.ListData{
// Attrs: []imap.MailboxAttr{imap.MailboxAttrNoSelect, imap.MailboxAttrHasChildren},
// Delim: '/',
// Mailbox: "[PMail]",
// Mailbox: "[Smail]",
//})
w.WriteList(&imap.ListData{
Attrs: []imap.MailboxAttr{imap.MailboxAttrHasNoChildren},
@@ -95,7 +95,7 @@ func (s *serverSession) List(w *imapserver.ListWriter, ref string, patterns []st
w.WriteList(&imap.ListData{
Attrs: []imap.MailboxAttr{imap.MailboxAttrNoSelect, imap.MailboxAttrHasChildren},
Delim: '/',
Mailbox: "[PMail]",
Mailbox: "[Smail]",
})
}
for _, pattern := range patterns {
+4 -4
View File
@@ -2,10 +2,10 @@ package imap_server
import (
"database/sql"
"github.com/Jinnrry/pmail/db"
"github.com/Jinnrry/pmail/models"
"github.com/Jinnrry/pmail/utils/errors"
"github.com/Jinnrry/pmail/utils/password"
"git.pcux.cn/xuans/Smail/db"
"git.pcux.cn/xuans/Smail/models"
"git.pcux.cn/xuans/Smail/utils/errors"
"git.pcux.cn/xuans/Smail/utils/password"
"github.com/emersion/go-imap/v2"
log "github.com/sirupsen/logrus"
"strings"
+4 -4
View File
@@ -1,10 +1,10 @@
package imap_server
import (
"github.com/Jinnrry/pmail/dto/response"
"github.com/Jinnrry/pmail/services/group"
"github.com/Jinnrry/pmail/services/list"
"github.com/Jinnrry/pmail/utils/context"
"git.pcux.cn/xuans/Smail/dto/response"
"git.pcux.cn/xuans/Smail/services/group"
"git.pcux.cn/xuans/Smail/services/list"
"git.pcux.cn/xuans/Smail/utils/context"
"github.com/emersion/go-imap/v2"
"github.com/emersion/go-imap/v2/imapserver"
"github.com/spf13/cast"
+2 -2
View File
@@ -1,8 +1,8 @@
package imap_server
import (
"github.com/Jinnrry/pmail/db"
"github.com/Jinnrry/pmail/models"
"git.pcux.cn/xuans/Smail/db"
"git.pcux.cn/xuans/Smail/models"
"github.com/emersion/go-imap/v2/imapserver"
"github.com/spf13/cast"
)
+1 -1
View File
@@ -1,7 +1,7 @@
package imap_server
import (
"github.com/Jinnrry/pmail/services/group"
"git.pcux.cn/xuans/Smail/services/group"
"github.com/emersion/go-imap/v2"
"strings"
)
+1 -1
View File
@@ -1,7 +1,7 @@
package imap_server
import (
"github.com/Jinnrry/pmail/services/list"
"git.pcux.cn/xuans/Smail/services/list"
"github.com/emersion/go-imap/v2"
"github.com/emersion/go-imap/v2/imapserver"
log "github.com/sirupsen/logrus"
+1 -1
View File
@@ -1,7 +1,7 @@
package imap_server
import (
"github.com/Jinnrry/pmail/services/group"
"git.pcux.cn/xuans/Smail/services/group"
"github.com/emersion/go-imap/v2"
"github.com/spf13/cast"
"strings"
+1 -1
View File
@@ -1,7 +1,7 @@
package imap_server
import (
"github.com/Jinnrry/pmail/services/group"
"git.pcux.cn/xuans/Smail/services/group"
"github.com/emersion/go-imap/v2"
"github.com/spf13/cast"
)
+5 -5
View File
@@ -1,11 +1,11 @@
package imap_server
import (
"github.com/Jinnrry/pmail/dto/response"
"github.com/Jinnrry/pmail/services/del_email"
"github.com/Jinnrry/pmail/services/detail"
"github.com/Jinnrry/pmail/services/list"
"github.com/Jinnrry/pmail/utils/array"
"git.pcux.cn/xuans/Smail/dto/response"
"git.pcux.cn/xuans/Smail/services/del_email"
"git.pcux.cn/xuans/Smail/services/detail"
"git.pcux.cn/xuans/Smail/services/list"
"git.pcux.cn/xuans/Smail/utils/array"
"github.com/emersion/go-imap/v2"
"github.com/emersion/go-imap/v2/imapserver"
"github.com/spf13/cast"
+13 -13
View File
@@ -4,19 +4,19 @@ import (
"database/sql"
errors2 "errors"
"github.com/Jinnrry/gopop"
"github.com/Jinnrry/pmail/consts"
"github.com/Jinnrry/pmail/db"
"github.com/Jinnrry/pmail/dto"
"github.com/Jinnrry/pmail/dto/parsemail"
"github.com/Jinnrry/pmail/models"
"github.com/Jinnrry/pmail/services/del_email"
"github.com/Jinnrry/pmail/services/detail"
"github.com/Jinnrry/pmail/services/list"
"github.com/Jinnrry/pmail/utils/array"
"github.com/Jinnrry/pmail/utils/context"
"github.com/Jinnrry/pmail/utils/errors"
"github.com/Jinnrry/pmail/utils/id"
"github.com/Jinnrry/pmail/utils/password"
"git.pcux.cn/xuans/Smail/consts"
"git.pcux.cn/xuans/Smail/db"
"git.pcux.cn/xuans/Smail/dto"
"git.pcux.cn/xuans/Smail/dto/parsemail"
"git.pcux.cn/xuans/Smail/models"
"git.pcux.cn/xuans/Smail/services/del_email"
"git.pcux.cn/xuans/Smail/services/detail"
"git.pcux.cn/xuans/Smail/services/list"
"git.pcux.cn/xuans/Smail/utils/array"
"git.pcux.cn/xuans/Smail/utils/context"
"git.pcux.cn/xuans/Smail/utils/errors"
"git.pcux.cn/xuans/Smail/utils/id"
"git.pcux.cn/xuans/Smail/utils/password"
log "github.com/sirupsen/logrus"
"github.com/spf13/cast"
"strings"
+4 -4
View File
@@ -4,9 +4,9 @@ import (
"bytes"
"fmt"
"github.com/Jinnrry/gopop"
"github.com/Jinnrry/pmail/config"
"github.com/Jinnrry/pmail/db"
"github.com/Jinnrry/pmail/utils/context"
"git.pcux.cn/xuans/Smail/config"
"git.pcux.cn/xuans/Smail/db"
"git.pcux.cn/xuans/Smail/utils/context"
"github.com/emersion/go-message/mail"
"io"
"testing"
@@ -15,7 +15,7 @@ import (
func Test_action_Retr(t *testing.T) {
config.Init()
config.Instance.DbType = config.DBTypeSQLite
config.Instance.DbDSN = config.ROOT_PATH + "./config/pmail_temp.db"
config.Instance.DbDSN = config.ROOT_PATH + "./config/smail_temp.db"
db.Init("")
a := action{}
+1 -1
View File
@@ -4,7 +4,7 @@ import (
"crypto/rand"
"crypto/tls"
"github.com/Jinnrry/gopop"
"github.com/Jinnrry/pmail/config"
"git.pcux.cn/xuans/Smail/config"
log "github.com/sirupsen/logrus"
"time"
)
+5 -5
View File
@@ -3,11 +3,11 @@ package smtp_server
import (
"database/sql"
"errors"
"github.com/Jinnrry/pmail/db"
"github.com/Jinnrry/pmail/models"
"github.com/Jinnrry/pmail/utils/context"
"github.com/Jinnrry/pmail/utils/id"
"github.com/Jinnrry/pmail/utils/password"
"git.pcux.cn/xuans/Smail/db"
"git.pcux.cn/xuans/Smail/models"
"git.pcux.cn/xuans/Smail/utils/context"
"git.pcux.cn/xuans/Smail/utils/id"
"git.pcux.cn/xuans/Smail/utils/password"
"github.com/emersion/go-sasl"
"github.com/emersion/go-smtp"
log "github.com/sirupsen/logrus"
+10 -10
View File
@@ -7,16 +7,16 @@ import (
"fmt"
"strings"
"github.com/Jinnrry/pmail/config"
"github.com/Jinnrry/pmail/consts"
"github.com/Jinnrry/pmail/db"
"github.com/Jinnrry/pmail/dto/parsemail"
"github.com/Jinnrry/pmail/hooks"
"github.com/Jinnrry/pmail/hooks/framework"
"github.com/Jinnrry/pmail/models"
"github.com/Jinnrry/pmail/utils/array"
"github.com/Jinnrry/pmail/utils/async"
"github.com/Jinnrry/pmail/utils/context"
"git.pcux.cn/xuans/Smail/config"
"git.pcux.cn/xuans/Smail/consts"
"git.pcux.cn/xuans/Smail/db"
"git.pcux.cn/xuans/Smail/dto/parsemail"
"git.pcux.cn/xuans/Smail/hooks"
"git.pcux.cn/xuans/Smail/hooks/framework"
"git.pcux.cn/xuans/Smail/models"
"git.pcux.cn/xuans/Smail/utils/array"
"git.pcux.cn/xuans/Smail/utils/async"
"git.pcux.cn/xuans/Smail/utils/context"
smtp "github.com/emersion/go-smtp"
log "github.com/sirupsen/logrus"
"xorm.io/builder"
@@ -13,16 +13,16 @@ import (
"testing"
"time"
"github.com/Jinnrry/pmail/config"
"github.com/Jinnrry/pmail/consts"
"github.com/Jinnrry/pmail/db"
"github.com/Jinnrry/pmail/dto"
"github.com/Jinnrry/pmail/dto/parsemail"
"github.com/Jinnrry/pmail/hooks"
"github.com/Jinnrry/pmail/hooks/framework"
"github.com/Jinnrry/pmail/models"
listservice "github.com/Jinnrry/pmail/services/list"
"github.com/Jinnrry/pmail/utils/context"
"git.pcux.cn/xuans/Smail/config"
"git.pcux.cn/xuans/Smail/consts"
"git.pcux.cn/xuans/Smail/db"
"git.pcux.cn/xuans/Smail/dto"
"git.pcux.cn/xuans/Smail/dto/parsemail"
"git.pcux.cn/xuans/Smail/hooks"
"git.pcux.cn/xuans/Smail/hooks/framework"
"git.pcux.cn/xuans/Smail/models"
listservice "git.pcux.cn/xuans/Smail/services/list"
"git.pcux.cn/xuans/Smail/utils/context"
smtp "github.com/emersion/go-smtp"
log "github.com/sirupsen/logrus"
_ "modernc.org/sqlite"
@@ -6,13 +6,13 @@ import (
"net/netip"
"testing"
"github.com/Jinnrry/pmail/config"
"github.com/Jinnrry/pmail/db"
"github.com/Jinnrry/pmail/dto/parsemail"
"github.com/Jinnrry/pmail/hooks"
"github.com/Jinnrry/pmail/hooks/framework"
"github.com/Jinnrry/pmail/models"
"github.com/Jinnrry/pmail/utils/context"
"git.pcux.cn/xuans/Smail/config"
"git.pcux.cn/xuans/Smail/db"
"git.pcux.cn/xuans/Smail/dto/parsemail"
"git.pcux.cn/xuans/Smail/hooks"
"git.pcux.cn/xuans/Smail/hooks/framework"
"git.pcux.cn/xuans/Smail/models"
"git.pcux.cn/xuans/Smail/utils/context"
"xorm.io/xorm"
)
+13 -13
View File
@@ -10,19 +10,19 @@ import (
"strings"
"time"
"github.com/Jinnrry/pmail/config"
"github.com/Jinnrry/pmail/consts"
"github.com/Jinnrry/pmail/db"
"github.com/Jinnrry/pmail/dto/parsemail"
"github.com/Jinnrry/pmail/hooks"
"github.com/Jinnrry/pmail/hooks/framework"
"github.com/Jinnrry/pmail/listen/imap_server"
"github.com/Jinnrry/pmail/models"
"github.com/Jinnrry/pmail/services/rule"
"github.com/Jinnrry/pmail/utils/array"
"github.com/Jinnrry/pmail/utils/async"
"github.com/Jinnrry/pmail/utils/context"
"github.com/Jinnrry/pmail/utils/send"
"git.pcux.cn/xuans/Smail/config"
"git.pcux.cn/xuans/Smail/consts"
"git.pcux.cn/xuans/Smail/db"
"git.pcux.cn/xuans/Smail/dto/parsemail"
"git.pcux.cn/xuans/Smail/hooks"
"git.pcux.cn/xuans/Smail/hooks/framework"
"git.pcux.cn/xuans/Smail/listen/imap_server"
"git.pcux.cn/xuans/Smail/models"
"git.pcux.cn/xuans/Smail/services/rule"
"git.pcux.cn/xuans/Smail/utils/array"
"git.pcux.cn/xuans/Smail/utils/async"
"git.pcux.cn/xuans/Smail/utils/context"
"git.pcux.cn/xuans/Smail/utils/send"
"github.com/mileusna/spf"
log "github.com/sirupsen/logrus"
"github.com/spf13/cast"
@@ -2,12 +2,12 @@ package smtp_server
import (
"bytes"
"github.com/Jinnrry/pmail/config"
"github.com/Jinnrry/pmail/db"
parsemail2 "github.com/Jinnrry/pmail/dto/parsemail"
"github.com/Jinnrry/pmail/hooks"
"github.com/Jinnrry/pmail/session"
"github.com/Jinnrry/pmail/utils/context"
"git.pcux.cn/xuans/Smail/config"
"git.pcux.cn/xuans/Smail/db"
parsemail2 "git.pcux.cn/xuans/Smail/dto/parsemail"
"git.pcux.cn/xuans/Smail/hooks"
"git.pcux.cn/xuans/Smail/session"
"git.pcux.cn/xuans/Smail/utils/context"
log "github.com/sirupsen/logrus"
"net"
"net/netip"
@@ -40,7 +40,7 @@ func testInit() {
config.Init()
config.Instance.DkimPrivateKeyPath = config.ROOT_PATH + "./config/dkim/dkim.priv"
config.Instance.DbType = config.DBTypeSQLite
config.Instance.DbDSN = config.ROOT_PATH + "./config/pmail_temp.db"
config.Instance.DbDSN = config.ROOT_PATH + "./config/smail_temp.db"
parsemail2.Init()
db.Init("")
@@ -137,7 +137,7 @@ PGRpdiBkaXI9Imx0ciI+PGRpdj7mraPmlofmtYvor5UyPC9kaXY+PC9kaXY+DQo=
}
func TestPmailEmail(t *testing.T) {
func TestSmailEmail(t *testing.T) {
testInit()
emailData := `DKIM-Signature: a=rsa-sha256; bh=x7Rh+N2y2K9exccEAyKCTAGDgYKfnLZpMWc25ug5Ny4=;
c=simple/simple; d=domain.com;
+1 -1
View File
@@ -4,7 +4,7 @@ import (
"crypto/tls"
"time"
"github.com/Jinnrry/pmail/config"
"git.pcux.cn/xuans/Smail/config"
"github.com/emersion/go-smtp"
log "github.com/sirupsen/logrus"
)
+3 -3
View File
@@ -1,9 +1,9 @@
package main
import (
"github.com/Jinnrry/pmail/config"
"github.com/Jinnrry/pmail/listen/cron_server"
"github.com/Jinnrry/pmail/res_init"
"git.pcux.cn/xuans/Smail/config"
"git.pcux.cn/xuans/Smail/listen/cron_server"
"git.pcux.cn/xuans/Smail/res_init"
log "github.com/sirupsen/logrus"
)
+10 -10
View File
@@ -6,12 +6,12 @@ import (
"encoding/json"
"flag"
"fmt"
"github.com/Jinnrry/pmail/config"
"github.com/Jinnrry/pmail/db"
"github.com/Jinnrry/pmail/dto/response"
"github.com/Jinnrry/pmail/models"
"github.com/Jinnrry/pmail/signal"
"github.com/Jinnrry/pmail/utils/array"
"git.pcux.cn/xuans/Smail/config"
"git.pcux.cn/xuans/Smail/db"
"git.pcux.cn/xuans/Smail/dto/response"
"git.pcux.cn/xuans/Smail/models"
"git.pcux.cn/xuans/Smail/signal"
"git.pcux.cn/xuans/Smail/utils/array"
"github.com/spf13/cast"
"io"
"net"
@@ -38,7 +38,7 @@ func TestMain(m *testing.M) {
httpClient = &http.Client{Jar: cookeieJar, Timeout: 5 * time.Minute}
os.Remove("config/config.json")
os.Remove("config/pmail_temp.db")
os.Remove("config/smail_temp.db")
os.Setenv("setup_port", cast.ToString(TestPort))
go func() {
@@ -375,16 +375,16 @@ func testDataBaseSet(t *testing.T) {
argList := flag.Args()
configData := `
{"action":"set","step":"database","db_type":"sqlite","db_dsn":"./config/pmail_temp.db"}
{"action":"set","step":"database","db_type":"sqlite","db_dsn":"./config/smail_temp.db"}
`
if array.InArray("mysql", argList) {
configData = `
{"action":"set","step":"database","db_type":"mysql","db_dsn":"root:githubTest@tcp(mysql:3306)/pmail?parseTime=True"}
{"action":"set","step":"database","db_type":"mysql","db_dsn":"root:githubTest@tcp(mysql:3306)/smail?parseTime=True"}
`
} else if array.InArray("postgres", argList) {
configData = `
{"action":"set","step":"database","db_type":"postgres","db_dsn":"postgres://postgres:githubTest@postgres:5432/pmail?sslmode=disable"}
{"action":"set","step":"database","db_type":"postgres","db_dsn":"postgres://postgres:githubTest@postgres:5432/smail?sslmode=disable"}
`
}
+12 -12
View File
@@ -7,18 +7,18 @@ import (
"fmt"
"github.com/Jinnrry/pmail/config"
"github.com/Jinnrry/pmail/db"
"github.com/Jinnrry/pmail/dto/parsemail"
"github.com/Jinnrry/pmail/hooks"
"github.com/Jinnrry/pmail/listen/http_server"
"github.com/Jinnrry/pmail/listen/imap_server"
"github.com/Jinnrry/pmail/listen/pop3_server"
"github.com/Jinnrry/pmail/listen/smtp_server"
"github.com/Jinnrry/pmail/services/setup/ssl"
"github.com/Jinnrry/pmail/session"
"github.com/Jinnrry/pmail/signal"
"github.com/Jinnrry/pmail/utils/file"
"git.pcux.cn/xuans/Smail/config"
"git.pcux.cn/xuans/Smail/db"
"git.pcux.cn/xuans/Smail/dto/parsemail"
"git.pcux.cn/xuans/Smail/hooks"
"git.pcux.cn/xuans/Smail/listen/http_server"
"git.pcux.cn/xuans/Smail/listen/imap_server"
"git.pcux.cn/xuans/Smail/listen/pop3_server"
"git.pcux.cn/xuans/Smail/listen/smtp_server"
"git.pcux.cn/xuans/Smail/services/setup/ssl"
"git.pcux.cn/xuans/Smail/session"
"git.pcux.cn/xuans/Smail/signal"
"git.pcux.cn/xuans/Smail/utils/file"
log "github.com/sirupsen/logrus"
// 新增:HTTP 就绪探测
"net/http"
+5 -5
View File
@@ -2,11 +2,11 @@ package attachments
import (
"encoding/json"
"github.com/Jinnrry/pmail/db"
"github.com/Jinnrry/pmail/dto/parsemail"
"github.com/Jinnrry/pmail/models"
"github.com/Jinnrry/pmail/services/auth"
"github.com/Jinnrry/pmail/utils/context"
"git.pcux.cn/xuans/Smail/db"
"git.pcux.cn/xuans/Smail/dto/parsemail"
"git.pcux.cn/xuans/Smail/models"
"git.pcux.cn/xuans/Smail/services/auth"
"git.pcux.cn/xuans/Smail/utils/context"
log "github.com/sirupsen/logrus"
)
+3 -3
View File
@@ -7,9 +7,9 @@ import (
"crypto/x509"
"encoding/base64"
"encoding/pem"
"github.com/Jinnrry/pmail/db"
"github.com/Jinnrry/pmail/models"
"github.com/Jinnrry/pmail/utils/context"
"git.pcux.cn/xuans/Smail/db"
"git.pcux.cn/xuans/Smail/models"
"git.pcux.cn/xuans/Smail/utils/context"
log "github.com/sirupsen/logrus"
"os"
"strings"
+4 -4
View File
@@ -1,10 +1,10 @@
package del_email
import (
"github.com/Jinnrry/pmail/consts"
"github.com/Jinnrry/pmail/db"
"github.com/Jinnrry/pmail/models"
"github.com/Jinnrry/pmail/utils/context"
"git.pcux.cn/xuans/Smail/consts"
"git.pcux.cn/xuans/Smail/db"
"git.pcux.cn/xuans/Smail/models"
"git.pcux.cn/xuans/Smail/utils/context"
log "github.com/sirupsen/logrus"
"github.com/spf13/cast"
"log/slog"
+8 -8
View File
@@ -4,14 +4,14 @@ import (
"database/sql"
"encoding/json"
"fmt"
"github.com/Jinnrry/pmail/db"
"github.com/Jinnrry/pmail/dto/parsemail"
"github.com/Jinnrry/pmail/dto/response"
"github.com/Jinnrry/pmail/models"
"github.com/Jinnrry/pmail/services/list"
"github.com/Jinnrry/pmail/utils/array"
"github.com/Jinnrry/pmail/utils/context"
"github.com/Jinnrry/pmail/utils/errors"
"git.pcux.cn/xuans/Smail/db"
"git.pcux.cn/xuans/Smail/dto/parsemail"
"git.pcux.cn/xuans/Smail/dto/response"
"git.pcux.cn/xuans/Smail/models"
"git.pcux.cn/xuans/Smail/services/list"
"git.pcux.cn/xuans/Smail/utils/array"
"git.pcux.cn/xuans/Smail/utils/context"
"git.pcux.cn/xuans/Smail/utils/errors"
log "github.com/sirupsen/logrus"
"strings"
)
+8 -8
View File
@@ -3,14 +3,14 @@ package group
import (
errors2 "errors"
"fmt"
"github.com/Jinnrry/pmail/consts"
"github.com/Jinnrry/pmail/db"
"github.com/Jinnrry/pmail/dto"
"github.com/Jinnrry/pmail/models"
"github.com/Jinnrry/pmail/services/del_email"
"github.com/Jinnrry/pmail/utils/array"
"github.com/Jinnrry/pmail/utils/context"
"github.com/Jinnrry/pmail/utils/errors"
"git.pcux.cn/xuans/Smail/consts"
"git.pcux.cn/xuans/Smail/db"
"git.pcux.cn/xuans/Smail/dto"
"git.pcux.cn/xuans/Smail/models"
"git.pcux.cn/xuans/Smail/services/del_email"
"git.pcux.cn/xuans/Smail/utils/array"
"git.pcux.cn/xuans/Smail/utils/context"
"git.pcux.cn/xuans/Smail/utils/errors"
log "github.com/sirupsen/logrus"
"strings"
"xorm.io/builder"
+3 -3
View File
@@ -2,9 +2,9 @@ package group
import (
"fmt"
"github.com/Jinnrry/pmail/config"
"github.com/Jinnrry/pmail/db"
"github.com/Jinnrry/pmail/utils/context"
"git.pcux.cn/xuans/Smail/config"
"git.pcux.cn/xuans/Smail/db"
"git.pcux.cn/xuans/Smail/utils/context"
"testing"
)
+4 -4
View File
@@ -4,10 +4,10 @@ import (
"strings"
"time"
"github.com/Jinnrry/pmail/db"
"github.com/Jinnrry/pmail/dto/response"
"github.com/Jinnrry/pmail/models"
"github.com/Jinnrry/pmail/utils/context"
"git.pcux.cn/xuans/Smail/db"
"git.pcux.cn/xuans/Smail/dto/response"
"git.pcux.cn/xuans/Smail/models"
"git.pcux.cn/xuans/Smail/utils/context"
"github.com/emersion/go-imap/v2"
log "github.com/sirupsen/logrus"
)
+7 -7
View File
@@ -2,13 +2,13 @@ package list
import (
"fmt"
"github.com/Jinnrry/pmail/consts"
"github.com/Jinnrry/pmail/db"
"github.com/Jinnrry/pmail/dto"
"github.com/Jinnrry/pmail/dto/response"
"github.com/Jinnrry/pmail/models"
"github.com/Jinnrry/pmail/utils/array"
"github.com/Jinnrry/pmail/utils/context"
"git.pcux.cn/xuans/Smail/consts"
"git.pcux.cn/xuans/Smail/db"
"git.pcux.cn/xuans/Smail/dto"
"git.pcux.cn/xuans/Smail/dto/response"
"git.pcux.cn/xuans/Smail/models"
"git.pcux.cn/xuans/Smail/utils/array"
"git.pcux.cn/xuans/Smail/utils/context"
log "github.com/sirupsen/logrus"
"strings"
)
+2 -2
View File
@@ -1,8 +1,8 @@
package match
import (
"github.com/Jinnrry/pmail/dto/parsemail"
"github.com/Jinnrry/pmail/utils/context"
"git.pcux.cn/xuans/Smail/dto/parsemail"
"git.pcux.cn/xuans/Smail/utils/context"
)
const (
+2 -2
View File
@@ -1,8 +1,8 @@
package match
import (
"github.com/Jinnrry/pmail/dto/parsemail"
"github.com/Jinnrry/pmail/utils/context"
"git.pcux.cn/xuans/Smail/dto/parsemail"
"git.pcux.cn/xuans/Smail/utils/context"
"strings"
)
+2 -2
View File
@@ -1,8 +1,8 @@
package match
import (
"github.com/Jinnrry/pmail/dto/parsemail"
"github.com/Jinnrry/pmail/utils/context"
"git.pcux.cn/xuans/Smail/dto/parsemail"
"git.pcux.cn/xuans/Smail/utils/context"
)
type EqualMatch struct {
+2 -2
View File
@@ -1,8 +1,8 @@
package match
import (
"github.com/Jinnrry/pmail/dto/parsemail"
"github.com/Jinnrry/pmail/utils/context"
"git.pcux.cn/xuans/Smail/dto/parsemail"
"git.pcux.cn/xuans/Smail/utils/context"
"github.com/dlclark/regexp2"
log "github.com/sirupsen/logrus"
)
+9 -9
View File
@@ -4,15 +4,15 @@ import (
"fmt"
"strings"
"github.com/Jinnrry/pmail/config"
"github.com/Jinnrry/pmail/consts"
"github.com/Jinnrry/pmail/db"
"github.com/Jinnrry/pmail/dto"
"github.com/Jinnrry/pmail/dto/parsemail"
"github.com/Jinnrry/pmail/models"
"github.com/Jinnrry/pmail/services/rule/match"
"github.com/Jinnrry/pmail/utils/context"
"github.com/Jinnrry/pmail/utils/send"
"git.pcux.cn/xuans/Smail/config"
"git.pcux.cn/xuans/Smail/consts"
"git.pcux.cn/xuans/Smail/db"
"git.pcux.cn/xuans/Smail/dto"
"git.pcux.cn/xuans/Smail/dto/parsemail"
"git.pcux.cn/xuans/Smail/models"
"git.pcux.cn/xuans/Smail/services/rule/match"
"git.pcux.cn/xuans/Smail/utils/context"
"git.pcux.cn/xuans/Smail/utils/send"
log "github.com/sirupsen/logrus"
"github.com/spf13/cast"
)
+5 -5
View File
@@ -4,11 +4,11 @@ import (
"strings"
"testing"
"github.com/Jinnrry/pmail/config"
"github.com/Jinnrry/pmail/db"
"github.com/Jinnrry/pmail/dto/parsemail"
"github.com/Jinnrry/pmail/models"
"github.com/Jinnrry/pmail/utils/context"
"git.pcux.cn/xuans/Smail/config"
"git.pcux.cn/xuans/Smail/db"
"git.pcux.cn/xuans/Smail/dto/parsemail"
"git.pcux.cn/xuans/Smail/models"
"git.pcux.cn/xuans/Smail/utils/context"
_ "modernc.org/sqlite"
"xorm.io/xorm"
)
+8 -8
View File
@@ -1,13 +1,13 @@
package setup
import (
"github.com/Jinnrry/pmail/config"
"github.com/Jinnrry/pmail/db"
"github.com/Jinnrry/pmail/models"
"github.com/Jinnrry/pmail/utils/array"
"github.com/Jinnrry/pmail/utils/context"
"github.com/Jinnrry/pmail/utils/errors"
"github.com/Jinnrry/pmail/utils/password"
"git.pcux.cn/xuans/Smail/config"
"git.pcux.cn/xuans/Smail/db"
"git.pcux.cn/xuans/Smail/models"
"git.pcux.cn/xuans/Smail/utils/array"
"git.pcux.cn/xuans/Smail/utils/context"
"git.pcux.cn/xuans/Smail/utils/errors"
"git.pcux.cn/xuans/Smail/utils/password"
)
func GetDatabaseSettings(ctx *context.Context) (string, string, error) {
@@ -17,7 +17,7 @@ func GetDatabaseSettings(ctx *context.Context) (string, string, error) {
}
if configData.DbType == "" && configData.DbDSN == "" {
return config.DBTypeSQLite, config.ROOT_PATH + "./config/pmail.db", nil
return config.DBTypeSQLite, config.ROOT_PATH + "./config/smail.db", nil
}
return configData.DbType, configData.DbDSN, nil
+6 -6
View File
@@ -2,14 +2,14 @@ package setup
import (
"fmt"
"github.com/Jinnrry/pmail/config"
"git.pcux.cn/xuans/Smail/config"
"strings"
"github.com/Jinnrry/pmail/i18n"
"github.com/Jinnrry/pmail/services/auth"
"github.com/Jinnrry/pmail/utils/context"
"github.com/Jinnrry/pmail/utils/errors"
"github.com/Jinnrry/pmail/utils/ip"
"git.pcux.cn/xuans/Smail/i18n"
"git.pcux.cn/xuans/Smail/services/auth"
"git.pcux.cn/xuans/Smail/utils/context"
"git.pcux.cn/xuans/Smail/utils/errors"
"git.pcux.cn/xuans/Smail/utils/ip"
)
type DNSItem struct {
+3 -3
View File
@@ -1,9 +1,9 @@
package setup
import (
"github.com/Jinnrry/pmail/config"
"github.com/Jinnrry/pmail/utils/array"
"github.com/Jinnrry/pmail/utils/errors"
"git.pcux.cn/xuans/Smail/config"
"git.pcux.cn/xuans/Smail/utils/array"
"git.pcux.cn/xuans/Smail/utils/errors"
"strings"
)
+3 -3
View File
@@ -1,9 +1,9 @@
package setup
import (
"github.com/Jinnrry/pmail/config"
"github.com/Jinnrry/pmail/signal"
"github.com/Jinnrry/pmail/utils/errors"
"git.pcux.cn/xuans/Smail/config"
"git.pcux.cn/xuans/Smail/signal"
"git.pcux.cn/xuans/Smail/utils/errors"
)
// Finish 标记初始化完成
+1 -1
View File
@@ -1,7 +1,7 @@
package ssl
import (
"github.com/Jinnrry/pmail/utils/context"
"git.pcux.cn/xuans/Smail/utils/context"
"github.com/go-acme/lego/v4/challenge/dns01"
log "github.com/sirupsen/logrus"
"time"
+1 -1
View File
@@ -3,7 +3,7 @@ package ssl
//import (
// "github.com/go-acme/lego/v4/providers/dns"
// "os"
// "pmail/utils/errors"
// "git.pcux.cn/xuans/Smail/utils/errors"
// "regexp"
// "strings"
//)
+7 -7
View File
@@ -5,11 +5,11 @@ import (
"crypto/ecdsa"
"crypto/tls"
"crypto/x509"
"github.com/Jinnrry/pmail/config"
"github.com/Jinnrry/pmail/services/setup"
"github.com/Jinnrry/pmail/signal"
"github.com/Jinnrry/pmail/utils/async"
"github.com/Jinnrry/pmail/utils/errors"
"git.pcux.cn/xuans/Smail/config"
"git.pcux.cn/xuans/Smail/services/setup"
"git.pcux.cn/xuans/Smail/signal"
"git.pcux.cn/xuans/Smail/utils/async"
"git.pcux.cn/xuans/Smail/utils/errors"
"github.com/go-acme/lego/v4/certificate"
"github.com/go-acme/lego/v4/challenge/dns01"
log "github.com/sirupsen/logrus"
@@ -85,7 +85,7 @@ func renewCertificate(privateKey *ecdsa.PrivateKey, cfg *config.Config) error {
}
conf := lego.NewConfig(&myUser)
conf.UserAgent = "PMail"
conf.UserAgent = "Smail"
conf.Certificate.KeyType = certcrypto.RSA2048
// A client facilitates communication with the CA server.
@@ -164,7 +164,7 @@ func generateCertificate(privateKey *ecdsa.PrivateKey, cfg *config.Config, newAc
}
conf := lego.NewConfig(&myUser)
conf.UserAgent = "PMail"
conf.UserAgent = "Smail"
conf.Certificate.KeyType = certcrypto.RSA2048
// A client facilitates communication with the CA server.
+1 -1
View File
@@ -2,7 +2,7 @@ package ssl
import (
"fmt"
"github.com/Jinnrry/pmail/config"
"git.pcux.cn/xuans/Smail/config"
"testing"
)
+2 -2
View File
@@ -1,8 +1,8 @@
package session
import (
"github.com/Jinnrry/pmail/config"
"github.com/Jinnrry/pmail/db"
"git.pcux.cn/xuans/Smail/config"
"git.pcux.cn/xuans/Smail/db"
"github.com/alexedwards/scs/mysqlstore"
"github.com/alexedwards/scs/postgresstore"
"github.com/alexedwards/scs/sqlite3store"
+1 -1
View File
@@ -2,7 +2,7 @@ package async
import (
"errors"
"github.com/Jinnrry/pmail/utils/context"
"git.pcux.cn/xuans/Smail/utils/context"
log "github.com/sirupsen/logrus"
"github.com/spf13/cast"
"runtime/debug"
+8 -8
View File
@@ -5,14 +5,14 @@ import (
"crypto/x509"
"errors"
"fmt"
"github.com/Jinnrry/pmail/config"
"github.com/Jinnrry/pmail/dto/parsemail"
"github.com/Jinnrry/pmail/models"
"github.com/Jinnrry/pmail/utils/array"
"github.com/Jinnrry/pmail/utils/async"
"github.com/Jinnrry/pmail/utils/consts"
"github.com/Jinnrry/pmail/utils/context"
"github.com/Jinnrry/pmail/utils/smtp"
"git.pcux.cn/xuans/Smail/config"
"git.pcux.cn/xuans/Smail/dto/parsemail"
"git.pcux.cn/xuans/Smail/models"
"git.pcux.cn/xuans/Smail/utils/array"
"git.pcux.cn/xuans/Smail/utils/async"
"git.pcux.cn/xuans/Smail/utils/consts"
"git.pcux.cn/xuans/Smail/utils/context"
"git.pcux.cn/xuans/Smail/utils/smtp"
log "github.com/sirupsen/logrus"
"net"
"net/textproto"
Loaded 100 of 131 files, more files were not shown because too many files have changed in this diff. Show more