ston1th/gowiki
0
0
Fork 0
Code Issues 2 Releases Activity

added user independent sections and started db migration work

Browse source
This commit is contained in:
ston1th 2019-03-26 23:55:55 +01:00
commit 16ea95bf09
24 changed files with 622 additions and 122 deletions
Download patch file Download diff file Expand all files Collapse all files

41
pkg/db/page.go
View file

@ -14,15 +14,14 @@ import (
const pagePrefix = "page/"
var (
errPageNotFound = store.ErrKeyNotFound
errPermissionDenied = errors.New("db: permission denied")
errInvalidPermission = errors.New("db: invalid permission")
errPrivateWikiPage = errors.New("db: private wiki pages are not allowed")
errNonPublicIndexPage = errors.New("db: internal/private index page is not allowed")
errDeleteIndexPage = errors.New("db: index page can not be deleted")
errPageNotFound = store.ErrKeyNotFound
errPermissionDenied = errors.New("db: permission denied")
errInvalidPermission = errors.New("db: invalid permission")
errPrivateWikiPage = errors.New("db: private wiki pages are not allowed")
errDeleteIndexPage = errors.New("db: index page can not be deleted")
)
func (db *DB) GetAllSections(username string) (sections core.Sections) {
func (db *DB) GetAllSections(username string) (sections core.SectionPages) {
m := make(map[string]core.UpdatedPages)
db.store.ForEach(func(k string, _ []byte) error {
if trim, ok := hasTrimPrefix(k, pagePrefix); ok {
@ -46,7 +45,7 @@ func (db *DB) GetAllSections(username string) (sections core.Sections) {
if l > 5 {
l = 5
}
sections = append(sections, core.Section{s, p[:l]})
sections = append(sections, core.SectionPage{s, p[:l]})
}
sort.Sort(sections)
return
@ -86,7 +85,7 @@ func (db *DB) ValidatePage(st, username string) bool {
db.cache.Add(st, p)
return true
}
return core.ReadPerm(username, p)
return db.ReadPerm(st, username, p.Perm)
}
func (db *DB) GetPage(section, title, username string) (p *core.Page, err error) {
@ -97,7 +96,7 @@ func (db *DB) GetPage(section, title, username string) (p *core.Page, err error)
db.cache.Add(st, p)
return
}
if !core.ReadPerm(username, p) {
if !db.ReadPerm(section, username, p.Perm) {
err = errPageNotFound
}
return
@ -109,7 +108,7 @@ func (db *DB) getPage(title, username string) (p *core.Page, err error) {
if err != nil {
return
}
if !core.ReadPerm(username, p) {
if !db.ReadPerm(title, username, p.Perm) {
err = errPageNotFound
}
return
@ -120,13 +119,9 @@ func (db *DB) CreatePage(title, section, markdown, username string, p core.Permi
err = errInvalidPermission
return
}
owner := username
if section == core.WikiSection {
owner = core.WikiSection
if p == core.Private {
err = errPrivateWikiPage
return
}
if section == core.WikiSection && p == core.Private {
err = errPrivateWikiPage
return
}
st := render.StoreTitle(section, render.Title(title))
_, err = db.getPage(st, username)
@ -139,7 +134,6 @@ func (db *DB) CreatePage(title, section, markdown, username string, p core.Permi
StoreTitle: st,
Markdown: markdown,
Created: created(username),
Owner: owner,
Perm: p,
}
search := render.Render(page)
@ -166,17 +160,12 @@ func (db *DB) UpdatePage(title, section, markdown, username string, p core.Permi
err = errPrivateWikiPage
return
}
if section == core.WikiSection && title == core.IndexPage &&
(p == core.Internal || p == core.Private) {
err = errNonPublicIndexPage
return
}
st := render.StoreTitle(section, title)
page, err := db.getPage(st, username)
if err != nil {
return
}
if !core.WritePerm(username, section, page) {
if !db.WritePerm(title, username, page.Perm) {
return errPermissionDenied
}
@ -216,7 +205,7 @@ func (db *DB) DeletePage(title, section, username string) (err error) {
if page, err = db.getPage(st, username); err != nil {
return
}
if !core.WritePerm(username, section, page) {
if !db.WritePerm(section, username, page.Perm) {
return errPermissionDenied
}
return db.deletePage(st)