From 9320e6cd060a6ace54e12a8cb53dd02341224682 Mon Sep 17 00:00:00 2001 From: Tony Murray Date: Wed, 20 Jul 2022 08:25:45 -0500 Subject: [PATCH] Prevent duplicate plugin table entries (#14120) * Prevent duplicate plugin table entries Some sort of race condition. Add a unique index, this will cause the create query to fail when it tries to add a new entry for an existing plugin. * Add index --- app/Plugins/PluginManager.php | 6 ++- ...2022_07_19_081224_plugins_unique_index.php | 45 +++++++++++++++++++ misc/db_schema.yaml | 1 + 3 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 database/migrations/2022_07_19_081224_plugins_unique_index.php diff --git a/app/Plugins/PluginManager.php b/app/Plugins/PluginManager.php index 0aa5533d76..69d683cdbd 100644 --- a/app/Plugins/PluginManager.php +++ b/app/Plugins/PluginManager.php @@ -189,7 +189,11 @@ class PluginManager if (! $plugin) { try { - $plugin = Plugin::create([ + // plugin should not exist, but check for safety + $plugin = Plugin::firstOrCreate([ + 'version' => 2, + 'plugin_name' => $name, + ], [ 'plugin_name' => $name, 'plugin_active' => $name !== 'ExamplePlugin', 'version' => 2, diff --git a/database/migrations/2022_07_19_081224_plugins_unique_index.php b/database/migrations/2022_07_19_081224_plugins_unique_index.php new file mode 100644 index 0000000000..6c11796e2c --- /dev/null +++ b/database/migrations/2022_07_19_081224_plugins_unique_index.php @@ -0,0 +1,45 @@ +groupBy(['version', 'plugin_name'])->select(['version', 'plugin_name'])->get(); + $valid_plugins = []; + foreach ($plugins as $plugin) { + // find the newest id with settings + $valid_plugins[] = DB::table('plugins') + ->where(['version' => $plugin->version, 'plugin_name' => $plugin->plugin_name]) + ->orderBy('settings', 'DESC') + ->orderBy('plugin_id', 'DESC') + ->value('plugin_id'); + } + DB::table('plugins')->whereNotIn('plugin_id', $valid_plugins)->delete(); + + Schema::table('plugins', function (Blueprint $table) { + $table->unique(['version', 'plugin_name']); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('plugins', function (Blueprint $table) { + $table->dropUnique('plugins_version_plugin_name_unique'); + }); + } +} diff --git a/misc/db_schema.yaml b/misc/db_schema.yaml index 900662ac4c..89b13c0e5e 100644 --- a/misc/db_schema.yaml +++ b/misc/db_schema.yaml @@ -1356,6 +1356,7 @@ plugins: - { Field: settings, Type: longtext, 'Null': true, Extra: '' } Indexes: PRIMARY: { Name: PRIMARY, Columns: [plugin_id], Unique: true, Type: BTREE } + plugins_version_plugin_name_unique: { Name: plugins_version_plugin_name_unique, Columns: [version, plugin_name], Unique: true, Type: BTREE } pollers: Columns: - { Field: id, Type: 'int unsigned', 'Null': false, Extra: auto_increment }