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

syntax fixes

Browse source
This commit is contained in:
ston1th 2021-11-05 21:55:18 +01:00
commit 1ce33aa89a
13 changed files with 45 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

4
pkg/db/db.go
View file

@ -34,7 +34,7 @@ type DB struct {
indexPath string
}
func NewPlain(cfg core.Config) (db *DB, err error) {
func NewPlain(cfg *core.Config) (db *DB, err error) {
db = &DB{admin: cfg.Admin, cache: cache.NewCache()}
dbFile := filepath.Join(cfg.DataDir, storeFile)
err = godrop.Unveil(dbFile, "rwc")
@ -45,7 +45,7 @@ func NewPlain(cfg core.Config) (db *DB, err error) {
return
}
func New(cfg core.Config) (db *DB, err error) {
func New(cfg *core.Config) (db *DB, err error) {
db, err = NewPlain(cfg)
if err != nil {
return

6
pkg/db/page.go
View file

@ -30,7 +30,11 @@ func (db *DB) GetAllSections(username string, admin bool) (sections core.Section
}
p, err := db.getPage(k, username)
if err == nil {
s := k[:strings.Index(k, "/")]
i := strings.Index(k, "/")
if i == -1 {
return nil
}
s := k[:i]
if _, ok := m[s]; !ok {
m[s] = core.UpdatedPages{}
}

15
pkg/db/user.go
View file

@ -40,21 +40,22 @@ func (db *DB) GetUsers() (users core.Users, err error) {
return
}
func (db *DB) GetUserWithoutPassword(username string) (u core.User, err error) {
func (db *DB) GetUserWithoutPassword(username string) (u *core.User, err error) {
u, err = db.GetUser(username)
u.Password = ""
return
}
func (db *DB) GetUserSecret(username string) (secret string, err error) {
var user core.User
var user *core.User
user, err = db.GetUser(username)
secret = user.Secret
return
}
func (db *DB) GetUser(username string) (u core.User, err error) {
err = db.store.Get(userPrefix+username, &u)
func (db *DB) GetUser(username string) (u *core.User, err error) {
u = new(core.User)
err = db.store.Get(userPrefix+username, u)
return
}
@ -86,7 +87,7 @@ func (db *DB) CreateUser(username, password string, admin bool) error {
})
}
func (db *DB) Login(username, password string) (u core.User, err error) {
func (db *DB) Login(username, password string) (u *core.User, err error) {
if username == defUser && !db.admin {
err = errors.New("db: user disabled")
return
@ -118,7 +119,7 @@ func (db *DB) Login(username, password string) (u core.User, err error) {
return
}
func (db *DB) Totp(username, pin string) (u core.User, err error) {
func (db *DB) Totp(username, pin string) (u *core.User, err error) {
u, err = db.GetUser(username)
if err != nil {
return
@ -147,7 +148,7 @@ func (db *DB) Totp(username, pin string) (u core.User, err error) {
}
func (db *DB) UnlockUser(username string) (err error) {
var u core.User
var u *core.User
u, err = db.GetUser(username)
if err != nil {
return