Mirrors/Win11Debloat
1
0
Fork 0
mirror of https://github.com/Raphire/Win11Debloat.git synced 2026-08-22 07:36:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve error handling in Set-StoreSearchSuggestionsDisabled (#739)

Browse Source
This commit is contained in:
Jeffrey
2026-08-16 18:49:15 +02:00
committed by GitHub
parent 5072958b10
commit 1a26934499
2 changed files with 30 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Scripts/Features/Set-StoreSearchSuggestions.ps1
+11 -5
View File
@@ -73,11 +73,17 @@ function Set-StoreSearchSuggestionsDisabled {
New-Item -Path $StoreAppsDatabase -ItemType File -Force | Out-Null New-Item -Path $StoreAppsDatabase -ItemType File -Force | Out-Null
} }
$AccountSid = [System.Security.Principal.SecurityIdentifier]::new('S-1-1-0') # 'EVERYONE' group try {
$Acl = Get-Acl -Path $StoreAppsDatabase $AccountSid = [System.Security.Principal.SecurityIdentifier]::new('S-1-1-0') # 'EVERYONE' group
$Ace = [System.Security.AccessControl.FileSystemAccessRule]::new($AccountSid, 'FullControl', 'Deny') $Acl = Get-Acl -Path $StoreAppsDatabase -ErrorAction Stop
$Acl.SetAccessRule($Ace) | Out-Null $Ace = [System.Security.AccessControl.FileSystemAccessRule]::new($AccountSid, 'FullControl', 'Deny')
Set-Acl -Path $StoreAppsDatabase -AclObject $Acl | Out-Null $Acl.SetAccessRule($Ace) | Out-Null
Set-Acl -Path $StoreAppsDatabase -AclObject $Acl -ErrorAction Stop | Out-Null
}
catch {
Write-Warning "Failed to restrict ACL for store database '$StoreAppsDatabase': $($_.Exception.Message)"
return
}
Write-Host "Disabled Microsoft Store search suggestions for user $userName" Write-Host "Disabled Microsoft Store search suggestions for user $userName"
} }
Tests/Set-StoreSearchSuggestions.Tests.ps1
+19 -4
View File
@@ -126,18 +126,33 @@ Describe 'Set-StoreSearchSuggestionsDisabled' {
$acl.AddedRules | Should -HaveCount 1 $acl.AddedRules | Should -HaveCount 1
} }
It 'surfaces ACL failures instead of reporting the database as disabled' { It 'warns and does not report success when reading the ACL fails' {
$script:Params = @{} $script:Params = @{}
Mock Test-Path { $true } Mock Test-Path { $true }
Mock Get-Acl { throw 'access denied' } Mock Get-Acl { throw 'access denied' }
Mock Set-Acl { throw 'ACL must not be written after a read failure.' } Mock Set-Acl { throw 'ACL must not be written after a read failure.' }
Mock Write-Warning {}
{ Set-StoreSearchSuggestionsDisabled -StoreAppsDatabase 'C:\Users\Alice\AppData\Local\Packages\store.db'
Set-StoreSearchSuggestionsDisabled -StoreAppsDatabase 'C:\Users\Alice\AppData\Local\Packages\store.db'
} | Should -Throw '*access denied*'
Should -Invoke Write-Warning -Times 1 -Exactly
Should -Invoke Write-Host -Times 0 -Exactly -ParameterFilter { $Object -like 'Disabled Microsoft Store search suggestions*' }
Should -Invoke Set-Acl -Times 0 -Exactly Should -Invoke Set-Acl -Times 0 -Exactly
} }
It 'warns and does not report success when writing the ACL fails' {
$script:Params = @{}
$acl = New-TestStoreDatabaseAcl
Mock Test-Path { $true }
Mock Get-Acl { $acl }
Mock Set-Acl { throw 'access denied' }
Mock Write-Warning {}
Set-StoreSearchSuggestionsDisabled -StoreAppsDatabase 'C:\Users\Alice\AppData\Local\Packages\store.db'
Should -Invoke Write-Warning -Times 1 -Exactly
Should -Invoke Write-Host -Times 0 -Exactly -ParameterFilter { $Object -like 'Disabled Microsoft Store search suggestions*' }
}
} }
Describe 'Set-StoreSearchSuggestionsEnabled' { Describe 'Set-StoreSearchSuggestionsEnabled' {