diff --git a/hscontrol/db/db_test.go b/hscontrol/db/db_test.go index 6c87b47dd..8718a12bf 100644 --- a/hscontrol/db/db_test.go +++ b/hscontrol/db/db_test.go @@ -752,22 +752,46 @@ func TestSQLiteMigrationAddsCreatedByToken(t *testing.T) { assert.True(t, got.CreatedByToken) } -// TestSQLiteRejectsPre029Database ensures a real pre-0.29 database is refused -// rather than silently skipping the migrations that were removed. +// TestSQLiteRejectsPre029Database ensures real pre-0.29 databases are refused +// before anything is written, rather than silently skipping the migrations +// that were removed. func TestSQLiteRejectsPre029Database(t *testing.T) { - dbPath := t.TempDir() + "/headscale_test.db" - - err := createSQLiteFromSQLFile("testdata/sqlite_too_old/headscale_0.26.1_dump.sql", dbPath) + dumps, err := os.ReadDir("testdata/sqlite_too_old") require.NoError(t, err) - _, err = NewHeadscaleDatabase(&types.Config{ - Database: types.DatabaseConfig{ - Type: "sqlite3", - Sqlite: types.SqliteConfig{Path: dbPath}, - }, - Policy: types.PolicyConfig{Mode: types.PolicyModeDB}, - }) - require.ErrorIs(t, err, errDatabaseTooOld) + for _, dump := range dumps { + t.Run(dump.Name(), func(t *testing.T) { + dbPath := t.TempDir() + "/headscale_test.db" + + err := createSQLiteFromSQLFile(filepath.Join("testdata/sqlite_too_old", dump.Name()), dbPath) + require.NoError(t, err) + + schema := func() string { + raw, err := sql.Open("sqlite", dbPath) + require.NoError(t, err) + + defer raw.Close() + + var s string + require.NoError(t, raw.QueryRowContext(context.Background(), + "SELECT group_concat(sql, ';') FROM (SELECT sql FROM sqlite_master WHERE sql IS NOT NULL ORDER BY name)", + ).Scan(&s)) + + return s + } + before := schema() + + _, err = NewHeadscaleDatabase(&types.Config{ + Database: types.DatabaseConfig{ + Type: "sqlite3", + Sqlite: types.SqliteConfig{Path: dbPath}, + }, + Policy: types.PolicyConfig{Mode: types.PolicyModeDB}, + }) + require.ErrorIs(t, err, errDatabaseTooOld) + assert.Equal(t, before, schema()) + }) + } } // TestSQLiteAllTestdataMigrations tests migration compatibility across all SQLite schemas diff --git a/hscontrol/db/testdata/sqlite_too_old/headscale_0.22.3_dump.sql b/hscontrol/db/testdata/sqlite_too_old/headscale_0.22.3_dump.sql new file mode 100644 index 000000000..4ded33086 --- /dev/null +++ b/hscontrol/db/testdata/sqlite_too_old/headscale_0.22.3_dump.sql @@ -0,0 +1,14 @@ +PRAGMA foreign_keys=OFF; +BEGIN TRANSACTION; +CREATE TABLE `users` (`id` integer,`created_at` datetime,`updated_at` datetime,`deleted_at` datetime,`name` text UNIQUE,PRIMARY KEY (`id`)); +CREATE TABLE `pre_auth_keys` (`id` integer,`key` text,`user_id` integer,`reusable` numeric,`ephemeral` numeric DEFAULT false,`used` numeric DEFAULT false,`created_at` datetime,`expiration` datetime,PRIMARY KEY (`id`)); +CREATE TABLE `machines` (`id` integer,`machine_key` varchar(64),`node_key` text,`disco_key` text,`ip_addresses` text,`hostname` text,`given_name` varchar(63),`user_id` integer,`register_method` text,`forced_tags` text,`auth_key_id` integer,`last_seen` datetime,`last_successful_update` datetime,`expiry` datetime,`host_info` text,`endpoints` text,`created_at` datetime,`updated_at` datetime,`deleted_at` datetime,PRIMARY KEY (`id`)); +CREATE TABLE `routes` (`id` integer,`created_at` datetime,`updated_at` datetime,`deleted_at` datetime,`machine_id` integer,`prefix` text,`advertised` numeric,`enabled` numeric,`is_primary` numeric,PRIMARY KEY (`id`)); +CREATE TABLE `kvs` (`key` text,`value` text); +INSERT INTO kvs VALUES('db_version','1'); +CREATE TABLE `pre_auth_key_acl_tags` (`id` integer,`pre_auth_key_id` integer,`tag` text,PRIMARY KEY (`id`)); +CREATE TABLE IF NOT EXISTS "api_keys" (`id` integer,`prefix` text UNIQUE,`hash` blob,`created_at` datetime,`expiration` datetime,`last_seen` datetime,PRIMARY KEY (`id`)); +CREATE INDEX `idx_users_deleted_at` ON `users`(`deleted_at`); +CREATE INDEX `idx_routes_deleted_at` ON `routes`(`deleted_at`); +CREATE UNIQUE INDEX `idx_api_keys_prefix` ON `api_keys`(`prefix`); +COMMIT;