Actively Exploited CVEs label enhancement

Nudge/Preferences/DefaultPreferencesNudge.swift

@@ -445,6 +445,18 @@ struct UserInterfaceVariables {
         userInterfaceUpdateElementsJSON?.actionButtonTextUnsupported ??
         "Replace Your Device"
     }
+
+    static var activelyExploitedOutput: String {
+        userInterfaceUpdateElementsProfile?["activelyExploitedOutput"] as? String ??
+        userInterfaceUpdateElementsJSON?.activelyExploitedOutput ??
+        "TorF"
+    }
+
+    static var activelyExploitedText: String {
+        userInterfaceUpdateElementsProfile?["activelyExploitedText"] as? String ??
+        userInterfaceUpdateElementsJSON?.activelyExploitedText ??
+        "Actively Exploited CVEs:"
+    }
 
     static var applicationTerminatedNotificationImagePath: String {
         userInterfaceProfile?["applicationTerminatedNotificationImagePath"] as? String ??

Nudge/Preferences/PreferencesStructure.swift

@@ -523,14 +523,14 @@ extension UserInterface {
 
 // MARK: - UpdateElement
 struct UpdateElement: Codable {
-    var language, actionButtonText, actionButtonTextUnsupported, applicationTerminatedTitleText, applicationTerminatedBodyText, customDeferralButtonText, customDeferralDropdownText: String?
+    var language, actionButtonText, actionButtonTextUnsupported, activelyExploitedOutput, activelyExploitedText, applicationTerminatedTitleText, applicationTerminatedBodyText, customDeferralButtonText, customDeferralDropdownText: String?
     var informationButtonText, mainContentHeader, mainContentHeaderUnsupported, mainContentNote, mainContentNoteUnsupported: String?
     var mainContentSubHeader, mainContentSubHeaderUnsupported, mainContentText, mainContentTextUnsupported, mainHeader, mainHeaderUnsupported: String?
     var oneDayDeferralButtonText, oneHourDeferralButtonText, primaryQuitButtonText, screenShotAltText, secondaryQuitButtonText, subHeader, subHeaderUnsupported: String?
 
     enum CodingKeys: String, CodingKey {
         case language = "_language"
-        case actionButtonText, actionButtonTextUnsupported, applicationTerminatedTitleText, applicationTerminatedBodyText, customDeferralButtonText, customDeferralDropdownText, informationButtonText, mainContentHeader, mainContentHeaderUnsupported, mainContentNote, mainContentNoteUnsupported, mainContentSubHeader, mainContentSubHeaderUnsupported, mainContentText, mainContentTextUnsupported, mainHeader, mainHeaderUnsupported, oneDayDeferralButtonText, oneHourDeferralButtonText, primaryQuitButtonText, screenShotAltText, secondaryQuitButtonText, subHeader, subHeaderUnsupported
+        case actionButtonText, actionButtonTextUnsupported, activelyExploitedText, applicationTerminatedTitleText, applicationTerminatedBodyText, customDeferralButtonText, customDeferralDropdownText, informationButtonText, mainContentHeader, mainContentHeaderUnsupported, mainContentNote, mainContentNoteUnsupported, mainContentSubHeader, mainContentSubHeaderUnsupported, mainContentText, mainContentTextUnsupported, mainHeader, mainHeaderUnsupported, oneDayDeferralButtonText, oneHourDeferralButtonText, primaryQuitButtonText, screenShotAltText, secondaryQuitButtonText, subHeader, subHeaderUnsupported
     }
 }
 
@@ -556,6 +556,8 @@ extension UpdateElement {
         language: String? = nil,
         actionButtonText: String? = nil,
         actionButtonTextUnsupported: String? = nil,
+        activelyExploitedOutput: String? = nil,
+        activelyExploitedText: String? = nil,
         applicationTerminatedTitleText: String? = nil,
         applicationTerminatedBodyText: String? = nil,
         customDeferralButtonText: String? = nil,
@@ -583,6 +585,8 @@ extension UpdateElement {
             language: language ?? self.language,
             actionButtonText: actionButtonText ?? self.actionButtonText,
             actionButtonTextUnsupported: actionButtonTextUnsupported ?? self.actionButtonTextUnsupported,
+            activelyExploitedOutput: activelyExploitedOutput ?? self.activelyExploitedOutput,
+            activelyExploitedText: activelyExploitedText ?? self.activelyExploitedText,
             applicationTerminatedTitleText: applicationTerminatedTitleText ?? self.applicationTerminatedTitleText,
             applicationTerminatedBodyText: applicationTerminatedBodyText ?? self.applicationTerminatedBodyText,
             customDeferralButtonText: customDeferralButtonText ?? self.customDeferralButtonText,

Nudge/UI/Defaults.swift

@@ -66,6 +66,7 @@ struct UIConstants {
 
 class AppState: ObservableObject {
     @Published var activelyExploitedCVEs = false
+    @Published var activelyExploitedCVEsCount = 0
     @Published var afterFirstStateChange = false
     @Published var allowButtons = true
     @Published var daysRemaining = DateManager().getNumberOfDaysBetween()

Nudge/UI/Main.swift

@@ -261,6 +261,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
                     nudgePrimaryState.requiredMinimumOSVersion = selectedOS!.productVersion
                     nudgePrimaryState.sofaAboutUpdateURL = selectedOS!.securityInfo
                     nudgePrimaryState.activelyExploitedCVEs = activelyExploitedCVEs
+                    nudgePrimaryState.activelyExploitedCVEsCount = selectedOS!.activelyExploitedCVEs.count
                     switch (activelyExploitedCVEs, presentCVEs, AppStateManager().requireMajorUpgrade()) {
                     case (false, true, true):
                         LogManager.notice("Non Actively Exploited Major Upgrade detected. Using nonActivelyExploitedCVEsMajorUpgradeSLA value: \(OSVersionRequirementVariables.nonActivelyExploitedCVEsMajorUpgradeSLA)", logger: sofaLog)

Nudge/UI/StandardMode/LeftSide.swift

@@ -41,7 +41,15 @@ struct StandardModeLeftSide: View {
                 InfoRow(label: "Required Date:", value: DateManager().coerceDateToString(date: requiredInstallationDate, formatterString: UserInterfaceVariables.requiredInstallationDisplayFormat))
             }
             if OptionalFeatureVariables.utilizeSOFAFeed && UserInterfaceVariables.showActivelyExploitedCVEs {
-                InfoRow(label: "Actively Exploited CVEs:", value: String(appState.activelyExploitedCVEs).capitalized, isHighlighted: appState.activelyExploitedCVEs ? true : false, boldText: appState.activelyExploitedCVEs)
+                switch UserInterfaceVariables.activelyExploitedOutput {
+                case "YorN", "yorn":
+                    let resultTempText = String(appState.activelyExploitedCVEs ? "Yes" : "No").localized(desiredLanguage: getDesiredLanguage(locale: appState.locale))
+                    InfoRow(label: UserInterfaceVariables.activelyExploitedText.localized(desiredLanguage: getDesiredLanguage(locale: appState.locale)), value: resultTempText.capitalized, isHighlighted: appState.activelyExploitedCVEs ? true : false, boldText: appState.activelyExploitedCVEs)
+                case "Count", "count":
+                    InfoRow(label: UserInterfaceVariables.activelyExploitedText.localized(desiredLanguage: getDesiredLanguage(locale: appState.locale)), value: String(appState.activelyExploitedCVEsCount), isHighlighted: appState.activelyExploitedCVEs ? true : false, boldText: appState.activelyExploitedCVEs)
+                default:
+                    InfoRow(label: UserInterfaceVariables.activelyExploitedText.localized(desiredLanguage: getDesiredLanguage(locale: appState.locale)), value: String(appState.activelyExploitedCVEs).capitalized, isHighlighted: appState.activelyExploitedCVEs ? true : false, boldText: appState.activelyExploitedCVEs)
+                }
             }
             InfoRow(label: "Current OS Version:", value: GlobalVariables.currentOSVersion)
             if UserInterfaceVariables.showDaysRemainingToUpdate {

Schema/jamf/com.github.macadmins.Nudge.json

@@ -1534,6 +1534,43 @@
                                                     }
                                                 ]
                                             },
+                                            "activelyExploitedOutput": {
+                                                "description": "Modifies the output format of the Actively Exploited CVEs field. Use TorF for True/False, YorN for Yes/No, use Count for actual count of CVEs. Lowercase is accepted, any other values will result in default of True/False (Note: This key is only used with Nudge v2.2 and higher)",
+                                                "anyOf": [
+                                                    {
+                                                        "type": "null",
+                                                        "title": "Not Configured"
+                                                    },
+                                                    {
+                                                        "title": "Configured",
+                                                        "type": "string",
+                                                        "enum": [
+                                                            "TorF",
+                                                            "YorN",
+                                                            "Count"
+                                                          ],
+                                                          "default": "TorF"
+                                                    }
+                                                ]
+                                            },
+                                            "activelyExploitedText": {
+                                                "description": "Modifies the label for Actively Exploited CVEs (if enabled). Length of text may cause label to span more than one line. (Note: This key is only used with Nudge v2.2 and higher)",
+                                                "anyOf": [
+                                                    {
+                                                        "type": "null",
+                                                        "title": "Not Configured"
+                                                    },
+                                                    {
+                                                        "title": "Configured",
+                                                        "type": "string",
+                                                        "options": {
+                                                            "inputAttributes": {
+                                                                "placeholder": "Actively Exploited CVEs:"
+                                                            }
+                                                        }
+                                                    }
+                                                ]
+                                            },
                                             "applicationTerminatedTitleText": {
                                                 "description": "Modifies the terminated application notification title. (Note: This key is only used with Nudge v2.0 and higher)",
                                                 "anyOf": [