From c20400fa40d88329b1187aed84ead66e8cae4dde Mon Sep 17 00:00:00 2001
From: Neil Burrows <neil.burrows@nvable.com>
Date: Mon, 22 Jun 2020 10:13:28 +0100
Subject: Prevent system plugins from being uninstalled

---
 Emby.Server.Implementations/Updates/InstallationManager.cs | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'Emby.Server.Implementations/Updates')

diff --git a/Emby.Server.Implementations/Updates/InstallationManager.cs b/Emby.Server.Implementations/Updates/InstallationManager.cs
index 80326fddf2..0e912dfe9c 100644
--- a/Emby.Server.Implementations/Updates/InstallationManager.cs
+++ b/Emby.Server.Implementations/Updates/InstallationManager.cs
@@ -402,6 +402,12 @@ namespace Emby.Server.Implementations.Updates
         /// <param name="plugin">The plugin.</param>
         public void UninstallPlugin(IPlugin plugin)
         {
+            if (!plugin.CanUninstall)
+            {
+                _logger.LogInformation("Attempt to delete non removable plugin {0}", plugin.Name);
+                return;
+            }
+
             plugin.OnUninstalling();
 
             // Remove it the quick way for now
-- 
cgit v1.2.3


From a20fd341618499fe151e623e0c40e975ea708ad1 Mon Sep 17 00:00:00 2001
From: Neil Burrows <neil@pawprint.co.uk>
Date: Mon, 22 Jun 2020 11:04:20 +0100
Subject: Update Emby.Server.Implementations/Updates/InstallationManager.cs

Co-authored-by: Vasily <JustAMan@users.noreply.github.com>
---
 Emby.Server.Implementations/Updates/InstallationManager.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Emby.Server.Implementations/Updates')

diff --git a/Emby.Server.Implementations/Updates/InstallationManager.cs b/Emby.Server.Implementations/Updates/InstallationManager.cs
index 0e912dfe9c..fbbc97029c 100644
--- a/Emby.Server.Implementations/Updates/InstallationManager.cs
+++ b/Emby.Server.Implementations/Updates/InstallationManager.cs
@@ -404,7 +404,7 @@ namespace Emby.Server.Implementations.Updates
         {
             if (!plugin.CanUninstall)
             {
-                _logger.LogInformation("Attempt to delete non removable plugin {0}", plugin.Name);
+                _logger.LogWarning("Attempt to delete non removable plugin {0}, ignoring request", plugin.Name);
                 return;
             }
 
-- 
cgit v1.2.3