From b8db8ac71ab46a47f843c0bbbb7078a30e3f6e36 Mon Sep 17 00:00:00 2001 From: GoEdgeLab Date: Sun, 10 Oct 2021 10:35:05 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=B9=E6=AE=8A=E9=A1=B5=E9=9D=A2=E5=8F=AF?= =?UTF-8?q?=E4=BB=A5=E7=9B=B4=E6=8E=A5=E4=BD=BF=E7=94=A8HTML?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/nodes/http_request_page.go | 69 ++++++++++----- internal/nodes/http_request_shutdown.go | 106 ++++++++++++++---------- 2 files changed, 109 insertions(+), 66 deletions(-) diff --git a/internal/nodes/http_request_page.go b/internal/nodes/http_request_page.go index 96eb255..4fe1ec1 100644 --- a/internal/nodes/http_request_page.go +++ b/internal/nodes/http_request_page.go @@ -1,6 +1,7 @@ package nodes import ( + "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/shared" "github.com/TeaOSLab/EdgeNode/internal/remotelogs" "github.com/TeaOSLab/EdgeNode/internal/utils" "github.com/iwind/TeaGo/Tea" @@ -20,24 +21,54 @@ func (this *HTTPRequest) doPage(status int) (shouldStop bool) { for _, page := range this.web.Pages { if page.Match(status) { - if urlPrefixRegexp.MatchString(page.URL) { - this.doURL(http.MethodGet, page.URL, "", page.NewStatus, true) - return true - } else { - file := Tea.Root + Tea.DS + page.URL - fp, err := os.Open(file) - if err != nil { - logs.Error(err) - msg := "404 page not found: '" + page.URL + "'" + if len(page.BodyType) == 0 || page.BodyType == shared.BodyTypeURL { + if urlPrefixRegexp.MatchString(page.URL) { + this.doURL(http.MethodGet, page.URL, "", page.NewStatus, true) + return true + } else { + file := Tea.Root + Tea.DS + page.URL + fp, err := os.Open(file) + if err != nil { + logs.Error(err) + msg := "404 page not found: '" + page.URL + "'" - this.writer.WriteHeader(http.StatusNotFound) - _, err := this.writer.Write([]byte(msg)) + this.writer.WriteHeader(http.StatusNotFound) + _, 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 { logs.Error(err) } - return true } + return true + } else if page.BodyType == shared.BodyTypeHTML { // 修改状态码 if page.NewStatus > 0 { // 自定义响应Headers @@ -47,11 +78,8 @@ func (this *HTTPRequest) doPage(status int) (shouldStop bool) { 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) + + _, err := this.writer.WriteString(this.Format(page.Body)) if err != nil { if !this.canIgnore(err) { remotelogs.Warn("HTTP_REQUEST_PAGE", "write to client failed: "+err.Error()) @@ -59,13 +87,8 @@ func (this *HTTPRequest) doPage(status int) (shouldStop bool) { } else { this.writer.SetOk() } - err = fp.Close() - if err != nil { - logs.Error(err) - } + return true } - - return true } } return false diff --git a/internal/nodes/http_request_shutdown.go b/internal/nodes/http_request_shutdown.go index c019b18..b9d260a 100644 --- a/internal/nodes/http_request_shutdown.go +++ b/internal/nodes/http_request_shutdown.go @@ -1,6 +1,7 @@ package nodes import ( + "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/shared" "github.com/TeaOSLab/EdgeNode/internal/remotelogs" "github.com/TeaOSLab/EdgeNode/internal/utils" "github.com/iwind/TeaGo/Tea" @@ -21,8 +22,40 @@ func (this *HTTPRequest) doShutdown() { return } - // URL为空，则显示文本 TODO 未来可以自定义文本 - if len(shutdown.URL) == 0 { + if len(shutdown.BodyType) == 0 || shutdown.BodyType == shared.BodyTypeURL { + // 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 if shutdown.Status > 0 { this.processResponseHeaders(shutdown.Status) @@ -31,53 +64,40 @@ func (this *HTTPRequest) doShutdown() { this.processResponseHeaders(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 { - logs.Error(err) + if !this.canIgnore(err) { + remotelogs.Warn("HTTP_REQUEST_SHUTDOWN", "write to client failed: "+err.Error()) + } + } else { + this.writer.SetOk() } - return - } - - // 从本地文件中读取 - // 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)) + err = fp.Close() if err != nil { - logs.Error(err) + remotelogs.Warn("HTTP_REQUEST_SHUTDOWN", "close file failed: "+err.Error()) } - return - } - - // 自定义响应Headers - if shutdown.Status > 0 { - this.processResponseHeaders(shutdown.Status) - this.writer.WriteHeader(shutdown.Status) - } else { - 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 if shutdown.BodyType == shared.BodyTypeHTML { + // 自定义响应Headers + if shutdown.Status > 0 { + this.processResponseHeaders(shutdown.Status) + this.writer.WriteHeader(shutdown.Status) + } else { + this.processResponseHeaders(http.StatusOK) + this.writer.WriteHeader(http.StatusOK) } - } else { - this.writer.SetOk() - } - err = fp.Close() - if err != nil { - remotelogs.Warn("HTTP_REQUEST_SHUTDOWN", "close file failed: "+err.Error()) + _, err := this.writer.WriteString(this.Format(shutdown.Body)) + if err != nil { + if !this.canIgnore(err) { + remotelogs.Warn("HTTP_REQUEST_SHUTDOWN", "write to client failed: "+err.Error()) + } + } else { + this.writer.SetOk() + } } }