mirror of
https://github.com/go-gitea/gitea.git
synced 2024-12-11 12:45:35 +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>
131 lines
7.2 KiB
Handlebars
131 lines
7.2 KiB
Handlebars
{{range .Feeds}}
|
|
<div class="news">
|
|
<div class="ui left">
|
|
{{avatarByAction .}}
|
|
</div>
|
|
<div class="ui grid">
|
|
<div class="ui fourteen wide column">
|
|
<div class="{{if or (eq .GetOpType 5) (eq .GetOpType 18)}}push news{{end}}">
|
|
<p>
|
|
{{if gt .ActUser.ID 0}}
|
|
<a href="{{AppSubUrl}}/{{.GetActUserName | PathEscape}}" title="{{.GetDisplayNameTitle}}">{{.GetDisplayName}}</a>
|
|
{{else}}
|
|
{{.ShortActUserName}}
|
|
{{end}}
|
|
{{if eq .GetOpType 1}}
|
|
{{$.i18n.Tr "action.create_repo" (.GetRepoLink|Escape) (.ShortRepoPath|Escape) | Str2html}}
|
|
{{else if eq .GetOpType 2}}
|
|
{{$.i18n.Tr "action.rename_repo" (.GetContent|Escape) (.GetRepoLink|Escape) (.ShortRepoPath|Escape) | Str2html}}
|
|
{{else if eq .GetOpType 5}}
|
|
{{ $branchLink := .GetBranch | PathEscapeSegments | Escape}}
|
|
{{if .Content}}
|
|
{{$.i18n.Tr "action.commit_repo" (.GetRepoLink|Escape) $branchLink (Escape .GetBranch) (.ShortRepoPath|Escape) | Str2html}}
|
|
{{else}}
|
|
{{$.i18n.Tr "action.create_branch" (.GetRepoLink|Escape) $branchLink (Escape .GetBranch) (.ShortRepoPath|Escape) | Str2html}}
|
|
{{end}}
|
|
{{else if eq .GetOpType 6}}
|
|
{{ $index := index .GetIssueInfos 0}}
|
|
{{$.i18n.Tr "action.create_issue" (.GetRepoLink|Escape) $index (.ShortRepoPath|Escape) | Str2html}}
|
|
{{else if eq .GetOpType 7}}
|
|
{{ $index := index .GetIssueInfos 0}}
|
|
{{$.i18n.Tr "action.create_pull_request" (.GetRepoLink|Escape) $index (.ShortRepoPath|Escape) | Str2html}}
|
|
{{else if eq .GetOpType 8}}
|
|
{{$.i18n.Tr "action.transfer_repo" .GetContent (.GetRepoLink|Escape) (.ShortRepoPath|Escape) | Str2html}}
|
|
{{else if eq .GetOpType 9}}
|
|
{{ $tagLink := .GetTag | PathEscapeSegments | Escape}}
|
|
{{$.i18n.Tr "action.push_tag" (.GetRepoLink|Escape) $tagLink (.ShortRepoPath|Escape) .GetTag | Str2html}}
|
|
{{else if eq .GetOpType 10}}
|
|
{{ $index := index .GetIssueInfos 0}}
|
|
{{$.i18n.Tr "action.comment_issue" (.GetRepoLink|Escape) $index (.ShortRepoPath|Escape) | Str2html}}
|
|
{{else if eq .GetOpType 11}}
|
|
{{ $index := index .GetIssueInfos 0}}
|
|
{{$.i18n.Tr "action.merge_pull_request" (.GetRepoLink|Escape) $index (.ShortRepoPath|Escape) | Str2html}}
|
|
{{else if eq .GetOpType 12}}
|
|
{{ $index := index .GetIssueInfos 0}}
|
|
{{$.i18n.Tr "action.close_issue" (.GetRepoLink|Escape) $index (.ShortRepoPath|Escape) | Str2html}}
|
|
{{else if eq .GetOpType 13}}
|
|
{{ $index := index .GetIssueInfos 0}}
|
|
{{$.i18n.Tr "action.reopen_issue" (.GetRepoLink|Escape) $index (.ShortRepoPath|Escape) | Str2html}}
|
|
{{else if eq .GetOpType 14}}
|
|
{{ $index := index .GetIssueInfos 0}}
|
|
{{$.i18n.Tr "action.close_pull_request" (.GetRepoLink|Escape) $index (.ShortRepoPath|Escape) | Str2html}}
|
|
{{else if eq .GetOpType 15}}
|
|
{{ $index := index .GetIssueInfos 0}}
|
|
{{$.i18n.Tr "action.reopen_pull_request" (.GetRepoLink|Escape) $index (.ShortRepoPath|Escape) | Str2html}}
|
|
{{else if eq .GetOpType 16}}
|
|
{{ $index := index .GetIssueInfos 0}}
|
|
{{$.i18n.Tr "action.delete_tag" (.GetRepoLink|Escape) (.GetTag|Escape) (.ShortRepoPath|Escape) | Str2html}}
|
|
{{else if eq .GetOpType 17}}
|
|
{{ $index := index .GetIssueInfos 0}}
|
|
{{$.i18n.Tr "action.delete_branch" (.GetRepoLink|Escape) (.GetBranch|Escape) (.ShortRepoPath|Escape) | Str2html}}
|
|
{{else if eq .GetOpType 18}}
|
|
{{ $branchLink := .GetBranch | PathEscapeSegments}}
|
|
{{$.i18n.Tr "action.mirror_sync_push" (.GetRepoLink|Escape) $branchLink (.GetBranch|Escape) (.ShortRepoPath|Escape) | Str2html}}
|
|
{{else if eq .GetOpType 19}}
|
|
{{$.i18n.Tr "action.mirror_sync_create" (.GetRepoLink|Escape) (.GetBranch|Escape) (.ShortRepoPath|Escape) | Str2html}}
|
|
{{else if eq .GetOpType 20}}
|
|
{{$.i18n.Tr "action.mirror_sync_delete" (.GetRepoLink|Escape) (.GetBranch|Escape) (.ShortRepoPath|Escape) | Str2html}}
|
|
{{else if eq .GetOpType 21}}
|
|
{{ $index := index .GetIssueInfos 0}}
|
|
{{$.i18n.Tr "action.approve_pull_request" (.GetRepoLink|Escape) $index (.ShortRepoPath|Escape) | Str2html}}
|
|
{{else if eq .GetOpType 22}}
|
|
{{ $index := index .GetIssueInfos 0}}
|
|
{{$.i18n.Tr "action.reject_pull_request" (.GetRepoLink|Escape) $index (.ShortRepoPath|Escape) | Str2html}}
|
|
{{else if eq .GetOpType 23}}
|
|
{{ $index := index .GetIssueInfos 0}}
|
|
{{$.i18n.Tr "action.comment_pull" (.GetRepoLink|Escape) $index (.ShortRepoPath|Escape) | Str2html}}
|
|
{{else if eq .GetOpType 24}}
|
|
{{ $branchLink := .GetBranch | PathEscapeSegments | Escape}}
|
|
{{ $linkText := .Content | RenderEmoji }}
|
|
{{$.i18n.Tr "action.publish_release" (.GetRepoLink|Escape) $branchLink (.ShortRepoPath|Escape) $linkText | Str2html}}
|
|
{{else if eq .GetOpType 25}}
|
|
{{ $index := index .GetIssueInfos 0}}
|
|
{{ $reviewer := index .GetIssueInfos 1}}
|
|
{{$.i18n.Tr "action.review_dismissed" (.GetRepoLink|Escape) $index (.ShortRepoPath|Escape) $reviewer | Str2html}}
|
|
{{end}}
|
|
</p>
|
|
{{if or (eq .GetOpType 5) (eq .GetOpType 18)}}
|
|
<div class="content">
|
|
<ul>
|
|
{{ $push := ActionContent2Commits .}}
|
|
{{ $repoLink := .GetRepoLink}}
|
|
{{range $push.Commits}}
|
|
{{ $commitLink := printf "%s/commit/%s" $repoLink .Sha1}}
|
|
<li>
|
|
{{avatarHTML ($push.AvatarLink .AuthorEmail) 16 "mr-2" .AuthorName}}
|
|
<a class="commit-id mr-2" href="{{$commitLink}}">{{ShortSha .Sha1}}</a>
|
|
<span class="text truncate light grey">
|
|
{{RenderCommitMessage .Message $repoLink $.ComposeMetas}}
|
|
</span>
|
|
</li>
|
|
{{end}}
|
|
{{if and (gt $push.Len 1) $push.CompareURL}}<li><a href="{{AppSubUrl}}/{{$push.CompareURL}}">{{$.i18n.Tr "action.compare_commits" $push.Len}} »</a></li>{{end}}
|
|
</ul>
|
|
</div>
|
|
{{else if eq .GetOpType 6}}
|
|
<span class="text truncate issue title">{{index .GetIssueInfos 1 | RenderEmoji}}</span>
|
|
{{else if eq .GetOpType 7}}
|
|
<span class="text truncate issue title">{{index .GetIssueInfos 1 | RenderEmoji}}</span>
|
|
{{else if or (eq .GetOpType 10) (eq .GetOpType 21) (eq .GetOpType 22) (eq .GetOpType 23)}}
|
|
<a href="{{.GetCommentLink}}" class="text truncate issue title">{{.GetIssueTitle | RenderEmoji}}</a>
|
|
{{$comment := index .GetIssueInfos 1}}
|
|
{{if gt (len $comment) 0}}<p class="text light grey">{{$comment | RenderEmoji}}</p>{{end}}
|
|
{{else if eq .GetOpType 11}}
|
|
<p class="text light grey">{{index .GetIssueInfos 1}}</p>
|
|
{{else if or (eq .GetOpType 12) (eq .GetOpType 13) (eq .GetOpType 14) (eq .GetOpType 15)}}
|
|
<span class="text truncate issue title">{{.GetIssueTitle | RenderEmoji}}</span>
|
|
{{else if eq .GetOpType 25}}
|
|
<p class="text light grey">{{$.i18n.Tr "action.review_dismissed_reason"}}</p>
|
|
<p class="text light grey">{{index .GetIssueInfos 2 | RenderEmoji}}</p>
|
|
{{end}}
|
|
<p class="text italic light grey">{{TimeSince .GetCreate $.i18n.Lang}}</p>
|
|
</div>
|
|
</div>
|
|
<div class="ui two wide right aligned column">
|
|
<span class="text grey">{{svg (printf "octicon-%s" (ActionIcon .GetOpType)) 32}}</span>
|
|
</div>
|
|
</div>
|
|
<div class="ui divider"></div>
|
|
</div>
|
|
{{end}}
|