Ignore strongname mismatch for assemblies returned by AssemblyResolve…

… event (dotnet#101039) This check was somehow missed during earlier cleanups that deleted strongname matching for assembly binding. Fixes dotnet#101029
matouskozak · Apr 30, 2024 · be39cf4 · be39cf4
1 parent 4cad8a6
commit be39cf4
Show file tree

Hide file tree

Showing 14 changed files with 19 additions and 73 deletions.
diff --git a/src/coreclr/dlls/mscorrc/mscorrc.rc b/src/coreclr/dlls/mscorrc/mscorrc.rc
@@ -113,7 +113,6 @@ BEGIN
     COR_E_FILELOAD                          "Unable to load file '%1'."
     COR_E_ASSEMBLYEXPECTED                  "The module '%1' was expected to contain an assembly manifest."
     FUSION_E_REF_DEF_MISMATCH               "The located assembly's manifest definition with name '%1' does not match the assembly reference."
-    FUSION_E_PRIVATE_ASM_DISALLOWED         "Assembly '%1' is required to be strongly named."
     FUSION_E_INVALID_NAME                   "The given assembly name, '%1', was invalid."
     FUSION_E_APP_DOMAIN_LOCKED              "The requested assembly version conflicts with what is already bound in the app domain or specified in the manifest."
     IDS_EE_HASH_VAL_FAILED                  "Hash validation failed for file or assembly '%1'."

diff --git a/src/coreclr/inc/corerror.xml b/src/coreclr/inc/corerror.xml
@@ -172,12 +172,6 @@
 	<Comment> The located assembly's manifest definition does not match the assembly reference. </Comment>
 </HRESULT>
 
-<HRESULT NumericValue="0x80131044">
-	<SymbolicName>FUSION_E_PRIVATE_ASM_DISALLOWED</SymbolicName>
-	<Message>"A strongly-named assembly is required."</Message>
-	<Comment> A strongly-named assembly is required. </Comment>
-</HRESULT>
-
 <HRESULT NumericValue="0x80131047">
 	<SymbolicName>FUSION_E_INVALID_NAME</SymbolicName>
 	<Message>"The given assembly name was invalid."</Message>

diff --git a/src/coreclr/pal/prebuilt/corerror/mscorurt.rc b/src/coreclr/pal/prebuilt/corerror/mscorurt.rc
@@ -14,7 +14,6 @@ BEGIN
 	MSG_FOR_URT_HR(HOST_E_INVALIDOPERATION) "Invalid operation."
 	MSG_FOR_URT_HR(HOST_E_CLRNOTAVAILABLE) "CLR has been disabled due to unrecoverable error."
 	MSG_FOR_URT_HR(FUSION_E_REF_DEF_MISMATCH) "The located assembly's manifest definition does not match the assembly reference."
-	MSG_FOR_URT_HR(FUSION_E_PRIVATE_ASM_DISALLOWED) "A strongly-named assembly is required."
 	MSG_FOR_URT_HR(FUSION_E_INVALID_NAME) "The given assembly name was invalid."
 	MSG_FOR_URT_HR(FUSION_E_APP_DOMAIN_LOCKED) "The requested assembly version conflicts with what is already bound in the app domain or specified in the manifest."
 	MSG_FOR_URT_HR(COR_E_LOADING_REFERENCE_ASSEMBLY) "Reference assemblies cannot be loaded for execution."

diff --git a/src/coreclr/pal/prebuilt/inc/corerror.h b/src/coreclr/pal/prebuilt/inc/corerror.h
@@ -41,7 +41,6 @@
 #define HOST_E_INVALIDOPERATION EMAKEHR(0x1022)
 #define HOST_E_CLRNOTAVAILABLE EMAKEHR(0x1023)
 #define FUSION_E_REF_DEF_MISMATCH EMAKEHR(0x1040)
-#define FUSION_E_PRIVATE_ASM_DISALLOWED EMAKEHR(0x1044)
 #define FUSION_E_INVALID_NAME EMAKEHR(0x1047)
 #define FUSION_E_APP_DOMAIN_LOCKED EMAKEHR(0x1053)
 #define COR_E_LOADING_REFERENCE_ASSEMBLY EMAKEHR(0x1058)

diff --git a/src/coreclr/utilcode/ex.cpp b/src/coreclr/utilcode/ex.cpp
@@ -574,7 +574,6 @@ LPCSTR Exception::GetHRSymbolicName(HRESULT hr)
     CASE_HRESULT(COR_E_CANNOTUNLOADAPPDOMAIN)
     CASE_HRESULT(MSEE_E_ASSEMBLYLOADINPROGRESS)
     CASE_HRESULT(FUSION_E_REF_DEF_MISMATCH)
-    CASE_HRESULT(FUSION_E_PRIVATE_ASM_DISALLOWED)
     CASE_HRESULT(FUSION_E_INVALID_NAME)
     CASE_HRESULT(CLDB_E_FILE_BADREAD)
     CASE_HRESULT(CLDB_E_FILE_BADWRITE)

diff --git a/src/coreclr/vm/appdomain.cpp b/src/coreclr/vm/appdomain.cpp
@@ -4528,13 +4528,6 @@ AppDomain::RaiseAssemblyResolveEvent(
     }
     GCPROTECT_END();
 
-    if (pAssembly != NULL)
-    {
-        // Check that the public key token matches the one specified in the spec
-        // MatchPublicKeys throws as appropriate
-        pSpec->MatchPublicKeys(pAssembly);
-    }
-
     RETURN pAssembly;
 } // AppDomain::RaiseAssemblyResolveEvent
 

diff --git a/src/coreclr/vm/assemblyspec.cpp b/src/coreclr/vm/assemblyspec.cpp
@@ -295,55 +295,6 @@ void AssemblySpec::InitializeAssemblyNameRef(_In_ BINDER_SPACE::AssemblyName* as
     spec.AssemblyNameInit(assemblyNameRef);
 }
 
-
-// Check if the supplied assembly's public key matches up with the one in the Spec, if any
-// Throws an appropriate exception in case of a mismatch
-void AssemblySpec::MatchPublicKeys(Assembly *pAssembly)
-{
-    CONTRACTL
-    {
-        INSTANCE_CHECK;
-        THROWS;
-        GC_TRIGGERS;
-        MODE_ANY;
-    }
-    CONTRACTL_END;
-
-    // Check that the public keys are the same as in the AR.
-    if (!IsStrongNamed())
-        return;
-
-    const void *pbPublicKey;
-    DWORD cbPublicKey;
-    pbPublicKey = pAssembly->GetPublicKey(&cbPublicKey);
-    if (cbPublicKey == 0)
-        ThrowHR(FUSION_E_PRIVATE_ASM_DISALLOWED);
-
-    if (IsAfPublicKey(m_dwFlags))
-    {
-        if ((m_cbPublicKeyOrToken != cbPublicKey) ||
-            memcmp(m_pbPublicKeyOrToken, pbPublicKey, m_cbPublicKeyOrToken))
-        {
-            ThrowHR(FUSION_E_REF_DEF_MISMATCH);
-        }
-    }
-    else
-    {
-        // Ref has a token
-        StrongNameToken strongNameToken;
-
-        IfFailThrow(StrongNameTokenFromPublicKey((BYTE*)pbPublicKey,
-            cbPublicKey,
-            &strongNameToken));
-
-        if ((m_cbPublicKeyOrToken != StrongNameToken::SIZEOF_TOKEN) ||
-            memcmp(m_pbPublicKeyOrToken, &strongNameToken, StrongNameToken::SIZEOF_TOKEN))
-        {
-            ThrowHR(FUSION_E_REF_DEF_MISMATCH);
-        }
-    }
-}
-
 Assembly *AssemblySpec::LoadAssembly(FileLoadLevel targetLevel, BOOL fThrowOnFileNotFound)
 {
     CONTRACTL

diff --git a/src/coreclr/vm/assemblyspec.hpp b/src/coreclr/vm/assemblyspec.hpp
@@ -193,8 +193,6 @@ class AssemblySpec  : public BaseAssemblySpec
     static void InitializeAssemblyNameRef(_In_ BINDER_SPACE::AssemblyName* assemblyName, _Out_ ASSEMBLYNAMEREF* assemblyNameRef);
 
   public:
-    void MatchPublicKeys(Assembly *pAssembly);
-
     AppDomain *GetAppDomain()
     {
         LIMITED_METHOD_CONTRACT;

diff --git a/src/coreclr/vm/rexcep.h b/src/coreclr/vm/rexcep.h
@@ -144,7 +144,6 @@ DEFINE_EXCEPTION(g_SystemNS,           FieldAccessException,           false,  C
 DEFINE_EXCEPTION(g_IONS,               FileLoadException,              true,
                  COR_E_FILELOAD,
                  FUSION_E_INVALID_NAME,
-                 FUSION_E_PRIVATE_ASM_DISALLOWED,
                  FUSION_E_REF_DEF_MISMATCH,
                  HRESULT_FROM_WIN32(ERROR_TOO_MANY_OPEN_FILES),
                  HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION), HRESULT_FROM_WIN32(ERROR_LOCK_VIOLATION),

diff --git a/src/libraries/Common/src/System/HResults.cs b/src/libraries/Common/src/System/HResults.cs
@@ -127,7 +127,6 @@ internal static partial class HResults
         internal const int CTL_E_PATHNOTFOUND = unchecked((int)0x800A004C);
         internal const int CTL_E_FILENOTFOUND = unchecked((int)0x800A0035);
         internal const int FUSION_E_INVALID_NAME = unchecked((int)0x80131047);
-        internal const int FUSION_E_PRIVATE_ASM_DISALLOWED = unchecked((int)0x80131044);
         internal const int FUSION_E_REF_DEF_MISMATCH = unchecked((int)0x80131040);
         internal const int ERROR_TOO_MANY_OPEN_FILES = unchecked((int)0x80070004);
         internal const int ERROR_SHARING_VIOLATION = unchecked((int)0x80070020);

diff --git a/src/libraries/System.Private.CoreLib/src/System/Runtime/InteropServices/Marshal.cs b/src/libraries/System.Private.CoreLib/src/System/Runtime/InteropServices/Marshal.cs
@@ -818,7 +818,6 @@ public static IntPtr GetHINSTANCE(Module m)
                         };
                     }
                 case HResults.FUSION_E_INVALID_NAME:
-                case HResults.FUSION_E_PRIVATE_ASM_DISALLOWED:
                 case HResults.FUSION_E_REF_DEF_MISMATCH:
                 case HResults.ERROR_TOO_MANY_OPEN_FILES:
                 case HResults.ERROR_SHARING_VIOLATION:

diff --git a/src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/AppDomainTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/AppDomainTests.cs
@@ -7,6 +7,7 @@
 using System.IO;
 using System.Net.Http;
 using System.Reflection;
+using System.Reflection.Emit;
 using System.Resources;
 using System.Runtime.CompilerServices;
 using System.Runtime.ExceptionServices;
@@ -654,6 +655,24 @@ public void AssemblyResolve_IsNotCalledForCoreLibResources()
             }).Dispose();
         }
 
+        [ConditionalFact(typeof(RemoteExecutor), nameof(RemoteExecutor.IsSupported))]
+        public void AssemblyResolve_IgnoresStrongNameMismatches()
+        {
+            RemoteExecutor.Invoke(() =>
+            {
+                AppDomain.CurrentDomain.AssemblyResolve +=
+                    (sender, e) =>
+                    {
+                        if (!e.Name.StartsWith("MyAssembly"))
+                            return null;
+
+                        return AssemblyBuilder.DefineDynamicAssembly(
+                            new AssemblyName("MyAssembly"), AssemblyBuilderAccess.Run);
+                    };
+                Assembly.Load("MyAssembly, PublicKeyToken=1234567890ABCDEF");
+            }).Dispose();
+        }
+
         class CorrectlyPropagatesException : Exception
         {
             public CorrectlyPropagatesException(string message) : base(message)

diff --git a/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/IO/Exceptions.HResults.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/IO/Exceptions.HResults.cs
@@ -18,7 +18,6 @@ public static class HResults
 
         public const int COR_E_FILELOAD = unchecked((int)0x80131621);
         public const int FUSION_E_INVALID_NAME = unchecked((int)0x80131047);
-        public const int FUSION_E_PRIVATE_ASM_DISALLOWED = unchecked((int)0x80131044);
         public const int FUSION_E_REF_DEF_MISMATCH = unchecked((int)0x80131040);
         public const int ERROR_TOO_MANY_OPEN_FILES = unchecked((int)0x80070004);
         public const int ERROR_SHARING_VIOLATION = unchecked((int)0x80070020);

diff --git a/...ies/System.Runtime/tests/System.Runtime.Tests/System/IO/FileLoadException.InteropTests.cs b/...ies/System.Runtime/tests/System.Runtime.Tests/System/IO/FileLoadException.InteropTests.cs
@@ -13,7 +13,6 @@ public static class FileLoadExceptionInteropTests
         [Theory]
         [InlineData(HResults.COR_E_FILELOAD)]
         [InlineData(HResults.FUSION_E_INVALID_NAME)]
-        [InlineData(HResults.FUSION_E_PRIVATE_ASM_DISALLOWED)]
         [InlineData(HResults.FUSION_E_REF_DEF_MISMATCH)]
         [InlineData(HResults.ERROR_TOO_MANY_OPEN_FILES)]
         [InlineData(HResults.ERROR_SHARING_VIOLATION)]