Validate db schema before startup

scnserver/db/impl/logs/database.go

@@ -3,13 +3,14 @@ package logs
 import (
 	server "blackforestbytes.com/simplecloudnotifier"
 	"blackforestbytes.com/simplecloudnotifier/db/dbtools"
-	"blackforestbytes.com/simplecloudnotifier/db/impl/logs/schema"
+	"blackforestbytes.com/simplecloudnotifier/db/schema"
 	"context"
 	"database/sql"
 	"errors"
 	"fmt"
 	"github.com/jmoiron/sqlx"
 	_ "github.com/mattn/go-sqlite3"
+	"github.com/rs/zerolog/log"
 	"gogs.mikescher.com/BlackForestBytes/goext/langext"
 	"gogs.mikescher.com/BlackForestBytes/goext/sq"
 	"time"
@@ -67,9 +68,20 @@ func (db *Database) Migrate(ctx context.Context) error {
 	defer cancel()
 
 	currschema, err := db.ReadSchema(ctx)
+	if err != nil {
+		return err
+	}
+
 	if currschema == 0 {
 
-		_, err = db.db.Exec(ctx, schema.LogsSchema1, sq.PP{})
+		schemastr := schema.LogsSchema1
+
+		schemahash, err := sq.HashSqliteSchema(ctx, schemastr)
+		if err != nil {
+			return err
+		}
+
+		_, err = db.db.Exec(ctx, schemastr, sq.PP{})
 		if err != nil {
 			return err
 		}
@@ -79,7 +91,12 @@ func (db *Database) Migrate(ctx context.Context) error {
 			return err
 		}
 
-		err = db.pp.Init(ctx)
+		err = db.WriteMetaString(ctx, "schema_hash", schemahash)
+		if err != nil {
+			return err
+		}
+
+		err = db.pp.Init(ctx) // Re-Init
 		if err != nil {
 			return err
 		}
@@ -87,6 +104,31 @@ func (db *Database) Migrate(ctx context.Context) error {
 		return nil
 
 	} else if currschema == 1 {
+
+		schemHashDB, err := sq.HashSqliteDatabase(ctx, db.db)
+		if err != nil {
+			return err
+		}
+
+		schemaHashMeta, err := db.ReadMetaString(ctx, "schema_hash")
+		if err != nil {
+			return err
+		}
+
+		schemHashAsset := schema.LogsHash1
+		if err != nil {
+			return err
+		}
+
+		if schemHashDB != langext.Coalesce(schemaHashMeta, "") || langext.Coalesce(schemaHashMeta, "") != schemHashAsset {
+			log.Debug().Str("schemHashDB", schemHashDB).Msg("Schema (logs db)")
+			log.Debug().Str("schemaHashMeta", langext.Coalesce(schemaHashMeta, "")).Msg("Schema (logs db)")
+			log.Debug().Str("schemHashAsset", schemHashAsset).Msg("Schema (logs db)")
+			return errors.New("database schema does not match (logs db)")
+		} else {
+			log.Debug().Str("schemHash", schemHashDB).Msg("Verified Schema consistency (logs db)")
+		}
+
 		return nil // current
 	} else {
 		return errors.New(fmt.Sprintf("Unknown DB schema: %d", currschema))

scnserver/db/impl/logs/schema/assets.go

@@ -1,6 +0,0 @@
-package schema
-
-import _ "embed"
-
-//go:embed schema_1.ddl
-var LogsSchema1 string

scnserver/db/impl/primary/database.go

@@ -3,13 +3,14 @@ package primary
 import (
 	server "blackforestbytes.com/simplecloudnotifier"
 	"blackforestbytes.com/simplecloudnotifier/db/dbtools"
-	"blackforestbytes.com/simplecloudnotifier/db/impl/primary/schema"
+	"blackforestbytes.com/simplecloudnotifier/db/schema"
 	"context"
 	"database/sql"
 	"errors"
 	"fmt"
 	"github.com/jmoiron/sqlx"
 	_ "github.com/mattn/go-sqlite3"
+	"github.com/rs/zerolog/log"
 	"gogs.mikescher.com/BlackForestBytes/goext/langext"
 	"gogs.mikescher.com/BlackForestBytes/goext/sq"
 	"time"
@@ -67,9 +68,20 @@ func (db *Database) Migrate(ctx context.Context) error {
 	defer cancel()
 
 	currschema, err := db.ReadSchema(ctx)
+	if err != nil {
+		return err
+	}
+
 	if currschema == 0 {
 
-		_, err = db.db.Exec(ctx, schema.PrimarySchema3, sq.PP{})
+		schemastr := schema.PrimarySchema3
+
+		schemahash, err := sq.HashSqliteSchema(ctx, schemastr)
+		if err != nil {
+			return err
+		}
+
+		_, err = db.db.Exec(ctx, schemastr, sq.PP{})
 		if err != nil {
 			return err
 		}
@@ -79,7 +91,12 @@ func (db *Database) Migrate(ctx context.Context) error {
 			return err
 		}
 
-		err = db.pp.Init(ctx)
+		err = db.WriteMetaString(ctx, "schema_hash", schemahash)
+		if err != nil {
+			return err
+		}
+
+		err = db.pp.Init(ctx) // Re-Init
 		if err != nil {
 			return err
 		}
@@ -89,8 +106,33 @@ func (db *Database) Migrate(ctx context.Context) error {
 	} else if currschema == 1 {
 		return errors.New("cannot autom. upgrade schema 1")
 	} else if currschema == 2 {
-		return errors.New("cannot autom. upgrade schema 2") //TODO
+		return errors.New("cannot autom. upgrade schema 2")
 	} else if currschema == 3 {
+
+		schemHashDB, err := sq.HashSqliteDatabase(ctx, db.db)
+		if err != nil {
+			return err
+		}
+
+		schemaHashMeta, err := db.ReadMetaString(ctx, "schema_hash")
+		if err != nil {
+			return err
+		}
+
+		schemHashAsset := schema.PrimaryHash3
+		if err != nil {
+			return err
+		}
+
+		if schemHashDB != langext.Coalesce(schemaHashMeta, "") || langext.Coalesce(schemaHashMeta, "") != schemHashAsset {
+			log.Debug().Str("schemHashDB", schemHashDB).Msg("Schema (primary db)")
+			log.Debug().Str("schemaHashMeta", langext.Coalesce(schemaHashMeta, "")).Msg("Schema (primary db)")
+			log.Debug().Str("schemHashAsset", schemHashAsset).Msg("Schema (primary db)")
+			return errors.New("database schema does not match (primary db)")
+		} else {
+			log.Debug().Str("schemHash", schemHashDB).Msg("Verified Schema consistency (primary db)")
+		}
+
 		return nil // current
 	} else {
 		return errors.New(fmt.Sprintf("Unknown DB schema: %d", currschema))

scnserver/db/impl/primary/schema/assets.go

@@ -1,12 +0,0 @@
-package schema
-
-import _ "embed"
-
-//go:embed schema_1.ddl
-var PrimarySchema1 string
-
-//go:embed schema_2.ddl
-var PrimarySchema2 string
-
-//go:embed schema_3.ddl
-var PrimarySchema3 string

scnserver/db/impl/primary/schema/schema_sqlite.ddl

@@ -1,7 +0,0 @@
-CREATE TABLE sqlite_master (
-    type text,
-    name text,
-    tbl_name text,
-    rootpage integer,
-    sql text
-);

scnserver/db/impl/requests/database.go

@@ -3,13 +3,14 @@ package requests
 import (
 	server "blackforestbytes.com/simplecloudnotifier"
 	"blackforestbytes.com/simplecloudnotifier/db/dbtools"
-	"blackforestbytes.com/simplecloudnotifier/db/impl/requests/schema"
+	"blackforestbytes.com/simplecloudnotifier/db/schema"
 	"context"
 	"database/sql"
 	"errors"
 	"fmt"
 	"github.com/jmoiron/sqlx"
 	_ "github.com/mattn/go-sqlite3"
+	"github.com/rs/zerolog/log"
 	"gogs.mikescher.com/BlackForestBytes/goext/langext"
 	"gogs.mikescher.com/BlackForestBytes/goext/sq"
 	"time"
@@ -67,9 +68,20 @@ func (db *Database) Migrate(ctx context.Context) error {
 	defer cancel()
 
 	currschema, err := db.ReadSchema(ctx)
+	if err != nil {
+		return err
+	}
+
 	if currschema == 0 {
 
-		_, err = db.db.Exec(ctx, schema.RequestsSchema1, sq.PP{})
+		schemastr := schema.RequestsSchema1
+
+		schemahash, err := sq.HashSqliteSchema(ctx, schemastr)
+		if err != nil {
+			return err
+		}
+
+		_, err = db.db.Exec(ctx, schemastr, sq.PP{})
 		if err != nil {
 			return err
 		}
@@ -79,7 +91,12 @@ func (db *Database) Migrate(ctx context.Context) error {
 			return err
 		}
 
-		err = db.pp.Init(ctx)
+		err = db.WriteMetaString(ctx, "schema_hash", schemahash)
+		if err != nil {
+			return err
+		}
+
+		err = db.pp.Init(ctx) // Re-Init
 		if err != nil {
 			return err
 		}
@@ -87,6 +104,31 @@ func (db *Database) Migrate(ctx context.Context) error {
 		return nil
 
 	} else if currschema == 1 {
+
+		schemHashDB, err := sq.HashSqliteDatabase(ctx, db.db)
+		if err != nil {
+			return err
+		}
+
+		schemaHashMeta, err := db.ReadMetaString(ctx, "schema_hash")
+		if err != nil {
+			return err
+		}
+
+		schemHashAsset := schema.RequestsHash1
+		if err != nil {
+			return err
+		}
+
+		if schemHashDB != langext.Coalesce(schemaHashMeta, "") || langext.Coalesce(schemaHashMeta, "") != schemHashAsset {
+			log.Debug().Str("schemHashDB", schemHashDB).Msg("Schema (requests db)")
+			log.Debug().Str("schemaHashMeta", langext.Coalesce(schemaHashMeta, "")).Msg("Schema (requests db)")
+			log.Debug().Str("schemHashAsset", schemHashAsset).Msg("Schema (requests db)")
+			return errors.New("database schema does not match (requests db)")
+		} else {
+			log.Debug().Str("schemHash", schemHashDB).Msg("Verified Schema consistency (requests db)")
+		}
+
 		return nil // current
 	} else {
 		return errors.New(fmt.Sprintf("Unknown DB schema: %d", currschema))

scnserver/db/impl/requests/schema/assets.go

@@ -1,6 +0,0 @@
-package schema
-
-import _ "embed"
-
-//go:embed schema_1.ddl
-var RequestsSchema1 string

scnserver/db/impl/requests/schema/schema_sqlite.ddl

@@ -1,7 +0,0 @@
-CREATE TABLE sqlite_master (
-    type text,
-    name text,
-    tbl_name text,
-    rootpage integer,
-    sql text
-);

scnserver/db/schema/assets.go

@@ -0,0 +1,28 @@
+package schema
+
+import _ "embed"
+
+//go:embed primary_1.ddl
+var PrimarySchema1 string
+
+const PrimaryHash1 = "f2b2847f32681a7178e405553beea4a324034915a0c5a5dc70b3c6abbcc852f2"
+
+//go:embed primary_2.ddl
+var PrimarySchema2 string
+
+const PrimaryHash2 = "07ed1449114416ed043084a30e0722a5f97bf172161338d2f7106a8dfd387d0a"
+
+//go:embed primary_3.ddl
+var PrimarySchema3 string
+
+const PrimaryHash3 = "a4851e7953d3423622555cde03d2d0ea2ca367fbe28aa3e363771f1d04bed90a"
+
+//go:embed requests_1.ddl
+var RequestsSchema1 string
+
+const RequestsHash1 = "ebb0a5748b605e8215437413b738279670190ca8159b6227cfc2aa13418b41e9"
+
+//go:embed logs_1.ddl
+var LogsSchema1 string
+
+const LogsHash1 = "65fba477c04095effc3a8e1bb79fe7547b8e52e983f776f156266eddc4f201d7"