Skip to content

Commit

Permalink
Add a reserved path check to the wiki (#720)
Browse files Browse the repository at this point in the history
  • Loading branch information
Bwko authored and lunny committed Jan 22, 2017
1 parent f9a3aa8 commit 1257d43
Showing 1 changed file with 18 additions and 1 deletion.
19 changes: 18 additions & 1 deletion models/wiki.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,10 @@ import (
"code.gitea.io/gitea/modules/sync"
)

var wikiWorkingPool = sync.NewExclusivePool()
var (
reservedWikiPaths = []string{"_pages", "_new", "_edit"}
wikiWorkingPool = sync.NewExclusivePool()
)

// ToWikiPageURL formats a string to corresponding wiki URL name.
func ToWikiPageURL(name string) string {
Expand Down Expand Up @@ -88,8 +91,22 @@ func discardLocalWikiChanges(localPath string) error {
return discardLocalRepoBranchChanges(localPath, "master")
}

// pathAllowed checks if a wiki path is allowed
func pathAllowed(path string) error {
for i := range reservedWikiPaths {
if path == reservedWikiPaths[i] {
return ErrWikiAlreadyExist{path}
}
}
return nil
}

// updateWikiPage adds new page to repository wiki.
func (repo *Repository) updateWikiPage(doer *User, oldWikiPath, wikiPath, content, message string, isNew bool) (err error) {
if err = pathAllowed(wikiPath); err != nil {
return err
}

wikiWorkingPool.CheckIn(com.ToStr(repo.ID))
defer wikiWorkingPool.CheckOut(com.ToStr(repo.ID))

Expand Down

0 comments on commit 1257d43

Please sign in to comment.