admin/PowerShell-PowerShell
1
0
Fork 0
mirror of https://github.com/PowerShell/PowerShell synced 2026-06-08 12:12:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

[release/v7.4] Move .NET method invocation logging to after the needed type conversion is done for method arguments (#25568)

Browse Source 
Co-authored-by: Dongbo Wang <dongbow@microsoft.com>
This commit is contained in:
PowerShell Team Bot
2025-06-04 09:29:08 -07:00
committed by GitHub
co-authored by Dongbo Wang
parent d89ebded1e
commit 133f616078
1 changed files with 86 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/System.Management.Automation/engine/runtime/Binding/Binders.cs
+86 -21
View File
@@ -6935,20 +6935,6 @@ namespace System.Management.Automation.Language
expr = Expression.Block(expr, ExpressionCache.AutomationNullConstant);
}
// Expression block runs two expressions in order:
// - 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);
// 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
// propagation and ensure errors are attributed to the correct code (the
@@ -7111,6 +7097,7 @@ namespace System.Management.Automation.Language
invocationType != MethodInvocationType.NonVirtual;
var parameters = mi.GetParameters();
var argExprs = new Expression[parameters.Length];
var argsToLog = new List<Expression>(Math.Max(parameters.Length, args.Length));
for (int i = 0; i < parameters.Length; ++i)
{
@@ -7135,16 +7122,21 @@ namespace System.Management.Automation.Language
if (expandParameters)
{
argExprs[i] = Expression.NewArrayInit(
paramElementType,
args.Skip(i).Select(
a => a.CastOrConvertMethodArgument(
IEnumerable<Expression> elements = args
.Skip(i)
.Select(a =>
a.CastOrConvertMethodArgument(
paramElementType,
paramName,
mi.Name,
allowCastingToByRefLikeType: false,
temps,
initTemps)));
initTemps))
.ToList();
argExprs[i] = Expression.NewArrayInit(paramElementType, elements);
// User specified the element arguments, so we log them instead of the compiler-created array.
argsToLog.AddRange(elements);
}
else
{
@@ -7155,13 +7147,18 @@ namespace System.Management.Automation.Language
allowCastingToByRefLikeType: false,
temps,
initTemps);
argExprs[i] = arg;
argsToLog.Add(arg);
}
}
else if (i >= args.Length)
{
Diagnostics.Assert(parameters[i].IsOptional,
// We don't log the default value for an optional parameter, as it's not specified by the user.
Diagnostics.Assert(
parameters[i].IsOptional,
"if there are too few arguments, FindBestMethod should only succeed if parameters are optional");
var argValue = parameters[i].DefaultValue;
if (argValue == null)
{
@@ -7192,17 +7189,25 @@ namespace System.Management.Automation.Language
var psRefValue = Expression.Property(args[i].Expression.Cast(typeof(PSReference)), CachedReflectionInfo.PSReference_Value);
initTemps.Add(Expression.Assign(temp, psRefValue.Convert(temp.Type)));
copyOutTemps.Add(Expression.Assign(psRefValue, temp.Cast(typeof(object))));
argExprs[i] = temp;
argsToLog.Add(temp);
}
else
{
argExprs[i] = args[i].CastOrConvertMethodArgument(
var convertedArg = args[i].CastOrConvertMethodArgument(
parameterType,
paramName,
mi.Name,
allowCastingToByRefLikeType,
temps,
initTemps);
argExprs[i] = convertedArg;
// If the converted arg is a byref-like type, then we log the original arg.
argsToLog.Add(convertedArg.Type.IsByRefLike
? args[i].Expression
: convertedArg);
}
}
}
@@ -7248,6 +7253,12 @@ namespace System.Management.Automation.Language
}
}
// We need to add one expression to log the .NET invocation before actually invoking:
// - Log method invocation to AMSI Notifications (can throw PSSecurityException)
// - Invoke method
string targetName = mi.ReflectedType?.FullName ?? string.Empty;
string methodName = mi.Name is ".ctor" ? "new" : mi.Name;
if (temps.Count > 0)
{
if (call.Type != typeof(void) && copyOutTemps.Count > 0)
@@ -7258,8 +7269,13 @@ namespace System.Management.Automation.Language
copyOutTemps.Add(retValue);
}
AddMemberInvocationLogging(initTemps, targetName, methodName, argsToLog);
call = Expression.Block(call.Type, temps, initTemps.Append(call).Concat(copyOutTemps));
}
else
{
call = AddMemberInvocationLogging(call, targetName, methodName, argsToLog);
}
return call;
}
@@ -7551,6 +7567,55 @@ namespace System.Management.Automation.Language
}
}
#nullable enable
private static Expression AddMemberInvocationLogging(
Expression expr,
string targetName,
string name,
List<Expression> args)
{
#if UNIX
// For efficiency this is a no-op on non-Windows platforms.
return expr;
#else
Expression[] invocationArgs = new Expression[args.Count];
for (int i = 0; i < args.Count; i++)
{
invocationArgs[i] = args[i].Cast(typeof(object));
}
return Expression.Block(
Expression.Call(
CachedReflectionInfo.MemberInvocationLoggingOps_LogMemberInvocation,
Expression.Constant(targetName),
Expression.Constant(name),
Expression.NewArrayInit(typeof(object), invocationArgs)),
expr);
#endif
}
private static void AddMemberInvocationLogging(
List<Expression> exprs,
string targetName,
string name,
List<Expression> args)
{
#if !UNIX
Expression[] invocationArgs = new Expression[args.Count];
for (int i = 0; i < args.Count; i++)
{
invocationArgs[i] = args[i].Cast(typeof(object));
}
exprs.Add(Expression.Call(
CachedReflectionInfo.MemberInvocationLoggingOps_LogMemberInvocation,
Expression.Constant(targetName),
Expression.Constant(name),
Expression.NewArrayInit(typeof(object), invocationArgs)));
#endif
}
#nullable disable
#endregion
}