Update module mattn/go-sqlite3 to v2.0.6

.gitignore

@@ -20,4 +20,3 @@ docs/resources/
 pkg/static/templates_vfsdata.go
 files/
 !pkg/files/
-vikunja-dump*

docs/content/doc/setup/full-docker-example.md

@@ -218,57 +218,3 @@ services:
       - frontend
     restart: unless-stopped
 {{< /highlight >}}
-
-## Example with Caddy v2 as proxy
-
-You will need the following `Caddyfile` on your host (or elsewhere, but then you'd need to adjust the proxy mount at the bottom of the compose file):
-
-{{< highlight conf >}}
-vikunja.example.com {
-    reverse_proxy /api/* api:3456
-    reverse_proxy frontend:80
-}
-{{< /highlight >}}
-
-`docker-compose.yml` config:
-
-{{< highlight yaml >}}
-version: '3'
-
-services:
-  db:
-    image: mariadb:10
-    environment:
-      MYSQL_ROOT_PASSWORD: supersecret
-      MYSQL_DATABASE: vikunja
-    volumes:
-      - ./db:/var/lib/mysql
-    restart: unless-stopped
-  api:
-    image: vikunja/api
-    environment:
-      VIKUNJA_DATABASE_HOST: db
-      VIKUNJA_DATABASE_PASSWORD: supersecret
-      VIKUNJA_DATABASE_TYPE: mysql
-      VIKUNJA_DATABASE_USER: root
-      VIKUNJA_DATABASE_DATABASE: vikunja
-    volumes: 
-      - ./files:/app/vikunja/files
-    depends_on:
-      - db
-    restart: unless-stopped
-  frontend:
-    image: vikunja/frontend
-    restart: unless-stopped
-  caddy:
-    image: caddy
-    restart: unless-stopped
-    ports:
-        - "80:80"
-        - "443:443"
-    depends_on:
-      - api
-      - frontend
-    volumes:
-        - ./Caddyfile:/etc/caddy/Caddyfile:ro
-{{< /highlight >}}

docs/content/doc/usage/cli.md

@@ -81,23 +81,4 @@ Starts Vikunja's REST api server.
 Usage:
 {{< highlight bash >}}
 $ vikunja web    
-{{< /highlight >}}
-
-### `dump`
-
-Creates a zip file with all vikunja-related files.
-This includes config, version, all files and the full database.
-
-Usage:
-{{< highlight bash >}}
-$ vikunja dump
-{{< /highlight >}}
-
-### `restore`
-
-Restores a previously created dump from a zip file, see `dump`.
-
-Usage:
-{{< highlight bash >}}
-$ vikunja restore <path to dump zip file>
-{{< /highlight >}}
+{{< /highlight >}}

docs/themes/vikunja

@@ -1 +1 @@
-Subproject commit f50566db25df9fa03243ba06d17511e050d4be95
+Subproject commit 7dce4df7b6068137d3e6127693706e806fc264b1

go.mod

@@ -47,7 +47,7 @@ require (
 	github.com/laurent22/ical-go v0.1.1-0.20181107184520-7e5d6ade8eef
 	github.com/lib/pq v1.7.0
 	github.com/mailru/easyjson v0.7.0 // indirect
-	github.com/mattn/go-sqlite3 v2.0.3+incompatible
+	github.com/mattn/go-sqlite3 v2.0.6+incompatible
 	github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
 	github.com/olekukonko/tablewriter v0.0.4
 	github.com/onsi/ginkgo v1.12.0 // indirect

pkg/cmd/cmd.go

@@ -17,6 +17,15 @@
 package cmd
 
 import (
+	"code.vikunja.io/api/pkg/config"
+	"code.vikunja.io/api/pkg/files"
+	"code.vikunja.io/api/pkg/log"
+	"code.vikunja.io/api/pkg/mail"
+	"code.vikunja.io/api/pkg/migration"
+	"code.vikunja.io/api/pkg/models"
+	migrator "code.vikunja.io/api/pkg/modules/migration"
+	"code.vikunja.io/api/pkg/red"
+	"code.vikunja.io/api/pkg/user"
 	"fmt"
 	"github.com/spf13/cobra"
 	"os"
@@ -45,3 +54,48 @@ func Execute() {
 		os.Exit(1)
 	}
 }
+
+// Will only fullInit config, redis, logger but no db connection.
+func lightInit() {
+	// Init the config
+	config.InitConfig()
+
+	// Init redis
+	red.InitRedis()
+
+	// Set logger
+	log.InitLogger()
+}
+
+// Initializes all kinds of things in the right order
+func fullInit() {
+
+	lightInit()
+
+	// Run the migrations
+	migration.Migrate(nil)
+
+	// Set Engine
+	err := models.SetEngine()
+	if err != nil {
+		log.Fatal(err.Error())
+	}
+	err = user.InitDB()
+	if err != nil {
+		log.Fatal(err.Error())
+	}
+	err = files.SetEngine()
+	if err != nil {
+		log.Fatal(err.Error())
+	}
+	err = migrator.InitDB()
+	if err != nil {
+		log.Fatal(err.Error())
+	}
+
+	// Initialize the files handler
+	files.InitFileHandler()
+
+	// Start the mail daemon
+	mail.StartMailDaemon()
+}

pkg/cmd/dump.go

@@ -1,43 +0,0 @@
-// Vikunja is a to-do list application to facilitate your life.
-// Copyright 2018-2020 Vikunja and contributors. All rights reserved.
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-package cmd
-
-import (
-	"code.vikunja.io/api/pkg/initialize"
-	"code.vikunja.io/api/pkg/log"
-	"code.vikunja.io/api/pkg/modules/dump"
-	"github.com/spf13/cobra"
-	"time"
-)
-
-func init() {
-	rootCmd.AddCommand(dumpCmd)
-}
-
-var dumpCmd = &cobra.Command{
-	Use:   "dump",
-	Short: "Dump all vikunja data into a zip file. Includes config, files and db.",
-	PreRun: func(cmd *cobra.Command, args []string) {
-		initialize.FullInit()
-	},
-	Run: func(cmd *cobra.Command, args []string) {
-		filename := "vikunja-dump_" + time.Now().Format("2006-01-02_15-03-05") + ".zip"
-		if err := dump.Dump(filename); err != nil {
-			log.Critical(err.Error())
-		}
-	},
-}

pkg/cmd/migrate.go

@@ -17,7 +17,6 @@
 package cmd
 
 import (
-	"code.vikunja.io/api/pkg/initialize"
 	"code.vikunja.io/api/pkg/migration"
 	"github.com/spf13/cobra"
 )
@@ -37,7 +36,7 @@ var migrateCmd = &cobra.Command{
 	Use:   "migrate",
 	Short: "Run all database migrations which didn't already run.",
 	PersistentPreRun: func(cmd *cobra.Command, args []string) {
-		initialize.LightInit()
+		lightInit()
 	},
 	Run: func(cmd *cobra.Command, args []string) {
 		migration.Migrate(nil)

pkg/cmd/restore.go

@@ -1,42 +0,0 @@
-// Vikunja is a to-do list application to facilitate your life.
-// Copyright 2018-2020 Vikunja and contributors. All rights reserved.
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-package cmd
-
-import (
-	"code.vikunja.io/api/pkg/initialize"
-	"code.vikunja.io/api/pkg/log"
-	"code.vikunja.io/api/pkg/modules/dump"
-	"github.com/spf13/cobra"
-)
-
-func init() {
-	rootCmd.AddCommand(restoreCmd)
-}
-
-var restoreCmd = &cobra.Command{
-	Use:   "restore [filename]",
-	Short: "Restores all vikunja data from a vikunja dump.",
-	Args:  cobra.ExactArgs(1),
-	PreRun: func(cmd *cobra.Command, args []string) {
-		initialize.FullInit()
-	},
-	Run: func(cmd *cobra.Command, args []string) {
-		if err := dump.Restore(args[0]); err != nil {
-			log.Critical(err.Error())
-		}
-	},
-}

pkg/cmd/testmail.go

@@ -17,7 +17,6 @@
 package cmd
 
 import (
-	"code.vikunja.io/api/pkg/initialize"
 	"code.vikunja.io/api/pkg/log"
 	"code.vikunja.io/api/pkg/mail"
 	"github.com/spf13/cobra"
@@ -32,7 +31,7 @@ var testmailCmd = &cobra.Command{
 	Short: "Send a test mail using the configured smtp connection",
 	Args:  cobra.ExactArgs(1),
 	PreRun: func(cmd *cobra.Command, args []string) {
-		initialize.LightInit()
+		lightInit()
 
 		// Start the mail daemon
 		mail.StartMailDaemon()

pkg/cmd/web.go

@@ -18,7 +18,6 @@ package cmd
 
 import (
 	"code.vikunja.io/api/pkg/config"
-	"code.vikunja.io/api/pkg/initialize"
 	"code.vikunja.io/api/pkg/log"
 	"code.vikunja.io/api/pkg/routes"
 	"code.vikunja.io/api/pkg/swagger"
@@ -38,7 +37,7 @@ var webCmd = &cobra.Command{
 	Use:   "web",
 	Short: "Starts the rest api web server",
 	PreRun: func(cmd *cobra.Command, args []string) {
-		initialize.FullInit()
+		fullInit()
 	},
 	Run: func(cmd *cobra.Command, args []string) {
 

pkg/db/db.go

@@ -168,20 +168,3 @@ func initSqliteEngine() (engine *xorm.Engine, err error) {
 
 	return xorm.NewEngine("sqlite3", path)
 }
-
-// WipeEverything wipes all tables and their data. Use with caution...
-func WipeEverything() error {
-
-	tables, err := x.DBMetas()
-	if err != nil {
-		return err
-	}
-
-	for _, t := range tables {
-		if err := x.DropTables(t.Name); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}

pkg/db/dump.go

@@ -1,54 +0,0 @@
-// Vikunja is a to-do list application to facilitate your life.
-// Copyright 2018-2020 Vikunja and contributors. All rights reserved.
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-package db
-
-import "encoding/json"
-
-// Dump dumps all database tables
-func Dump() (data map[string][]byte, err error) {
-	tables, err := x.DBMetas()
-	if err != nil {
-		return
-	}
-
-	data = make(map[string][]byte, len(tables))
-	for _, table := range tables {
-		entries := []map[string]interface{}{}
-		err := x.Table(table.Name).Find(&entries)
-		if err != nil {
-			return nil, err
-		}
-		data[table.Name], err = json.Marshal(entries)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	return
-}
-
-// Restore restores a table with all its entries
-func Restore(table string, contents []map[string]interface{}) (err error) {
-
-	for _, content := range contents {
-		if _, err := x.Table(table).Insert(content); err != nil {
-			return err
-		}
-	}
-
-	return
-}

pkg/files/dump.go

@@ -1,41 +0,0 @@
-// Vikunja is a to-do list application to facilitate your life.
-// Copyright 2018-2020 Vikunja and contributors. All rights reserved.
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-package files
-
-import (
-	"io"
-)
-
-// Dump dumps all saved files
-// This only includes the raw files, no db entries.
-func Dump() (allFiles map[int64]io.ReadCloser, err error) {
-	files := []*File{}
-	err = x.Find(&files)
-	if err != nil {
-		return
-	}
-
-	allFiles = make(map[int64]io.ReadCloser, len(files))
-	for _, file := range files {
-		if err := file.LoadFileByID(); err != nil {
-			return nil, err
-		}
-		allFiles[file.ID] = file.File
-	}
-
-	return
-}

pkg/files/files.go

@@ -96,7 +96,7 @@ func Create(f io.ReadCloser, realname string, realsize uint64, a web.Auth) (file
 	}
 
 	// Save the file to storage with its new ID as path
-	err = file.Save(f)
+	err = afs.WriteReader(file.getFileName(), f)
 	return
 }
 
@@ -113,8 +113,3 @@ func (f *File) Delete() (err error) {
 	err = afs.Remove(f.getFileName())
 	return
 }
-
-// Save saves a file to storage
-func (f *File) Save(fcontent io.ReadCloser) error {
-	return afs.WriteReader(f.getFileName(), fcontent)
-}

pkg/initialize/init.go

@@ -1,79 +0,0 @@
-// Vikunja is a to-do list application to facilitate your life.
-// Copyright 2018-2020 Vikunja and contributors. All rights reserved.
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-package initialize
-
-import (
-	"code.vikunja.io/api/pkg/config"
-	"code.vikunja.io/api/pkg/files"
-	"code.vikunja.io/api/pkg/log"
-	"code.vikunja.io/api/pkg/mail"
-	"code.vikunja.io/api/pkg/migration"
-	"code.vikunja.io/api/pkg/models"
-	migrator "code.vikunja.io/api/pkg/modules/migration"
-	"code.vikunja.io/api/pkg/red"
-	"code.vikunja.io/api/pkg/user"
-)
-
-// LightInit will only fullInit config, redis, logger but no db connection.
-func LightInit() {
-	// Init the config
-	config.InitConfig()
-
-	// Init redis
-	red.InitRedis()
-
-	// Set logger
-	log.InitLogger()
-}
-
-// InitEngines intializes all db connections
-func InitEngines() {
-	err := models.SetEngine()
-	if err != nil {
-		log.Fatal(err.Error())
-	}
-	err = user.InitDB()
-	if err != nil {
-		log.Fatal(err.Error())
-	}
-	err = files.SetEngine()
-	if err != nil {
-		log.Fatal(err.Error())
-	}
-	err = migrator.InitDB()
-	if err != nil {
-		log.Fatal(err.Error())
-	}
-}
-
-// FullInit initializes all kinds of things in the right order
-func FullInit() {
-
-	LightInit()
-
-	// Run the migrations
-	migration.Migrate(nil)
-
-	// Set Engine
-	InitEngines()
-
-	// Initialize the files handler
-	files.InitFileHandler()
-
-	// Start the mail daemon
-	mail.StartMailDaemon()
-}

pkg/migration/migration.go

@@ -104,15 +104,6 @@ func Rollback(migrationID string) {
 	log.Info("Rolled back successfully.")
 }
 
-// MigrateTo executes all migrations up to a certain point
-func MigrateTo(migrationID string, x *xorm.Engine) error {
-	m := initMigration(x)
-	if err := m.MigrateTo(migrationID); err != nil {
-		return err
-	}
-	return nil
-}
-
 // Deletes a column from a table. All arguments are strings, to let them be standalone and not depending on any struct.
 func dropTableColum(x *xorm.Engine, tableName, col string) error {
 

pkg/modules/dump/dump.go

@@ -1,146 +0,0 @@
-// Vikunja is a to-do list application to facilitate your life.
-// Copyright 2018-2020 Vikunja and contributors. All rights reserved.
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-package dump
-
-import (
-	"archive/zip"
-	"code.vikunja.io/api/pkg/db"
-	"code.vikunja.io/api/pkg/files"
-	"code.vikunja.io/api/pkg/log"
-	"code.vikunja.io/api/pkg/version"
-	"fmt"
-	"github.com/spf13/viper"
-	"io"
-	"os"
-	"strconv"
-)
-
-// Change to deflate to gain better compression
-// see http://golang.org/pkg/archive/zip/#pkg-constants
-const compressionUsed = zip.Deflate
-
-// Dump creates a zip file with all vikunja files at filename
-func Dump(filename string) error {
-	dumpFile, err := os.Create(filename)
-	if err != nil {
-		return fmt.Errorf("error opening dump file: %s", err)
-	}
-	defer dumpFile.Close()
-
-	dumpWriter := zip.NewWriter(dumpFile)
-	defer dumpWriter.Close()
-
-	// Config
-	log.Info("Start dumping config file...")
-	err = writeFileToZip(viper.ConfigFileUsed(), dumpWriter)
-	if err != nil {
-		return fmt.Errorf("error saving config file: %s", err)
-	}
-	log.Info("Dumped config file")
-
-	// Version
-	log.Info("Start dumping version file...")
-	err = writeBytesToZip("VERSION", []byte(version.Version), dumpWriter)
-	if err != nil {
-		return fmt.Errorf("error saving version: %s", err)
-	}
-	log.Info("Dumped version")
-
-	// Database
-	log.Info("Start dumping database...")
-	data, err := db.Dump()
-	if err != nil {
-		return fmt.Errorf("error saving database data: %s", err)
-	}
-	for t, d := range data {
-		err = writeBytesToZip("database/"+t+".json", d, dumpWriter)
-		if err != nil {
-			return fmt.Errorf("error writing database table %s: %s", t, err)
-		}
-	}
-	log.Info("Dumped database")
-
-	// Files
-	log.Info("Start dumping files...")
-	allFiles, err := files.Dump()
-	if err != nil {
-		return fmt.Errorf("error saving file: %s", err)
-	}
-	for fid, file := range allFiles {
-		header := &zip.FileHeader{
-			Name:   "files/" + strconv.FormatInt(fid, 10),
-			Method: compressionUsed,
-		}
-		w, err := dumpWriter.CreateHeader(header)
-		if err != nil {
-			return err
-		}
-		_, err = io.Copy(w, file)
-		if err != nil {
-			return fmt.Errorf("error writing file %d: %s", fid, err)
-		}
-		_ = file.Close()
-	}
-	log.Infof("Dumped files")
-
-	log.Info("Done creating dump")
-	log.Infof("Dump file saved at %s", filename)
-	return nil
-}
-
-func writeFileToZip(filename string, writer *zip.Writer) error {
-	// #nosec
-	fileToZip, err := os.Open(filename)
-	if err != nil {
-		return err
-	}
-	defer fileToZip.Close()
-
-	// Get the file information
-	info, err := fileToZip.Stat()
-	if err != nil {
-		return err
-	}
-
-	header, err := zip.FileInfoHeader(info)
-	if err != nil {
-		return err
-	}
-
-	header.Name = info.Name()
-	header.Method = compressionUsed
-
-	w, err := writer.CreateHeader(header)
-	if err != nil {
-		return err
-	}
-	_, err = io.Copy(w, fileToZip)
-	return err
-}
-
-func writeBytesToZip(filename string, data []byte, writer *zip.Writer) (err error) {
-	header := &zip.FileHeader{
-		Name:   filename,
-		Method: compressionUsed,
-	}
-	w, err := writer.CreateHeader(header)
-	if err != nil {
-		return err
-	}
-	_, err = w.Write(data)
-	return
-}

pkg/modules/dump/restore.go

@@ -1,217 +0,0 @@
-// Vikunja is a to-do list application to facilitate your life.
-// Copyright 2018-2020 Vikunja and contributors. All rights reserved.
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-package dump
-
-import (
-	"archive/zip"
-	"bufio"
-	"bytes"
-	"code.vikunja.io/api/pkg/db"
-	"code.vikunja.io/api/pkg/files"
-	"code.vikunja.io/api/pkg/initialize"
-	"code.vikunja.io/api/pkg/log"
-	"code.vikunja.io/api/pkg/migration"
-	"encoding/json"
-	"fmt"
-	"io"
-	"os"
-	"sort"
-	"src.techknowlogick.com/xormigrate"
-	"strconv"
-	"strings"
-)
-
-const maxConfigSize = 5 * 1024 * 1024 // 5 MB, should be largely enough
-
-// Restore takes a zip file name and restores it
-func Restore(filename string) error {
-
-	r, err := zip.OpenReader(filename)
-	if err != nil {
-		return fmt.Errorf("could not open zip file: %s", err)
-	}
-
-	log.Warning("Restoring a dump will wipe your current installation!")
-	log.Warning("To confirm, please type 'Yes, I understand' and confirm with enter:")
-	cr := bufio.NewReader(os.Stdin)
-	text, err := cr.ReadString('\n')
-	if err != nil {
-		return fmt.Errorf("could not read confirmation message: %s", err)
-	}
-	if text != "Yes, I understand\n" {
-		return fmt.Errorf("invalid confirmation message")
-	}
-
-	// Find the configFile, database and files files
-	var configFile *zip.File
-	dbfiles := make(map[string]*zip.File)
-	filesFiles := make(map[string]*zip.File)
-	for _, file := range r.File {
-		if strings.HasPrefix(file.Name, "config") {
-			configFile = file
-			continue
-		}
-		if strings.HasPrefix(file.Name, "database/") {
-			fname := strings.ReplaceAll(file.Name, "database/", "")
-			dbfiles[fname[:len(fname)-5]] = file
-			continue
-		}
-		if strings.HasPrefix(file.Name, "files/") {
-			filesFiles[strings.ReplaceAll(file.Name, "files/", "")] = file
-		}
-	}
-	if configFile == nil {
-		return fmt.Errorf("dump does not contain a config file")
-	}
-
-	///////
-	// Restore the config file
-	if configFile.UncompressedSize64 > maxConfigSize {
-		return fmt.Errorf("config file too large, is %d, max size is %d", configFile.UncompressedSize64, maxConfigSize)
-	}
-
-	outFile, err := os.OpenFile(configFile.Name, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, configFile.Mode())
-	if err != nil {
-		return fmt.Errorf("could not open config file for writing: %s", err)
-	}
-
-	cfgr, err := configFile.Open()
-	if err != nil {
-		return err
-	}
-
-	// #nosec - We eliminated the potential decompression bomb by erroring out above if the file is larger than a threshold.
-	_, err = io.Copy(outFile, cfgr)
-	if err != nil {
-		return fmt.Errorf("could not create config file: %s", err)
-	}
-
-	_ = cfgr.Close()
-	_ = outFile.Close()
-
-	log.Infof("The config file has been restored to '%s'.", configFile.Name)
-	log.Infof("You can now make changes to it, hit enter when you're done.")
-	if _, err := bufio.NewReader(os.Stdin).ReadString('\n'); err != nil {
-		return fmt.Errorf("could not read from stdin: %s", err)
-	}
-	log.Info("Restoring...")
-
-	// Init the configFile again since the restored configuration is most likely different from the one before
-	initialize.LightInit()
-	initialize.InitEngines()
-	files.InitFileHandler()
-
-	///////
-	// Restore the db
-	// Start by wiping everything
-	if err := db.WipeEverything(); err != nil {
-		return fmt.Errorf("could not wipe database: %s", err)
-	}
-	log.Info("Wiped database.")
-
-	// Because we don't explicitly saved the table definitions, we take the last ran db migration from the dump
-	// and execute everything until that point.
-	migrations := dbfiles["migration"]
-	rc, err := migrations.Open()
-	if err != nil {
-		return fmt.Errorf("could not open migrations: %s", err)
-	}
-	defer rc.Close()
-
-	var buf bytes.Buffer
-	if _, err := buf.ReadFrom(rc); err != nil {
-		return fmt.Errorf("could not read migrations: %s", err)
-	}
-
-	ms := []*xormigrate.Migration{}
-	if err := json.Unmarshal(buf.Bytes(), &ms); err != nil {
-		return fmt.Errorf("could not read migrations: %s", err)
-	}
-	sort.Slice(ms, func(i, j int) bool {
-		return ms[i].ID > ms[j].ID
-	})
-
-	lastMigration := ms[len(ms)-1]
-	if err := migration.MigrateTo(lastMigration.ID, nil); err != nil {
-		return fmt.Errorf("could not create db structure: %s", err)
-	}
-
-	// Restore all db data
-	for table, d := range dbfiles {
-		content, err := unmarshalFileToJSON(d)
-		if err != nil {
-			return fmt.Errorf("could not read table %s: %s", table, err)
-		}
-		if err := db.Restore(table, content); err != nil {
-			return fmt.Errorf("could not restore table data for table %s: %s", table, err)
-		}
-		log.Infof("Restored table %s", table)
-	}
-	log.Infof("Restored %d tables", len(dbfiles))
-
-	// Run migrations again to migrate a potentially outdated dump
-	migration.Migrate(nil)
-
-	///////
-	// Restore Files
-	for i, file := range filesFiles {
-		id, err := strconv.ParseInt(i, 10, 64)
-		if err != nil {
-			return fmt.Errorf("could not parse file id %s: %s", i, err)
-		}
-
-		f := &files.File{ID: id}
-
-		fc, err := file.Open()
-		if err != nil {
-			return fmt.Errorf("could not open file %s: %s", i, err)
-		}
-
-		if err := f.Save(fc); err != nil {
-			return fmt.Errorf("could not save file: %s", err)
-		}
-
-		_ = fc.Close()
-		log.Infof("Restored file %s", i)
-	}
-	log.Infof("Restored %d files.", len(filesFiles))
-
-	///////
-	// Done
-	log.Infof("Done restoring dump.")
-
-	return nil
-}
-
-func unmarshalFileToJSON(file *zip.File) (contents []map[string]interface{}, err error) {
-	rc, err := file.Open()
-	if err != nil {
-		return
-	}
-	defer rc.Close()
-
-	var buf bytes.Buffer
-	if _, err := buf.ReadFrom(rc); err != nil {
-		return nil, err
-	}
-
-	contents = []map[string]interface{}{}
-	if err := json.Unmarshal(buf.Bytes(), &contents); err != nil {
-		return nil, err
-	}
-	return
-}

pkg/routes/api/v1/user_add_update.go

@@ -45,9 +45,6 @@ func RegisterUser(c echo.Context) error {
 	if err := c.Bind(&datUser); err != nil {
 		return c.JSON(http.StatusBadRequest, models.Message{"No or invalid user model provided."})
 	}
-	if datUser == nil {
-		return c.JSON(http.StatusBadRequest, models.Message{"No or invalid user model provided."})
-	}
 
 	// Insert the user
 	newUser, err := user.CreateUser(datUser.APIFormat())