mirror of
https://codeberg.org/forgejo/forgejo
synced 2024-11-24 10:46:10 +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>
275 lines
11 KiB
Handlebars
275 lines
11 KiB
Handlebars
{{template "base/head" .}}
|
|
<div class="page-content repository projects view-project">
|
|
{{template "repo/header" .}}
|
|
<div class="ui container">
|
|
<div class="ui two column stackable grid">
|
|
<div class="column">
|
|
{{template "repo/issue/navbar" .}}
|
|
</div>
|
|
<div class="column right aligned">
|
|
{{if and .CanWriteProjects (not .Repository.IsArchived)}}
|
|
<a class="ui green button show-modal item" href="{{$.RepoLink}}/issues/new?project={{$.Project.ID}}">{{.i18n.Tr "repo.issues.new"}}</a>
|
|
<a class="ui green button show-modal item" data-modal="#new-board-item">{{.i18n.Tr "new_project_board"}}</a>
|
|
{{end}}
|
|
<div class="ui small modal new-board-modal" id="new-board-item">
|
|
<div class="header">
|
|
{{$.i18n.Tr "repo.projects.board.new"}}
|
|
</div>
|
|
<div class="content">
|
|
<form class="ui form">
|
|
<div class="required field">
|
|
<label for="new_board">{{$.i18n.Tr "repo.projects.board.new_title"}}</label>
|
|
<input class="new-board" id="new_board" name="title" required>
|
|
</div>
|
|
|
|
<div class="field color-field">
|
|
<label for="new_board_color">{{$.i18n.Tr "repo.projects.board.color"}}</label>
|
|
<div class="color picker column">
|
|
<input class="color-picker" maxlength="7" placeholder="#c320f6" id="new_board_color_picker" name="color">
|
|
<div class="column precolors">
|
|
{{template "repo/issue/label_precolors"}}
|
|
</div>
|
|
</div>
|
|
</div>
|
|
|
|
<div class="text right actions">
|
|
<div class="ui cancel button">{{$.i18n.Tr "settings.cancel"}}</div>
|
|
<button data-url="{{$.RepoLink}}/projects/{{$.Project.ID}}" class="ui green button" id="new_board_submit">{{$.i18n.Tr "repo.projects.board.new_submit"}}</button>
|
|
</div>
|
|
</form>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
<div class="ui divider"></div>
|
|
<div class="ui two column stackable grid">
|
|
<div class="column">
|
|
<h2 class="project-title">{{$.Project.Title}}</h2>
|
|
<div class="content project-description">{{$.Project.RenderedContent|Str2html}}</div>
|
|
</div>
|
|
{{if and (or $.CanWriteIssues $.CanWritePulls) (not $.Repository.IsArchived)}}
|
|
<div class="column right aligned">
|
|
<div class="ui compact right small menu">
|
|
<a class="item" href="{{$.RepoLink}}/projects/{{.Project.ID}}/edit" data-id={{$.Project.ID}} data-title={{$.Project.Title}}>
|
|
{{svg "octicon-pencil"}}
|
|
<span class="mx-3">{{$.i18n.Tr "repo.issues.label_edit"}}</span>
|
|
</a>
|
|
{{if .Project.IsClosed}}
|
|
<a class="item link-action" href data-url="{{$.RepoLink}}/projects/{{.Project.ID}}/open">
|
|
{{svg "octicon-check"}}
|
|
<span class="mx-3">{{$.i18n.Tr "repo.projects.open"}}</span>
|
|
</a>
|
|
{{else}}
|
|
<a class="item link-action" href data-url="{{$.RepoLink}}/projects/{{.Project.ID}}/close">
|
|
{{svg "octicon-skip"}}
|
|
<span class="mx-3">{{$.i18n.Tr "repo.projects.close"}}</span>
|
|
</a>
|
|
{{end}}
|
|
<a class="item delete-button" href="#" data-url="{{$.RepoLink}}/projects/{{.Project.ID}}/delete" data-id="{{.Project.ID}}">
|
|
{{svg "octicon-trash"}}
|
|
<span class="mx-3">{{$.i18n.Tr "repo.issues.label_delete"}}</span>
|
|
</a>
|
|
</div>
|
|
</div>
|
|
{{end}}
|
|
</div>
|
|
<div class="ui divider"></div>
|
|
</div>
|
|
<div class="ui container fluid padded" id="project-board">
|
|
|
|
<div class="board">
|
|
{{ range $board := .Boards }}
|
|
|
|
<div class="ui segment board-column" style="background: {{.Color}} !important;" data-id="{{.ID}}" data-sorting="{{.Sorting}}" data-url="{{$.RepoLink}}/projects/{{$.Project.ID}}/{{.ID}}">
|
|
<div class="board-column-header df ac sb">
|
|
<div class="ui large label board-label py-2">{{.Title}}</div>
|
|
{{if and $.CanWriteProjects (not $.Repository.IsArchived) (ne .ID 0)}}
|
|
<div class="ui dropdown jump item poping up" data-variation="tiny inverted">
|
|
<div class="not-mobile px-3" tabindex="-1">
|
|
{{svg "octicon-kebab-horizontal"}}
|
|
</div>
|
|
<div class="menu user-menu" tabindex="-1">
|
|
<a class="item show-modal button" data-modal="#edit-project-board-modal-{{.ID}}">
|
|
{{svg "octicon-pencil"}}
|
|
{{$.i18n.Tr "repo.projects.board.edit"}}
|
|
</a>
|
|
{{if not .Default}}
|
|
<a class="item show-modal button" data-modal="#set-default-project-board-modal-{{.ID}}">
|
|
{{svg "octicon-pin"}}
|
|
{{$.i18n.Tr "repo.projects.board.set_default"}}
|
|
</a>
|
|
{{end}}
|
|
<a class="item show-modal button" data-modal="#delete-board-modal-{{.ID}}">
|
|
{{svg "octicon-trash"}}
|
|
{{$.i18n.Tr "repo.projects.board.delete"}}
|
|
</a>
|
|
|
|
<div class="ui small modal edit-project-board" id="edit-project-board-modal-{{.ID}}">
|
|
<div class="header">
|
|
{{$.i18n.Tr "repo.projects.board.edit"}}
|
|
</div>
|
|
<div class="content">
|
|
<form class="ui form">
|
|
<div class="required field">
|
|
<label for="new_board_title">{{$.i18n.Tr "repo.projects.board.edit_title"}}</label>
|
|
<input class="project-board-title" id="new_board_title" name="title" value="{{.Title}}" required>
|
|
</div>
|
|
|
|
<div class="field color-field">
|
|
<label for="new_board_color">{{$.i18n.Tr "repo.projects.board.color"}}</label>
|
|
<div class="color picker column">
|
|
<input class="color-picker" maxlength="7" placeholder="#c320f6" id="new_board_color" name="color" value="{{.Color}}">
|
|
<div class="column precolors">
|
|
{{template "repo/issue/label_precolors"}}
|
|
</div>
|
|
</div>
|
|
</div>
|
|
|
|
<div class="text right actions">
|
|
<div class="ui cancel button">{{$.i18n.Tr "settings.cancel"}}</div>
|
|
<button data-url="{{$.RepoLink}}/projects/{{$.Project.ID}}/{{.ID}}" class="ui red button">{{$.i18n.Tr "repo.projects.board.edit"}}</button>
|
|
</div>
|
|
</form>
|
|
</div>
|
|
</div>
|
|
|
|
<div class="ui basic modal" id="set-default-project-board-modal-{{.ID}}">
|
|
<div class="ui icon header">
|
|
{{$.i18n.Tr "repo.projects.board.set_default"}}
|
|
</div>
|
|
<div class="content center">
|
|
<label>
|
|
{{$.i18n.Tr "repo.projects.board.set_default_desc"}}
|
|
</label>
|
|
</div>
|
|
<div class="text right actions">
|
|
<div class="ui cancel button">{{$.i18n.Tr "settings.cancel"}}</div>
|
|
<button class="ui red button set-default-project-board" data-url="{{$.RepoLink}}/projects/{{$.Project.ID}}/{{.ID}}/default">{{$.i18n.Tr "repo.projects.board.set_default"}}</button>
|
|
</div>
|
|
</div>
|
|
|
|
<div class="ui basic modal" id="delete-board-modal-{{.ID}}">
|
|
<div class="ui icon header">
|
|
{{$.i18n.Tr "repo.projects.board.delete"}}
|
|
</div>
|
|
<div class="content center">
|
|
<label>
|
|
{{$.i18n.Tr "repo.projects.board.deletion_desc"}}
|
|
</label>
|
|
</div>
|
|
<div class="text right actions">
|
|
<div class="ui cancel button">{{$.i18n.Tr "settings.cancel"}}</div>
|
|
<button class="ui red button delete-project-board" data-url="{{$.RepoLink}}/projects/{{$.Project.ID}}/{{.ID}}">{{$.i18n.Tr "repo.projects.board.delete"}}</button>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
{{ end }}
|
|
</div>
|
|
<div class="ui divider"></div>
|
|
|
|
<div class="ui cards board" data-url="{{$.RepoLink}}/projects/{{$.Project.ID}}/{{.ID}}" data-project="{{$.Project.ID}}" data-board="{{.ID}}" id="board_{{.ID}}">
|
|
|
|
{{ range .Issues }}
|
|
|
|
<!-- start issue card -->
|
|
<div class="card board-card" data-issue="{{.ID}}">
|
|
<div class="content p-0">
|
|
<div class="header">
|
|
<span class="dif ac vm {{if .IsClosed}}red{{else}}green{{end}}">
|
|
{{if .IsPull}}
|
|
{{if .PullRequest.HasMerged}}
|
|
{{svg "octicon-git-merge" 16 "text purple"}}
|
|
{{else}}
|
|
{{if .IsClosed}}
|
|
{{svg "octicon-git-pull-request" 16 "text red"}}
|
|
{{else}}
|
|
{{svg "octicon-git-pull-request" 16 "text green"}}
|
|
{{end}}
|
|
{{end}}
|
|
{{else}}
|
|
{{if .IsClosed}}
|
|
{{svg "octicon-issue-closed" 16 "text red"}}
|
|
{{else}}
|
|
{{svg "octicon-issue-opened" 16 "text green"}}
|
|
{{end}}
|
|
{{end}}
|
|
</span>
|
|
<a class="project-board-title vm" href="{{.Link}}">
|
|
{{.Title}}
|
|
</a>
|
|
</div>
|
|
<div class="meta my-2">
|
|
<span class="text light grey">
|
|
#{{.Index}}
|
|
{{ $timeStr := TimeSinceUnix .GetLastEventTimestamp $.Lang }}
|
|
{{if .OriginalAuthor }}
|
|
{{$.i18n.Tr .GetLastEventLabelFake $timeStr (.OriginalAuthor|Escape) | Safe}}
|
|
{{else if gt .Poster.ID 0}}
|
|
{{$.i18n.Tr .GetLastEventLabel $timeStr (.Poster.HomeLink|Escape) (.Poster.GetDisplayName | Escape) | Safe}}
|
|
{{else}}
|
|
{{$.i18n.Tr .GetLastEventLabelFake $timeStr (.Poster.GetDisplayName | Escape) | Safe}}
|
|
{{end}}
|
|
</span>
|
|
</div>
|
|
{{- if .MilestoneID }}
|
|
<div class="meta my-2">
|
|
<a class="milestone" href="{{$.RepoLink}}/milestone/{{ .MilestoneID}}">
|
|
{{svg "octicon-milestone" 16 "mr-2 vm"}}
|
|
<span class="vm">{{ .Milestone.Name }}</span>
|
|
</a>
|
|
</div>
|
|
{{- end }}
|
|
{{- range index $.LinkedPRs .ID }}
|
|
<div class="meta my-2">
|
|
<a href="{{$.RepoLink}}/pulls/{{ .Index }}">
|
|
<span class="m-0 {{if .PullRequest.HasMerged}}purple{{else if .IsClosed}}red{{else}}green{{end}}">{{svg "octicon-git-merge" 16 "mr-2 vm"}}</span>
|
|
<span class="vm">{{ .Title}} <span class="text light grey">#{{.Index}}</span></span>
|
|
</a>
|
|
</div>
|
|
{{- end }}
|
|
</div>
|
|
{{if .Labels}}
|
|
<div class="extra content labels-list p-0 pt-2">
|
|
{{ range .Labels }}
|
|
<a class="ui label" href="{{$.RepoLink}}/issues?labels={{.ID}}" style="color: {{.ForegroundColor}}; background-color: {{.Color}};" title="{{.Description | RenderEmojiPlain}}">{{.Name | RenderEmoji}}</a>
|
|
{{ end }}
|
|
</div>
|
|
{{end}}
|
|
</div>
|
|
<!-- stop issue card -->
|
|
|
|
{{ end }}
|
|
</div>
|
|
</div>
|
|
{{ end }}
|
|
</div>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
{{if or .CanWriteIssues .CanWritePulls}}
|
|
<div class="ui small basic delete modal">
|
|
<div class="ui icon header">
|
|
{{svg "octicon-trash"}}
|
|
{{.i18n.Tr "repo.projects.deletion"}}
|
|
</div>
|
|
<div class="content">
|
|
<p>{{.i18n.Tr "repo.projects.deletion_desc"}}</p>
|
|
</div>
|
|
<div class="actions">
|
|
<div class="ui red basic inverted cancel button">
|
|
<i class="remove icon"></i>
|
|
{{.i18n.Tr "modal.no"}}
|
|
</div>
|
|
<div class="ui green basic inverted ok button">
|
|
<i class="checkmark icon"></i>
|
|
{{.i18n.Tr "modal.yes"}}
|
|
</div>
|
|
</div>
|
|
</div>
|
|
{{end}}
|
|
|
|
{{template "base/footer" .}}
|