Feature/v2.8.0 (#231)

支持Imap协议
升级所有依赖
修复部分bug
This commit is contained in:
Jinnrry authored and GitHub committed 2025-01-04 16:23:07 +08:00
1 parent 6697d2b229
commit 5af46b32f6
82 files changed
+4149 -345

No files matched your search

+155 -4
View File
@@ -1,13 +1,22 @@
package config
import (
"bytes"
"crypto/ecdsa"
"crypto/elliptic"
"crypto/rand"
"crypto/x509"
"encoding/json"
"encoding/pem"
"fmt"
"github.com/Jinnrry/pmail/utils/context"
"github.com/Jinnrry/pmail/utils/errors"
"github.com/Jinnrry/pmail/utils/file"
log "github.com/sirupsen/logrus"
"os"
"path/filepath"
"strings"
"time"
)
var IsInit bool
@@ -41,6 +50,43 @@ type Config struct {
setupPort int // 初始化阶段端口
}
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.HasSuffix(ROOT_PATH, "/") {
ROOT_PATH += "/"
}
fmt.Println("Env Root Path:", ROOT_PATH)
return
}
}
ex, err := os.Executable()
if err != nil {
panic(err)
}
exPath := filepath.Dir(ex)
realPath, err := filepath.EvalSymlinks(exPath)
if err != nil {
panic(err)
}
// 如果是Goland运行,不修改根路径
if strings.Contains(realPath, "GoLand") && strings.Contains(realPath, "JetBrains") {
return
}
if !strings.HasSuffix(realPath, "/") {
realPath += "/"
}
ROOT_PATH = realPath
fmt.Println("Root Path:", ROOT_PATH)
}
func (c *Config) GetSetupPort() int {
return c.setupPort
}
@@ -60,24 +106,47 @@ var DBTypes []string = []string{DBTypeMySQL, DBTypeSQLite, DBTypePostgres}
var Instance *Config = &Config{}
type logFormatter struct {
}
// Format 定义日志输出格式
func (l *logFormatter) Format(entry *log.Entry) ([]byte, error) {
b := bytes.Buffer{}
b.WriteString(fmt.Sprintf("[%s]", entry.Level.String()))
b.WriteString(fmt.Sprintf("[%s]", entry.Time.Format("2006-01-02 15:04:05")))
if entry.Context != nil {
ctx := entry.Context.(*context.Context)
if ctx != nil {
b.WriteString(fmt.Sprintf("[%s]", ctx.GetValue(context.LogID)))
}
}
b.WriteString(fmt.Sprintf("[%s:%d]", entry.Caller.File, entry.Caller.Line))
b.WriteString(entry.Message)
b.WriteString("\n")
return b.Bytes(), nil
}
func Init() {
var cfgData []byte
var err error
args := os.Args
if len(args) >= 2 && args[len(args)-1] == "dev" {
cfgData, err = os.ReadFile("./config/config.dev.json")
cfgData, err = os.ReadFile(ROOT_PATH + "./config/config.dev.json")
if err != nil {
return
}
} else {
cfgData, err = os.ReadFile("./config/config.json")
cfgData, err = os.ReadFile(ROOT_PATH + "./config/config.json")
if err != nil {
log.Errorf("config file not found,%s", err.Error())
return
}
}
err = json.Unmarshal(cfgData, &Instance)
Instance.fixPath()
if err != nil {
return
}
@@ -90,10 +159,39 @@ func Init() {
IsInit = true
}
// 设置日志格式为json格式
log.SetFormatter(&logFormatter{})
log.SetReportCaller(true)
// 设置将日志输出到标准输出(默认的输出为stderr,标准错误)
// 日志消息输出可以是任意的io.writer类型
log.SetOutput(os.Stdout)
var cstZone = time.FixedZone("CST", 8*3600)
time.Local = cstZone
if Instance != nil {
switch Instance.LogLevel {
case "":
log.SetLevel(log.InfoLevel)
case "debug":
log.SetLevel(log.DebugLevel)
case "info":
log.SetLevel(log.InfoLevel)
case "warn":
log.SetLevel(log.WarnLevel)
case "error":
log.SetLevel(log.ErrorLevel)
default:
log.SetLevel(log.InfoLevel)
}
} else {
log.SetLevel(log.InfoLevel)
}
}
func ReadPrivateKey() (*ecdsa.PrivateKey, bool) {
key, err := os.ReadFile("./config/ssl/account_private.pem")
key, err := os.ReadFile(ROOT_PATH + "./config/ssl/account_private.pem")
if err != nil {
return createNewPrivateKey(), true
}
@@ -114,10 +212,63 @@ func createNewPrivateKey() *ecdsa.PrivateKey {
x509Encoded, _ := x509.MarshalECPrivateKey(privateKey)
// 将ec 密钥写入到 pem文件里
keypem, _ := os.OpenFile("./config/ssl/account_private.pem", os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0666)
keypem, _ := os.OpenFile(ROOT_PATH+"./config/ssl/account_private.pem", os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0666)
err = pem.Encode(keypem, &pem.Block{Type: "EC PRIVATE KEY", Bytes: x509Encoded})
if err != nil {
panic(err)
}
return privateKey
}
func WriteConfig(cfg *Config) error {
bytes, _ := json.Marshal(cfg)
_ = os.MkdirAll(ROOT_PATH+"/config/", 0755)
err := os.WriteFile(ROOT_PATH+"./config/config.json", bytes, 0666)
if err != nil {
return errors.Wrap(err)
}
return nil
}
func ReadConfig() (*Config, error) {
configData := Config{
DkimPrivateKeyPath: ROOT_PATH + "config/dkim/dkim.priv",
SSLPrivateKeyPath: ROOT_PATH + "config/ssl/private.key",
SSLPublicKeyPath: ROOT_PATH + "config/ssl/public.crt",
}
if !file.PathExist(ROOT_PATH + "./config/config.json") {
bytes, _ := json.Marshal(configData)
_ = os.MkdirAll(ROOT_PATH+"/config/", 0755)
err := os.WriteFile(ROOT_PATH+"./config/config.json", bytes, 0666)
if err != nil {
log.Errorf("Write Config Error:%s", err.Error())
return nil, errors.Wrap(err)
}
} else {
cfgData, err := os.ReadFile(ROOT_PATH + "./config/config.json")
if err != nil {
log.Errorf("Read Config Error:%s", err.Error())
return nil, errors.Wrap(err)
}
err = json.Unmarshal(cfgData, &configData)
configData.fixPath()
if err != nil {
log.Errorf("Read Config Unmarshal Error:%s", err.Error())
return nil, errors.Wrap(err)
}
}
return &configData, nil
}
func (c *Config) fixPath() {
if c.DbType == DBTypeSQLite && !strings.HasPrefix(c.DbDSN, "/") {
c.DbDSN = ROOT_PATH + c.DbDSN
}
if !strings.HasPrefix(c.SSLPublicKeyPath, "/") {
c.SSLPublicKeyPath = ROOT_PATH + c.SSLPublicKeyPath
}
if !strings.HasPrefix(c.SSLPrivateKeyPath, "/") {
c.SSLPrivateKeyPath = ROOT_PATH + c.SSLPrivateKeyPath
}
}
+1 -1
View File
@@ -1,5 +1,5 @@
{
"logLevel": "",
"logLevel": "debug",
"domain": "test.domain",
"domains": null,
"webDomain": "mail.test.domain",