Skip to content

Updated to reduce errors #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AdamGrossTX wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Updated to reduce errors #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
43fe96e
Updated to Reduce Errors
AdamGrossTX Feb 1, 2022
4b48f43
Updated to reduce Errors
AdamGrossTX Feb 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 20 additions & 12 deletions WHFBCHECKS/private/Get-WHFBCA.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,23 +11,31 @@ function get-WHFBCA {
if ($ca.Children.cn.count -gt 1) {
$res = [System.Collections.ArrayList]::new()
foreach ($c in $ca) {
$CASvr = get-adcomputer $c.cn.ToString() -properties *
$caa = [PSCustomObject]@{
Name = $c.cn
CAName = $c.children.cn[0]
OSVer = [decimal]$CASvr.OperatingSystemVersion.split(' ')[0]
try {
$CASvr = get-adcomputer $c.cn.ToString() -properties *
$caa = [PSCustomObject]@{
Name = $c.cn
CAName = $c.children.cn[0]
OSVer = [decimal]$CASvr.OperatingSystemVersion.split(' ')[0]
}
$res.Add($caa) | out-null
}
catch {
}
$res.Add($caa) | out-null
}
}
elseif ($ca.Children.cn.count -eq 1) {
$CASvr = get-adcomputer $ca.cn -properties *
$caa = [PSCustomObject]@{
Name = $ca.cn
CAName = $ca.children.cn[0]
OSVer = [decimal]$CASvr.OperatingSystemVersion.split(' ')[0]
try {
$CASvr = get-adcomputer $ca.cn -properties *
$caa = [PSCustomObject]@{
Name = $ca.cn
CAName = $ca.children.cn[0]
OSVer = [decimal]$CASvr.OperatingSystemVersion.split(' ')[0]
}
$res = $caa
}
catch {
}
$res = $caa
}
return $res
}
16 changes: 8 additions & 8 deletions WHFBCHECKS/public/test-WHFB.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@ function Test-WHFB {
add-type -path "$($module.ModuleBase)\Microsoft.IdentityModel.Clients.ActiveDirectory.dll"
$AuthSessions = [Microsoft.IdentityModel.Clients.ActiveDirectory.TokenCache]::DefaultShared.ReadItems()
$authed = $false
foreach ($AuthSession in $AuthSessions) {
if ($AuthSession.clientid -eq "1b730954-1685-4b74-9bfd-dac224a7b894") {
if ($AuthSession.expireson -gt (Get-Date)) {
$authed = $true
}
}
}
#foreach ($AuthSession in $AuthSessions) {
# if ($AuthSession.clientid -eq "1b730954-1685-4b74-9bfd-dac224a7b894") {
# if ($AuthSession.expireson -gt (Get-Date)) {
# $authed = $true
# }
# }
#}
if (!$authed) {
Connect-MsolService
}
Expand Down Expand Up @@ -252,7 +252,7 @@ function Test-WHFB {
else {
foreach ($CertCRLDP in $CertCRLDPs) {
if ( ($CertCRLDP.Contains("(")) -and ($CertCRLDP.Contains(")")) ) {
$CertCRLDP = ($CertCRLDP.Substring(($CertCRLDP.IndexOf("(") + 1))).TrimEnd(")")
$CertCRLDP = ($CertCRLDP.Substring(0,($CertCRLDP.IndexOf("(")))).TrimEnd(")") + ".crl"
}
Write-FormattedHost -Message "CA KDC cert on Domain Controller $($DCC.PSComputerName) HTTP CRL is:" -ResultState Pass -ResultMessage $CertCRLDP
$CACRLValid = Get-WHFBCACRLValid -crl (Invoke-WebRequest -Uri $CertCRLDP -UseBasicParsing).content
Expand Down