mirror of
https://github.com/Raphire/Win11Debloat.git
synced 2026-06-10 02:26:29 +00:00
Add Support for "-user" Parameter running under SYSTEM (#609)
Co-authored-by: Jeffrey <9938813+Raphire@users.noreply.github.com>
This commit is contained in:
@@ -27,16 +27,19 @@ function Split-RegistryPath {
|
||||
$null
|
||||
}
|
||||
|
||||
if ($hiveName.Equals('HKEY_USERS', [System.StringComparison]::OrdinalIgnoreCase) -and -not [string]::IsNullOrWhiteSpace($normalizedSubKey)) {
|
||||
if ($hiveName.Equals('HKEY_USERS', [System.StringComparison]::OrdinalIgnoreCase) -and
|
||||
-not [string]::IsNullOrWhiteSpace($normalizedSubKey) -and
|
||||
-not [string]::IsNullOrWhiteSpace([string]$script:RegistryTargetHiveMountName)) {
|
||||
if ($normalizedSubKey -match '^(?<mount>[^\\]+)(?:\\(?<rest>.*))?$') {
|
||||
$mountName = [string]$matches.mount
|
||||
if ($mountName.Equals('.DEFAULT', [System.StringComparison]::OrdinalIgnoreCase)) {
|
||||
if ($mountName.Equals('Default', [System.StringComparison]::OrdinalIgnoreCase)) {
|
||||
$remainingSubKey = if ($matches.rest) { [string]$matches.rest } else { '' }
|
||||
$targetMountName = [string]$script:RegistryTargetHiveMountName
|
||||
if ([string]::IsNullOrWhiteSpace($remainingSubKey)) {
|
||||
$normalizedSubKey = 'Default'
|
||||
$normalizedSubKey = $targetMountName
|
||||
}
|
||||
else {
|
||||
$normalizedSubKey = "Default\$remainingSubKey"
|
||||
$normalizedSubKey = "$targetMountName\$remainingSubKey"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -31,14 +31,6 @@ function Test-TargetUserName {
|
||||
}
|
||||
}
|
||||
|
||||
if (TestIfUserIsLoggedIn -Username $normalizedUserName) {
|
||||
return [PSCustomObject]@{
|
||||
IsValid = $false
|
||||
UserName = $normalizedUserName
|
||||
Message = "User '$normalizedUserName' is currently logged in. Please sign out that user first."
|
||||
}
|
||||
}
|
||||
|
||||
return [PSCustomObject]@{
|
||||
IsValid = $true
|
||||
UserName = $normalizedUserName
|
||||
|
||||
@@ -1,42 +0,0 @@
|
||||
function TestIfUserIsLoggedIn {
|
||||
param(
|
||||
[Parameter(Mandatory)]
|
||||
[string]$Username
|
||||
)
|
||||
|
||||
try {
|
||||
$quserOutput = @(& quser 2>$null)
|
||||
if ($LASTEXITCODE -ne 0 -or -not $quserOutput) {
|
||||
return $false
|
||||
}
|
||||
|
||||
foreach ($line in ($quserOutput | Select-Object -Skip 1)) {
|
||||
if ([string]::IsNullOrWhiteSpace($line)) { continue }
|
||||
|
||||
# Remove current-session marker and split columns.
|
||||
$normalizedLine = $line.TrimStart('>', ' ')
|
||||
$parts = $normalizedLine -split '\s+'
|
||||
if ($parts.Count -eq 0) { continue }
|
||||
|
||||
$sessionUser = $parts[0]
|
||||
if ([string]::IsNullOrWhiteSpace($sessionUser)) { continue }
|
||||
|
||||
# Normalize possible DOMAIN\user or user@domain formats.
|
||||
if ($sessionUser.Contains('\')) {
|
||||
$sessionUser = ($sessionUser -split '\\')[-1]
|
||||
}
|
||||
if ($sessionUser.Contains('@')) {
|
||||
$sessionUser = ($sessionUser -split '@')[0]
|
||||
}
|
||||
|
||||
if ($sessionUser.Equals($Username, [System.StringComparison]::OrdinalIgnoreCase)) {
|
||||
return $true
|
||||
}
|
||||
}
|
||||
}
|
||||
catch {
|
||||
return $false
|
||||
}
|
||||
|
||||
return $false
|
||||
}
|
||||
152
Scripts/Helpers/UserHiveHelpers.ps1
Normal file
152
Scripts/Helpers/UserHiveHelpers.ps1
Normal file
@@ -0,0 +1,152 @@
|
||||
function New-TargetUserHiveContext {
|
||||
param(
|
||||
[Parameter(Mandatory)]
|
||||
[string]$TargetUserName,
|
||||
[AllowNull()]
|
||||
[object]$UserContext,
|
||||
[Parameter(Mandatory)]
|
||||
[string]$HiveDatPath,
|
||||
[AllowNull()]
|
||||
[string]$MountName,
|
||||
[bool]$WasAlreadyLoaded = $false,
|
||||
[bool]$WasLoadedByScript = $false
|
||||
)
|
||||
|
||||
$effectiveMountName = if ([string]::IsNullOrWhiteSpace($MountName)) { 'Default' } else { $MountName }
|
||||
|
||||
return [PSCustomObject]@{
|
||||
TargetUserName = $TargetUserName
|
||||
UserSid = if ($UserContext) { $UserContext.UserSid } else { $null }
|
||||
ProfilePath = if ($UserContext) { $UserContext.ProfilePath } else { $null }
|
||||
HiveDatPath = $HiveDatPath
|
||||
MountName = $effectiveMountName
|
||||
WasAlreadyLoaded = $WasAlreadyLoaded
|
||||
WasLoadedByScript = $WasLoadedByScript
|
||||
}
|
||||
}
|
||||
|
||||
function Resolve-TargetUserHiveContext {
|
||||
param(
|
||||
[Parameter(Mandatory)]
|
||||
[string]$TargetUserName
|
||||
)
|
||||
|
||||
$normalizedTargetUserName = NormalizeUserLookupValue -Value $TargetUserName
|
||||
if ([string]::IsNullOrWhiteSpace($normalizedTargetUserName)) {
|
||||
throw 'Target user name for registry hive resolution is empty.'
|
||||
}
|
||||
|
||||
$userContext = ResolveUserProfileContext -UserName $normalizedTargetUserName
|
||||
if (-not $userContext -or [string]::IsNullOrWhiteSpace([string]$userContext.ProfilePath)) {
|
||||
throw "Unable to resolve profile path for target user '$normalizedTargetUserName'."
|
||||
}
|
||||
|
||||
$hiveDatPath = Join-Path $userContext.ProfilePath 'NTUSER.DAT'
|
||||
if (-not (Test-Path -LiteralPath $hiveDatPath)) {
|
||||
throw "Unable to find target user hive at '$hiveDatPath'."
|
||||
}
|
||||
|
||||
$isDefaultProfile = $normalizedTargetUserName.Equals('Default', [System.StringComparison]::OrdinalIgnoreCase)
|
||||
$userSid = if ($userContext) { [string]$userContext.UserSid } else { '' }
|
||||
|
||||
if ((-not $isDefaultProfile) -and (-not [string]::IsNullOrWhiteSpace($userSid))) {
|
||||
$loadedHivePath = "Registry::HKEY_USERS\$userSid"
|
||||
if (Test-Path -LiteralPath $loadedHivePath) {
|
||||
return (New-TargetUserHiveContext `
|
||||
-TargetUserName $normalizedTargetUserName `
|
||||
-UserContext $userContext `
|
||||
-HiveDatPath $hiveDatPath `
|
||||
-MountName $userSid `
|
||||
-WasAlreadyLoaded $true `
|
||||
-WasLoadedByScript $false)
|
||||
}
|
||||
}
|
||||
|
||||
return (New-TargetUserHiveContext `
|
||||
-TargetUserName $normalizedTargetUserName `
|
||||
-UserContext $userContext `
|
||||
-HiveDatPath $hiveDatPath `
|
||||
-MountName 'Default' `
|
||||
-WasAlreadyLoaded $false `
|
||||
-WasLoadedByScript $false)
|
||||
}
|
||||
|
||||
function Resolve-LoadedTargetUserHiveContext {
|
||||
param(
|
||||
[Parameter(Mandatory)]
|
||||
$HiveContext
|
||||
)
|
||||
|
||||
$userSid = [string]$HiveContext.UserSid
|
||||
if ([string]::IsNullOrWhiteSpace($userSid)) {
|
||||
return $null
|
||||
}
|
||||
|
||||
$loadedHivePath = "Registry::HKEY_USERS\$userSid"
|
||||
if (-not (Test-Path -LiteralPath $loadedHivePath)) {
|
||||
return $null
|
||||
}
|
||||
|
||||
return (New-TargetUserHiveContext `
|
||||
-TargetUserName $HiveContext.TargetUserName `
|
||||
-UserContext ([PSCustomObject]@{ UserSid = $HiveContext.UserSid; ProfilePath = $HiveContext.ProfilePath }) `
|
||||
-HiveDatPath $HiveContext.HiveDatPath `
|
||||
-MountName $userSid `
|
||||
-WasAlreadyLoaded $true `
|
||||
-WasLoadedByScript $false)
|
||||
}
|
||||
|
||||
function Invoke-WithTargetUserHive {
|
||||
param(
|
||||
[Parameter(Mandatory)]
|
||||
[string]$TargetUserName,
|
||||
[Parameter(Mandatory)]
|
||||
[scriptblock]$ScriptBlock,
|
||||
$ArgumentObject = $null,
|
||||
[switch]$PassHiveContext
|
||||
)
|
||||
|
||||
$hiveContext = Resolve-TargetUserHiveContext -TargetUserName $TargetUserName
|
||||
$previousHiveMountName = $script:RegistryTargetHiveMountName
|
||||
|
||||
try {
|
||||
if (-not $hiveContext.WasAlreadyLoaded) {
|
||||
$global:LASTEXITCODE = 0
|
||||
reg load "HKU\$($hiveContext.MountName)" "$($hiveContext.HiveDatPath)" | Out-Null
|
||||
$loadExitCode = $LASTEXITCODE
|
||||
|
||||
if ($loadExitCode -ne 0) {
|
||||
$loadedSidContext = Resolve-LoadedTargetUserHiveContext -HiveContext $hiveContext
|
||||
if ($loadedSidContext) {
|
||||
$hiveContext = $loadedSidContext
|
||||
}
|
||||
else {
|
||||
throw "Failed to load target user hive '$($hiveContext.HiveDatPath)' (exit code: $loadExitCode)."
|
||||
}
|
||||
}
|
||||
else {
|
||||
$hiveContext.WasLoadedByScript = $true
|
||||
}
|
||||
}
|
||||
|
||||
$script:RegistryTargetHiveMountName = [string]$hiveContext.MountName
|
||||
|
||||
if ($PassHiveContext) {
|
||||
return & $ScriptBlock $ArgumentObject $hiveContext
|
||||
}
|
||||
|
||||
return & $ScriptBlock $ArgumentObject
|
||||
}
|
||||
finally {
|
||||
$script:RegistryTargetHiveMountName = $previousHiveMountName
|
||||
|
||||
if ($hiveContext -and $hiveContext.WasLoadedByScript) {
|
||||
$global:LASTEXITCODE = 0
|
||||
reg unload "HKU\$($hiveContext.MountName)" | Out-Null
|
||||
$unloadExitCode = $LASTEXITCODE
|
||||
if ($unloadExitCode -ne 0) {
|
||||
Write-Warning "Failed to unload registry hive 'HKU\$($hiveContext.MountName)' (exit code: $unloadExitCode)"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user