New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Forward non-intercepted methods on class proxies to target #571
Merged
stakx
merged 5 commits into
castleproject:master
from
stakx:forward-non-intercepted-methods-to-target
Feb 3, 2021
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
56d74dd
Non-proxied methods should forward to target
stakx 41556e9
Forward non-intercepted methods to class proxy target
stakx aeb19c2
`hook.ShouldInterceptMethod` now broken for non-public methods
stakx ea5b272
Skip interceptors for non-intercepted methods
stakx 77743ac
Update the changelog
stakx File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
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
63 changes: 63 additions & 0 deletions
63
src/Castle.Core.Tests/DynamicProxy.Tests/BugsReported/GitHubIssue536.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,63 @@ | ||
// Copyright 2004-2021 Castle Project - http://www.castleproject.org/ | ||
// | ||
// Licensed under the Apache License, Version 2.0 (the "License"); | ||
// you may not use this file except in compliance with the License. | ||
// You may obtain a copy of the License at | ||
// | ||
// http://www.apache.org/licenses/LICENSE-2.0 | ||
// | ||
// Unless required by applicable law or agreed to in writing, software | ||
// distributed under the License is distributed on an "AS IS" BASIS, | ||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
// See the License for the specific language governing permissions and | ||
// limitations under the License. | ||
|
||
namespace Castle.DynamicProxy.Tests.BugsReported | ||
{ | ||
using System; | ||
using System.Reflection; | ||
using System.Threading.Tasks; | ||
|
||
using NUnit.Framework; | ||
|
||
[TestFixture] | ||
public class GitHubIssue536 : BasePEVerifyTestCase | ||
{ | ||
[Test] | ||
public void DynamicProxy_NonIntercepted_Property_Leaked() | ||
{ | ||
var instance = new TestClassForCache(); | ||
var toProxy = instance.GetType(); | ||
|
||
var proxyGenerationOptions = new ProxyGenerationOptions(new TestCacheProxyGenerationHook()); | ||
|
||
var generator = new ProxyGenerator(); | ||
var proxy = generator.CreateClassProxyWithTarget(toProxy, | ||
instance, | ||
proxyGenerationOptions); | ||
|
||
var accessor = (ITestCacheInterface)proxy; | ||
accessor.InstanceProperty = 1; | ||
|
||
Assert.AreEqual(accessor.InstanceProperty, instance.InstanceProperty); | ||
} | ||
|
||
public class TestCacheProxyGenerationHook : AllMethodsHook | ||
{ | ||
public override bool ShouldInterceptMethod(Type type, MethodInfo methodInfo) | ||
{ | ||
return false; | ||
} | ||
} | ||
|
||
public interface ITestCacheInterface | ||
{ | ||
int InstanceProperty { get; set; } | ||
} | ||
|
||
public class TestClassForCache : ITestCacheInterface | ||
{ | ||
public virtual int InstanceProperty { get; set; } | ||
} | ||
} | ||
} |
21 changes: 21 additions & 0 deletions
21
src/Castle.Core.Tests/DynamicProxy.Tests/Classes/HasVirtualStringAutoProperty.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,21 @@ | ||
// Copyright 2004-2019 Castle Project - http://www.castleproject.org/ | ||
// | ||
// Licensed under the Apache License, Version 2.0 (the "License"); | ||
// you may not use this file except in compliance with the License. | ||
// You may obtain a copy of the License at | ||
// | ||
// http://www.apache.org/licenses/LICENSE-2.0 | ||
// | ||
// Unless required by applicable law or agreed to in writing, software | ||
// distributed under the License is distributed on an "AS IS" BASIS, | ||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
// See the License for the specific language governing permissions and | ||
// limitations under the License. | ||
|
||
namespace Castle.DynamicProxy.Tests.Classes | ||
{ | ||
public class HasVirtualStringAutoProperty | ||
{ | ||
public virtual string Property { get; set; } | ||
} | ||
} |
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
41 changes: 41 additions & 0 deletions
41
src/Castle.Core.Tests/DynamicProxy.Tests/ProxySomeMethodsHook.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,41 @@ | ||
// Copyright 2004-2019 Castle Project - http://www.castleproject.org/ | ||
// | ||
// Licensed under the Apache License, Version 2.0 (the "License"); | ||
// you may not use this file except in compliance with the License. | ||
// You may obtain a copy of the License at | ||
// | ||
// http://www.apache.org/licenses/LICENSE-2.0 | ||
// | ||
// Unless required by applicable law or agreed to in writing, software | ||
// distributed under the License is distributed on an "AS IS" BASIS, | ||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
// See the License for the specific language governing permissions and | ||
// limitations under the License. | ||
|
||
namespace Castle.DynamicProxy.Tests | ||
{ | ||
using System; | ||
using System.Reflection; | ||
|
||
#if FEATURE_SERIALIZATION | ||
[Serializable] | ||
#endif | ||
public class ProxySomeMethodsHook : IProxyGenerationHook | ||
{ | ||
private readonly Func<Type, MethodInfo, bool> shouldInterceptMethod; | ||
|
||
public ProxySomeMethodsHook(Func<Type, MethodInfo, bool> shouldInterceptMethod) | ||
{ | ||
this.shouldInterceptMethod = shouldInterceptMethod; | ||
} | ||
|
||
public bool ShouldInterceptMethod(Type type, MethodInfo methodInfo) | ||
{ | ||
return shouldInterceptMethod(type, methodInfo); | ||
} | ||
|
||
void IProxyGenerationHook.MethodsInspected() { } | ||
|
||
void IProxyGenerationHook.NonProxyableMemberNotification(Type type, MemberInfo memberInfo) { } | ||
} | ||
} |
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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I am splitting off the pre-screening from
AcceptMethod
so thatWrappedMembersCollector
has a way of distinguishing between non-interceptable methods (e.g.object.Finalize
,object.MemberwiseClone
), and methods that the hook wants filtered out. It is only the latter group of methods that should be forwarded to the target; the former group of methods must not be proxied at all!(In my original PR, I made this distinction via
AllMethodsHook.SkippedTypes
, which wasn't ideal; see #450 (comment).)