fixed 邮箱解析使用官方库

Author: woetu

reptile/Netsarang.go

@@ -14,7 +14,6 @@ package reptile
 import (
 	"bytes"
 	"context"
-	"encoding/base64"
 	"errors"
 	"github.com/PuerkitoBio/goquery"
 	"github.com/chromedp/cdproto/page"
@@ -136,17 +135,11 @@ func NetsarangGetInfo(mail, product string) (string, error) {
 		return "", errors.New("邮件ID不存在")
 	}
 	// 获取最新一封邮件
-	content, err := LinShiYouXiangGetMail(prefix, mailId)
+	msg, err := LinShiYouXiangGetMail(prefix, mailId)
 	if err != nil {
 		return "", err
 	}
-	// 分割取内容
-	text := strings.Split(content, "AmazonSES")
-	if len(text) < 2 {
-		return "", errors.New("邮件内容不正确")
-	}
-	// 解密，邮件协议Content-Transfer-Encoding指定了base64
-	htmlText, err := base64.StdEncoding.DecodeString(text[1])
+	htmlText, err := DecodeMail(msg)
 	if err != nil {
 		return "", err
 	}

reptile/mail.go

@@ -1,3 +1,5 @@
+package reptile
+
 /**
  *
  * @Description:
@@ -9,21 +11,39 @@
  * @Package:
  * @Software: GoLand
  */
-package reptile
 
 import (
+	"encoding/base64"
+	"errors"
 	"github.com/antchfx/htmlquery"
 	"github.com/chromedp/cdproto/page"
 	"github.com/chromedp/chromedp"
 	"math"
 	"net/http"
+	"net/mail"
+	"strings"
 	"time"
 	"tool-gin/utils"
 )
 
+// DecodeMail 解码邮件内容 https://github.com/alexcesaro/quotedprintable
+func DecodeMail(msg *mail.Message) ([]byte, error) {
+	body := utils.BytesToStringByBuffer(msg.Body)
+	if len(body) == 0 || body == "" {
+		return nil, errors.New("邮件内容不正确")
+	}
+	encoding := msg.Header.Get("Content-Transfer-Encoding")
+	// 解码，邮件协议Content-Transfer-Encoding指定了编码方式
+	if encoding == "base64" {
+		body, err := base64.StdEncoding.DecodeString(body)
+		return body, err
+	}
+	return nil, errors.New("解码方式错误：" + encoding)
+}
+
 const LinShiYouXiang = "https://www.linshiyouxiang.net"
 
-// 获取邮箱号后缀
+// LinShiYouXiangSuffix 获取邮箱号后缀
 func LinShiYouXiangSuffix() (string, error) {
 	var suffixArray []string
 	response, err := utils.HttpRequest(http.MethodGet, LinShiYouXiang, "", nil, nil)
@@ -46,7 +66,7 @@ func LinShiYouXiangSuffix() (string, error) {
 	return suffixArray[utils.RandIntn(len(suffixArray)-1)], nil
 }
 
-// 获取邮箱号
+// LinShiYouXiangApply 获取邮箱号
 // prefix： 邮箱前缀
 func LinShiYouXiangApply(prefix string) (map[string]interface{}, error) {
 	url := LinShiYouXiang + "/api/v1/mailbox/keepalive"
@@ -58,14 +78,14 @@ func LinShiYouXiangApply(prefix string) (map[string]interface{}, error) {
 	return utils.HttpReadBodyJsonMap(http.MethodGet, url, "", param, nil)
 }
 
-// 获取邮件列表
+// LinShiYouXiangList 获取邮件列表
 // prefix： 邮箱前缀
 func LinShiYouXiangList(prefix string) ([]map[string]interface{}, error) {
 	url := LinShiYouXiang + "/api/v1/mailbox/" + prefix
 	return utils.HttpReadBodyJsonArray(http.MethodGet, url, "", nil, nil)
 }
 
-// 获取邮件内容
+// LinShiYouXiangGetMail 获取邮件内容
 // prefix： 邮箱前缀
 // id：		邮件编号
 //
@@ -76,12 +96,18 @@ func LinShiYouXiangList(prefix string) ([]map[string]interface{}, error) {
 // htmlText, err := base64.StdEncoding.DecodeString(text[1])
 // 解析HTML
 // doc, err := goquery.NewDocumentFromReader(bytes.NewReader(htmlText))
-func LinShiYouXiangGetMail(prefix, id string) (string, error) {
+func LinShiYouXiangGetMail(prefix, id string) (*mail.Message, error) {
 	url := LinShiYouXiang + "/mailbox/" + prefix + "/" + id + "/source"
-	return utils.HttpReadBodyString(http.MethodGet, url, "", nil, nil)
+	content, err := utils.HttpReadBodyString(http.MethodGet, url, "", nil, nil)
+	if err != nil {
+		return nil, err
+	}
+	r := strings.NewReader(content)
+	m, err := mail.ReadMessage(r) // 解析邮件
+	return m, err
 }
 
-// 删除邮件
+// LinShiYouXiangDelete 删除邮件
 // prefix： 邮箱前缀
 // id:  	邮件编号
 func LinShiYouXiangDelete(prefix, id string) (map[string]interface{}, error) {

reptile/reptile_test.go

@@ -12,9 +12,13 @@
 package reptile
 
 import (
+	"bytes"
 	"fmt"
 	"github.com/chromedp/cdproto/target"
 	"github.com/chromedp/chromedp"
+	"log"
+	"net/mail"
+	"strings"
 	"testing"
 	"time"
 )
@@ -67,3 +71,22 @@ func TestApply(t *testing.T) {
 	t.Log(err)
 	t.Log(res)
 }
+func TestMail(t *testing.T) {
+	msg := "Received: from a27-154.smtp-out.us-west-2.amazonses.com ([54.240.27.154]) by temporary-mail.net\n  for <[email protected]>; Wed, 21 Apr 2021 13:29:21 +0800 (CST)\nDKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple;\n\ts=n6yk34xlzntpmtevqgs5ghp2jksprvft; d=netsarang.com; t=1618982959;\n\th=Date:To:From:Reply-To:Subject:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding;\n\tbh=OsRfLaUS97/+yRoJ/BSpIARvBe+S33pKrzp1it7xCyQ=;\n\tb=LTblU9qEhTeorpht/julhD6ar7a6MDmEI9zH3TBy28KI6ah7Q+E1J0fAML2Pbcd0\n\tqX/68C8+vtGD03BGEzVPjJTJDoztO0qoNz5l7C/DSGV1MEyxh8ccQtW7rw+7+kQXv/+\n\tBKztqxpwXMjNuzZb3E0W1GYju0kr4qT5nXkMXD5o=\nDKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple;\n\ts=7v7vs6w47njt4pimodk5mmttbegzsi6n; d=amazonses.com; t=1618982959;\n\th=Date:To:From:Reply-To:Subject:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Feedback-ID;\n\tbh=OsRfLaUS97/+yRoJ/BSpIARvBe+S33pKrzp1it7xCyQ=;\n\tb=NhCoNeJCoIpySzLuSxUV5P0zlsh4pLKUz5bhIG3spGhLgW0Pzf/1ZHyJJOTL9T3C\n\tDi7ChUyfnWdRjWSp+7EiA4VNrqGtOzoOsMZKipURghknjlG8bYjpCpdGXrO1D5IBlIj\n\tCl8sZevNShTh++kQW27S4S83cuDhbwxGEgxhSy3k=\nDate: Wed, 21 Apr 2021 05:29:19 +0000\nTo: [email protected]\nFrom: \"NetSarang, Inc.\" <[email protected]>\nReply-To: [email protected]\nSubject: Xshell 7 download instruction\nMessage-ID: <01010178f2e77a87-c9bb10f6-ef08-4dad-ba57-4524546de5d2-000000@us-west-2.amazonses.com>\nX-Mailer: PHPMailer 5.2.10 (https://github.com/PHPMailer/PHPMailer/)\nMIME-Version: 1.0\nContent-Type: text/html; charset=utf-8\nContent-Transfer-Encoding: base64\nFeedback-ID: 1.us-west-2.l7ekw14vD6Jumpwas0GHbg0O54ld7FbCklw8tqJLu88=:AmazonSES\nX-SES-Outgoing: 2021.04.21-54.240.27.154\n\nPHNwYW4+RGVhciB1c2VyLDwvc3Bhbj4NCjxiciAvPjxiciAvPg0KPHNwYW4+VGhhbmsgeW91IGZv\nciB5b3VyIGludGVyZXN0IGluIFhzaGVsbCA3LiBXZSBoYXZlIHByZXBhcmVkIHlvdXIgZXZhbHVh\ndGlvbiBwYWNrYWdlLiBJZiB5b3UgZGlkIG5vdCByZXF1ZXN0IGFuIGV2YWx1YXRpb24gb2YgWHNo\nZWxsIDcsIHBsZWFzZSBjb250YWN0IG91ciBzdXBwb3J0IHRlYW0gYXQgc3VwcG9ydEBuZXRzYXJh\nbmcuY29tIHRvIGhhdmUgeW91ciBlbWFpbCBhZGRyZXNzIHJlbW92ZWQgZnJvbSBhbnkgZnV0dXJl\nIGVtYWlscyByZWxhdGVkIHRvIFhzaGVsbCA3Ljwvc3Bhbj4NCjxiciAvPjxiciAvPg0KPHNwYW4+\nUGxlYXNlIGdvIHRvIHRoZSBmb2xsb3dpbmcgVVJMIHRvIHN0YXJ0IGRvd25sb2FkaW5nIHlvdXIg\nZXZhbHVhdGlvbiBzb2Z0d2FyZTo8L3NwYW4+DQo8YnIgLz48YnIgLz4NCjxzcGFuPjxhIGhyZWY9\nImh0dHBzOi8vd3d3Lm5ldHNhcmFuZy5jb20vZW4vZG93bmxvYWRpbmcvP3Rva2VuPVZscDJUM1pN\nTVROblR6RmhXWGxFYnpWck1uSjNRVUE0U1VWWGMxcFlMVE5aY0hoRFQxcDJkV1JEU1RCQiIgdGFy\nZ2V0PSJfYmxhbmsiPmh0dHBzOi8vd3d3Lm5ldHNhcmFuZy5jb20vZW4vZG93bmxvYWRpbmcvP3Rv\na2VuPVZscDJUM1pNTVROblR6RmhXWGxFYnpWck1uSjNRVUE0U1VWWGMxcFlMVE5aY0hoRFQxcDJk\nV1JEU1RCQjwvYT48L3NwYW4+DQo8YnIgLz48YnIgLz4NCjxzcGFuPlRoaXMgbGluayB3aWxsIGV4\ncGlyZSBvbiBNYXkgMjEsIDIwMjE8L3NwYW4+IDxzcGFuPllvdSBjYW4gZXZhbHVhdGUgdGhlIHNv\nZnR3YXJlIGZvciAzMCBkYXlzIHNpbmNlIGluc3RhbGxhdGlvbi48L3NwYW4+DQo8YnIgLz48YnIg\nLz48YnIgLz4NCjxiPkRvIHlvdSBoYXZlIGFueSBxdWVzdGlvbnM/PC9iPg0KPGJyIC8+DQo8c3Bh\nbj5XZSBvZmZlciBmcmVlIHRlY2huaWNhbCBzdXBwb3J0IGR1cmluZyB0aGUgZXZhbHVhdGlvbiBw\nZXJpb2QuIElmIHlvdSBoYXZlIGFueSBxdWVzdGlvbnMsIHBsZWFzZSBzZW5kIHVzIGFuIGVtYWls\nIGF0IDxhIGhyZWY9Im1haWx0bzpzdXBwb3J0QG5ldHNhcmFuZy5jb20iPnN1cHBvcnRAbmV0c2Fy\nYW5nLmNvbTwvYT4uPC9zcGFuPg0KPGJyIC8+PGJyIC8+PGJyIC8+DQo8c3Bhbj5CZXN0IHJlZ2Fy\nZHMsPC9zcGFuPg0KPGJyIC8+PGJyIC8+PGJyIC8+DQo8dGFibGUgYm9yZGVyPSIwIiBjZWxscGFk\nZGluZz0iMCIgY2VsbHNwYWNpbmc9IjAiPg0KPHRib2R5Pg0KPHRyPjx0ZD49PT09PT09PT09PT09\nPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PC90\nZD48L3RyPg0KPHRyPjx0ZD5OZXRTYXJhbmcsIEluYy48L3RkPjwvdHI+DQo8dHI+PHRkPjQ3MDEg\nUGF0cmljayBIZW5yeSBEci4gQkxERyAyMiwgU3VpdGUgMTM3LCBTYW50YSBDbGFyYSwgQ0EgOTUw\nNTQsIFUuUy5BLjwvdGQ+PC90cj4NCjx0cj48dGQ+V2Vic2l0ZTogaHR0cDovL3d3dy5uZXRzYXJh\nbmcuY29tIHwgRW1haWw6IHN1cHBvcnRAbmV0c2FyYW5nLmNvbTwvdGQ+PC90cj4NCjx0cj48dGQ+\nUGhvbmU6ICg2NjkpIDIwNC0zMzAxPC90ZD48L3RyPg0KPC90Ym9keT4NCjwvdGFibGU+DQo=\n\n"
+	r := strings.NewReader(msg)
+	m, err := mail.ReadMessage(r)
+	if err != nil {
+		log.Fatal(err)
+	}
+	header := m.Header
+	fmt.Println("Date:", header.Get("Date"))
+	fmt.Println("From:", header.Get("From"))
+	fmt.Println("To:", header.Get("To"))
+	fmt.Println("Subject:", header.Get("Subject"))
+	fmt.Println("Content-Transfer-Encoding:")
+
+	buf := new(bytes.Buffer) // io.ReadCloser类型转换为string
+	buf.ReadFrom(m.Body)
+	b := buf.String()
+	fmt.Println("-------", b)
+}

utils/bytes.go

@@ -1,7 +1,9 @@
 package utils
 
 import (
+	"bytes"
 	"errors"
+	"io"
 	"strconv"
 	"strings"
 	"unicode"
@@ -25,7 +27,7 @@ const (
 
 var invalidByteQuantityError = errors.New("字节数量必须是一个正整数，其单位为测量单位 M, MB, MiB, G, GiB, or GB")
 
-// ByteSize返回10M，12.5K等形式的人类可读字节串。以下单位可供选择：
+// ByteSize 返回10M，12.5K等形式的人类可读字节串。以下单位可供选择：
 //	E: Exabyte
 //	P: Petabyte
 //	T: Terabyte
@@ -68,7 +70,7 @@ func ByteSize(bytes uint64) string {
 	return result + unit
 }
 
-// ToMegabytes将ByteSize格式化的字符串解析为兆字节。
+// ToMegabytes 将ByteSize格式化的字符串解析为兆字节。
 func ToMegabytes(s string) (uint64, error) {
 	bytes, err := ToBytes(s)
 	if err != nil {
@@ -78,7 +80,7 @@ func ToMegabytes(s string) (uint64, error) {
 	return bytes / MEGABYTE, nil
 }
 
-// ToBytes将ByteSize格式化的字符串解析为字节。注意二进制前缀和SI前缀单位均表示基数为2的单位
+// ToBytes 将ByteSize格式化的字符串解析为字节。注意二进制前缀和SI前缀单位均表示基数为2的单位
 // KB = K = KiB	= 1024
 // MB = M = MiB = 1024 * K
 // GB = G = GiB = 1024 * M
@@ -120,3 +122,24 @@ func ToBytes(s string) (uint64, error) {
 		return 0, invalidByteQuantityError
 	}
 }
+
+// BytesToStringByBuffer io.ReadCloser类型转换为string
+func BytesToStringByBuffer(body io.Reader) string {
+	buf := new(bytes.Buffer) // io.ReadCloser类型转换为string
+	buf.ReadFrom(body)
+	//b := *(*string)(unsafe.Pointer(&body))
+	/*_, err := io.Copy(buf, body)
+	b :=buf.String()*/
+	return buf.String()
+}
+
+// BytesToStringByIo io.ReadCloser类型转换为string
+func BytesToStringByIo(body io.Reader) (string, error) {
+	bd, err := io.ReadAll(body)
+	if err != nil {
+		return "", err
+	}
+	b := string(bd)
+	//b :=fmt.Sprintf("%s", body)
+	return b, err
+}