修复生产审查凭据泄露风险并增加持久投递队列
This commit is contained in:
1 parent
071460ed9a
commit
6b009197bc
70 files changed
+1581
-262
No files matched your search
@@ -10,17 +10,14 @@ import (
|
||||
"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/services/access"
|
||||
"git.pcux.cn/xuans/Smail/services/outbox"
|
||||
|
||||
"git.pcux.cn/xuans/Smail/utils/async"
|
||||
"git.pcux.cn/xuans/Smail/utils/context"
|
||||
"git.pcux.cn/xuans/Smail/utils/send"
|
||||
"git.pcux.cn/xuans/Smail/utils/validation"
|
||||
log "github.com/sirupsen/logrus"
|
||||
"github.com/spf13/cast"
|
||||
"mime"
|
||||
"net/http"
|
||||
"strings"
|
||||
@@ -274,61 +271,12 @@ func Send(ctx *context.Context, w http.ResponseWriter, req *http.Request) {
|
||||
}
|
||||
RecordUserContacts(ctx.UserID, contactList)
|
||||
|
||||
e.MessageId = cast.ToInt64(modelEmail.Id)
|
||||
e.MsgID = modelEmail.MsgID
|
||||
|
||||
async.New(ctx).Process(func(p any) {
|
||||
errMsg := ""
|
||||
err, sendErr := send.SendTriggered(ctx, e, "网页写信")
|
||||
|
||||
log.WithContext(ctx).Debugf("插件执行--SendAfter")
|
||||
|
||||
as2 := async.New(ctx)
|
||||
for _, hook := range hooks.Snapshot() {
|
||||
if hook == nil {
|
||||
continue
|
||||
}
|
||||
as2.WaitProcess(func(hk any) {
|
||||
hk.(framework.EmailHook).SendAfter(ctx, e, sendErr)
|
||||
}, hook)
|
||||
}
|
||||
as2.Wait()
|
||||
log.WithContext(ctx).Debugf("插件执行--SendAfter")
|
||||
|
||||
if err != nil {
|
||||
errMsg = err.Error()
|
||||
_ = db.Transaction(db.Instance, func(session *xorm.Session) error {
|
||||
if _, updateErr := session.Exec(db.WithContext(ctx, "update email set status = ?, error = ? where id = ?"), consts.EmailStatusFail, errMsg, modelEmail.Id); updateErr != nil {
|
||||
log.WithContext(ctx).Errorf("update email status failed: %+v", updateErr)
|
||||
return updateErr
|
||||
}
|
||||
if _, updateErr := session.Exec(db.WithContext(ctx, "update user_email set status = ? where email_id = ? and user_id = ?"), consts.EmailStatusFail, modelEmail.Id, ctx.UserID); updateErr != nil {
|
||||
log.WithContext(ctx).Errorf("update user_email status failed: %+v", updateErr)
|
||||
return updateErr
|
||||
}
|
||||
return nil
|
||||
})
|
||||
} else {
|
||||
_ = db.Transaction(db.Instance, func(session *xorm.Session) error {
|
||||
if _, updateErr := session.Exec(db.WithContext(ctx, "update email set status = ?, error = '' where id = ?"), consts.EmailStatusSent, modelEmail.Id); updateErr != nil {
|
||||
log.WithContext(ctx).Errorf("update email status failed: %+v", updateErr)
|
||||
return updateErr
|
||||
}
|
||||
if _, updateErr := session.Exec(db.WithContext(ctx, "update user_email set status = ? where email_id = ? and user_id = ?"), consts.EmailStatusSent, modelEmail.Id, ctx.UserID); updateErr != nil {
|
||||
log.WithContext(ctx).Errorf("update user_email status failed: %+v", updateErr)
|
||||
return updateErr
|
||||
}
|
||||
return nil
|
||||
})
|
||||
}
|
||||
|
||||
}, nil)
|
||||
|
||||
response.NewSuccessResponse(i18n.GetText(ctx.Lang, "succ")).FPrint(w)
|
||||
}
|
||||
|
||||
func persistOutgoingEmail(engine *xorm.Engine, userID int, email *models.Email) error {
|
||||
return db.Transaction(engine, func(session *xorm.Session) error {
|
||||
var saved models.Email
|
||||
err := db.Transaction(engine, func(session *xorm.Session) error {
|
||||
candidate := *email
|
||||
candidate.Id = 0
|
||||
candidate.Status = consts.EmailStatusDeliveryPending
|
||||
@@ -347,9 +295,16 @@ func persistOutgoingEmail(engine *xorm.Engine, userID int, email *models.Email)
|
||||
if _, err := session.Insert(&relation); err != nil {
|
||||
return err
|
||||
}
|
||||
*email = candidate
|
||||
if err := outbox.Enqueue(session, candidate); err != nil {
|
||||
return err
|
||||
}
|
||||
saved = candidate
|
||||
return nil
|
||||
})
|
||||
if err == nil {
|
||||
*email = saved
|
||||
}
|
||||
return err
|
||||
}
|
||||
|
||||
func decodeAttachment(data string) (string, []byte, error) {
|
||||
|
||||
@@ -20,7 +20,7 @@ func TestSendTransactionalPersistenceConsistency(t *testing.T) {
|
||||
t.Fatalf("create test engine: %v", err)
|
||||
}
|
||||
engine.SetMaxOpenConns(1)
|
||||
if err := engine.Sync2(&models.Email{}, &models.UserEmail{}); err != nil {
|
||||
if err := engine.Sync2(&models.Email{}, &models.UserEmail{}, &models.OutboundDelivery{}); err != nil {
|
||||
t.Fatalf("sync test database: %v", err)
|
||||
}
|
||||
defer engine.Close()
|
||||
@@ -43,6 +43,7 @@ func TestSendTransactionalPersistenceConsistency(t *testing.T) {
|
||||
Status: consts.EmailStatusDeliveryPending,
|
||||
CreateTime: now,
|
||||
MsgID: "msg-123@example.com",
|
||||
To: `[{"EmailAddress":"recipient@example.com"}]`,
|
||||
}
|
||||
|
||||
err = persistOutgoingEmail(engine, ctx.UserID, &modelEmail)
|
||||
@@ -120,18 +121,18 @@ func TestOutboxExposesDeliveryStatus(t *testing.T) {
|
||||
}
|
||||
defer engine.Close()
|
||||
engine.SetMaxOpenConns(1)
|
||||
if err := engine.Sync2(&models.Email{}, &models.UserEmail{}, &models.UserTrustedSender{}); err != nil {
|
||||
if err := engine.Sync2(&models.Email{}, &models.UserEmail{}, &models.UserTrustedSender{}, &models.OutboundDelivery{}); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
previous := db.Instance
|
||||
db.Instance = engine
|
||||
defer func() { db.Instance = previous }()
|
||||
ctx := &context.Context{UserID: 1}
|
||||
email := models.Email{Subject: "pending", Type: consts.EmailTypeSend, Status: consts.EmailStatusSent}
|
||||
email := models.Email{Subject: "pending", Type: consts.EmailTypeSend, Status: consts.EmailStatusSent, To: `[{"EmailAddress":"recipient@example.com"}]`}
|
||||
if err := persistOutgoingEmail(engine, ctx.UserID, &email); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
for _, status := range []int8{consts.EmailStatusDeliveryPending, consts.EmailStatusSent, consts.EmailStatusFail} {
|
||||
for _, status := range []int8{consts.EmailStatusDeliveryPending, consts.EmailStatusSent, consts.EmailStatusFail, consts.EmailStatusDeliveryUncertain} {
|
||||
if _, err := engine.ID(email.Id).Cols("status").Update(&models.Email{Status: status}); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
@@ -150,3 +151,28 @@ func TestOutboxExposesDeliveryStatus(t *testing.T) {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestPersistOutgoingEmailRollsBackQueueFailure(t *testing.T) {
|
||||
engine, err := xorm.NewEngine("sqlite", ":memory:")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
defer engine.Close()
|
||||
engine.SetMaxOpenConns(1)
|
||||
if err := engine.Sync2(&models.Email{}, &models.UserEmail{}, &models.OutboundDelivery{}); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if _, err := engine.Exec("CREATE TRIGGER reject_queue BEFORE INSERT ON outbound_delivery BEGIN SELECT RAISE(ABORT, 'injected queue failure'); END"); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
email := models.Email{To: `[{"EmailAddress":"recipient@example.com"}]`}
|
||||
if err := persistOutgoingEmail(engine, 1, &email); err == nil {
|
||||
t.Fatal("queue failure ignored")
|
||||
}
|
||||
for _, model := range []any{&models.Email{}, &models.UserEmail{}, &models.OutboundDelivery{}} {
|
||||
count, err := engine.Count(model)
|
||||
if err != nil || count != 0 || email.Id != 0 {
|
||||
t.Fatalf("rollback failed for %T: count=%d id=%d error=%v", model, count, email.Id, err)
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user