From 9a1e4450837f2c4a7c18a7d6a016d55d11241950 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Przemys=C5=82aw=20K=C5=82ys?= Date: Thu, 9 Apr 2020 11:05:16 +0200 Subject: [PATCH] Update --- Examples/Test.ps1 | 5 --- Public/Get-GPOZaurrWmi.ps1 | 82 ++++++++++++++++++++++---------------- 2 files changed, 47 insertions(+), 40 deletions(-) delete mode 100644 Examples/Test.ps1 diff --git a/Examples/Test.ps1 b/Examples/Test.ps1 deleted file mode 100644 index 468e3c4..0000000 --- a/Examples/Test.ps1 +++ /dev/null @@ -1,5 +0,0 @@ -Import-Module "$PSScriptRoot\..\GPoZaurr.psd1" -Force - -Get-GPOZaurr | ForEach { - Write-Warning "Write-Warning " -} \ No newline at end of file diff --git a/Public/Get-GPOZaurrWmi.ps1 b/Public/Get-GPOZaurrWmi.ps1 index 2720b6c..fb9d8f8 100644 --- a/Public/Get-GPOZaurrWmi.ps1 +++ b/Public/Get-GPOZaurrWmi.ps1 @@ -15,27 +15,56 @@ $QueryServer = $ForestInformation['QueryServers'][$Domain]['HostName'][0] if ($Guid -or $Name) { foreach ($N in $Name) { - $ldapFilter = "(&(objectClass=msWMI-Som)(msWMI-Name=$N))" - Get-ADObject -LDAPFilter $ldapFilter -Properties $wmiFilterAttr -Server $QueryServer | ForEach-Object -Process { - $WMI = $_.'msWMI-Parm2' -split ';' - [PSCustomObject] @{ - Name = $_.'msWMI-Name' - Description = $_.'msWMI-Parm1' - Domain = $Domain - NameSpace = $WMI[5] - Query = $WMI[6] - Author = $_.'msWMI-Author' - ID = $_.'msWMI-ID' - Created = $_.Created - Modified = $_.Modified - ObjectGUID = $_.'ObjectGUID' - CanonicalName = $_.CanonicalName - DistinguishedName = $_.'DistinguishedName' + try { + $ldapFilter = "(&(objectClass=msWMI-Som)(msWMI-Name=$N))" + Get-ADObject -LDAPFilter $ldapFilter -Properties $wmiFilterAttr -Server $QueryServer | ForEach-Object -Process { + $WMI = $_.'msWMI-Parm2' -split ';' + [PSCustomObject] @{ + Name = $_.'msWMI-Name' + Description = $_.'msWMI-Parm1' + Domain = $Domain + NameSpace = $WMI[5] + Query = $WMI[6] + Author = $_.'msWMI-Author' + ID = $_.'msWMI-ID' + Created = $_.Created + Modified = $_.Modified + ObjectGUID = $_.'ObjectGUID' + CanonicalName = $_.CanonicalName + DistinguishedName = $_.'DistinguishedName' + } } + } catch { + Write-Warning "Get-GPOZaurrWMI - Error processing WMI for $Domain`: $($_.Error.Exception)" } } foreach ($G in $GUID) { $ldapFilter = "(&(objectClass=msWMI-Som)(Name={$G}))" + try { + Get-ADObject -LDAPFilter $ldapFilter -Properties $wmiFilterAttr -Server $QueryServer | ForEach-Object -Process { + $WMI = $_.'msWMI-Parm2' -split ';' + [PSCustomObject] @{ + Name = $_.'msWMI-Name' + Description = $_.'msWMI-Parm1' + Domain = $Domain + NameSpace = $WMI[5] + Query = $WMI[6] + Author = $_.'msWMI-Author' + ID = $_.'msWMI-ID' + Created = $_.Created + Modified = $_.Modified + ObjectGUID = $_.'ObjectGUID' + CanonicalName = $_.CanonicalName + DistinguishedName = $_.'DistinguishedName' + } + } + } catch { + Write-Warning "Get-GPOZaurrWMI - Error processing WMI for $Domain`: $($_.Error.Exception)" + } + } + } else { + $ldapFilter = "(objectClass=msWMI-Som)" + try { Get-ADObject -LDAPFilter $ldapFilter -Properties $wmiFilterAttr -Server $QueryServer | ForEach-Object -Process { $WMI = $_.'msWMI-Parm2' -split ';' [PSCustomObject] @{ @@ -53,25 +82,8 @@ DistinguishedName = $_.'DistinguishedName' } } - } - } else { - $ldapFilter = "(objectClass=msWMI-Som)" - Get-ADObject -LDAPFilter $ldapFilter -Properties $wmiFilterAttr -Server $QueryServer | ForEach-Object -Process { - $WMI = $_.'msWMI-Parm2' -split ';' - [PSCustomObject] @{ - Name = $_.'msWMI-Name' - Description = $_.'msWMI-Parm1' - Domain = $Domain - NameSpace = $WMI[5] - Query = $WMI[6] - Author = $_.'msWMI-Author' - ID = $_.'msWMI-ID' - Created = $_.Created - Modified = $_.Modified - ObjectGUID = $_.'ObjectGUID' - CanonicalName = $_.CanonicalName - DistinguishedName = $_.'DistinguishedName' - } + } catch { + Write-Warning "Get-GPOZaurrWMI - Error processing WMI for $Domain`: $($_.Error.Exception)" } } }