summaryrefslogtreecommitdiffstats
path: root/routers/private
diff options
context:
space:
mode:
authorzeripath <art27@cantab.net>2020-04-19 15:26:58 +0100
committerGitHub <noreply@github.com>2020-04-19 15:26:58 +0100
commit41f05588edf8026e43e799dd56114ac001bd7589 (patch)
treed08e88f994837fc2c889d8e00280a8b36ba14e66 /routers/private
parent9588d2c6226c3d027bc5eca8cde7f85806dc3633 (diff)
downloadgitea-41f05588edf8026e43e799dd56114ac001bd7589.tar.gz
gitea-41f05588edf8026e43e799dd56114ac001bd7589.zip
Prevent clones and pushes to disabled wiki (#11131)
Signed-off-by: Andrew Thornton <art27@cantab.net>
Diffstat (limited to 'routers/private')
-rw-r--r--routers/private/serv.go21
1 files changed, 20 insertions, 1 deletions
diff --git a/routers/private/serv.go b/routers/private/serv.go
index 91c28143ee..d5b5fcc8f7 100644
--- a/routers/private/serv.go
+++ b/routers/private/serv.go
@@ -329,8 +329,27 @@ func ServCommand(ctx *macaron.Context) {
results.RepoID = repo.ID
}
- // Finally if we're trying to touch the wiki we should init it
if results.IsWiki {
+ // Ensure the wiki is enabled before we allow access to it
+ if _, err := repo.GetUnit(models.UnitTypeWiki); err != nil {
+ if models.IsErrUnitTypeNotExist(err) {
+ ctx.JSON(http.StatusForbidden, map[string]interface{}{
+ "results": results,
+ "type": "ErrForbidden",
+ "err": "repository wiki is disabled",
+ })
+ return
+ }
+ log.Error("Failed to get the wiki unit in %-v Error: %v", repo, err)
+ ctx.JSON(http.StatusInternalServerError, map[string]interface{}{
+ "results": results,
+ "type": "InternalServerError",
+ "err": fmt.Sprintf("Failed to get the wiki unit in %s/%s Error: %v", ownerName, repoName, err),
+ })
+ return
+ }
+
+ // Finally if we're trying to touch the wiki we should init it
if err = wiki_service.InitWiki(repo); err != nil {
log.Error("Failed to initialize the wiki in %-v Error: %v", repo, err)
ctx.JSON(http.StatusInternalServerError, map[string]interface{}{