diff --git a/custom/conf/app.example.ini b/custom/conf/app.example.ini
index 8e85394d34..76482bf607 100644
--- a/custom/conf/app.example.ini
+++ b/custom/conf/app.example.ini
@@ -2234,7 +2234,9 @@ ROUTER = console
;; Show template execution time in the footer
;SHOW_FOOTER_TEMPLATE_LOAD_TIME = true
;; Generate sitemap. Defaults to `true`.
-; ENABLE_SITEMAP = true
+;ENABLE_SITEMAP = true
+;; Enable/Disable RSS/Atom feed
+;ENABLE_FEED = true
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
diff --git a/docs/content/doc/advanced/config-cheat-sheet.en-us.md b/docs/content/doc/advanced/config-cheat-sheet.en-us.md
index 92758c61e4..4e7ef492f9 100644
--- a/docs/content/doc/advanced/config-cheat-sheet.en-us.md
+++ b/docs/content/doc/advanced/config-cheat-sheet.en-us.md
@@ -1288,3 +1288,4 @@ PROXY_HOSTS = *.github.com
- `SHOW_FOOTER_VERSION`: **true**: Show Gitea and Go version information in the footer.
- `SHOW_FOOTER_TEMPLATE_LOAD_TIME`: **true**: Show time of template execution in the footer.
- `ENABLE_SITEMAP`: **true**: Generate sitemap.
+- `ENABLE_FEED`: **true**: Enable/Disable RSS/Atom feed.
diff --git a/modules/context/repo.go b/modules/context/repo.go
index 1a0263a330..c363c36994 100644
--- a/modules/context/repo.go
+++ b/modules/context/repo.go
@@ -441,8 +441,10 @@ func RepoAssignment(ctx *Context) (cancel context.CancelFunc) {
userName := ctx.Params(":username")
repoName := ctx.Params(":reponame")
repoName = strings.TrimSuffix(repoName, ".git")
- repoName = strings.TrimSuffix(repoName, ".rss")
- repoName = strings.TrimSuffix(repoName, ".atom")
+ if setting.EnableFeed {
+ repoName = strings.TrimSuffix(repoName, ".rss")
+ repoName = strings.TrimSuffix(repoName, ".atom")
+ }
// Check if the user is the same as the repository owner
if ctx.IsSigned && ctx.Doer.LowerName == strings.ToLower(userName) {
diff --git a/modules/setting/setting.go b/modules/setting/setting.go
index 12558da494..fb425c8717 100644
--- a/modules/setting/setting.go
+++ b/modules/setting/setting.go
@@ -440,6 +440,7 @@ var (
ShowFooterBranding bool
ShowFooterVersion bool
ShowFooterTemplateLoadTime bool
+ EnableFeed bool
// Global setting objects
Cfg *ini.File
@@ -1102,6 +1103,7 @@ func loadFromConf(allowEmpty bool, extraConfig string) {
ShowFooterVersion = Cfg.Section("other").Key("SHOW_FOOTER_VERSION").MustBool(true)
ShowFooterTemplateLoadTime = Cfg.Section("other").Key("SHOW_FOOTER_TEMPLATE_LOAD_TIME").MustBool(true)
EnableSitemap = Cfg.Section("other").Key("ENABLE_SITEMAP").MustBool(true)
+ EnableFeed = Cfg.Section("other").Key("ENABLE_FEED").MustBool(true)
UI.ShowUserEmail = Cfg.Section("ui").Key("SHOW_USER_EMAIL").MustBool(true)
UI.DefaultShowFullName = Cfg.Section("ui").Key("DEFAULT_SHOW_FULL_NAME").MustBool(false)
diff --git a/routers/web/repo/view.go b/routers/web/repo/view.go
index 7500dbb34b..7a9e44ff5e 100644
--- a/routers/web/repo/view.go
+++ b/routers/web/repo/view.go
@@ -771,13 +771,16 @@ func checkCitationFile(ctx *context.Context, entry *git.TreeEntry) {
// Home render repository home page
func Home(ctx *context.Context) {
- isFeed, _, showFeedType := feed.GetFeedType(ctx.Params(":reponame"), ctx.Req)
- if isFeed {
- feed.ShowRepoFeed(ctx, ctx.Repo.Repository, showFeedType)
- return
- }
+ if setting.EnableFeed {
+ isFeed, _, showFeedType := feed.GetFeedType(ctx.Params(":reponame"), ctx.Req)
+ if isFeed {
+ feed.ShowRepoFeed(ctx, ctx.Repo.Repository, showFeedType)
+ return
+ }
- ctx.Data["FeedURL"] = ctx.Repo.Repository.HTMLURL()
+ ctx.Data["EnableFeed"] = true
+ ctx.Data["FeedURL"] = ctx.Repo.Repository.HTMLURL()
+ }
checkHomeCodeViewable(ctx)
if ctx.Written() {
diff --git a/routers/web/web.go b/routers/web/web.go
index 142f2384eb..fe5007abb7 100644
--- a/routers/web/web.go
+++ b/routers/web/web.go
@@ -310,6 +310,13 @@ func RegisterRoutes(m *web.Route) {
}
}
+ feedEnabled := func(ctx *context.Context) {
+ if !setting.EnableFeed {
+ ctx.Error(http.StatusNotFound)
+ return
+ }
+ }
+
// FIXME: not all routes need go through same middleware.
// Especially some AJAX requests, we can reduce middleware number to improve performance.
// Routers.
@@ -633,9 +640,11 @@ func RegisterRoutes(m *web.Route) {
m.Get(".png", func(ctx *context.Context) { ctx.Error(http.StatusNotFound) })
m.Get(".keys", user.ShowSSHKeys)
m.Get(".gpg", user.ShowGPGKeys)
- m.Get(".rss", feed.ShowUserFeedRSS)
- m.Get(".atom", feed.ShowUserFeedAtom)
+ m.Get(".rss", feedEnabled, feed.ShowUserFeedRSS)
+ m.Get(".atom", feedEnabled, feed.ShowUserFeedAtom)
m.Get("", user.Profile)
+ }, func(ctx *context.Context) {
+ ctx.Data["EnableFeed"] = setting.EnableFeed
}, context_service.UserAssignmentWeb())
m.Get("/attachments/{uuid}", repo.GetAttachment)
}, ignSignIn)
diff --git a/templates/base/head.tmpl b/templates/base/head.tmpl
index 70a88ff755..e2fc8434aa 100644
--- a/templates/base/head.tmpl
+++ b/templates/base/head.tmpl
@@ -15,7 +15,7 @@
{{end}}
-{{if .FeedURL}}
+{{if and .EnableFeed .FeedURL}}
{{end}}
diff --git a/templates/org/home.tmpl b/templates/org/home.tmpl
index 448639975f..358f045bc6 100644
--- a/templates/org/home.tmpl
+++ b/templates/org/home.tmpl
@@ -5,7 +5,9 @@