hoangvv/NextZen-UserService
1
0
Fork 0
mirror of https://github.com/KaySar12/NextZen-UserService.git synced 2025-03-15 15:15:35 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix bug: fix cant apply https when update domain

Browse Source
This commit is contained in:
hoangvv 2024-11-25 16:04:00 +07:00
parent 9d36ce5c78
commit 72c7014e03
1 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
route/v1/user.go
View File

@ -295,6 +295,7 @@ func OnePanelUpdateWebsite(c *gin.Context) {
fmt.Println(updateProxyResult) fmt.Println(updateProxyResult)
sslId := -1 sslId := -1
acmeId := 0 acmeId := 0
var validSSL bool
var searchSSLParam model2.SearchSSLRequest var searchSSLParam model2.SearchSSLRequest
if sslProvider == "selfSigned" { if sslProvider == "selfSigned" {
searchSSLParam.AcmeAccountID = strconv.Itoa(acmeId) searchSSLParam.AcmeAccountID = strconv.Itoa(acmeId)
@ -308,10 +309,12 @@ func OnePanelUpdateWebsite(c *gin.Context) {
Success: common_err.SERVICE_ERROR, Success: common_err.SERVICE_ERROR,
Message: common_err.GetMsg(common_err.SERVICE_ERROR), Message: common_err.GetMsg(common_err.SERVICE_ERROR),
}) })
return
} }
for _, item := range searchSSL.Data { for _, item := range searchSSL.Data {
if item.Provider == sslProvider && item.PrimaryDomain == domain { if item.Provider == sslProvider && item.PrimaryDomain == domain && item.Status == "ready" {
sslId = item.ID sslId = item.ID
validSSL = true
break break
} }
} }
@ -332,7 +335,7 @@ func OnePanelUpdateWebsite(c *gin.Context) {
} }
if sslId < 0 { if sslId < 0 {
//TODO create new SSL if not exist //TODO create new SSL if not exist
if sslProvider == "selfSigned" { if sslProvider == "http" {
sslId, err = OnePanelApplyWebsiteSSl(domain, search.Data.Items[0].ID, headers) sslId, err = OnePanelApplyWebsiteSSl(domain, search.Data.Items[0].ID, headers)
if err != nil { if err != nil {
c.JSON(common_err.SERVICE_ERROR, c.JSON(common_err.SERVICE_ERROR,
@ -341,6 +344,18 @@ func OnePanelUpdateWebsite(c *gin.Context) {
Message: common_err.GetMsg(common_err.SERVICE_ERROR), Message: common_err.GetMsg(common_err.SERVICE_ERROR),
}) })
} }
if sslId > 0 {
validSSL, err = checkGlobalSSLStatus(sslId, headers, domain, 10)
if err != nil {
c.JSON(common_err.SUCCESS,
model.Result{
Success: common_err.COMMAND_ERROR_INVALID_OPERATION,
Message: fmt.Sprintf("Fail to upgrade %s from http to https", domain),
Data: false,
})
return
}
}
} else { } else {
sslId, err = IssueSelfSignedCert(domain, search.Data.Items[0].ID, headers, 3) sslId, err = IssueSelfSignedCert(domain, search.Data.Items[0].ID, headers, 3)
if err != nil { if err != nil {
@ -350,8 +365,18 @@ func OnePanelUpdateWebsite(c *gin.Context) {
Message: common_err.GetMsg(common_err.SERVICE_ERROR), Message: common_err.GetMsg(common_err.SERVICE_ERROR),
}) })
} }
validSSL = true
} }
} }
if sslId < 0 || !validSSL {
c.JSON(common_err.SUCCESS,
model.Result{
Success: common_err.COMMAND_ERROR_INVALID_OPERATION,
Message: fmt.Sprintf("Fail to Create SSL or domain %s is invalid to create global SSL", domain),
Data: false,
})
return
}
updateHttps, err := UpdateWebsiteHttps(true, acmeId, sslId, search.Data.Items[0].ID, headers) updateHttps, err := UpdateWebsiteHttps(true, acmeId, sslId, search.Data.Items[0].ID, headers)
if err != nil { if err != nil {
c.JSON(common_err.SERVICE_ERROR, c.JSON(common_err.SERVICE_ERROR,
@ -362,7 +387,6 @@ func OnePanelUpdateWebsite(c *gin.Context) {
} }
fmt.Println(updateHttps) fmt.Println(updateHttps)
return return
} }
} }
func OnePanelCreateWebsite(c *gin.Context) { func OnePanelCreateWebsite(c *gin.Context) {
@ -442,8 +466,9 @@ func OnePanelCreateWebsite(c *gin.Context) {
} }
for _, item := range ssl.Data { for _, item := range ssl.Data {
if item.PrimaryDomain == domain && item.Provider == sslProvider { if item.PrimaryDomain == domain && item.Provider == sslProvider && item.Status == "ready" {
sslId = item.ID sslId = item.ID
validSSL = true
break break
} }
} }