Merge pull request 'Disabling Stars should disable the routes too' (#2471) from algernon/forgejo:stars/disable-routes into forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2471 Reviewed-by: Otto <otto@codeberg.org> Reviewed-by: Gusted <gusted@noreply.codeberg.org>
This commit is contained in:
commit
2855727c85
|
@ -49,7 +49,7 @@ var (
|
||||||
DownloadOrCloneMethods []string
|
DownloadOrCloneMethods []string
|
||||||
PrefixArchiveFiles bool
|
PrefixArchiveFiles bool
|
||||||
DisableMigrations bool
|
DisableMigrations bool
|
||||||
DisableStars bool `ini:"DISABLE_STARS"`
|
DisableStars bool
|
||||||
DisableForks bool
|
DisableForks bool
|
||||||
DefaultBranch string
|
DefaultBranch string
|
||||||
AllowAdoptionOfUnadoptedRepositories bool
|
AllowAdoptionOfUnadoptedRepositories bool
|
||||||
|
|
|
@ -964,7 +964,9 @@ func Routes() *web.Route {
|
||||||
m.Get("/{target}", user.CheckFollowing)
|
m.Get("/{target}", user.CheckFollowing)
|
||||||
})
|
})
|
||||||
|
|
||||||
|
if !setting.Repository.DisableStars {
|
||||||
m.Get("/starred", user.GetStarredRepos)
|
m.Get("/starred", user.GetStarredRepos)
|
||||||
|
}
|
||||||
|
|
||||||
m.Get("/subscriptions", user.GetWatchedRepos)
|
m.Get("/subscriptions", user.GetWatchedRepos)
|
||||||
}, context_service.UserAssignmentAPI())
|
}, context_service.UserAssignmentAPI())
|
||||||
|
@ -1039,6 +1041,7 @@ func Routes() *web.Route {
|
||||||
Post(bind(api.CreateRepoOption{}), repo.Create)
|
Post(bind(api.CreateRepoOption{}), repo.Create)
|
||||||
|
|
||||||
// (repo scope)
|
// (repo scope)
|
||||||
|
if !setting.Repository.DisableStars {
|
||||||
m.Group("/starred", func() {
|
m.Group("/starred", func() {
|
||||||
m.Get("", user.GetMyStarredRepos)
|
m.Get("", user.GetMyStarredRepos)
|
||||||
m.Group("/{username}/{reponame}", func() {
|
m.Group("/{username}/{reponame}", func() {
|
||||||
|
@ -1047,6 +1050,7 @@ func Routes() *web.Route {
|
||||||
m.Delete("", user.Unstar)
|
m.Delete("", user.Unstar)
|
||||||
}, repoAssignment())
|
}, repoAssignment())
|
||||||
}, tokenRequiresScopes(auth_model.AccessTokenScopeCategoryRepository))
|
}, tokenRequiresScopes(auth_model.AccessTokenScopeCategoryRepository))
|
||||||
|
}
|
||||||
m.Get("/times", repo.ListMyTrackedTimes)
|
m.Get("/times", repo.ListMyTrackedTimes)
|
||||||
m.Get("/stopwatches", repo.GetStopwatches)
|
m.Get("/stopwatches", repo.GetStopwatches)
|
||||||
m.Get("/subscriptions", user.GetMyWatchedRepos)
|
m.Get("/subscriptions", user.GetMyWatchedRepos)
|
||||||
|
@ -1208,7 +1212,9 @@ func Routes() *web.Route {
|
||||||
m.Post("/markup", reqToken(), bind(api.MarkupOption{}), misc.Markup)
|
m.Post("/markup", reqToken(), bind(api.MarkupOption{}), misc.Markup)
|
||||||
m.Post("/markdown", reqToken(), bind(api.MarkdownOption{}), misc.Markdown)
|
m.Post("/markdown", reqToken(), bind(api.MarkdownOption{}), misc.Markdown)
|
||||||
m.Post("/markdown/raw", reqToken(), misc.MarkdownRaw)
|
m.Post("/markdown/raw", reqToken(), misc.MarkdownRaw)
|
||||||
|
if !setting.Repository.DisableStars {
|
||||||
m.Get("/stargazers", repo.ListStargazers)
|
m.Get("/stargazers", repo.ListStargazers)
|
||||||
|
}
|
||||||
m.Get("/subscribers", repo.ListSubscribers)
|
m.Get("/subscribers", repo.ListSubscribers)
|
||||||
m.Group("/subscription", func() {
|
m.Group("/subscription", func() {
|
||||||
m.Get("", user.IsWatching)
|
m.Get("", user.IsWatching)
|
||||||
|
|
|
@ -1129,8 +1129,10 @@ func registerRoutes(m *web.Route) {
|
||||||
m.Post("/unwatch", repo.ActionWatch(false))
|
m.Post("/unwatch", repo.ActionWatch(false))
|
||||||
m.Post("/accept_transfer", repo.ActionTransfer(true))
|
m.Post("/accept_transfer", repo.ActionTransfer(true))
|
||||||
m.Post("/reject_transfer", repo.ActionTransfer(false))
|
m.Post("/reject_transfer", repo.ActionTransfer(false))
|
||||||
|
if !setting.Repository.DisableStars {
|
||||||
m.Post("/star", repo.ActionStar(true))
|
m.Post("/star", repo.ActionStar(true))
|
||||||
m.Post("/unstar", repo.ActionStar(false))
|
m.Post("/unstar", repo.ActionStar(false))
|
||||||
|
}
|
||||||
}, reqSignIn, context.RepoAssignment, context.UnitTypes())
|
}, reqSignIn, context.RepoAssignment, context.UnitTypes())
|
||||||
|
|
||||||
// Grouping for those endpoints not requiring authentication (but should respect ignSignIn)
|
// Grouping for those endpoints not requiring authentication (but should respect ignSignIn)
|
||||||
|
@ -1359,7 +1361,9 @@ func registerRoutes(m *web.Route) {
|
||||||
m.Get("/open.svg", badges.GetOpenPullsBadge)
|
m.Get("/open.svg", badges.GetOpenPullsBadge)
|
||||||
m.Get("/closed.svg", badges.GetClosedPullsBadge)
|
m.Get("/closed.svg", badges.GetClosedPullsBadge)
|
||||||
})
|
})
|
||||||
|
if !setting.Repository.DisableStars {
|
||||||
m.Get("/stars.svg", badges.GetStarsBadge)
|
m.Get("/stars.svg", badges.GetStarsBadge)
|
||||||
|
}
|
||||||
m.Get("/release.svg", badges.GetLatestReleaseBadge)
|
m.Get("/release.svg", badges.GetLatestReleaseBadge)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
@ -1590,7 +1594,9 @@ func registerRoutes(m *web.Route) {
|
||||||
m.Post("/{username}/{reponame}/lastcommit/*", ignSignInAndCsrf, context.RepoAssignment, context.UnitTypes(), context.RepoRefByType(context.RepoRefCommit), reqRepoCodeReader, repo.LastCommit)
|
m.Post("/{username}/{reponame}/lastcommit/*", ignSignInAndCsrf, context.RepoAssignment, context.UnitTypes(), context.RepoRefByType(context.RepoRefCommit), reqRepoCodeReader, repo.LastCommit)
|
||||||
|
|
||||||
m.Group("/{username}/{reponame}", func() {
|
m.Group("/{username}/{reponame}", func() {
|
||||||
|
if !setting.Repository.DisableStars {
|
||||||
m.Get("/stars", repo.Stars)
|
m.Get("/stars", repo.Stars)
|
||||||
|
}
|
||||||
m.Get("/watchers", repo.Watchers)
|
m.Get("/watchers", repo.Watchers)
|
||||||
m.Get("/search", reqRepoCodeReader, repo.Search)
|
m.Get("/search", reqRepoCodeReader, repo.Search)
|
||||||
}, ignSignIn, context.RepoAssignment, context.RepoRef(), context.UnitTypes())
|
}, ignSignIn, context.RepoAssignment, context.RepoRef(), context.UnitTypes())
|
||||||
|
|
|
@ -9,7 +9,10 @@ import (
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
auth_model "code.gitea.io/gitea/models/auth"
|
auth_model "code.gitea.io/gitea/models/auth"
|
||||||
|
"code.gitea.io/gitea/modules/setting"
|
||||||
api "code.gitea.io/gitea/modules/structs"
|
api "code.gitea.io/gitea/modules/structs"
|
||||||
|
"code.gitea.io/gitea/modules/test"
|
||||||
|
"code.gitea.io/gitea/routers"
|
||||||
"code.gitea.io/gitea/tests"
|
"code.gitea.io/gitea/tests"
|
||||||
|
|
||||||
"github.com/stretchr/testify/assert"
|
"github.com/stretchr/testify/assert"
|
||||||
|
@ -25,12 +28,26 @@ func TestAPIStar(t *testing.T) {
|
||||||
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeReadUser)
|
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeReadUser)
|
||||||
tokenWithUserScope := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteUser, auth_model.AccessTokenScopeWriteRepository)
|
tokenWithUserScope := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteUser, auth_model.AccessTokenScopeWriteRepository)
|
||||||
|
|
||||||
|
assertDisabledStarsNotFound := func(t *testing.T, req *RequestWrapper) {
|
||||||
|
t.Helper()
|
||||||
|
|
||||||
|
defer tests.PrintCurrentTest(t)()
|
||||||
|
defer test.MockVariableValue(&setting.Repository.DisableStars, true)()
|
||||||
|
defer test.MockVariableValue(&testWebRoutes, routers.NormalRoutes())()
|
||||||
|
|
||||||
|
MakeRequest(t, req, http.StatusNotFound)
|
||||||
|
}
|
||||||
|
|
||||||
t.Run("Star", func(t *testing.T) {
|
t.Run("Star", func(t *testing.T) {
|
||||||
defer tests.PrintCurrentTest(t)()
|
defer tests.PrintCurrentTest(t)()
|
||||||
|
|
||||||
req := NewRequest(t, "PUT", fmt.Sprintf("/api/v1/user/starred/%s", repo)).
|
req := NewRequest(t, "PUT", fmt.Sprintf("/api/v1/user/starred/%s", repo)).
|
||||||
AddTokenAuth(tokenWithUserScope)
|
AddTokenAuth(tokenWithUserScope)
|
||||||
MakeRequest(t, req, http.StatusNoContent)
|
MakeRequest(t, req, http.StatusNoContent)
|
||||||
|
|
||||||
|
t.Run("disabled stars", func(t *testing.T) {
|
||||||
|
assertDisabledStarsNotFound(t, req)
|
||||||
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
t.Run("GetStarredRepos", func(t *testing.T) {
|
t.Run("GetStarredRepos", func(t *testing.T) {
|
||||||
|
@ -46,6 +63,10 @@ func TestAPIStar(t *testing.T) {
|
||||||
DecodeJSON(t, resp, &repos)
|
DecodeJSON(t, resp, &repos)
|
||||||
assert.Len(t, repos, 1)
|
assert.Len(t, repos, 1)
|
||||||
assert.Equal(t, repo, repos[0].FullName)
|
assert.Equal(t, repo, repos[0].FullName)
|
||||||
|
|
||||||
|
t.Run("disabled stars", func(t *testing.T) {
|
||||||
|
assertDisabledStarsNotFound(t, req)
|
||||||
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
t.Run("GetMyStarredRepos", func(t *testing.T) {
|
t.Run("GetMyStarredRepos", func(t *testing.T) {
|
||||||
|
@ -61,6 +82,10 @@ func TestAPIStar(t *testing.T) {
|
||||||
DecodeJSON(t, resp, &repos)
|
DecodeJSON(t, resp, &repos)
|
||||||
assert.Len(t, repos, 1)
|
assert.Len(t, repos, 1)
|
||||||
assert.Equal(t, repo, repos[0].FullName)
|
assert.Equal(t, repo, repos[0].FullName)
|
||||||
|
|
||||||
|
t.Run("disabled stars", func(t *testing.T) {
|
||||||
|
assertDisabledStarsNotFound(t, req)
|
||||||
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
t.Run("IsStarring", func(t *testing.T) {
|
t.Run("IsStarring", func(t *testing.T) {
|
||||||
|
@ -73,6 +98,10 @@ func TestAPIStar(t *testing.T) {
|
||||||
req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/user/starred/%s", repo+"notexisting")).
|
req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/user/starred/%s", repo+"notexisting")).
|
||||||
AddTokenAuth(tokenWithUserScope)
|
AddTokenAuth(tokenWithUserScope)
|
||||||
MakeRequest(t, req, http.StatusNotFound)
|
MakeRequest(t, req, http.StatusNotFound)
|
||||||
|
|
||||||
|
t.Run("disabled stars", func(t *testing.T) {
|
||||||
|
assertDisabledStarsNotFound(t, req)
|
||||||
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
t.Run("Unstar", func(t *testing.T) {
|
t.Run("Unstar", func(t *testing.T) {
|
||||||
|
@ -81,5 +110,9 @@ func TestAPIStar(t *testing.T) {
|
||||||
req := NewRequest(t, "DELETE", fmt.Sprintf("/api/v1/user/starred/%s", repo)).
|
req := NewRequest(t, "DELETE", fmt.Sprintf("/api/v1/user/starred/%s", repo)).
|
||||||
AddTokenAuth(tokenWithUserScope)
|
AddTokenAuth(tokenWithUserScope)
|
||||||
MakeRequest(t, req, http.StatusNoContent)
|
MakeRequest(t, req, http.StatusNoContent)
|
||||||
|
|
||||||
|
t.Run("disabled stars", func(t *testing.T) {
|
||||||
|
assertDisabledStarsNotFound(t, req)
|
||||||
|
})
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
|
@ -16,7 +16,9 @@ import (
|
||||||
unit_model "code.gitea.io/gitea/models/unit"
|
unit_model "code.gitea.io/gitea/models/unit"
|
||||||
"code.gitea.io/gitea/models/unittest"
|
"code.gitea.io/gitea/models/unittest"
|
||||||
user_model "code.gitea.io/gitea/models/user"
|
user_model "code.gitea.io/gitea/models/user"
|
||||||
|
"code.gitea.io/gitea/modules/setting"
|
||||||
"code.gitea.io/gitea/modules/test"
|
"code.gitea.io/gitea/modules/test"
|
||||||
|
"code.gitea.io/gitea/routers"
|
||||||
files_service "code.gitea.io/gitea/services/repository/files"
|
files_service "code.gitea.io/gitea/services/repository/files"
|
||||||
"code.gitea.io/gitea/tests"
|
"code.gitea.io/gitea/tests"
|
||||||
|
|
||||||
|
@ -107,6 +109,14 @@ func TestBadges(t *testing.T) {
|
||||||
resp := MakeRequest(t, req, http.StatusSeeOther)
|
resp := MakeRequest(t, req, http.StatusSeeOther)
|
||||||
|
|
||||||
assertBadge(t, resp, "stars-0-blue")
|
assertBadge(t, resp, "stars-0-blue")
|
||||||
|
|
||||||
|
t.Run("disabled stars", func(t *testing.T) {
|
||||||
|
defer tests.PrintCurrentTest(t)()
|
||||||
|
defer test.MockVariableValue(&setting.Repository.DisableStars, true)()
|
||||||
|
defer test.MockVariableValue(&testWebRoutes, routers.NormalRoutes())()
|
||||||
|
|
||||||
|
MakeRequest(t, req, http.StatusNotFound)
|
||||||
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
t.Run("Issues", func(t *testing.T) {
|
t.Run("Issues", func(t *testing.T) {
|
||||||
|
|
|
@ -9,6 +9,9 @@ import (
|
||||||
"strings"
|
"strings"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
|
"code.gitea.io/gitea/modules/setting"
|
||||||
|
"code.gitea.io/gitea/modules/test"
|
||||||
|
"code.gitea.io/gitea/routers"
|
||||||
"code.gitea.io/gitea/tests"
|
"code.gitea.io/gitea/tests"
|
||||||
|
|
||||||
"github.com/stretchr/testify/assert"
|
"github.com/stretchr/testify/assert"
|
||||||
|
@ -80,3 +83,26 @@ func TestRepoStarUnstarUI(t *testing.T) {
|
||||||
func TestRepoWatchUnwatchUI(t *testing.T) {
|
func TestRepoWatchUnwatchUI(t *testing.T) {
|
||||||
testRepoStarringOrWatching(t, "watch", "watchers")
|
testRepoStarringOrWatching(t, "watch", "watchers")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestDisabledStars(t *testing.T) {
|
||||||
|
defer tests.PrepareTestEnv(t)()
|
||||||
|
defer test.MockVariableValue(&setting.Repository.DisableStars, true)()
|
||||||
|
defer test.MockVariableValue(&testWebRoutes, routers.NormalRoutes())()
|
||||||
|
|
||||||
|
t.Run("repo star, unstar", func(t *testing.T) {
|
||||||
|
defer tests.PrintCurrentTest(t)()
|
||||||
|
|
||||||
|
req := NewRequest(t, "POST", "/user2/repo1/action/star")
|
||||||
|
MakeRequest(t, req, http.StatusNotFound)
|
||||||
|
|
||||||
|
req = NewRequest(t, "POST", "/user2/repo1/action/unstar")
|
||||||
|
MakeRequest(t, req, http.StatusNotFound)
|
||||||
|
})
|
||||||
|
|
||||||
|
t.Run("repo stargazers", func(t *testing.T) {
|
||||||
|
defer tests.PrintCurrentTest(t)()
|
||||||
|
|
||||||
|
req := NewRequest(t, "GET", "/user2/repo1/stars")
|
||||||
|
MakeRequest(t, req, http.StatusNotFound)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in New Issue