mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-11-24 11:31:54 +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>
65 lines
2.8 KiB
Handlebars
65 lines
2.8 KiB
Handlebars
{{template "base/head" .}}
|
|
<div class="page-content repository file list">
|
|
{{template "repo/header" .}}
|
|
<div class="ui container">
|
|
<div class="ui repo-search">
|
|
<form class="ui form ignore-dirty" method="get">
|
|
<div class="ui fluid action input">
|
|
<input name="q" value="{{.Keyword}}" placeholder="{{.i18n.Tr "repo.search.search_repo"}}">
|
|
<div class="ui dropdown selection">
|
|
<input name="t" type="hidden" value="{{.queryType}}">{{svg "octicon-triangle-down" 14 "dropdown icon"}}
|
|
<div class="text">{{.i18n.Tr (printf "repo.search.%s" (or .queryType "fuzzy"))}}</div>
|
|
<div class="menu transition hidden" tabindex="-1" style="display: block !important;">
|
|
<div class="item" data-value="">{{.i18n.Tr "repo.search.fuzzy"}}</div>
|
|
<div class="item" data-value="match">{{.i18n.Tr "repo.search.match"}}</div>
|
|
</div>
|
|
</div>
|
|
<button class="ui icon button" type="submit">{{svg "octicon-search" 16}}</button>
|
|
</div>
|
|
</form>
|
|
</div>
|
|
{{if .Keyword}}
|
|
<h3>
|
|
{{.i18n.Tr "repo.search.results" (.Keyword|Escape) (.RepoLink|Escape) (.RepoName|Escape) | Str2html }}
|
|
</h3>
|
|
<div class="df ac fw">
|
|
{{range $term := .SearchResultLanguages}}
|
|
<a class="ui text-label df ac mr-1 my-1 {{if eq $.Language $term.Language}}primary {{end}}basic label" href="{{$.SourcePath}}/search?q={{$.Keyword}}{{if ne $.Language $term.Language}}&l={{$term.Language}}{{end}}{{if ne $.queryType ""}}&t={{$.queryType}}{{end}}">
|
|
<i class="color-icon mr-3" style="background-color: {{$term.Color}}"></i>
|
|
{{$term.Language}}
|
|
<div class="detail">{{$term.Count}}</div>
|
|
</a>
|
|
{{end}}
|
|
</div>
|
|
<div class="repository search">
|
|
{{range $result := .SearchResults}}
|
|
<div class="diff-file-box diff-box file-content non-diff-file-content repo-search-result">
|
|
<h4 class="ui top attached normal header">
|
|
<span class="file">{{.Filename}}</span>
|
|
<a class="ui basic tiny button" rel="nofollow" href="{{$.SourcePath}}/src/commit/{{PathEscape $result.CommitID}}/{{PathEscapeSegments .Filename}}">{{$.i18n.Tr "repo.diff.view_file"}}</a>
|
|
</h4>
|
|
<div class="ui attached table segment">
|
|
<div class="file-body file-code code-view">
|
|
<table>
|
|
<tbody>
|
|
<tr>
|
|
<td class="lines-num">
|
|
{{range .LineNumbers}}
|
|
<a href="{{$.SourcePath}}/src/commit/{{PathEscape $result.CommitID}}/{{PathEscapeSegments $result.Filename}}#L{{.}}"><span>{{.}}</span></a>
|
|
{{end}}
|
|
</td>
|
|
<td class="lines-code chroma"><code class="code-inner">{{.FormattedLines | Safe}}</code></td>
|
|
</tr>
|
|
</tbody>
|
|
</table>
|
|
</div>
|
|
</div>
|
|
{{template "shared/searchbottom" dict "root" $ "result" .}}
|
|
</div>
|
|
{{end}}
|
|
</div>
|
|
{{template "base/paginate" .}}
|
|
{{end}}
|
|
</div>
|
|
</div>
|
|
{{template "base/footer" .}}
|