V2.5.2 (#145)
* 移除自动DNS记录验证方式 * v2.5.2 (#13) 1、重写SSL证书申请逻辑,支持DNS记录验证方式 2、修复无法查看详情的bug 3、优化手动设置证书的逻辑 4、发送失败邮件添加错误提醒 5、补充详情接口的单元测试 Co-authored-by: jinnrry <jinnrry@users.noreply.github.com> Reviewed-on: http://192.168.123.5/jinnrry/PMail_Github/pulls/13 --------- Co-authored-by: jinnrry <jinnrry@users.noreply.github.com> Co-authored-by: jinnrry <i@jinnrry.com>
This commit is contained in:
20 files changed
+440
-371
No files matched your search
@@ -27,6 +27,7 @@ type emilItem struct {
|
||||
IsRead bool `json:"is_read"`
|
||||
Sender User `json:"sender"`
|
||||
Dangerous bool `json:"dangerous"`
|
||||
Error string `json:"error"`
|
||||
}
|
||||
|
||||
type User struct {
|
||||
@@ -83,6 +84,7 @@ func EmailList(ctx *context.Context, w http.ResponseWriter, req *http.Request) {
|
||||
IsRead: email.IsRead == 1,
|
||||
Sender: sender,
|
||||
Dangerous: email.SPFCheck == 0 && email.DKIMCheck == 0,
|
||||
Error: email.Error.String,
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
@@ -213,11 +213,28 @@ func Send(ctx *context.Context, w http.ResponseWriter, req *http.Request) {
|
||||
if err != nil {
|
||||
log.WithContext(ctx).Errorf("sql Error :%+v", err)
|
||||
}
|
||||
|
||||
ue := models.UserEmail{
|
||||
UserID: ctx.UserID,
|
||||
EmailID: modelEmail.Id,
|
||||
Status: 2,
|
||||
IsRead: 1,
|
||||
}
|
||||
db.Instance.Insert(&ue)
|
||||
|
||||
} else {
|
||||
_, err := db.Instance.Exec(db.WithContext(ctx, "update email set status =1 where id = ? "), modelEmail.Id)
|
||||
if err != nil {
|
||||
log.WithContext(ctx).Errorf("sql Error :%+v", err)
|
||||
}
|
||||
|
||||
ue := models.UserEmail{
|
||||
UserID: ctx.UserID,
|
||||
EmailID: modelEmail.Id,
|
||||
Status: 1,
|
||||
IsRead: 1,
|
||||
}
|
||||
db.Instance.Insert(&ue)
|
||||
}
|
||||
|
||||
}, nil)
|
||||
|
||||
@@ -31,7 +31,7 @@ func GetUserGroup(ctx *context.Context, w http.ResponseWriter, req *http.Request
|
||||
},
|
||||
{
|
||||
Label: i18n.GetText(ctx.Lang, "outbox"),
|
||||
Tag: dto.SearchTag{Type: 1, Status: 1}.ToString(),
|
||||
Tag: dto.SearchTag{Type: 1, Status: -1}.ToString(),
|
||||
},
|
||||
{
|
||||
Label: i18n.GetText(ctx.Lang, "sketch"),
|
||||
|
||||
+22
-25
@@ -5,6 +5,7 @@ import (
|
||||
log "github.com/sirupsen/logrus"
|
||||
"io"
|
||||
"net/http"
|
||||
"os"
|
||||
"pmail/config"
|
||||
"pmail/dto/response"
|
||||
"pmail/services/setup"
|
||||
@@ -134,40 +135,36 @@ func Setup(ctx *context.Context, w http.ResponseWriter, req *http.Request) {
|
||||
return
|
||||
}
|
||||
|
||||
//if reqData["step"] == "ssl" && reqData["action"] == "getParams" {
|
||||
// params, err := ssl.GetServerParamsList(reqData["serverName"])
|
||||
// if err != nil {
|
||||
// response.NewErrorResponse(response.ServerError, err.Error(), "").FPrint(w)
|
||||
// return
|
||||
// }
|
||||
// response.NewSuccessResponse(params).FPrint(w)
|
||||
// return
|
||||
//}
|
||||
if reqData["step"] == "ssl" && reqData["action"] == "getParams" {
|
||||
dnsChallenge := ssl.GetDnsChallengeInstance()
|
||||
|
||||
//if reqData["step"] == "ssl" && reqData["action"] == "setParams" {
|
||||
// for key, v := range reqData {
|
||||
// if key != "step" && key != "action" {
|
||||
// ssl.SetDomainServerParams(key, v)
|
||||
// }
|
||||
// }
|
||||
// response.NewSuccessResponse("Succ").FPrint(w)
|
||||
// return
|
||||
//}
|
||||
response.NewSuccessResponse(dnsChallenge.GetDNSSettings(ctx)).FPrint(w)
|
||||
return
|
||||
}
|
||||
|
||||
if reqData["step"] == "ssl" && reqData["action"] == "set" {
|
||||
keyPath := reqData["key_path"]
|
||||
crtPath := reqData["crt_path"]
|
||||
|
||||
serviceName, ok := reqData["serviceName"]
|
||||
if !ok {
|
||||
serviceName = ""
|
||||
}
|
||||
err := ssl.SetSSL(reqData["ssl_type"], reqData["key_path"], reqData["crt_path"], serviceName)
|
||||
_, err := os.Stat(keyPath)
|
||||
if err != nil {
|
||||
response.NewErrorResponse(response.ServerError, err.Error(), "").FPrint(w)
|
||||
return
|
||||
}
|
||||
|
||||
//if reqData["ssl_type"] == config.SSLTypeAutoHTTP || reqData["ssl_type"] == config.SSLTypeAutoDNS {
|
||||
if reqData["ssl_type"] == config.SSLTypeAutoHTTP {
|
||||
_, err = os.Stat(crtPath)
|
||||
if err != nil {
|
||||
response.NewErrorResponse(response.ServerError, err.Error(), "").FPrint(w)
|
||||
return
|
||||
}
|
||||
|
||||
err = ssl.SetSSL(reqData["ssl_type"], reqData["key_path"], reqData["crt_path"])
|
||||
if err != nil {
|
||||
response.NewErrorResponse(response.ServerError, err.Error(), "").FPrint(w)
|
||||
return
|
||||
}
|
||||
|
||||
if reqData["ssl_type"] == config.SSLTypeAutoHTTP || reqData["ssl_type"] == config.SSLTypeAutoDNS {
|
||||
err = ssl.GenSSL(false)
|
||||
if err != nil {
|
||||
response.NewErrorResponse(response.ServerError, err.Error(), "").FPrint(w)
|
||||
|
||||
Reference in new issue
Block a user