bingyi/gf
1
0
Fork 0
mirror of https://gitee.com/johng/gf synced 2026-06-07 02:12:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1657 from houseme/fix-1655

Browse Source 
fix: server access logs contain the protocol used between the server …
This commit is contained in:
John Guo
2022-03-09 22:23:40 +08:00
committed by GitHub
parent 1625fc6f7e 3d6867c321
commit 465100ae41
3 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
net/ghttp/ghttp_request.go
View File

@ -19,6 +19,7 @@ import (
"github.com/gogf/gf/v2/os/gtime"
"github.com/gogf/gf/v2/os/gview"
"github.com/gogf/gf/v2/text/gregex"
"github.com/gogf/gf/v2/text/gstr"
"github.com/gogf/gf/v2/util/guid"
)
@ -224,8 +225,12 @@ func (r *Request) GetRemoteIp() string {
// GetUrl returns current URL of this request.
func (r *Request) GetUrl() string {
scheme := "http"
if r.TLS != nil {
var (
scheme = "http"
proto = r.Header.Get("X-Forwarded-Proto")
)
if r.TLS != nil || gstr.Equal(proto, "https") {
scheme = "https"
}
return fmt.Sprintf(`%s://%s%s`, scheme, r.Host, r.URL.String())

11
net/ghttp/ghttp_server_log.go
View File

@ -18,8 +18,12 @@ func (s *Server) handleAccessLog(r *Request) {
if !s.IsAccessLogEnabled() {
return
}
scheme := "http"
if r.TLS != nil {
var (
scheme = "http"
proto = r.Header.Get("X-Forwarded-Proto")
)
if r.TLS != nil || gstr.Equal(proto, "https") {
scheme = "https"
}
s.Logger().File(s.config.AccessLogPattern).
@ -43,9 +47,10 @@ func (s *Server) handleErrorLog(err error, r *Request) {
code = gerror.Code(err)
scheme = "http"
codeDetail = code.Detail()
proto = r.Header.Get("X-Forwarded-Proto")
codeDetailStr string
)
if r.TLS != nil {
if r.TLS != nil || gstr.Equal(proto, "https") {
scheme = "https"
}
if codeDetail != nil {

4
net/ghttp/ghttp_server_swagger.go
View File

@ -7,6 +7,8 @@
package ghttp
import (
"fmt"
"github.com/gogf/gf/v2/text/gstr"
)
@ -45,7 +47,7 @@ func (s *Server) swaggerUI(r *Request) {
if r.StaticFile != nil && r.StaticFile.File != nil && r.StaticFile.IsDir {
content := gstr.ReplaceByMap(swaggerUITemplate, map[string]string{
swaggerUIDocURLPlaceHolder: s.config.OpenApiPath,
swaggerUIDocNamePlaceHolder: gstr.TrimRight(r.GetUrl(), "/") + "/" + swaggerUIDocName,
swaggerUIDocNamePlaceHolder: gstr.TrimRight(fmt.Sprintf(`//%s%s`, r.Host, r.URL.String()), "/") + "/" + swaggerUIDocName,
})
r.Response.Write(content)
r.ExitAll()