added support for running any powershell command encoded as base64
through new protocol ToastRunPSBase64
This commit is contained in:
parent
3e2dece5d8
commit
22b11e23fa
1 changed files with 87 additions and 30 deletions
|
|
@ -82,18 +82,18 @@
|
||||||
** As well as added support for dynamic deadline retrieval for software updates **
|
** As well as added support for dynamic deadline retrieval for software updates **
|
||||||
** Stuff has been rewritten to suit my understanding and thoughts of the script **
|
** Stuff has been rewritten to suit my understanding and thoughts of the script **
|
||||||
|
|
||||||
2.0.0 - Huge changes to how this script handles custom protocols
|
2.0.0 - Huge changes to how this script handles custom protocols
|
||||||
Added Support for Custom Actions/Protocols within the script under user context removing the need for that to be run under SYSTEM/ADMIN
|
Added Support for Custom Actions/Protocols within the script under user context removing the need for that to be run under SYSTEM/ADMIN
|
||||||
- <Option Name="Action" Value="ToastRunUpdateID:" />
|
- <Option Name="Action" Value="ToastRunUpdateID:" />
|
||||||
- <Option Name="Action" Value="ToastRunPackageID:" />
|
- <Option Name="Action" Value="ToastRunPackageID:" />
|
||||||
- <Option Name="Action" Value="ToastRunApplicationID:" />
|
- <Option Name="Action" Value="ToastRunApplicationID:" />
|
||||||
- <Option Name="Action" Value="ToastReboot:" />
|
- <Option Name="Action" Value="ToastReboot:" />
|
||||||
Added Support to dynamically create Custom Action Scripts to support Custom Protocols
|
Added Support to dynamically create Custom Action Scripts to support Custom Protocols
|
||||||
Added Support for Software (Feature) Updates : Searches for an update and will store in variable
|
Added Support for Software (Feature) Updates : Searches for an update and will store in variable
|
||||||
Added new XML Types for Software Updates:
|
Added new XML Types for Software Updates:
|
||||||
- <Option Name="RunUpdateID" Enabled="True" Value="3012973" />
|
- <Option Name="RunUpdateID" Enabled="True" Value="3012973" />
|
||||||
- <Option Name="RunUpdateTitle" Enabled="True" Value="Version 1909" />
|
- <Option Name="RunUpdateTitle" Enabled="True" Value="Version 1909" />
|
||||||
Added support for getting deadline date/time dynamically for software updates
|
Added support for getting deadline date/time dynamically for software updates
|
||||||
- Configure DynamicDeadline with the UpdateID
|
- Configure DynamicDeadline with the UpdateID
|
||||||
|
|
||||||
2.0.1 - Updated custom action scripts!
|
2.0.1 - Updated custom action scripts!
|
||||||
|
|
@ -106,7 +106,7 @@
|
||||||
- If newer version is available from the script, new custom action scripts will be created
|
- If newer version is available from the script, new custom action scripts will be created
|
||||||
- This allows me to make sure the relevant scripts are in place in case I change something along the way
|
- This allows me to make sure the relevant scripts are in place in case I change something along the way
|
||||||
- Modified script output of custom script for RunPackageID to pick up Program ID dynamically
|
- Modified script output of custom script for RunPackageID to pick up Program ID dynamically
|
||||||
Added support for getting deadline date/time dynamically for applications
|
Added support for getting deadline date/time dynamically for applications
|
||||||
- Configure DynamicDeadline with the Application ID
|
- Configure DynamicDeadline with the Application ID
|
||||||
|
|
||||||
2.0.2 - Fixed an error in the custom protocols
|
2.0.2 - Fixed an error in the custom protocols
|
||||||
|
|
@ -267,21 +267,21 @@ function Get-GivenName() {
|
||||||
if (Get-Service -Name ccmexec -ErrorAction SilentlyContinue) {
|
if (Get-Service -Name ccmexec -ErrorAction SilentlyContinue) {
|
||||||
Write-Log -Message "Looking for logged on user's SID in WMI with CCM client"
|
Write-Log -Message "Looking for logged on user's SID in WMI with CCM client"
|
||||||
$LoggedOnSID = Get-CimInstance -Namespace ROOT\CCM -Class CCM_UserLogonEvents -Filter "LogoffTime=null" | Select -ExpandProperty UserSID
|
$LoggedOnSID = Get-CimInstance -Namespace ROOT\CCM -Class CCM_UserLogonEvents -Filter "LogoffTime=null" | Select -ExpandProperty UserSID
|
||||||
if ($LoggedOnSID.GetType().IsArray) {
|
if ($LoggedOnSID.GetType().IsArray) {
|
||||||
Write-Log -Message "Multiple SID's found logged on. Skipping"
|
Write-Log -Message "Multiple SID's found logged on. Skipping"
|
||||||
$GivenName = $null
|
$GivenName = $null
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
$RegKey = "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Authentication\LogonUI\SessionData"
|
$RegKey = "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Authentication\LogonUI\SessionData"
|
||||||
$DisplayName = (Get-ChildItem -Path $RegKey | Where-Object {$_.GetValue("LoggedOnUserSID") -eq $LoggedOnSID} | Select-Object -First 1).GetValue("LoggedOnDisplayName")
|
$DisplayName = (Get-ChildItem -Path $RegKey | Where-Object {$_.GetValue("LoggedOnUserSID") -eq $LoggedOnSID} | Select-Object -First 1).GetValue("LoggedOnDisplayName")
|
||||||
if ($DisplayName) {
|
if ($DisplayName) {
|
||||||
$GivenName = $DisplayName.Split()[0].Trim()
|
$GivenName = $DisplayName.Split()[0].Trim()
|
||||||
Write-Log -Message "Given name found matching logged on user SID: $GivenName"
|
Write-Log -Message "Given name found matching logged on user SID: $GivenName"
|
||||||
$GivenName
|
$GivenName
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
$GivenName = $null
|
$GivenName = $null
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -773,7 +773,7 @@ function Write-CustomActionRegistry() {
|
||||||
[CmdletBinding()]
|
[CmdletBinding()]
|
||||||
param (
|
param (
|
||||||
[Parameter(Position="0")]
|
[Parameter(Position="0")]
|
||||||
[ValidateSet("ToastRunApplicationID","ToastRunPackageID","ToastRunUpdateID","ToastReboot")]
|
[ValidateSet("ToastRunApplicationID", "ToastRunPackageID", "ToastRunUpdateID", "ToastReboot", "ToastRunPSBase64")]
|
||||||
[string]
|
[string]
|
||||||
$ActionType,
|
$ActionType,
|
||||||
[Parameter(Position="1")]
|
[Parameter(Position="1")]
|
||||||
|
|
@ -842,6 +842,20 @@ function Write-CustomActionRegistry() {
|
||||||
Write-Log -Level Error -Message "Error message: $ErrorMessage"
|
Write-Log -Level Error -Message "Error message: $ErrorMessage"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
ToastRunPSBase64 {
|
||||||
|
# Build out registry for custom action for running PowerShell command encoded as Base64 via the action button
|
||||||
|
try {
|
||||||
|
New-Item "HKCU:\Software\Classes\$($ActionType)\shell\open\command" -Force -ErrorAction SilentlyContinue | Out-Null
|
||||||
|
New-ItemProperty -LiteralPath "HKCU:\Software\Classes\$($ActionType)" -Name 'URL Protocol' -Value '' -PropertyType String -Force -ErrorAction SilentlyContinue | Out-Null
|
||||||
|
New-ItemProperty -LiteralPath "HKCU:\Software\Classes\$($ActionType)" -Name '(default)' -Value "URL:$($ActionType) Protocol" -PropertyType String -Force -ErrorAction SilentlyContinue | Out-Null
|
||||||
|
$RegCommandValue = $RegCommandPath + '\' + "$($ActionType).cmd `"%1`""
|
||||||
|
New-ItemProperty -LiteralPath "HKCU:\Software\Classes\$($ActionType)\shell\open\command" -Name '(default)' -Value $RegCommandValue -PropertyType String -Force -ErrorAction SilentlyContinue | Out-Null
|
||||||
|
} catch {
|
||||||
|
Write-Log -Level Error "Failed to create the $ActionType custom protocol in HKCU\Software\Classes. Action button might not work"
|
||||||
|
$ErrorMessage = $_.Exception.Message
|
||||||
|
Write-Log -Level Error -Message "Error message: $ErrorMessage"
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -853,7 +867,7 @@ function Write-CustomActionScript() {
|
||||||
[CmdletBinding()]
|
[CmdletBinding()]
|
||||||
param (
|
param (
|
||||||
[Parameter(Position="0")]
|
[Parameter(Position="0")]
|
||||||
[ValidateSet("ToastRunApplicationID","ToastRunPackageID","ToastRunUpdateID","ToastReboot")]
|
[ValidateSet("ToastRunApplicationID", "ToastRunPackageID", "ToastRunUpdateID", "ToastReboot", "ToastRunPSBase64")]
|
||||||
[string] $Type,
|
[string] $Type,
|
||||||
[Parameter(Position="1")]
|
[Parameter(Position="1")]
|
||||||
[String] $Path = $global:CustomScriptsPath
|
[String] $Path = $global:CustomScriptsPath
|
||||||
|
|
@ -1113,13 +1127,48 @@ exit 0
|
||||||
# Do not run another type; break
|
# Do not run another type; break
|
||||||
Break
|
Break
|
||||||
}
|
}
|
||||||
|
# Create custom scripts to run PowerShell command encoded as Base64 directly from the action button
|
||||||
|
ToastRunPSBase64 {
|
||||||
|
try {
|
||||||
|
$CMDFileName = $Type + '.cmd'
|
||||||
|
$CMDFilePath = $Path + '\' + $CMDFileName
|
||||||
|
try {
|
||||||
|
New-Item -Path $Path -Name $CMDFileName -Force -OutVariable PathInfo | Out-Null
|
||||||
|
} catch {
|
||||||
|
$ErrorMessage = $_.Exception.Message
|
||||||
|
Write-Log -Level Error -Message "Error message: $ErrorMessage"
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
$GetCustomScriptPath = $PathInfo.FullName
|
||||||
|
[String]$Script = "
|
||||||
|
set passedArg=%1
|
||||||
|
:: remove part before : from passed string
|
||||||
|
set base64=%passedArg:*:=%
|
||||||
|
powershell.exe -ExecutionPolicy Bypass -NoLogo -NonInteractive -NoProfile -WindowStyle Hidden -EncodedCommand %base64%"
|
||||||
|
if (-NOT[string]::IsNullOrEmpty($Script)) {
|
||||||
|
Out-File -FilePath $GetCustomScriptPath -InputObject $Script -Encoding ASCII -Force
|
||||||
|
}
|
||||||
|
} catch {
|
||||||
|
Write-Log -Level Error "Failed to create the custom .cmd script for $Type. Action button might not work"
|
||||||
|
$ErrorMessage = $_.Exception.Message
|
||||||
|
Write-Log -Level Error -Message "Error message: $ErrorMessage"
|
||||||
|
}
|
||||||
|
|
||||||
|
} catch {
|
||||||
|
Write-Log -Level Error "Failed to create the custom .cmd script for $Type. Action button might not work"
|
||||||
|
$ErrorMessage = $_.Exception.Message
|
||||||
|
Write-Log -Level Error -Message "Error message: $ErrorMessage"
|
||||||
|
}
|
||||||
|
# Do not run another type; break
|
||||||
|
Break
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
######### GENERAL VARIABLES #########
|
######### GENERAL VARIABLES #########
|
||||||
# Global variables
|
# Global variables
|
||||||
# Setting global script version
|
# Setting global script version
|
||||||
$global:ScriptVersion = "2.1.0"
|
$global:ScriptVersion = "2.1.1"
|
||||||
# Setting executing directory
|
# Setting executing directory
|
||||||
$global:ScriptPath = Split-Path -Parent $MyInvocation.MyCommand.Definition
|
$global:ScriptPath = Split-Path -Parent $MyInvocation.MyCommand.Definition
|
||||||
# Setting global custom action script location
|
# Setting global custom action script location
|
||||||
|
|
@ -1359,6 +1408,12 @@ if(-NOT[string]::IsNullOrEmpty($Xml)) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ($ActionButton1Content -match "^ToastRunPSBase64:\s*$") {
|
||||||
|
Write-Log -Level Error -Message "Error. Incomplete Value in the $Config file Action1 tag"
|
||||||
|
Write-Log -Level Error -Message "Error. You have to specify also the base64 encoded PowerShell command: like ToastRunPSBase64:bQBrAGQAaQByACAAQwA6AFwAdABlAG0AcABcAGIAYQBzAGUANgA0AA=="
|
||||||
|
Exit 1
|
||||||
|
}
|
||||||
|
|
||||||
# Check if toast is enabled in config.xml
|
# Check if toast is enabled in config.xml
|
||||||
if ($ToastEnabled -ne "True") {
|
if ($ToastEnabled -ne "True") {
|
||||||
Write-Log -Message "Toast notification is not enabled. Please check $Config file"
|
Write-Log -Message "Toast notification is not enabled. Please check $Config file"
|
||||||
|
|
@ -1625,10 +1680,12 @@ if ($CreateScriptsProtocolsEnabled -eq "True") {
|
||||||
Write-CustomActionRegistry -ActionType ToastRunApplicationID
|
Write-CustomActionRegistry -ActionType ToastRunApplicationID
|
||||||
Write-CustomActionRegistry -ActionType ToastRunPackageID
|
Write-CustomActionRegistry -ActionType ToastRunPackageID
|
||||||
Write-CustomActionRegistry -ActionType ToastRunUpdateID
|
Write-CustomActionRegistry -ActionType ToastRunUpdateID
|
||||||
|
Write-CustomActionRegistry -ActionType ToastRunPSBase64
|
||||||
Write-CustomActionScript -Type ToastReboot
|
Write-CustomActionScript -Type ToastReboot
|
||||||
Write-CustomActionScript -Type ToastRunApplicationID
|
Write-CustomActionScript -Type ToastRunApplicationID
|
||||||
Write-CustomActionScript -Type ToastRunPackageID
|
Write-CustomActionScript -Type ToastRunPackageID
|
||||||
Write-CustomActionScript -Type ToastRunUpdateID
|
Write-CustomActionScript -Type ToastRunUpdateID
|
||||||
|
Write-CustomActionScript -Type ToastRunPSBase64
|
||||||
New-ItemProperty -Path $global:RegistryPath -Name $RegistryName -Value $global:ScriptVersion -PropertyType "String" -Force | Out-Null
|
New-ItemProperty -Path $global:RegistryPath -Name $RegistryName -Value $global:ScriptVersion -PropertyType "String" -Force | Out-Null
|
||||||
}
|
}
|
||||||
catch {
|
catch {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue