Skip to content

Commit eacab6b

Browse files
lunnyzeripathlafriks
authored
Add disable download source configuration (#20548) (#20579)
* Add disable download source configuration (#20548) Add configuration to enable/disable download source from UI. Co-authored-by: zeripath <art27@cantab.net> * Fix BaseVars not used in renderering * Fix disabled open in vscode menu when disabling download source from UI Co-authored-by: zeripath <art27@cantab.net> Co-authored-by: Lauris BH <lauris@nix.lv>
1 parent ac9792c commit eacab6b

File tree

10 files changed

+40
-17
lines changed

10 files changed

+40
-17
lines changed

‎custom/conf/app.example.ini

+3
Original file line numberDiff line numberDiff line change
@@ -892,6 +892,9 @@ ROUTER = console
892892
;; Allow deletion of unadopted repositories
893893
;ALLOW_DELETION_OF_UNADOPTED_REPOSITORIES = false
894894

895+
;; Don't allow download source archive files from UI
896+
;DISABLE_DOWNLOAD_SOURCE_ARCHIVES = false
897+
895898
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
896899
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
897900
;[repository.editor]

‎docs/content/doc/advanced/config-cheat-sheet.en-us.md

+1
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ Values containing `#` or `;` must be quoted using `` ` `` or `"""`.
7878
- `DEFAULT_BRANCH`: **main**: Default branch name of all repositories.
7979
- `ALLOW_ADOPTION_OF_UNADOPTED_REPOSITORIES`: **false**: Allow non-admin users to adopt unadopted repositories
8080
- `ALLOW_DELETION_OF_UNADOPTED_REPOSITORIES`: **false**: Allow non-admin users to delete unadopted repositories
81+
- `DISABLE_DOWNLOAD_SOURCE_ARCHIVES`: **false**: Don't allow download source archive files from UI
8182

8283
### Repository - Editor (`repository.editor`)
8384

‎modules/context/context.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ func (ctx *Context) HTML(status int, name base.TplName) {
224224
ctx.Data["TemplateLoadTimes"] = func() string {
225225
return strconv.FormatInt(time.Since(tmplStartTime).Nanoseconds()/1e6, 10) + "ms"
226226
}
227-
if err := ctx.Render.HTML(ctx.Resp, status, string(name), ctx.Data); err != nil {
227+
if err := ctx.Render.HTML(ctx.Resp, status, string(name), templates.BaseVars().Merge(ctx.Data)); err != nil {
228228
if status == http.StatusInternalServerError && name == base.TplName("status/500") {
229229
ctx.PlainText(http.StatusInternalServerError, "Unable to find status/500 template")
230230
return

‎modules/setting/repository.go

+1
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ var (
4848
DefaultBranch string
4949
AllowAdoptionOfUnadoptedRepositories bool
5050
AllowDeleteOfUnadoptedRepositories bool
51+
DisableDownloadSourceArchives bool
5152

5253
// Repository editor settings
5354
Editor struct {

‎modules/templates/base.go

+5-4
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,11 @@ func BaseVars() Vars {
3535
"IsLandingPageExplore": setting.LandingPageURL == setting.LandingPageExplore,
3636
"IsLandingPageOrganizations": setting.LandingPageURL == setting.LandingPageOrganizations,
3737

38-
"ShowRegistrationButton": setting.Service.ShowRegistrationButton,
39-
"ShowMilestonesDashboardPage": setting.Service.ShowMilestonesDashboardPage,
40-
"ShowFooterBranding": setting.ShowFooterBranding,
41-
"ShowFooterVersion": setting.ShowFooterVersion,
38+
"ShowRegistrationButton": setting.Service.ShowRegistrationButton,
39+
"ShowMilestonesDashboardPage": setting.Service.ShowMilestonesDashboardPage,
40+
"ShowFooterBranding": setting.ShowFooterBranding,
41+
"ShowFooterVersion": setting.ShowFooterVersion,
42+
"DisableDownloadSourceArchives": setting.Repository.DisableDownloadSourceArchives,
4243

4344
"EnableSwagger": setting.API.EnableSwagger,
4445
"EnableOpenIDSignIn": setting.Service.EnableOpenIDSignIn,

‎routers/web/web.go

+8-1
Original file line numberDiff line numberDiff line change
@@ -289,6 +289,13 @@ func RegisterRoutes(m *web.Route) {
289289
}
290290
}
291291

292+
dlSourceEnabled := func(ctx *context.Context) {
293+
if setting.Repository.DisableDownloadSourceArchives {
294+
ctx.Error(http.StatusNotFound)
295+
return
296+
}
297+
}
298+
292299
// FIXME: not all routes need go through same middleware.
293300
// Especially some AJAX requests, we can reduce middleware number to improve performance.
294301
// Routers.
@@ -1096,7 +1103,7 @@ func RegisterRoutes(m *web.Route) {
10961103
m.Group("/archive", func() {
10971104
m.Get("/*", repo.Download)
10981105
m.Post("/*", repo.InitiateDownload)
1099-
}, repo.MustBeNotEmpty, reqRepoCodeReader)
1106+
}, repo.MustBeNotEmpty, dlSourceEnabled, reqRepoCodeReader)
11001107

11011108
m.Group("/branches", func() {
11021109
m.Get("", repo.Branches)

‎templates/mail/release.tmpl

+2
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,14 @@
3131
<br>
3232
{{.i18n.Tr "mail.release.downloads"}}
3333
<ul>
34+
{{if not .DisableDownloadSourceArchives}}
3435
<li>
3536
<a href="{{.Release.Repo.Link}}/archive/{{.Release.TagName | PathEscapeSegments}}.zip" rel="nofollow"><strong>{{.i18n.Tr "mail.release.download.zip"}}</strong></a>
3637
</li>
3738
<li>
3839
<a href="{{.Release.Repo.Link}}/archive/{{.Release.TagName | PathEscapeSegments}}.tar.gz" rel="nofollow"><strong>{{.i18n.Tr "mail.release.download.targz"}}</strong></a>
3940
</li>
41+
{{end}}
4042
{{if .Release.Attachments}}
4143
{{range .Release.Attachments}}
4244
<li>

‎templates/repo/branch/list.tmpl

+5-3
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,15 @@
2626
{{svg "octicon-git-branch"}}
2727
</div>
2828
{{end}}
29-
<div class="ui basic jump dropdown icon button tooltip" data-content="{{$.i18n.Tr "repo.branch.download" ($.DefaultBranch)}}" data-position="top right">
29+
{{if not $.DisableDownloadSourceArchives}}
30+
<div class="ui basic jump dropdown icon button tooltip" data-content="{{$.i18n.Tr "repo.branch.download" ($.DefaultBranch)}}" data-position="top right">
3031
{{svg "octicon-download"}}
3132
<div class="menu">
3233
<a class="item archive-link" href="{{$.RepoLink}}/archive/{{PathEscapeSegments $.DefaultBranch}}.zip" rel="nofollow">{{svg "octicon-file-zip"}}&nbsp;ZIP</a>
3334
<a class="item archive-link" href="{{$.RepoLink}}/archive/{{PathEscapeSegments $.DefaultBranch}}.tar.gz" rel="nofollow">{{svg "octicon-file-zip"}}&nbsp;TAR.GZ</a>
35+
</div>
3436
</div>
35-
</div>
37+
{{end}}
3638
</td>
3739
</tr>
3840
</tbody>
@@ -110,7 +112,7 @@
110112
{{svg "octicon-git-branch"}}
111113
</div>
112114
{{end}}
113-
{{if (not .IsDeleted)}}
115+
{{if and (not .IsDeleted) (not $.DisableDownloadSourceArchives)}}
114116
<div class="ui basic jump dropdown icon button tooltip" data-content="{{$.i18n.Tr "repo.branch.download" (.Name)}}" data-position="top right">
115117
{{svg "octicon-download"}}
116118
<div class="menu">

‎templates/repo/home.tmpl

+5-3
Original file line numberDiff line numberDiff line change
@@ -128,9 +128,11 @@
128128
<button id="download-btn" class="ui basic jump dropdown icon button tooltip" data-content="{{.i18n.Tr "repo.download_archive"}}" data-position="top right">
129129
{{svg "octicon-download"}}
130130
<div class="menu">
131-
<a class="item archive-link" href="{{$.RepoLink}}/archive/{{PathEscapeSegments $.BranchName}}.zip" rel="nofollow">{{svg "octicon-file-zip" 16 "mr-3"}}{{.i18n.Tr "repo.download_zip"}}</a>
132-
<a class="item archive-link" href="{{$.RepoLink}}/archive/{{PathEscapeSegments $.BranchName}}.tar.gz" rel="nofollow">{{svg "octicon-file-zip" 16 "mr-3"}}{{.i18n.Tr "repo.download_tar"}}</a>
133-
<a class="item archive-link" href="{{$.RepoLink}}/archive/{{PathEscapeSegments $.BranchName}}.bundle" rel="nofollow">{{svg "octicon-package" 16 "mr-3"}}{{.i18n.Tr "repo.download_bundle"}}</a>
131+
{{if not $.DisableDownloadSourceArchives}}
132+
<a class="item archive-link" href="{{$.RepoLink}}/archive/{{PathEscapeSegments $.BranchName}}.zip" rel="nofollow">{{svg "octicon-file-zip" 16 "mr-3"}}{{.i18n.Tr "repo.download_zip"}}</a>
133+
<a class="item archive-link" href="{{$.RepoLink}}/archive/{{PathEscapeSegments $.BranchName}}.tar.gz" rel="nofollow">{{svg "octicon-file-zip" 16 "mr-3"}}{{.i18n.Tr "repo.download_tar"}}</a>
134+
<a class="item archive-link" href="{{$.RepoLink}}/archive/{{PathEscapeSegments $.BranchName}}.bundle" rel="nofollow">{{svg "octicon-package" 16 "mr-3"}}{{.i18n.Tr "repo.download_bundle"}}</a>
135+
{{end}}
134136
<a class="item" href="vscode://vscode.git/clone?url={{$.RepoCloneLink.HTTPS}}">{{svg "gitea-vscode" 16 "mr-3"}}{{.i18n.Tr "repo.clone_in_vsc"}}</a>
135137
</div>
136138
</button>

‎templates/repo/release/list.tmpl

+9-5
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,10 @@
3737
<div class="download df ac">
3838
{{if $.Permission.CanRead $.UnitTypeCode}}
3939
<a class="mr-3 mono" href="{{$.RepoLink}}/src/commit/{{.Sha1}}" rel="nofollow">{{svg "octicon-git-commit" 16 "mr-2"}}{{ShortSha .Sha1}}</a>
40-
<a class="archive-link mr-3" href="{{$.RepoLink}}/archive/{{.TagName | PathEscapeSegments}}.zip" rel="nofollow">{{svg "octicon-file-zip" 16 "mr-2"}}ZIP</a>
41-
<a class="archive-link mr-3" href="{{$.RepoLink}}/archive/{{.TagName | PathEscapeSegments}}.tar.gz" rel="nofollow">{{svg "octicon-file-zip" 16 "mr-2"}}TAR.GZ</a>
40+
{{if not $.DisableDownloadSourceArchives}}
41+
<a class="archive-link mr-3" href="{{$.RepoLink}}/archive/{{.TagName | PathEscapeSegments}}.zip" rel="nofollow">{{svg "octicon-file-zip" 16 "mr-2"}}ZIP</a>
42+
<a class="archive-link mr-3" href="{{$.RepoLink}}/archive/{{.TagName | PathEscapeSegments}}.tar.gz" rel="nofollow">{{svg "octicon-file-zip" 16 "mr-2"}}TAR.GZ</a>
43+
{{end}}
4244
{{if (and $.CanCreateRelease $release.IsTag)}}
4345
<a class="mr-3" href="{{$.RepoLink}}/releases/new?tag={{.TagName}}">{{svg "octicon-tag" 16 "mr-2"}}{{$.i18n.Tr "repo.release.new_release"}}</a>
4446
{{end}}
@@ -104,8 +106,10 @@
104106
<div class="download">
105107
{{if $.Permission.CanRead $.UnitTypeCode}}
106108
<a class="mono" href="{{$.RepoLink}}/src/commit/{{.Sha1}}" rel="nofollow">{{svg "octicon-git-commit" 16 "mr-2"}}{{ShortSha .Sha1}}</a>
107-
<a class="archive-link" href="{{$.RepoLink}}/archive/{{.TagName | PathEscapeSegments}}.zip" rel="nofollow">{{svg "octicon-file-zip"}}&nbsp;ZIP</a>
108-
<a class="archive-link" href="{{$.RepoLink}}/archive/{{.TagName | PathEscapeSegments}}.tar.gz" rel="nofollow">{{svg "octicon-file-zip"}}&nbsp;TAR.GZ</a>
109+
{{if not $.DisableDownloadSourceArchives}}
110+
<a class="archive-link" href="{{$.RepoLink}}/archive/{{.TagName | PathEscapeSegments}}.zip" rel="nofollow">{{svg "octicon-file-zip"}}&nbsp;ZIP</a>
111+
<a class="archive-link" href="{{$.RepoLink}}/archive/{{.TagName | PathEscapeSegments}}.tar.gz" rel="nofollow">{{svg "octicon-file-zip"}}&nbsp;TAR.GZ</a>
112+
{{end}}
109113
{{end}}
110114
</div>
111115
{{else}}
@@ -146,7 +150,7 @@
146150
{{$.i18n.Tr "repo.release.downloads"}}
147151
</summary>
148152
<ul class="list">
149-
{{if and (not .IsDraft) ($.Permission.CanRead $.UnitTypeCode)}}
153+
{{if and (not $.DisableDownloadSourceArchives) (not .IsDraft) ($.Permission.CanRead $.UnitTypeCode)}}
150154
<li>
151155
<a class="archive-link" href="{{$.RepoLink}}/archive/{{.TagName | PathEscapeSegments}}.zip" rel="nofollow"><strong>{{svg "octicon-file-zip" 16 "mr-2"}}{{$.i18n.Tr "repo.release.source_code"}} (ZIP)</strong></a>
152156
</li>

0 commit comments

Comments
 (0)