Skip to content

Add AllowAccessToNonPublicMembers property to ParsingConfig #944

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add AllowAccessToNonPublicMembers property to ParsingConfig #944

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 12 additions & 5 deletions src/System.Linq.Dynamic.Core/Parser/ExpressionParser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1909,7 +1909,7 @@ private Expression ParseMemberAccess(Type? type, Expression? expression, string?
return Expression.MakeIndex(expression, typeof(DynamicClass).GetProperty("Item"), new[] { Expression.Constant(id) });
}
#endif
if (TryFindPropertyOrField(type!, id, expression, out var propertyOrFieldExpression))
if (TryFindPropertyOrField(type!, id, expression, out var propertyOrFieldExpression))
{
return propertyOrFieldExpression;
}
Expand Down Expand Up @@ -1954,7 +1954,9 @@ private bool TryFindPropertyOrField(Type type, string id, Expression? expression
switch (member)
{
case PropertyInfo property:
var propertyIsStatic = property?.GetGetMethod().IsStatic ?? property?.GetSetMethod().IsStatic ?? false;
var getter = property.GetGetMethod(true);
var setter = property.GetSetMethod(true);
var propertyIsStatic = (getter?.IsStatic == true) || (setter?.IsStatic == true);
propertyOrFieldExpression = propertyIsStatic ? Expression.Property(null, property) : Expression.Property(expression, property);
return true;

Expand Down Expand Up @@ -2514,7 +2516,8 @@ private static Exception IncompatibleOperandsError(string opName, Expression lef
{
#if !(UAP10_0 || NETSTANDARD)
var extraBindingFlag = _parsingConfig.PrioritizePropertyOrFieldOverTheType && staticAccess ? BindingFlags.Static : BindingFlags.Instance | BindingFlags.Static;
var bindingFlags = BindingFlags.Public | BindingFlags.DeclaredOnly | extraBindingFlag;
var visibilityFlags = BindingFlags.Public | (_parsingConfig.AllowAccessToNonPublicMembers ? BindingFlags.NonPublic : 0);
var bindingFlags = visibilityFlags | BindingFlags.DeclaredOnly | extraBindingFlag;
foreach (Type t in TypeHelper.GetSelfAndBaseTypes(type))
{
var findMembersType = _parsingConfig?.IsCaseSensitive == true ? Type.FilterName : Type.FilterNameIgnoreCase;
Expand All @@ -2532,14 +2535,18 @@ private static Exception IncompatibleOperandsError(string opName, Expression lef
{
// Try to find a property with the specified memberName
MemberInfo? member = t.GetTypeInfo().DeclaredProperties
.FirstOrDefault(x => (!staticAccess || x.GetAccessors(true)[0].IsStatic) && (x.Name == memberName || (!isCaseSensitive && x.Name.Equals(memberName, StringComparison.OrdinalIgnoreCase))));
.FirstOrDefault(x => (!staticAccess || x.GetAccessors(true)[0].IsStatic)
&& (x.Name == memberName || (!isCaseSensitive && x.Name.Equals(memberName, StringComparison.OrdinalIgnoreCase)))
&& (_parsingConfig.AllowAccessToNonPublicMembers || x.GetAccessors(true).Any(a => a.IsPublic)));
if (member != null)
{
return member;
}

// If no property is found, try to get a field with the specified memberName
member = t.GetTypeInfo().DeclaredFields.FirstOrDefault(x => (!staticAccess || x.IsStatic) && ((x.Name == memberName) || (!isCaseSensitive && x.Name.Equals(memberName, StringComparison.OrdinalIgnoreCase))));
member = t.GetTypeInfo().DeclaredFields.FirstOrDefault(x => (!staticAccess || x.IsStatic)
&& ((x.Name == memberName) || (!isCaseSensitive && x.Name.Equals(memberName, StringComparison.OrdinalIgnoreCase)))
&& (_parsingConfig.AllowAccessToNonPublicMembers || x.IsPublic));
if (member != null)
{
return member;
Expand Down
7 changes: 7 additions & 0 deletions src/System.Linq.Dynamic.Core/ParsingConfig.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,4 +319,11 @@ public IQueryableAnalyzer QueryableAnalyzer
/// Default value is <c>false</c>.
/// </summary>
public bool AllowEqualsAndToStringMethodsOnObject { get; set; }

/// <summary>
/// When set to true, the parser will consider non-public members (internal and private)
/// during property/field lookup where the runtime permits access (e.g., via InternalsVisibleTo).
/// Default value is false.
/// </summary>
public bool AllowAccessToNonPublicMembers { get; set; }
}