-
Notifications
You must be signed in to change notification settings - Fork 10k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[release/8.0] Improve usage of
Type.GetType
when activating types i…
…n data protection (#54762) * Added test demonstrating behavior on TypeLoadException * Catch exceptions when calling GetType and fall back to IActivator.CreateInstance<IXmlDecryptor> * Move trimming suppression * Include comment about how throwOnError: false can still throw * Check type name for known value before getting type * Remove unnecessary suppression * Comment * PR feedback * Update src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/XmlEncryption/XmlEncryptionExtensionsTests.cs --------- Co-authored-by: Kristian Hellang <kristian@identitystream.com> Co-authored-by: James Newton-King <james@newtonking.com>
- Loading branch information
1 parent
53e662d
commit 22bb1c3
Showing
6 changed files
with
173 additions
and
14 deletions.
There are no files selected for viewing
34 changes: 34 additions & 0 deletions
34
src/DataProtection/DataProtection/src/Internal/DefaultTypeNameResolver.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
// Licensed to the .NET Foundation under one or more agreements. | ||
// The .NET Foundation licenses this file to you under the MIT license. | ||
|
||
using System; | ||
using System.Diagnostics.CodeAnalysis; | ||
|
||
namespace Microsoft.AspNetCore.DataProtection.Internal; | ||
|
||
internal sealed class DefaultTypeNameResolver : ITypeNameResolver | ||
{ | ||
public static readonly DefaultTypeNameResolver Instance = new(); | ||
|
||
private DefaultTypeNameResolver() | ||
{ | ||
} | ||
|
||
[UnconditionalSuppressMessage("Trimmer", "IL2057", Justification = "Type.GetType is only used to resolve statically known types that are referenced by DataProtection assembly.")] | ||
public bool TryResolveType(string typeName, [NotNullWhen(true)] out Type? type) | ||
{ | ||
try | ||
{ | ||
// Some exceptions are thrown regardless of the value of throwOnError. | ||
// For example, if the type is found but cannot be loaded, | ||
// a System.TypeLoadException is thrown even if throwOnError is false. | ||
type = Type.GetType(typeName, throwOnError: false); | ||
return type != null; | ||
} | ||
catch | ||
{ | ||
type = null; | ||
return false; | ||
} | ||
} | ||
} |
12 changes: 12 additions & 0 deletions
12
src/DataProtection/DataProtection/src/Internal/ITypeNameResolver.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
// Licensed to the .NET Foundation under one or more agreements. | ||
// The .NET Foundation licenses this file to you under the MIT license. | ||
|
||
using System; | ||
using System.Diagnostics.CodeAnalysis; | ||
|
||
namespace Microsoft.AspNetCore.DataProtection.Internal; | ||
|
||
internal interface ITypeNameResolver | ||
{ | ||
bool TryResolveType(string typeName, [NotNullWhen(true)] out Type? type); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters