fixed totp and go mod

pkg/cmd/cmd.go

@@ -64,13 +64,18 @@ func initServer(cfg core.Config) (err error) {
 		return
 	}
 
-	log.InitLogger(cfg)
-
-	cfg.DataDir = filepath.Join(cfg.RunDir, core.DataDir)
-	err = godrop.Unveil(cfg.DataDir, "rwc")
+	err = godrop.Unveil(cfg.RunDir, "rwc")
 	if err != nil {
 		return
 	}
+	err = godrop.UnveilBlock()
+	if err != nil {
+		return
+	}
+
+	log.InitLogger(cfg)
+
+	cfg.DataDir = filepath.Join(cfg.RunDir, core.DataDir)
 	srv := server.NewHTTPServer(cfg, l)
 	err = srv.Start()
 	if err != nil {

pkg/core/const.go

@@ -19,8 +19,5 @@ const (
 	BootstrapCSS = "/bootstrap.css"
 	CustomCSS    = "/custom.css"
 
-	DataDir      = "data"
-	AutoImport   = "auto_import"
-	ManualImport = "manual_import"
-	Imported     = "imported"
+	DataDir = "data"
 )

pkg/db/db.go

@@ -6,7 +6,6 @@ import (
 	"git.giftfish.de/ston1th/docstore/pkg/core"
 	"git.giftfish.de/ston1th/docstore/pkg/index"
 	"git.giftfish.de/ston1th/docstore/pkg/store"
-	"git.giftfish.de/ston1th/godrop/v2"
 	"io"
 	"path/filepath"
 )
@@ -26,10 +25,6 @@ type DB struct {
 func New(cfg core.Config) (db *DB, err error) {
 	db = new(DB)
 	dbFile := filepath.Join(cfg.RunDir, storeFile)
-	err = godrop.Unveil(dbFile, "rwc")
-	if err != nil {
-		return
-	}
 	db.store, err = store.NewBoltStore(dbFile, nil)
 	if err != nil {
 		return

pkg/fs/fs.go

@@ -3,6 +3,7 @@ package fs
 import (
 	"errors"
 	"git.giftfish.de/ston1th/docstore/pkg/core"
+	"git.giftfish.de/ston1th/docstore/pkg/log"
 	"os"
 	"path/filepath"
 	"sort"
@@ -31,7 +32,15 @@ func NewFilesystem(base string) (fs *Filesystem, err error) {
 	}
 	fi, err := os.Stat(base)
 	if err != nil {
-		return
+		err = os.Mkdir(base, DirMode)
+		if err != nil {
+			return
+		}
+		log.Printf("fs: created data directory '%s'", base)
+		fi, err = os.Stat(base)
+		if err != nil {
+			return
+		}
 	}
 	if !fi.IsDir() {
 		err = errors.New("base dir '" + base + "' is not a directory")

pkg/index/index.go

@@ -5,7 +5,6 @@ package index
 import (
 	"errors"
 	"git.giftfish.de/ston1th/docstore/pkg/core"
-	"git.giftfish.de/ston1th/godrop/v2"
 	"github.com/blevesearch/bleve"
 	"github.com/blevesearch/bleve/mapping"
 	"html/template"
@@ -34,10 +33,6 @@ type Index struct {
 
 func NewIndex(path string) (i *Index, err error) {
 	var bi bleve.Index
-	err = godrop.Unveil(path, "rwc")
-	if err != nil {
-		return
-	}
 	if _, err = os.Stat(path); os.IsNotExist(err) {
 		var m *mapping.IndexMappingImpl
 		m, err = createMapping()

pkg/log/log.go

@@ -4,7 +4,6 @@ package log
 
 import (
 	"git.giftfish.de/ston1th/docstore/pkg/core"
-	"git.giftfish.de/ston1th/godrop/v2"
 	stdlog "log"
 	"os"
 	"path/filepath"
@@ -20,13 +19,7 @@ func InitLogger(cfg core.Config) {
 	if cfg.LogFile == "-" {
 		return
 	}
-	logfile := filepath.Join(cfg.DataDir, cfg.LogFile)
-	err := godrop.Unveil(logfile, "rwc")
-	if err != nil {
-		stdlog.Fatal(err)
-		return
-	}
-	f, err := os.OpenFile(logfile, os.O_RDWR|os.O_CREATE|os.O_APPEND, 0640)
+	f, err := os.OpenFile(filepath.Join(cfg.DataDir, cfg.LogFile), os.O_RDWR|os.O_CREATE|os.O_APPEND, 0640)
 	if err != nil {
 		stdlog.Fatal(err)
 	}

pkg/server/handler.go

@@ -583,7 +583,7 @@ func userTotpHandler(ctx *Context) {
 		Title:     "TOTP",
 		BodyTitle: "TOTP",
 	}
-	req := otp.Request{Username: ctx.Var("user")}
+	req := otp.Request{Username: ctx.User()}
 	u, err := ctx.Srv.DB.GetUser()
 	if err != nil {
 		ctx.Error(err)