Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion Jint.Tests/Runtime/Domain/HiddenMembers.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,15 @@

public class HiddenMembers
{
public HiddenMembers()
{
}

public HiddenMembers(string member1)
{
Member1 = member1;
}

[Obsolete]
public string Field1 = "Field1";

Expand All @@ -18,4 +27,4 @@ public class HiddenMembers
public string Method2() => "Method2";

public Type Type => GetType();
}
}
2 changes: 1 addition & 1 deletion Jint.Tests/Runtime/EngineLimitTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ public class EngineLimitTests
#if RELEASE
const int FunctionNestingCount = 990;
#else
const int FunctionNestingCount = 495;
const int FunctionNestingCount = 475;
#endif

[Fact]
Expand Down
18 changes: 18 additions & 0 deletions Jint.Tests/Runtime/InteropTests.MemberAccess.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using System.Collections;
using System.Diagnostics.CodeAnalysis;
using Jint.Native;
using Jint.Native.Object;
using Jint.Runtime;
using Jint.Runtime.Interop;
using Jint.Tests.Runtime.Domain;
Expand Down Expand Up @@ -76,6 +77,23 @@ public void ShouldBeAbleToFilterMembers()
Assert.True(engine.Evaluate("m.GetType").IsUndefined());
}

[Fact]
public void ShouldBeAbleToFilterConstructors()
{
var engine = new Engine(options => options
.SetTypeResolver(new TypeResolver
{
MemberFilter = member => member is System.Reflection.ConstructorInfo ci && ci.GetParameters().Length == 0
})
);

engine.SetValue("HiddenMembers", TypeReference.CreateTypeReference<HiddenMembers>(engine));
engine.Evaluate("new HiddenMembers()").Should().BeAssignableTo<ObjectInstance>();

var act = () => engine.Evaluate("new HiddenMembers('/etc/passwd')");
act.Should().Throw<JavaScriptException>().WithMessage("Could not resolve a constructor*");
}

[Fact]
public void ShouldBeAbleToExposeGetType()
{
Expand Down
7 changes: 6 additions & 1 deletion Jint/Runtime/Interop/TypeReference.cs
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,12 @@ static ObjectInstance ObjectCreator(Engine engine, Realm realm, ObjectCreateStat
{
var constructors = _constructorCache.GetOrAdd(
referenceType,
t => MethodDescriptor.Build(t.GetConstructors(BindingFlags.Public | BindingFlags.Instance)));
t =>
{
List<ConstructorInfo> constructors = [.. t.GetConstructors(BindingFlags.Public | BindingFlags.Instance)];
constructors.RemoveAll(x => !engine.Options.Interop.TypeResolver.MemberFilter(x));
return MethodDescriptor.Build(constructors);
});

Func<MethodDescriptor, MethodResolverState, JsCallArguments> argumentProvider = static (method, state) =>
{
Expand Down