Add check if target interface is public

Author: zalintyre

LegacyWrapperClient/Client/WrapperProxyFactory.cs

@@ -1,23 +1,14 @@
 using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Linq.Expressions;
-using System.Reflection;
 using System.Runtime.Serialization;
 using System.Runtime.Serialization.Formatters.Binary;
-using System.Text;
-using System.Threading.Tasks;
 using Castle.DynamicProxy;
 using LegacyWrapper.Common.Token;
-using LegacyWrapperClient.Architecture;
 using LegacyWrapperClient.Configuration;
 using LegacyWrapperClient.DynamicProxy;
 using LegacyWrapperClient.ProcessHandling;
 using LegacyWrapperClient.Token;
 using LegacyWrapperClient.Transport;
 using Ninject;
-using Ninject.Modules;
 using PommaLabs.Thrower;
 
 namespace LegacyWrapperClient.Client
@@ -64,7 +55,8 @@ private static TFunctions CreateProxy()
         /// <returns>Returns a new instance of TFunctions.</returns>
         public static TFunctions GetInstance(IWrapperConfig configuration)
         {
-            Raise.ArgumentException.If(!typeof(TFunctions).IsInterface, nameof(TFunctions), "Generic parameter type <TFunctions> must be an interface.");
+            Raise.ArgumentException.IfNot(typeof(TFunctions).IsInterface, nameof(TFunctions), "Generic parameter type <TFunctions> must be an interface.");
+            Raise.ArgumentException.IfNot(typeof(TFunctions).IsPublic, nameof(TFunctions), "The provided interface type <TFunctions> must be public.");
 
             CreateToken();
 

LegacyWrapperTest.Integration/Client/EdgeCaseTests.cs

@@ -26,6 +26,19 @@ public void TestTypeIsNotAnInterface()
             }
         }
 
+        [TestMethod, ExpectedException(typeof(ArgumentException))]
+        public void TestNonPublicInterface()
+        {
+            IWrapperConfig configuration = WrapperConfigBuilder.Create()
+                .TargetArchitecture(ArchitectureToLoad)
+                .Build();
+
+            using (var client = WrapperProxyFactory<ITestDllWithProtectedInterface>.GetInstance(configuration))
+            {
+                client.MethodWithoutAttribute();
+            }
+        }
+
         [TestMethod, ExpectedException(typeof(LegacyWrapperException))]
         public void TestLoadNonExistingLibrary()
         {

LegacyWrapperTest.Integration/Interface/ITestDll.cs

@@ -68,4 +68,10 @@ public interface ITestDllWithAttribute : IDisposable
     {
         void MethodWithoutAttribute();
     }
+
+    [LegacyDllImport("User32.dll")]
+    interface ITestDllWithProtectedInterface : IDisposable
+    {
+        void MethodWithoutAttribute();
+    }
 }