修复POP3协议会话和删除行为
Security Checks / security (push) Waiting to run

This commit is contained in:
xuans committed 2026-09-06 05:38:09 +08:00
1 parent 64b1aebef3
commit bf2d7b6e2d
3 files changed
+157 -76

No files matched your search

+6 -2
View File
@@ -234,6 +234,8 @@ func (s *Server) handleClient(conn net.Conn) {
infos, err := s.Action.List(session, getSafeArg(args, 0)) infos, err := s.Action.List(session, getSafeArg(args, 0))
if err != nil { if err != nil {
fmt.Fprintf(conn, "-ERR %s %s", err.Error(), eol) fmt.Fprintf(conn, "-ERR %s %s", err.Error(), eol)
} else if len(args) > 0 && len(infos) == 1 {
fmt.Fprintf(conn, "+OK %d %d%s", infos[0].Id, infos[0].Size, eol)
} else { } else {
ret := "+OK" + eol ret := "+OK" + eol
for _, info := range infos { for _, info := range infos {
@@ -248,6 +250,8 @@ func (s *Server) handleClient(conn net.Conn) {
infos, err := s.Action.Uidl(session, getSafeArg(args, 0)) infos, err := s.Action.Uidl(session, getSafeArg(args, 0))
if err != nil { if err != nil {
fmt.Fprintf(conn, "-ERR %s %s", err.Error(), eol) fmt.Fprintf(conn, "-ERR %s %s", err.Error(), eol)
} else if len(args) > 0 && len(infos) == 1 {
fmt.Fprintf(conn, "+OK %d %s%s", infos[0].Id, infos[0].UnionId, eol)
} else { } else {
ret := fmt.Sprintf("+OK%s", eol) ret := fmt.Sprintf("+OK%s", eol)
for _, info := range infos { for _, info := range infos {
@@ -261,7 +265,7 @@ func (s *Server) handleClient(conn net.Conn) {
if session.Status == TRANSACTION { if session.Status == TRANSACTION {
id, err1 := strconv.ParseInt(getSafeArg(args, 0), 10, 64) id, err1 := strconv.ParseInt(getSafeArg(args, 0), 10, 64)
line, err2 := strconv.Atoi(getSafeArg(args, 1)) line, err2 := strconv.Atoi(getSafeArg(args, 1))
if err1 != nil || err2 != nil { if err1 != nil || err2 != nil || line < 0 {
fmt.Fprintf(conn, "-ERR %s %s", "params error", eol) fmt.Fprintf(conn, "-ERR %s %s", "params error", eol)
} else { } else {
res, err := s.Action.Top(session, id, line) res, err := s.Action.Top(session, id, line)
@@ -306,7 +310,7 @@ func (s *Server) handleClient(conn net.Conn) {
} }
} }
} }
case "REST": case "RSET", "REST":
if session.Status == TRANSACTION { if session.Status == TRANSACTION {
err := s.Action.Rest(session) err := s.Action.Rest(session)
if err != nil { if err != nil {
+9 -7
View File
@@ -15,11 +15,13 @@ const (
) )
type Session struct { type Session struct {
Status Status Status Status
User string User string
DeleteIds []int64 DeleteIds []int64
Ctx context.Context MessageIDs []int64
Conn net.Conn MessageMap map[int64]int64
InTls bool Ctx context.Context
AliveTime time.Time Conn net.Conn
InTls bool
AliveTime time.Time
} }
+142 -67
View File
@@ -5,6 +5,7 @@ import (
"git.pcux.cn/xuans/Smail/consts" "git.pcux.cn/xuans/Smail/consts"
"git.pcux.cn/xuans/Smail/dto" "git.pcux.cn/xuans/Smail/dto"
"git.pcux.cn/xuans/Smail/dto/parsemail" "git.pcux.cn/xuans/Smail/dto/parsemail"
"git.pcux.cn/xuans/Smail/dto/response"
"git.pcux.cn/xuans/Smail/internal/gopop" "git.pcux.cn/xuans/Smail/internal/gopop"
"git.pcux.cn/xuans/Smail/services/access" "git.pcux.cn/xuans/Smail/services/access"
"git.pcux.cn/xuans/Smail/services/auth" "git.pcux.cn/xuans/Smail/services/auth"
@@ -17,6 +18,7 @@ import (
"git.pcux.cn/xuans/Smail/utils/id" "git.pcux.cn/xuans/Smail/utils/id"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
"github.com/spf13/cast" "github.com/spf13/cast"
"strconv"
"strings" "strings"
) )
@@ -129,52 +131,41 @@ func (a action) Apop(session *gopop.Session, username, digest string) error {
} }
func (a action) Stat(session *gopop.Session) (msgNum, msgSize int64, err error) { func (a action) Stat(session *gopop.Session) (msgNum, msgSize int64, err error) {
log.WithContext(session.Ctx).Debugf("POP3 CMD: STAT") log.WithContext(session.Ctx).Debugf("POP3 CMD: STAT")
emailList, err := a.visibleMessages(session)
num, size, err := list.Stat(session.Ctx.(*context.Context))
if err != nil { if err != nil {
return 0, 0, err return 0, 0, err
} }
log.WithContext(session.Ctx).Debugf("POP3 STAT RETURT : %d,%d", num, size) for _, info := range emailList {
return num, size, nil msgNum++
msgSize += int64(info.Size)
}
log.WithContext(session.Ctx).Debugf("POP3 STAT RETURT : %d,%d", msgNum, msgSize)
return msgNum, msgSize, nil
} }
// Uidl 查询某封邮件的唯一标志符 // Uidl 查询某封邮件的唯一标志符
func (a action) Uidl(session *gopop.Session, msg string) ([]gopop.UidlItem, error) { func (a action) Uidl(session *gopop.Session, msg string) ([]gopop.UidlItem, error) {
log.WithContext(session.Ctx).Debugf("POP3 CMD: UIDL ,Args:%s", msg) log.WithContext(session.Ctx).Debugf("POP3 CMD: UIDL ,Args:%s", msg)
reqId := cast.ToInt64(msg) if msg != "" {
if reqId > 0 { number, err := parseMessageNumber(msg)
info, err := detail.GetEmailDetail(session.Ctx.(*context.Context), cast.ToInt(reqId), false) if err != nil {
if err != nil || info == nil { return nil, err
return nil, errors2.New("no such message")
} }
log.WithContext(session.Ctx).Debugf("Uidl \n %+v", reqId) id, err := a.resolveMessageID(session, int64(number))
return []gopop.UidlItem{ if err != nil {
{ return nil, err
Id: reqId, }
UnionId: msg, return []gopop.UidlItem{{Id: int64(number), UnionId: cast.ToString(id)}}, nil
},
}, nil
} }
var res []listItem emailList, err := a.visibleMessages(session)
emailList, _, err := list.GetEmailList(session.Ctx.(*context.Context), dto.SearchTag{Type: consts.EmailTypeReceive, Status: -1, GroupId: -1}, "", true, 0, 99999)
if err != nil { if err != nil {
return nil, err return nil, err
} }
for _, info := range emailList { ret := make([]gopop.UidlItem, 0, len(emailList))
res = append(res, listItem{ for number, info := range emailList {
Id: cast.ToInt64(info.Id), ret = append(ret, gopop.UidlItem{Id: int64(number + 1), UnionId: cast.ToString(info.Id)})
Size: cast.ToInt64(info.Size),
})
}
ret := []gopop.UidlItem{}
for _, re := range res {
ret = append(ret, gopop.UidlItem{
Id: re.Id,
UnionId: cast.ToString(re.Id),
})
} }
log.WithContext(session.Ctx).Debugf("Uidl \n %+v", ret) log.WithContext(session.Ctx).Debugf("Uidl \n %+v", ret)
@@ -189,49 +180,41 @@ type listItem struct {
// List 邮件列表 // List 邮件列表
func (a action) List(session *gopop.Session, msg string) ([]gopop.MailInfo, error) { func (a action) List(session *gopop.Session, msg string) ([]gopop.MailInfo, error) {
log.WithContext(session.Ctx).Debugf("POP3 CMD: LIST ,Args:%s", msg) log.WithContext(session.Ctx).Debugf("POP3 CMD: LIST ,Args:%s", msg)
var res []listItem requestedNumber := 0
var listId int
if msg != "" { if msg != "" {
listId = cast.ToInt(msg) var err error
if listId == 0 { requestedNumber, err = parseMessageNumber(msg)
return nil, errors.New("params error") if err != nil {
return nil, err
} }
} }
emailList, err := a.visibleMessages(session)
if listId != 0 { if err != nil {
info, err := detail.GetEmailDetail(session.Ctx.(*context.Context), listId, false) return nil, err
if err != nil { }
return nil, err if requestedNumber > 0 {
} id, err := a.resolveMessageID(session, int64(requestedNumber))
item := listItem{
Id: cast.ToInt64(info.Id),
Size: cast.ToInt64(info.Size),
}
if item.Size == 0 {
item.Size = 9999
}
res = append(res, item)
} else {
emailList, _, err := list.GetEmailList(session.Ctx.(*context.Context), dto.SearchTag{Type: consts.EmailTypeReceive, Status: -1, GroupId: -1}, "", true, 0, 99999)
if err != nil { if err != nil {
return nil, err return nil, err
} }
filtered := make([]*response.EmailResponseData, 0, 1)
for _, info := range emailList { for _, info := range emailList {
item := listItem{ if cast.ToInt64(info.Id) == id {
Id: cast.ToInt64(info.Id), filtered = append(filtered, info)
Size: cast.ToInt64(info.Size), break
} }
if item.Size == 0 {
item.Size = 9999
}
res = append(res, item)
} }
emailList = filtered
} }
ret := []gopop.MailInfo{} ret := make([]gopop.MailInfo, 0, len(emailList))
for _, re := range res { for number, info := range emailList {
size := int64(info.Size)
if size == 0 {
size = 9999
}
ret = append(ret, gopop.MailInfo{ ret = append(ret, gopop.MailInfo{
Id: re.Id, Id: int64(number + 1),
Size: re.Size, Size: size,
}) })
} }
@@ -242,7 +225,11 @@ func (a action) List(session *gopop.Session, msg string) ([]gopop.MailInfo, erro
// Retr 获取邮件详情 // Retr 获取邮件详情
func (a action) Retr(session *gopop.Session, id int64) (string, int64, error) { func (a action) Retr(session *gopop.Session, id int64) (string, int64, error) {
log.WithContext(session.Ctx).Debugf("POP3 CMD: RETR ,Args:%d", id) log.WithContext(session.Ctx).Debugf("POP3 CMD: RETR ,Args:%d", id)
email, err := detail.GetEmailDetail(session.Ctx.(*context.Context), cast.ToInt(id), false) actualID, err := a.resolveMessageID(session, id)
if err != nil {
return "", 0, err
}
email, err := detail.GetEmailDetail(session.Ctx.(*context.Context), cast.ToInt(actualID), false)
if err != nil { if err != nil {
log.WithContext(session.Ctx.(*context.Context)).Errorf("%+v", err) log.WithContext(session.Ctx.(*context.Context)).Errorf("%+v", err)
return "", 0, errors.New("server error") return "", 0, errors.New("server error")
@@ -266,8 +253,16 @@ func (a action) Retr(session *gopop.Session, id int64) (string, int64, error) {
// Delete 删除邮件 // Delete 删除邮件
func (a action) Delete(session *gopop.Session, id int64) error { func (a action) Delete(session *gopop.Session, id int64) error {
log.WithContext(session.Ctx).Debugf("POP3 CMD: DELE ,Args:%d", id) log.WithContext(session.Ctx).Debugf("POP3 CMD: DELE ,Args:%d", id)
actualID, err := a.resolveMessageID(session, id)
session.DeleteIds = append(session.DeleteIds, id) if err != nil {
return err
}
for _, deletedID := range session.DeleteIds {
if deletedID == actualID {
return errors2.New("message already marked for deletion")
}
}
session.DeleteIds = append(session.DeleteIds, actualID)
session.DeleteIds = array.Unique(session.DeleteIds) session.DeleteIds = array.Unique(session.DeleteIds)
return nil return nil
} }
@@ -280,7 +275,14 @@ func (a action) Rest(session *gopop.Session) error {
func (a action) Top(session *gopop.Session, id int64, n int) (string, error) { func (a action) Top(session *gopop.Session, id int64, n int) (string, error) {
log.WithContext(session.Ctx).Debugf("POP3 CMD: TOP %d %d", id, n) log.WithContext(session.Ctx).Debugf("POP3 CMD: TOP %d %d", id, n)
email, err := detail.GetEmailDetail(session.Ctx.(*context.Context), cast.ToInt(id), false) if n < 0 {
return "", errors2.New("invalid line count")
}
actualID, err := a.resolveMessageID(session, id)
if err != nil {
return "", err
}
email, err := detail.GetEmailDetail(session.Ctx.(*context.Context), cast.ToInt(actualID), false)
if err != nil { if err != nil {
log.WithContext(session.Ctx.(*context.Context)).Errorf("%+v", err) log.WithContext(session.Ctx.(*context.Context)).Errorf("%+v", err)
return "", errors2.New("password error") return "", errors2.New("password error")
@@ -314,6 +316,79 @@ func (a action) Top(session *gopop.Session, id int64, n int) (string, error) {
} }
func parseMessageNumber(value string) (int, error) {
number, err := strconv.Atoi(strings.TrimSpace(value))
if err != nil || number <= 0 {
return 0, errors2.New("no such message")
}
return number, nil
}
func (a action) ensureMessageMap(session *gopop.Session) ([]*response.EmailResponseData, error) {
if session.MessageMap != nil {
return nil, nil
}
emailList, _, err := list.GetEmailList(session.Ctx.(*context.Context), dto.SearchTag{Type: consts.EmailTypeReceive, Status: -1, GroupId: -1}, "", true, 0, 99999)
if err != nil {
return nil, err
}
session.MessageMap = make(map[int64]int64, len(emailList))
session.MessageIDs = make([]int64, 0, len(emailList))
for number, info := range emailList {
id := cast.ToInt64(info.Id)
session.MessageMap[int64(number+1)] = id
session.MessageIDs = append(session.MessageIDs, id)
}
return emailList, nil
}
func (a action) resolveMessageID(session *gopop.Session, number int64) (int64, error) {
if number <= 0 {
return 0, errors2.New("no such message")
}
if _, err := a.ensureMessageMap(session); err != nil {
return 0, err
}
id, ok := session.MessageMap[number]
if !ok {
return 0, errors2.New("no such message")
}
for _, deletedID := range session.DeleteIds {
if deletedID == id {
return 0, errors2.New("message already marked for deletion")
}
}
return id, nil
}
func (a action) visibleMessages(session *gopop.Session) ([]*response.EmailResponseData, error) {
emailList, err := a.ensureMessageMap(session)
if err != nil {
return nil, err
}
if emailList == nil {
emailList, _, err = list.GetEmailList(session.Ctx.(*context.Context), dto.SearchTag{Type: consts.EmailTypeReceive, Status: -1, GroupId: -1}, "", true, 0, 99999)
if err != nil {
return nil, err
}
}
result := make([]*response.EmailResponseData, 0, len(emailList))
for _, info := range emailList {
id := cast.ToInt64(info.Id)
marked := false
for _, deletedID := range session.DeleteIds {
if deletedID == id {
marked = true
break
}
}
if !marked {
result = append(result, info)
}
}
return result, nil
}
func (a action) Noop(session *gopop.Session) error { func (a action) Noop(session *gopop.Session) error {
log.WithContext(session.Ctx).Debugf("POP3 CMD: NOOP ") log.WithContext(session.Ctx).Debugf("POP3 CMD: NOOP ")
return nil return nil