Skip to content

Turn off AMSI member invocation on *nix release builds #24451

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

Merged
SeeminglyScience merged 2 commits into from
Dec 9, 2024
Merged

Turn off AMSI member invocation on *nix release builds #24451

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f757133
Turn off AMSI member invocation on nix release builds
jborean93 Oct 16, 2024
d0984a9
Change call to optional add in the binder expression
jborean93 Dec 8, 2024
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
37 changes: 28 additions & 9 deletions src/System.Management.Automation/engine/runtime/Binding/Binders.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6947,15 +6947,7 @@ internal static DynamicMetaObject InvokeDotNetMethod(
// - Log method invocation to AMSI Notifications (can throw PSSecurityException)
// - Invoke method
string targetName = methodInfo.ReflectedType?.FullName ?? string.Empty;
expr = Expression.Block(
Expression.Call(
CachedReflectionInfo.MemberInvocationLoggingOps_LogMemberInvocation,
Expression.Constant(targetName),
Expression.Constant(name),
Expression.NewArrayInit(
typeof(object),
args.Select(static e => e.Expression.Cast(typeof(object))))),
expr);
MaybeAddMemberInvocationLogging(expr, targetName, name, args);

@mklement0 mklement0 Dec 9, 2024

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I may be missing something, but it looks like the return value from this method call is never used; shouldn't that be expr = MaybeAddMemberInvocationLogging(expr, targetName, name, args);?

@jborean93 jborean93 Dec 9, 2024

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good pickup, sorry for missing that. @SeeminglyScience will be submitting a new PR to fix that.

@iSazonov iSazonov Dec 10, 2024 •
edited
Loading

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That says there are no tests.
And many would say thank you for such an omission 😄


// If we're calling SteppablePipeline.{Begin|Process|End}, we don't want
// to wrap exceptions - this is very much a special case to help error
Expand Down Expand Up @@ -7566,6 +7558,33 @@ internal static void InvalidateCache()
}
}

#nullable enable
private static Expression MaybeAddMemberInvocationLogging(
Expression expr,
string targetName,
string name,
DynamicMetaObject[] args)
{
#if UNIX && !DEBUG
// For efficiency this is a no-op on non-Windows platforms in release builds.
return expr;
#else
Expression[] invocationArgs = new Expression[args.Length];
for (int i = 0; i < args.Length; i++)
{
invocationArgs[i] = args[i].Expression.Cast(typeof(object));
}
return Expression.Block(
Expression.Call(
CachedReflectionInfo.MemberInvocationLoggingOps_LogMemberInvocation,
Expression.Constant(targetName),
Expression.Constant(name),
Expression.NewArrayInit(typeof(object), invocationArgs)),
expr);
#endif
}
#nullable disable

#endregion
}

Expand Down