mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-11-15 07:09:47 +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>
127 lines
5.7 KiB
Handlebars
127 lines
5.7 KiB
Handlebars
{{template "base/head" .}}
|
|
<div class="page-content organization new team">
|
|
{{template "org/header" .}}
|
|
<div class="ui middle very relaxed page grid">
|
|
<div class="column">
|
|
<form class="ui form" action="{{if .PageIsOrgTeamsNew}}{{.OrgLink}}/teams/new{{else}}{{.OrgLink}}/teams/{{.Team.LowerName | PathEscape}}/edit{{end}}" data-delete-url="{{.OrgLink}}/teams/{{.Team.LowerName | PathEscape}}/delete" method="post">
|
|
{{.CsrfTokenHtml}}
|
|
<h3 class="ui top attached header">
|
|
{{if .PageIsOrgTeamsNew}}{{.i18n.Tr "org.create_new_team"}}{{else}}{{.i18n.Tr "org.teams.settings"}}{{end}}
|
|
</h3>
|
|
<div class="ui attached segment">
|
|
{{template "base/alert" .}}
|
|
<div class="required field {{if .Err_TeamName}}error{{end}}">
|
|
<label for="team_name">{{.i18n.Tr "org.team_name"}}</label>
|
|
{{if eq .Team.LowerName "owners"}}
|
|
<input type="hidden" name="team_name" value="{{.Team.Name}}">
|
|
{{end}}
|
|
<input id="team_name" name="team_name" value="{{.Team.Name}}" required {{if eq .Team.LowerName "owners"}}disabled{{end}} autofocus>
|
|
<span class="help">{{.i18n.Tr "org.team_name_helper"}}</span>
|
|
</div>
|
|
<div class="field {{if .Err_Description}}error{{end}}">
|
|
<label for="description">{{.i18n.Tr "org.team_desc"}}</label>
|
|
<input id="description" name="description" value="{{.Team.Description}}">
|
|
<span class="help">{{.i18n.Tr "org.team_desc_helper"}}</span>
|
|
</div>
|
|
{{if not (eq .Team.LowerName "owners")}}
|
|
<div class="grouped field">
|
|
<label>{{.i18n.Tr "org.team_access_desc"}}</label>
|
|
<br>
|
|
<div class="field">
|
|
<div class="ui radio checkbox">
|
|
<input type="radio" name="repo_access" value="specific" {{if not .Team.IncludesAllRepositories}}checked{{end}}>
|
|
<label>{{.i18n.Tr "org.teams.specific_repositories"}}</label>
|
|
<span class="help">{{.i18n.Tr "org.teams.specific_repositories_helper" | Str2html}}</span>
|
|
</div>
|
|
</div>
|
|
<div class="field">
|
|
<div class="ui radio checkbox">
|
|
<input type="radio" name="repo_access" value="all" {{if .Team.IncludesAllRepositories}}checked{{end}}>
|
|
<label>{{.i18n.Tr "org.teams.all_repositories"}}</label>
|
|
<span class="help">{{.i18n.Tr "org.teams.all_repositories_helper" | Str2html}}</span>
|
|
</div>
|
|
</div>
|
|
|
|
<div class="field">
|
|
<div class="ui checkbox">
|
|
<label for="can_create_org_repo">{{.i18n.Tr "org.teams.can_create_org_repo"}}</label>
|
|
<input id="can_create_org_repo" name="can_create_org_repo" type="checkbox" {{if .Team.CanCreateOrgRepo}}checked{{end}}>
|
|
<span class="help">{{.i18n.Tr "org.teams.can_create_org_repo_helper"}}</span>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
<div class="grouped field">
|
|
<label>{{.i18n.Tr "org.team_permission_desc"}}</label>
|
|
<br>
|
|
<div class="field">
|
|
<div class="ui radio checkbox">
|
|
<input type="radio" name="permission" value="read" {{if or .PageIsOrgTeamsNew (eq .Team.Authorize 1)}}checked{{end}}>
|
|
<label>{{.i18n.Tr "org.teams.read_access"}}</label>
|
|
<span class="help">{{.i18n.Tr "org.teams.read_access_helper"}}</span>
|
|
</div>
|
|
</div>
|
|
<div class="field">
|
|
<div class="ui radio checkbox">
|
|
<input type="radio" name="permission" value="write" {{if eq .Team.Authorize 2}}checked{{end}}>
|
|
<label>{{.i18n.Tr "org.teams.write_access"}}</label>
|
|
<span class="help">{{.i18n.Tr "org.teams.write_access_helper"}}</span>
|
|
</div>
|
|
</div>
|
|
<div class="field">
|
|
<div class="ui radio checkbox">
|
|
<input type="radio" name="permission" value="admin" {{if eq .Team.Authorize 3}}checked{{end}}>
|
|
<label>{{.i18n.Tr "org.teams.admin_access"}}</label>
|
|
<span class="help">{{.i18n.Tr "org.teams.admin_access_helper"}}</span>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
<div class="ui divider"></div>
|
|
|
|
<div class="team-units required grouped field"{{if eq .Team.Authorize 3}} style="display: none"{{end}}>
|
|
<label>{{.i18n.Tr "org.team_unit_desc"}}</label>
|
|
<br>
|
|
{{range $t, $unit := $.Units}}
|
|
{{if $unit.Type.UnitGlobalDisabled}}
|
|
<div class="field poping up" data-content="{{$.i18n.Tr "repo.unit_disabled"}}">
|
|
{{else}}
|
|
<div class="field">
|
|
{{end}}
|
|
<div class="ui toggle checkbox">
|
|
<input type="checkbox" class="hidden" name="units" value="{{$unit.Type.Value}}"{{if or (eq $.Team.ID 0) ($.Team.UnitEnabled $unit.Type)}} checked{{end}}>
|
|
<label>{{$.i18n.Tr $unit.NameKey}}{{if $unit.Type.UnitGlobalDisabled}} {{$.i18n.Tr "org.team_unit_disabled"}}{{end}}</label>
|
|
<span class="help">{{$.i18n.Tr $unit.DescKey}}</span>
|
|
</div>
|
|
</div>
|
|
{{end}}
|
|
</div>
|
|
<div class="ui divider"></div>
|
|
{{end}}
|
|
|
|
<div class="field">
|
|
{{if .PageIsOrgTeamsNew}}
|
|
<button class="ui green button">{{.i18n.Tr "org.create_team"}}</button>
|
|
<a class="ui button" href="{{.OrgLink}}/teams">{{.i18n.Tr "cancel"}}</a>
|
|
{{else}}
|
|
<button class="ui green button">{{.i18n.Tr "org.teams.update_settings"}}</button>
|
|
{{if not (eq .Team.LowerName "owners")}}
|
|
<button class="ui red button delete-button" data-url="{{.OrgLink}}/teams/{{.team_name | PathEscape}}/delete">{{.i18n.Tr "org.teams.delete_team"}}</button>
|
|
{{end}}
|
|
{{end}}
|
|
</div>
|
|
</div>
|
|
</form>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
|
|
<div class="ui small basic delete modal">
|
|
<div class="ui icon header">
|
|
{{svg "octicon-trash"}}
|
|
{{.i18n.Tr "org.teams.delete_team_title"}}
|
|
</div>
|
|
<div class="content">
|
|
<p>{{.i18n.Tr "org.teams.delete_team_desc"}}</p>
|
|
</div>
|
|
{{template "base/delete_modal_actions" .}}
|
|
</div>
|
|
{{template "base/footer" .}}
|