Merge pull request #2233 from microsoft/NovSUv2

Nov 24 SUv2
microsoft · Nov 27, 2024 · bc65bb6 · bc65bb6
2 parents 5e4e758 + 90bd90c
commit bc65bb6
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 15 deletions.
diff --git a/Diagnostics/HealthChecker/Analyzer/Invoke-AnalyzerKnownBuildIssues.ps1 b/Diagnostics/HealthChecker/Analyzer/Invoke-AnalyzerKnownBuildIssues.ps1
@@ -254,9 +254,9 @@ function Invoke-AnalyzerKnownBuildIssues {
         }
         $params = @{
             CurrentVersion          = $currentVersion
-            KnownBuildIssuesToFixes = @((GetKnownIssueBuildInformation "15.2.1544.13" $null),
-                (GetKnownIssueBuildInformation "15.2.1258.38" $null),
-                (GetKnownIssueBuildInformation "15.1.2507.43" $null))
+            KnownBuildIssuesToFixes = @((GetKnownIssueBuildInformation "15.2.1544.13" "15.2.1544.14"),
+                (GetKnownIssueBuildInformation "15.2.1258.38" "15.2.1258.39"),
+                (GetKnownIssueBuildInformation "15.1.2507.43" "15.1.2507.44"))
             InformationUrl          = (GetKnownIssueInformation @infoParams)
         }
         TestForKnownBuildIssues @params

diff --git a/Diagnostics/HealthChecker/Analyzer/Security/Invoke-AnalyzerSecurityCve-2024-49040.ps1 b/Diagnostics/HealthChecker/Analyzer/Security/Invoke-AnalyzerSecurityCve-2024-49040.ps1
@@ -21,7 +21,7 @@ function Invoke-AnalyzerSecurityCve-2024-49040 {
         $exchangeBuild = $exchangeInformation.BuildInformation.VersionInformation.BuildVersion
         # cSpell:disable
         # Need to disable cSpell because this is the name of the override
-        $filterParameterName = "AddDisclaimerforRegexMatch"
+        $filterParameterName = @("AddDisclaimerforRegexMatch", "AddP2FromRegexMatchHeader")
         # cSpell:enable
     }
     process {
@@ -37,8 +37,8 @@ function Invoke-AnalyzerSecurityCve-2024-49040 {
         [array]$nonCompliantSenderSettings = Get-FilteredSettingOverrideInformation @params
 
         $overrideDisabled = $nonCompliantSenderSettings.Count -gt 0 -and
-            ($null -ne ($nonCompliantSenderSettings | Where-Object { $_.ParameterValue -eq "false" }))
-        $isSuApplied = (Test-ExchangeBuildGreaterOrEqualThanSecurityPatch -CurrentExchangeBuild $SecurityObject.BuildInformation -SUName "Nov24SU")
+            (($nonCompliantSenderSettings | Where-Object { $_.ParameterValue -eq "false" }).Count -eq 2)
+        $isSuApplied = (Test-ExchangeBuildGreaterOrEqualThanSecurityPatch -CurrentExchangeBuild $SecurityObject.BuildInformation -SUName "Nov24SUv2")
 
         if (-not $isSuApplied -or $overrideDisabled) {
             $params = @{

diff --git a/Shared/Get-ExchangeBuildVersionInformation.ps1 b/Shared/Get-ExchangeBuildVersionInformation.ps1
@@ -127,14 +127,14 @@ function Get-ExchangeBuildVersionInformation {
                     $cuReleaseDate = "02/13/2024"
                     $supportedBuildNumber = $true
                 }
-                (GetBuildVersion $ex19 "CU14" -SU "Nov24SU") { $latestSUBuild = $true }
+                (GetBuildVersion $ex19 "CU14" -SU "Nov24SUv2") { $latestSUBuild = $true }
                 { $_ -lt (GetBuildVersion $ex19 "CU14") } {
                     $cuLevel = "CU13"
                     $cuReleaseDate = "05/03/2023"
                     $supportedBuildNumber = $true
                     $orgValue = 16761
                 }
-                (GetBuildVersion $ex19 "CU13" -SU "Nov24SU") { $latestSUBuild = $true }
+                (GetBuildVersion $ex19 "CU13" -SU "Nov24SUv2") { $latestSUBuild = $true }
                 { $_ -lt (GetBuildVersion $ex19 "CU13") } {
                     $cuLevel = "CU12"
                     $cuReleaseDate = "04/20/2022"
@@ -226,7 +226,7 @@ function Get-ExchangeBuildVersionInformation {
                     $cuReleaseDate = "04/20/2022"
                     $supportedBuildNumber = $true
                 }
-                (GetBuildVersion $ex16 "CU23" -SU "Nov24SU") { $latestSUBuild = $true }
+                (GetBuildVersion $ex16 "CU23" -SU "Nov24SUv2") { $latestSUBuild = $true }
                 { $_ -lt (GetBuildVersion $ex16 "CU23") } {
                     $cuLevel = "CU22"
                     $cuReleaseDate = "09/28/2021"
@@ -713,6 +713,7 @@ function GetExchangeBuildDictionary {
                     "Mar24SU"   = "15.1.2507.37"
                     "Apr24HU"   = "15.1.2507.39"
                     "Nov24SU"   = "15.1.2507.43"
+                    "Nov24SUv2" = "15.1.2507.44"
                 })
         }
         "Exchange2019" = @{
@@ -813,11 +814,13 @@ function GetExchangeBuildDictionary {
                     "Mar24SU"   = "15.2.1258.32"
                     "Apr24HU"   = "15.2.1258.34"
                     "Nov24SU"   = "15.2.1258.38"
+                    "Nov24SUv2" = "15.2.1258.39"
                 })
             "CU14" = (NewCUAndSUObject "15.2.1544.4" @{
-                    "Mar24SU" = "15.2.1544.9"
-                    "Apr24HU" = "15.2.1544.11"
-                    "Nov24SU" = "15.2.1544.13"
+                    "Mar24SU"   = "15.2.1544.9"
+                    "Apr24HU"   = "15.2.1544.11"
+                    "Nov24SU"   = "15.2.1544.13"
+                    "Nov24SUv2" = "15.2.1544.14"
                 })
         }
     }

diff --git a/Shared/Tests/Get-ExchangeBuildVersionInformation.Tests.ps1 b/Shared/Tests/Get-ExchangeBuildVersionInformation.Tests.ps1
@@ -194,7 +194,7 @@ Describe "Testing Get-ExchangeBuildVersionInformation.ps1" {
                         $latestSU.FriendlyName.Substring(0, $latestSU.FriendlyName.Length - 2) | Should -Be $secondSU.FriendlyName
                     }
                     # This test could change depending on the reason for the v2 release.
-                    $secondSU.LatestSU | Should -Be $true
+                    $secondSU.LatestSU | Should -Be $false #This would need to be true on the next SU release.
                 }
             }
         }
@@ -231,7 +231,7 @@ Describe "Testing Get-ExchangeBuildVersionInformation.ps1" {
                     $latestSupportedSU.FriendlyName.Substring(0, $latestSupportedSU.FriendlyName.Length - 2) | Should -Be $secondSU.FriendlyName
                 }
                 # This test could change depending on the reason for the v2 release.
-                $secondSU.LatestSU | Should -Be $true
+                $secondSU.LatestSU | Should -Be $false #This would need to be true on the next SU release.
             }
 
             $latestUnsupportedSUs = (GetExchangeBuildDictionary)["Exchange2019"][$unSupportedCU.CU].SU.Values |
@@ -281,7 +281,7 @@ Describe "Testing Get-ExchangeBuildVersionInformation.ps1" {
                     $latestSU.FriendlyName.Substring(0, $latestSU.FriendlyName.Length - 2) | Should -Be $previousSU.FriendlyName
                 }
                 # This test could change depending on the reason for the v2 release.
-                $previousSU.LatestSU | Should -Be $true
+                $previousSU.LatestSU | Should -Be $false #This would need to be true on the next SU release.
             }
 
             (Get-ExchangeBuildVersionInformation -FileVersion $latest2CUs[1]).Supported | Should -Be $false