Added the uri fething from #586
parent
19c8036672
commit
a8bfbe6ab9
|
@ -2,28 +2,49 @@
|
|||
|
||||
function Get-ExcludedApps {
|
||||
|
||||
$AppIDs = @()
|
||||
|
||||
#region blacklist in registry
|
||||
if ($GPOList) {
|
||||
|
||||
if (Test-Path "HKLM:\SOFTWARE\Policies\Romanitho\Winget-AutoUpdate\BlackList") {
|
||||
|
||||
$Key = 'HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Romanitho\Winget-AutoUpdate\BlackList\'
|
||||
|
||||
$ValueNames = (Get-Item -Path "HKLM:\SOFTWARE\Policies\Romanitho\Winget-AutoUpdate\BlackList").Property
|
||||
|
||||
$AppIDs = @()
|
||||
|
||||
foreach ($ValueName in $ValueNames) {
|
||||
$AppIDs += (Get-ItemPropertyValue -Path "HKLM:\SOFTWARE\Policies\Romanitho\Winget-AutoUpdate\BlackList" -Name $ValueName).Trim()
|
||||
}
|
||||
|
||||
}
|
||||
return $AppIDs | Where-Object { $_.length -gt 0 }
|
||||
|
||||
}
|
||||
#endregion blacklist in registry
|
||||
#region blacklist pulled from URI
|
||||
elseif ($URIList) {
|
||||
|
||||
$RegPath = "$WAU_GPORoot";
|
||||
$RegValueName = 'WAU_URIList';
|
||||
|
||||
if (Test-Path -Path $RegPath) {
|
||||
$RegKey = Get-Item -Path $RegPath;
|
||||
$WAUURI = $RegKey.GetValue($RegValueName);
|
||||
if ($null -ne $WAUURI) {
|
||||
$resp = Invoke-WebRequest -Uri $WAUURI -UseDefaultCredentials;
|
||||
if ($resp.BaseResponse.StatusCode -eq [System.Net.HttpStatusCode]::OK) {
|
||||
$resp.Content.Split([System.Environment]::NewLine, [System.StringSplitOptions]::RemoveEmptyEntries) |
|
||||
ForEach-Object {
|
||||
$AppIds += $_
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
#endregion blacklist pulled from URI
|
||||
elseif (Test-Path "$WorkingDir\excluded_apps.txt") {
|
||||
|
||||
return (Get-Content -Path "$WorkingDir\excluded_apps.txt").Trim() | Where-Object { $_.length -gt 0 }
|
||||
|
||||
}
|
||||
|
||||
return $AppIDs | Where-Object { $_.length -gt 0 }
|
||||
}
|
||||
|
|
|
@ -1,29 +1,50 @@
|
|||
#Function to get the allow List apps
|
||||
|
||||
function Get-IncludedApps {
|
||||
$AppIDs = @()
|
||||
|
||||
#region whitelist in registry
|
||||
if ($GPOList) {
|
||||
|
||||
if (Test-Path "HKLM:\SOFTWARE\Policies\Romanitho\Winget-AutoUpdate\WhiteList") {
|
||||
|
||||
$Key = 'HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Romanitho\Winget-AutoUpdate\WhiteList\'
|
||||
|
||||
$ValueNames = (Get-Item -Path "HKLM:\SOFTWARE\Policies\Romanitho\Winget-AutoUpdate\WhiteList").Property
|
||||
|
||||
$AppIDs = @()
|
||||
|
||||
foreach ($ValueName in $ValueNames) {
|
||||
$AppIDs += (Get-ItemPropertyValue -Path "HKLM:\SOFTWARE\Policies\Romanitho\Winget-AutoUpdate\WhiteList" -Name $ValueName).Trim()
|
||||
}
|
||||
|
||||
}
|
||||
return $AppIDs
|
||||
|
||||
}
|
||||
#endregion whitelist in registry
|
||||
#region whitelist pulled from URI
|
||||
elseif ($URIList) {
|
||||
|
||||
$RegPath = "$WAU_GPORoot";
|
||||
$RegValueName = 'WAU_URIList';
|
||||
|
||||
if (Test-Path -Path $RegPath) {
|
||||
$RegKey = Get-Item -Path $RegPath;
|
||||
$WAUURI = $RegKey.GetValue($RegValueName);
|
||||
if ($null -ne $WAUURI) {
|
||||
$resp = Invoke-WebRequest -Uri $WAUURI -UseDefaultCredentials;
|
||||
if ($resp.BaseResponse.StatusCode -eq [System.Net.HttpStatusCode]::OK) {
|
||||
$resp.Content.Split([System.Environment]::NewLine, [System.StringSplitOptions]::RemoveEmptyEntries) |
|
||||
ForEach-Object {
|
||||
$AppIds += $_
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
#endregion whitelist pulled from URI
|
||||
elseif (Test-Path "$WorkingDir\included_apps.txt") {
|
||||
|
||||
return (Get-Content -Path "$WorkingDir\included_apps.txt").Trim() | Where-Object { $_.length -gt 0 }
|
||||
|
||||
}
|
||||
|
||||
return $AppIDs | Where-Object { $_.length -gt 0 }
|
||||
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue