特殊页面可以直接使用HTML

This commit is contained in:
GoEdgeLab
2021-10-10 10:35:05 +08:00
parent fd0b093d58
commit b8db8ac71a
2 changed files with 109 additions and 66 deletions

View File

@@ -1,6 +1,7 @@
package nodes package nodes
import ( import (
"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/shared"
"github.com/TeaOSLab/EdgeNode/internal/remotelogs" "github.com/TeaOSLab/EdgeNode/internal/remotelogs"
"github.com/TeaOSLab/EdgeNode/internal/utils" "github.com/TeaOSLab/EdgeNode/internal/utils"
"github.com/iwind/TeaGo/Tea" "github.com/iwind/TeaGo/Tea"
@@ -20,24 +21,54 @@ func (this *HTTPRequest) doPage(status int) (shouldStop bool) {
for _, page := range this.web.Pages { for _, page := range this.web.Pages {
if page.Match(status) { if page.Match(status) {
if urlPrefixRegexp.MatchString(page.URL) { if len(page.BodyType) == 0 || page.BodyType == shared.BodyTypeURL {
this.doURL(http.MethodGet, page.URL, "", page.NewStatus, true) if urlPrefixRegexp.MatchString(page.URL) {
return true this.doURL(http.MethodGet, page.URL, "", page.NewStatus, true)
} else { return true
file := Tea.Root + Tea.DS + page.URL } else {
fp, err := os.Open(file) file := Tea.Root + Tea.DS + page.URL
if err != nil { fp, err := os.Open(file)
logs.Error(err) if err != nil {
msg := "404 page not found: '" + page.URL + "'" logs.Error(err)
msg := "404 page not found: '" + page.URL + "'"
this.writer.WriteHeader(http.StatusNotFound) this.writer.WriteHeader(http.StatusNotFound)
_, err := this.writer.Write([]byte(msg)) _, err := this.writer.Write([]byte(msg))
if err != nil {
logs.Error(err)
}
return true
}
// 修改状态码
if page.NewStatus > 0 {
// 自定义响应Headers
this.processResponseHeaders(page.NewStatus)
this.writer.WriteHeader(page.NewStatus)
} else {
this.processResponseHeaders(status)
this.writer.WriteHeader(status)
}
buf := bytePool1k.Get()
_, err = utils.CopyWithFilter(this.writer, fp, buf, func(p []byte) []byte {
return []byte(this.Format(string(p)))
})
bytePool1k.Put(buf)
if err != nil {
if !this.canIgnore(err) {
remotelogs.Warn("HTTP_REQUEST_PAGE", "write to client failed: "+err.Error())
}
} else {
this.writer.SetOk()
}
err = fp.Close()
if err != nil { if err != nil {
logs.Error(err) logs.Error(err)
} }
return true
} }
return true
} else if page.BodyType == shared.BodyTypeHTML {
// 修改状态码 // 修改状态码
if page.NewStatus > 0 { if page.NewStatus > 0 {
// 自定义响应Headers // 自定义响应Headers
@@ -47,11 +78,8 @@ func (this *HTTPRequest) doPage(status int) (shouldStop bool) {
this.processResponseHeaders(status) this.processResponseHeaders(status)
this.writer.WriteHeader(status) this.writer.WriteHeader(status)
} }
buf := bytePool1k.Get()
_, err = utils.CopyWithFilter(this.writer, fp, buf, func(p []byte) []byte { _, err := this.writer.WriteString(this.Format(page.Body))
return []byte(this.Format(string(p)))
})
bytePool1k.Put(buf)
if err != nil { if err != nil {
if !this.canIgnore(err) { if !this.canIgnore(err) {
remotelogs.Warn("HTTP_REQUEST_PAGE", "write to client failed: "+err.Error()) remotelogs.Warn("HTTP_REQUEST_PAGE", "write to client failed: "+err.Error())
@@ -59,13 +87,8 @@ func (this *HTTPRequest) doPage(status int) (shouldStop bool) {
} else { } else {
this.writer.SetOk() this.writer.SetOk()
} }
err = fp.Close() return true
if err != nil {
logs.Error(err)
}
} }
return true
} }
} }
return false return false

View File

@@ -1,6 +1,7 @@
package nodes package nodes
import ( import (
"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/shared"
"github.com/TeaOSLab/EdgeNode/internal/remotelogs" "github.com/TeaOSLab/EdgeNode/internal/remotelogs"
"github.com/TeaOSLab/EdgeNode/internal/utils" "github.com/TeaOSLab/EdgeNode/internal/utils"
"github.com/iwind/TeaGo/Tea" "github.com/iwind/TeaGo/Tea"
@@ -21,8 +22,40 @@ func (this *HTTPRequest) doShutdown() {
return return
} }
// URL为空则显示文本 TODO 未来可以自定义文本 if len(shutdown.BodyType) == 0 || shutdown.BodyType == shared.BodyTypeURL {
if len(shutdown.URL) == 0 { // URL为空则显示文本
if len(shutdown.URL) == 0 {
// 自定义响应Headers
if shutdown.Status > 0 {
this.processResponseHeaders(shutdown.Status)
this.writer.WriteHeader(shutdown.Status)
} else {
this.processResponseHeaders(http.StatusOK)
this.writer.WriteHeader(http.StatusOK)
}
_, err := this.writer.WriteString("The site have been shutdown.")
if err != nil {
logs.Error(err)
}
return
}
// 从本地文件中读取
file := Tea.Root + Tea.DS + shutdown.URL
fp, err := os.Open(file)
if err != nil {
logs.Error(err)
msg := "404 page not found: '" + shutdown.URL + "'"
this.writer.WriteHeader(http.StatusNotFound)
_, err = this.writer.Write([]byte(msg))
if err != nil {
logs.Error(err)
}
return
}
// 自定义响应Headers // 自定义响应Headers
if shutdown.Status > 0 { if shutdown.Status > 0 {
this.processResponseHeaders(shutdown.Status) this.processResponseHeaders(shutdown.Status)
@@ -31,53 +64,40 @@ func (this *HTTPRequest) doShutdown() {
this.processResponseHeaders(http.StatusOK) this.processResponseHeaders(http.StatusOK)
this.writer.WriteHeader(http.StatusOK) this.writer.WriteHeader(http.StatusOK)
} }
_, err := this.writer.WriteString("The site have been shutdown.") buf := bytePool1k.Get()
_, err = utils.CopyWithFilter(this.writer, fp, buf, func(p []byte) []byte {
return []byte(this.Format(string(p)))
})
bytePool1k.Put(buf)
if err != nil { if err != nil {
logs.Error(err) if !this.canIgnore(err) {
remotelogs.Warn("HTTP_REQUEST_SHUTDOWN", "write to client failed: "+err.Error())
}
} else {
this.writer.SetOk()
} }
return err = fp.Close()
}
// 从本地文件中读取
// TODO 支持从数据库中读取文件
file := Tea.Root + Tea.DS + shutdown.URL
fp, err := os.Open(file)
if err != nil {
logs.Error(err)
msg := "404 page not found: '" + shutdown.URL + "'"
this.writer.WriteHeader(http.StatusNotFound)
_, err = this.writer.Write([]byte(msg))
if err != nil { if err != nil {
logs.Error(err) remotelogs.Warn("HTTP_REQUEST_SHUTDOWN", "close file failed: "+err.Error())
} }
return } else if shutdown.BodyType == shared.BodyTypeHTML {
} // 自定义响应Headers
if shutdown.Status > 0 {
// 自定义响应Headers this.processResponseHeaders(shutdown.Status)
if shutdown.Status > 0 { this.writer.WriteHeader(shutdown.Status)
this.processResponseHeaders(shutdown.Status) } else {
this.writer.WriteHeader(shutdown.Status) this.processResponseHeaders(http.StatusOK)
} else { this.writer.WriteHeader(http.StatusOK)
this.processResponseHeaders(http.StatusOK)
this.writer.WriteHeader(http.StatusOK)
}
buf := bytePool1k.Get()
_, err = utils.CopyWithFilter(this.writer, fp, buf, func(p []byte) []byte {
return []byte(this.Format(string(p)))
})
bytePool1k.Put(buf)
if err != nil {
if !this.canIgnore(err) {
remotelogs.Warn("HTTP_REQUEST_SHUTDOWN", "write to client failed: "+err.Error())
} }
} else {
this.writer.SetOk()
}
err = fp.Close() _, err := this.writer.WriteString(this.Format(shutdown.Body))
if err != nil { if err != nil {
remotelogs.Warn("HTTP_REQUEST_SHUTDOWN", "close file failed: "+err.Error()) if !this.canIgnore(err) {
remotelogs.Warn("HTTP_REQUEST_SHUTDOWN", "write to client failed: "+err.Error())
}
} else {
this.writer.SetOk()
}
} }
} }