mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-11-05 09:49:23 +01:00
bbffcc3aec
There are multiple places where Gitea does not properly escape URLs that it is building and there are multiple places where it builds urls when there is already a simpler function available to use this.
This is an extensive PR attempting to fix these issues.
1. The first commit in this PR looks through all href, src and links in the Gitea codebase and has attempted to catch all the places where there is potentially incomplete escaping.
2. Whilst doing this we will prefer to use functions that create URLs over recreating them by hand.
3. All uses of strings should be directly escaped - even if they are not currently expected to contain escaping characters. The main benefit to doing this will be that we can consider relaxing the constraints on user names and reponames in future.
4. The next commit looks at escaping in the wiki and re-considers the urls that are used there. Using the improved escaping here wiki files containing '/'. (This implementation will currently still place all of the wiki files the root directory of the repo but this would not be difficult to change.)
5. The title generation in feeds is now properly escaped.
6. EscapePound is no longer needed - urls should be PathEscaped / QueryEscaped as necessary but then re-escaped with Escape when creating html with locales Signed-off-by: Andrew Thornton <art27@cantab.net>
Signed-off-by: Andrew Thornton <art27@cantab.net>
72 lines
3 KiB
Handlebars
72 lines
3 KiB
Handlebars
{{range .comments}}
|
|
|
|
{{ $createdStr:= TimeSinceUnix .CreatedUnix $.root.Lang }}
|
|
<div class="comment" id="{{.HashTag}}">
|
|
{{if .OriginalAuthor }}
|
|
<span class="avatar"><img src="{{AppSubUrl}}/assets/img/avatar_default.png"></span>
|
|
{{else}}
|
|
<a class="avatar" {{if gt .Poster.ID 0}}href="{{.Poster.HomeLink}}"{{end}}>
|
|
{{avatar .Poster}}
|
|
</a>
|
|
{{end}}
|
|
<div class="content comment-container">
|
|
<div class="ui top attached header comment-header df ac sb">
|
|
<div class="comment-header-left df ac">
|
|
{{if .OriginalAuthor }}
|
|
<span class="text black mr-2">
|
|
{{svg (MigrationIcon $.root.Repository.GetOriginalURLHostname)}}
|
|
{{ .OriginalAuthor }}
|
|
</span>
|
|
<span class="text grey">
|
|
{{$.root.i18n.Tr "repo.issues.commented_at" (.HashTag|Escape) $createdStr | Safe}}
|
|
</span>
|
|
<span class="text migrate">
|
|
{{if $.root.Repository.OriginalURL}}
|
|
({{$.root.i18n.Tr "repo.migrated_from" ($.root.Repository.OriginalURL | Escape) ($.root.Repository.GetOriginalURLHostname | Escape) | Safe }})
|
|
{{end}}
|
|
</span>
|
|
{{else}}
|
|
<span class="text grey">
|
|
<a {{if gt .Poster.ID 0}}href="{{.Poster.HomeLink}}"{{end}}>
|
|
{{.Poster.GetDisplayName}}
|
|
</a>
|
|
{{$.root.i18n.Tr "repo.issues.commented_at" (.HashTag|Escape) $createdStr | Safe}}
|
|
</span>
|
|
{{end}}
|
|
</div>
|
|
<div class="comment-header-right actions df ac">
|
|
{{if and .Review}}
|
|
{{if eq .Review.Type 0}}
|
|
<div class="ui label basic small yellow">
|
|
{{$.root.i18n.Tr "repo.issues.review.pending"}}
|
|
</div>
|
|
{{else}}
|
|
<div class="ui label basic small">
|
|
{{$.root.i18n.Tr "repo.issues.review.review"}}
|
|
</div>
|
|
{{end}}
|
|
{{end}}
|
|
{{template "repo/issue/view_content/add_reaction" Dict "ctx" $.root "ActionURL" (Printf "%s/comments/%d/reactions" $.root.RepoLink .ID) }}
|
|
{{template "repo/issue/view_content/context_menu" Dict "ctx" $.root "item" . "delete" true "issue" false "diff" true "IsCommentPoster" (and $.root.IsSigned (eq $.root.SignedUserID .PosterID))}}
|
|
</div>
|
|
</div>
|
|
<div class="ui attached segment comment-body">
|
|
<div class="render-content markup" {{if or $.Permission.IsAdmin $.HasIssuesOrPullsWritePermission (and $.root.IsSigned (eq $.root.SignedUserID .PosterID))}}data-can-edit="true"{{end}}>
|
|
{{if .RenderedContent}}
|
|
{{.RenderedContent|Str2html}}
|
|
{{else}}
|
|
<span class="no-content">{{$.root.i18n.Tr "repo.issues.no_content"}}</span>
|
|
{{end}}
|
|
</div>
|
|
<div id="comment-{{.ID}}" class="raw-content hide">{{.Content}}</div>
|
|
<div class="edit-content-zone hide" data-write="issuecomment-{{.ID}}-write" data-preview="issuecomment-{{.ID}}-preview" data-update-url="{{$.root.RepoLink}}/comments/{{.ID}}" data-context="{{$.root.RepoLink}}"></div>
|
|
</div>
|
|
{{$reactions := .Reactions.GroupByType}}
|
|
{{if $reactions}}
|
|
<div class="ui attached segment reactions">
|
|
{{template "repo/issue/view_content/reactions" Dict "ctx" $.root "ActionURL" (Printf "%s/comments/%d/reactions" $.root.RepoLink .ID) "Reactions" $reactions}}
|
|
</div>
|
|
{{end}}
|
|
</div>
|
|
</div>
|
|
{{end}}
|