test code 1 and fix some logic

Author: a1012112796

services/imap/cron.go

@@ -26,7 +26,7 @@ func FetchAllUnReadMails() (err error) {
 		}
 	}
 
-	if !mailReadQueue.IsEmpty() {
+	if !testMode && !mailReadQueue.IsEmpty() {
 		return
 	}
 

services/imap/imap.go

@@ -5,6 +5,7 @@
 package imap
 
 import (
+	"context"
 	"errors"
 	"io"
 	"io/ioutil"
@@ -28,16 +29,29 @@ func init() {
 	charset.RegisterEncoding("gb18030", simplifiedchinese.GB18030)
 }
 
+var testMode bool
+
 // Client an imap clientor
 type Client struct {
-	Client   *client.Client
+	Client   ClientPort
 	UserName string
 	Passwd   string
 	Addr     string
 	IsTLS    bool
 	Lock     sync.Mutex
 }
 
+// ClientPort client port to imap server or test code
+type ClientPort interface {
+	Login(username, password string) error
+	Logout() error
+	Select(name string, readOnly bool) (*imap.MailboxStatus, error)
+	Search(criteria *imap.SearchCriteria) (seqNums []uint32, err error)
+	Store(seqset *imap.SeqSet, item imap.StoreItem, value interface{}, ch chan *imap.Message) error
+	Expunge(ch chan uint32) error
+	Fetch(seqset *imap.SeqSet, items []imap.FetchItem, ch chan *imap.Message) error
+}
+
 // ClientInitOpt options to init an Client
 type ClientInitOpt struct {
 	Addr     string
@@ -73,6 +87,11 @@ func (c *Client) Login() error {
 
 	c.Lock.Lock()
 
+	// test mode
+	if testMode {
+		return c.Client.Login(c.UserName, c.Passwd)
+	}
+
 	// Connect to server
 	if c.IsTLS {
 		c.Client, err = client.DialTLS(c.Addr, nil)
@@ -89,7 +108,6 @@ func (c *Client) Login() error {
 // LogOut LogOut from service
 func (c *Client) LogOut() error {
 	err := c.Client.Logout()
-	c.Client = nil
 	c.Lock.Unlock()
 	return err
 }
@@ -225,12 +243,34 @@ func (c *Client) FetchMail(id uint32, box string, requestBody bool) (*mail.Reade
 	items := []imap.FetchItem{section.FetchItem()}
 
 	messages := make(chan *imap.Message, 1)
+	ctx, cancel := context.WithTimeout(context.Background(), time.Minute)
+	defer cancel()
+
+	finished := false
 
 	go func() {
 		err = c.Client.Fetch(seqSet, items, messages)
+		finished = true
 	}()
 
-	msg := <-messages
+	var msg *imap.Message
+	for finished {
+		select {
+		case msg, finished = <-messages:
+			if msg != nil {
+				if !finished {
+					close(messages)
+				}
+				break
+			}
+		case <-ctx.Done():
+			if !finished {
+				close(messages)
+			}
+			break
+		}
+	}
+
 	if err != nil {
 		return nil, err
 	}

services/imap/imap_test.go

@@ -0,0 +1,121 @@
+// Copyright 2021 The Gitea Authors.
+// All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
+package imap
+
+import (
+	"fmt"
+	"testing"
+
+	"code.gitea.io/gitea/modules/setting"
+	"github.com/emersion/go-imap"
+	"github.com/stretchr/testify/assert"
+)
+
+var logs string
+
+type testIMAPClient struct {
+	t *testing.T
+}
+
+func TestIMAP(t *testing.T) {
+	// test GetUnReadMails
+	logs = ""
+	mails, err := c.GetUnReadMails(setting.MailReciveService.ReciveBox, 100)
+	assert.NoError(t, err)
+	if !assert.Equal(t, 2, len(mails)) {
+		return
+	}
+	assert.Equal(t, "login: [email protected] 123456\n"+
+		"Select: INBOX, false\n"+
+		"Search: [\\Seen]\n"+
+		"logout\n", logs)
+
+	// TODO
+	// test handleReciveEmail
+	// c.Client.(*testIMAPClient).t = t
+
+	// for _, mail := range mails {
+	// 	logs = ""
+	// 	if !assert.NoError(t, mail.LoadHeader([]string{"From", "To", "In-Reply-To", "References"})) {
+	// 		return
+	// 	}
+	// 	if !assert.NoError(t, handleReciveEmail(mail)) {
+	// 		return
+	// 	}
+	// 	assert.Equal(t, "", logs)
+	// }
+}
+
+func (c *testIMAPClient) Login(username, password string) error {
+	logs += "login: " + username + " " + password + "\n"
+	return nil
+}
+
+func (c *testIMAPClient) Logout() error {
+	logs += "logout\n"
+	return nil
+}
+
+func (c *testIMAPClient) Select(name string, readOnly bool) (*imap.MailboxStatus, error) {
+	logs += fmt.Sprintf("Select: %v, %v\n", name, readOnly)
+	if name != "INBOX" {
+		return nil, fmt.Errorf("not found mail box")
+	}
+
+	return nil, nil
+}
+
+func (c *testIMAPClient) Search(criteria *imap.SearchCriteria) (seqNums []uint32, err error) {
+	logs += fmt.Sprintf("Search: %v\n", criteria.WithoutFlags)
+
+	return []uint32{1, 2}, nil
+}
+
+func (c *testIMAPClient) Store(seqset *imap.SeqSet, item imap.StoreItem, value interface{}, ch chan *imap.Message) error {
+	logs += "Store\n"
+	return nil
+}
+
+func (c *testIMAPClient) Expunge(ch chan uint32) error {
+	logs += "Expunge\n"
+	return nil
+}
+
+var testMails []string
+
+func (c *testIMAPClient) Fetch(seqset *imap.SeqSet, items []imap.FetchItem, ch chan *imap.Message) error {
+	defer close(ch)
+
+	// logs += fmt.Sprintf("Fetch: %v, %v\n", seqset.String(), items)
+	// if len(seqset.Set) != 1 {
+	// 	return nil
+	// }
+	// if seqset.Set[0].Start < 1 || seqset.Set[0].Start > 2 {
+	// 	return nil
+	// }
+
+	// if testMails == nil {
+	// 	// load test data
+	// 	testMails = make([]string, 2)
+	// 	issue1 := models.AssertExistsAndLoadBean(c.t, &models.Issue{ID: 1}).(*models.Issue)
+	// 	// comment2 := models.AssertExistsAndLoadBean(c.t, &models.Comment{ID: 2}).(*models.Comment)
+	// 	user2 := models.AssertExistsAndLoadBean(c.t, &models.User{ID: 2}).(*models.User)
+
+	// 	testMails[0] = "From: " + user2.Email + "\r\n" +
+	// 		"To: [email protected]\r\n" +
+	// 		"Subject: Re: " + issue1.Title + "\r\n" +
+	// 		"Date: Wed, 11 May 2016 14:31:59 +0000\r\n" +
+	// 		"Message-ID: <0000000@localhost/>\r\n" +
+	// 		"" +
+	// 		"Content-Type: text/plain\r\n" +
+	// 		"\r\n" +
+	// 		"test reply\r\n" +
+	// 		"----- origin mail ------\r\n" +
+	// 		issue1.Content
+	// }
+
+	return nil
+}

services/imap/mail_reciver.go

@@ -57,7 +57,11 @@ func NewContext() {
 }
 
 func handleReciveEmail(m *Mail) error {
-	from := m.Heads["From"][0].Address
+	fromEmail, ok := m.Heads["From"]
+	if !ok || len(fromEmail) < 1 {
+		return nil
+	}
+	from := fromEmail[0].Address
 	doer, err := models.GetUserByEmail(from)
 	if err != nil {
 		if models.IsErrUserNotExist(err) {

services/imap/main_test.go

@@ -0,0 +1,39 @@
+// Copyright 2021 The Gitea Authors.
+// All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
+package imap
+
+import (
+	"path/filepath"
+	"testing"
+
+	"code.gitea.io/gitea/models"
+	"code.gitea.io/gitea/modules/setting"
+)
+
+func TestMain(m *testing.M) {
+	// init test config
+	testMode = true
+	setting.MailReciveService = &setting.MailReciver{
+		ReciveEmail:    "[email protected]",
+		ReciveBox:      "INBOX",
+		QueueLength:    100,
+		Host:           "127.0.0.1:1313",
+		User:           "[email protected]",
+		Passwd:         "123456",
+		IsTLSEnabled:   false,
+		DeleteRodeMail: true,
+	}
+
+	c = new(Client)
+
+	c.UserName = setting.MailReciveService.User
+	c.Passwd = setting.MailReciveService.Passwd
+	c.Addr = setting.MailReciveService.Host
+	c.IsTLS = setting.MailReciveService.IsTLSEnabled
+	c.Client = new(testIMAPClient)
+
+	models.MainTest(m, filepath.Join("..", ".."))
+}