diff options
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/context/context.go | 16 | ||||
| -rw-r--r-- | pkg/template/template.go | 4 |
2 files changed, 13 insertions, 7 deletions
diff --git a/pkg/context/context.go b/pkg/context/context.go index 8b353f61..17a5ec96 100644 --- a/pkg/context/context.go +++ b/pkg/context/context.go @@ -6,7 +6,6 @@ package context import ( "fmt" - "html/template" "io" "net/http" "path" @@ -26,6 +25,7 @@ import ( "github.com/gogs/gogs/pkg/auth" "github.com/gogs/gogs/pkg/form" "github.com/gogs/gogs/pkg/setting" + "github.com/gogs/gogs/pkg/template" ) // Context represents context of a request. @@ -138,10 +138,16 @@ func (c *Context) JSONSuccess(data interface{}) { c.JSON(http.StatusOK, data) } +// Redirect responses redirection wtih given location and status. +// It escapes special characters in the location string. +func (c *Context) Redirect(location string, status ...int) { + c.Context.Redirect(template.EscapePound(location), status...) +} + // SubURLRedirect responses redirection wtih given location and status. // It prepends setting.AppSubURL to the location string. func (c *Context) SubURLRedirect(location string, status ...int) { - c.Redirect(setting.AppSubURL + location) + c.Redirect(setting.AppSubURL+location, status...) } // RenderWithErr used for page has form validation but need to prompt error to users. @@ -227,7 +233,7 @@ func Contexter() macaron.Handler { }, Org: &Organization{}, } - c.Data["Link"] = c.Link + c.Data["Link"] = template.EscapePound(c.Link) c.Data["PageStartTime"] = time.Now() // Quick responses appropriate go-get meta with status 200 @@ -296,13 +302,13 @@ func Contexter() macaron.Handler { // If request sends files, parse them here otherwise the Query() can't be parsed and the CsrfToken will be invalid. if c.Req.Method == "POST" && strings.Contains(c.Req.Header.Get("Content-Type"), "multipart/form-data") { if err := c.Req.ParseMultipartForm(setting.AttachmentMaxSize << 20); err != nil && !strings.Contains(err.Error(), "EOF") { // 32MB max size - c.Handle(500, "ParseMultipartForm", err) + c.ServerError("ParseMultipartForm", err) return } } c.Data["CSRFToken"] = x.GetToken() - c.Data["CSRFTokenHTML"] = template.HTML(`<input type="hidden" name="_csrf" value="` + x.GetToken() + `">`) + c.Data["CSRFTokenHTML"] = template.Safe(`<input type="hidden" name="_csrf" value="` + x.GetToken() + `">`) log.Trace("Session ID: %s", sess.ID()) log.Trace("CSRF Token: %v", c.Data["CSRFToken"]) diff --git a/pkg/template/template.go b/pkg/template/template.go index ff9921e7..8a85980a 100644 --- a/pkg/template/template.go +++ b/pkg/template/template.go @@ -64,7 +64,7 @@ func NewFuncMap() []template.FuncMap { "AppendAvatarSize": tool.AppendAvatarSize, "Safe": Safe, "Sanitize": bluemonday.UGCPolicy().Sanitize, - "Str2html": Str2html, + "Str2html": Str2HTML, "NewLine2br": NewLine2br, "TimeSince": tool.TimeSince, "RawTimeSince": tool.RawTimeSince, @@ -127,7 +127,7 @@ func Safe(raw string) template.HTML { return template.HTML(raw) } -func Str2html(raw string) template.HTML { +func Str2HTML(raw string) template.HTML { return template.HTML(markup.Sanitize(raw)) } |