v2.6.1 (#169)
1、新增垃圾邮件过滤插件 2、使用使用github.com/dlclark/regexp2替换go原生的正则包 3、修复空数据导致的邮件插入失败
This commit is contained in:
1 parent
9ffbdf41c3
commit
054336fe9e
78 files changed
+1123
-329
No files matched your search
@@ -2,12 +2,12 @@ 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"
|
||||
log "github.com/sirupsen/logrus"
|
||||
"pmail/db"
|
||||
"pmail/dto/parsemail"
|
||||
"pmail/models"
|
||||
"pmail/services/auth"
|
||||
"pmail/utils/context"
|
||||
)
|
||||
|
||||
func GetAttachments(ctx *context.Context, emailId int, cid string) (string, []byte) {
|
||||
|
||||
@@ -7,11 +7,11 @@ import (
|
||||
"crypto/x509"
|
||||
"encoding/base64"
|
||||
"encoding/pem"
|
||||
"github.com/Jinnrry/pmail/db"
|
||||
"github.com/Jinnrry/pmail/models"
|
||||
"github.com/Jinnrry/pmail/utils/context"
|
||||
log "github.com/sirupsen/logrus"
|
||||
"os"
|
||||
"pmail/db"
|
||||
"pmail/models"
|
||||
"pmail/utils/context"
|
||||
"strings"
|
||||
)
|
||||
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
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"
|
||||
"github.com/spf13/cast"
|
||||
"pmail/consts"
|
||||
"pmail/db"
|
||||
"pmail/models"
|
||||
"pmail/utils/context"
|
||||
"xorm.io/xorm"
|
||||
)
|
||||
|
||||
|
||||
@@ -4,13 +4,13 @@ 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/utils/context"
|
||||
"github.com/Jinnrry/pmail/utils/errors"
|
||||
log "github.com/sirupsen/logrus"
|
||||
"pmail/db"
|
||||
"pmail/dto/parsemail"
|
||||
"pmail/dto/response"
|
||||
"pmail/models"
|
||||
"pmail/utils/context"
|
||||
"pmail/utils/errors"
|
||||
"strings"
|
||||
)
|
||||
|
||||
|
||||
@@ -2,13 +2,13 @@ package group
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"github.com/Jinnrry/pmail/db"
|
||||
"github.com/Jinnrry/pmail/dto"
|
||||
"github.com/Jinnrry/pmail/models"
|
||||
"github.com/Jinnrry/pmail/utils/array"
|
||||
"github.com/Jinnrry/pmail/utils/context"
|
||||
"github.com/Jinnrry/pmail/utils/errors"
|
||||
log "github.com/sirupsen/logrus"
|
||||
"pmail/db"
|
||||
"pmail/dto"
|
||||
"pmail/models"
|
||||
"pmail/utils/array"
|
||||
"pmail/utils/context"
|
||||
"pmail/utils/errors"
|
||||
)
|
||||
|
||||
type GroupItem struct {
|
||||
|
||||
@@ -2,11 +2,11 @@ package list
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"github.com/Jinnrry/pmail/db"
|
||||
"github.com/Jinnrry/pmail/dto"
|
||||
"github.com/Jinnrry/pmail/dto/response"
|
||||
"github.com/Jinnrry/pmail/utils/context"
|
||||
log "github.com/sirupsen/logrus"
|
||||
"pmail/db"
|
||||
"pmail/dto"
|
||||
"pmail/dto/response"
|
||||
"pmail/utils/context"
|
||||
)
|
||||
|
||||
func GetEmailList(ctx *context.Context, tagInfo dto.SearchTag, keyword string, pop3List bool, offset, limit int) (emailList []*response.EmailResponseData, total int64) {
|
||||
|
||||
@@ -2,8 +2,8 @@ package match
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"pmail/dto/parsemail"
|
||||
"pmail/utils/context"
|
||||
"github.com/Jinnrry/pmail/dto/parsemail"
|
||||
"github.com/Jinnrry/pmail/utils/context"
|
||||
)
|
||||
|
||||
const (
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
package match
|
||||
|
||||
import (
|
||||
"pmail/dto/parsemail"
|
||||
"pmail/utils/context"
|
||||
"github.com/Jinnrry/pmail/dto/parsemail"
|
||||
"github.com/Jinnrry/pmail/utils/context"
|
||||
"strings"
|
||||
)
|
||||
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
package match
|
||||
|
||||
import (
|
||||
"pmail/dto/parsemail"
|
||||
"pmail/utils/context"
|
||||
"github.com/Jinnrry/pmail/dto/parsemail"
|
||||
"github.com/Jinnrry/pmail/utils/context"
|
||||
)
|
||||
|
||||
type EqualMatch struct {
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
package match
|
||||
|
||||
import (
|
||||
"github.com/Jinnrry/pmail/dto/parsemail"
|
||||
"github.com/Jinnrry/pmail/utils/context"
|
||||
"github.com/dlclark/regexp2"
|
||||
log "github.com/sirupsen/logrus"
|
||||
"pmail/dto/parsemail"
|
||||
"pmail/utils/context"
|
||||
"regexp"
|
||||
)
|
||||
|
||||
type RegexMatch struct {
|
||||
@@ -21,8 +21,8 @@ func NewRegexMatch(field, rule string) *RegexMatch {
|
||||
|
||||
func (r *RegexMatch) Match(ctx *context.Context, email *parsemail.Email) bool {
|
||||
content := getFieldContent(r.Field, email)
|
||||
|
||||
match, err := regexp.MatchString(r.Rule, content)
|
||||
re := regexp2.MustCompile(r.Rule, 0)
|
||||
match, err := re.MatchString(content)
|
||||
|
||||
if err != nil {
|
||||
log.WithContext(ctx).Errorf("rule regex error %v", err)
|
||||
|
||||
@@ -0,0 +1,13 @@
|
||||
package match
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"github.com/dlclark/regexp2"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func TestRegexMatch_Match(t *testing.T) {
|
||||
re := regexp2.MustCompile("^(?!.*abc\\.com).*", 0)
|
||||
match, err := re.MatchString("aa@abc.com")
|
||||
fmt.Println(match, err)
|
||||
}
|
||||
@@ -1,17 +1,17 @@
|
||||
package rule
|
||||
|
||||
import (
|
||||
"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"
|
||||
log "github.com/sirupsen/logrus"
|
||||
"github.com/spf13/cast"
|
||||
"pmail/config"
|
||||
"pmail/consts"
|
||||
"pmail/db"
|
||||
"pmail/dto"
|
||||
"pmail/dto/parsemail"
|
||||
"pmail/models"
|
||||
"pmail/services/rule/match"
|
||||
"pmail/utils/context"
|
||||
"pmail/utils/send"
|
||||
"strings"
|
||||
)
|
||||
|
||||
|
||||
@@ -2,15 +2,15 @@ package setup
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"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/file"
|
||||
"github.com/Jinnrry/pmail/utils/password"
|
||||
"os"
|
||||
"pmail/config"
|
||||
"pmail/db"
|
||||
"pmail/models"
|
||||
"pmail/utils/array"
|
||||
"pmail/utils/context"
|
||||
"pmail/utils/errors"
|
||||
"pmail/utils/file"
|
||||
"pmail/utils/password"
|
||||
)
|
||||
|
||||
func GetDatabaseSettings(ctx *context.Context) (string, string, error) {
|
||||
|
||||
@@ -2,11 +2,11 @@ package setup
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"pmail/i18n"
|
||||
"pmail/services/auth"
|
||||
"pmail/utils/context"
|
||||
"pmail/utils/errors"
|
||||
"pmail/utils/ip"
|
||||
"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"
|
||||
)
|
||||
|
||||
type DNSItem struct {
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
package setup
|
||||
|
||||
import (
|
||||
"pmail/utils/array"
|
||||
"pmail/utils/errors"
|
||||
"github.com/Jinnrry/pmail/utils/array"
|
||||
"github.com/Jinnrry/pmail/utils/errors"
|
||||
"strings"
|
||||
)
|
||||
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
package setup
|
||||
|
||||
import (
|
||||
"pmail/signal"
|
||||
"pmail/utils/errors"
|
||||
"github.com/Jinnrry/pmail/signal"
|
||||
"github.com/Jinnrry/pmail/utils/errors"
|
||||
)
|
||||
|
||||
// Finish 标记初始化完成
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
package ssl
|
||||
|
||||
import (
|
||||
"github.com/Jinnrry/pmail/utils/context"
|
||||
"github.com/go-acme/lego/v4/challenge/dns01"
|
||||
log "github.com/sirupsen/logrus"
|
||||
"pmail/utils/context"
|
||||
"time"
|
||||
)
|
||||
|
||||
|
||||
@@ -5,16 +5,16 @@ 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"
|
||||
"github.com/go-acme/lego/v4/certificate"
|
||||
"github.com/go-acme/lego/v4/challenge/dns01"
|
||||
log "github.com/sirupsen/logrus"
|
||||
"github.com/spf13/cast"
|
||||
"os"
|
||||
"pmail/config"
|
||||
"pmail/services/setup"
|
||||
"pmail/signal"
|
||||
"pmail/utils/async"
|
||||
"pmail/utils/errors"
|
||||
"time"
|
||||
|
||||
"github.com/go-acme/lego/v4/certcrypto"
|
||||
|
||||
Reference in new issue
Block a user