mirrors/PowerShell
0
0
Fork 0
mirror of https://github.com/PowerShell/PowerShell.git synced 2024-11-27 11:56:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

Handle the case that Runspace.DefaultRunspace is null when logging for WDAC Audit (#21344)

Browse Source
This commit is contained in:
Dongbo Wang 2024-03-14 11:39:25 -07:00 committed by GitHub
parent 4e357f129e
commit d67a82d833
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/System.Management.Automation/security/wldpNativeMethods.cs
View File

@ -8,6 +8,7 @@
using System.Diagnostics.CodeAnalysis;
using System.Management.Automation.Internal;
using System.Management.Automation.Runspaces;
using System.Management.Automation.Tracing;
using System.Runtime.InteropServices;
@ -91,9 +92,8 @@ namespace System.Management.Automation.Security
string messageToWrite = message;
// Augment the log message with current script information from the script debugger, if available.
context ??= System.Management.Automation.Runspaces.LocalPipeline.GetExecutionContextFromTLS();
context ??= LocalPipeline.GetExecutionContextFromTLS();
bool debuggerAvailable = context is not null &&
context._debugger is not null &&
context._debugger is ScriptDebugger;
if (debuggerAvailable)
@ -108,10 +108,9 @@ namespace System.Management.Automation.Security
PSEtwLog.LogWDACAuditEvent(title, messageToWrite, fqid);
// We drop into the debugger only if requested and we are running in the interactive host session runspace (Id == 1).
if (debuggerAvailable &&
dropIntoDebugger is true &&
if (debuggerAvailable && dropIntoDebugger &&
context._debugger.DebugMode.HasFlag(DebugModes.LocalScript) &&
System.Management.Automation.Runspaces.Runspace.DefaultRunspace.Id == 1 &&
Runspace.DefaultRunspace?.Id == 1 &&
context.DebugPreferenceVariable.HasFlag(ActionPreference.Break) &&
context.InternalHost?.UI is not null)
{