From dc2b8c464672d7bb69a32cf6f95555872f1f7ddf Mon Sep 17 00:00:00 2001 From: Mark Monteiro Date: Sat, 21 Mar 2020 23:19:24 +0100 Subject: [PATCH] Log a warning if an attempt is made to register an invalid service type --- .../Services/ServiceController.cs | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/Emby.Server.Implementations/Services/ServiceController.cs b/Emby.Server.Implementations/Services/ServiceController.cs index d963f9043c..3f9c8778b5 100644 --- a/Emby.Server.Implementations/Services/ServiceController.cs +++ b/Emby.Server.Implementations/Services/ServiceController.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Threading.Tasks; using Emby.Server.Implementations.HttpServer; using MediaBrowser.Model.Services; +using Microsoft.Extensions.Logging; namespace Emby.Server.Implementations.Services { @@ -11,6 +12,13 @@ namespace Emby.Server.Implementations.Services public class ServiceController { + private readonly ILogger _log; + + public ServiceController(ILogger log) + { + _log = log; + } + public void Init(HttpListenerHost appHost, IEnumerable serviceTypes) { foreach (var serviceType in serviceTypes) @@ -21,6 +29,13 @@ namespace Emby.Server.Implementations.Services public void RegisterService(HttpListenerHost appHost, Type serviceType) { + // Make sure the provided type implements IService + if (!serviceType.IsAssignableFrom(typeof(IService))) + { + _log.LogWarning("Tried to register a service that does not implement IService: {ServiceType}", serviceType); + return; + } + var processedReqs = new HashSet(); var actions = ServiceExecGeneral.Reset(serviceType);