diff --git a/Config/standards.json b/Config/standards.json index dcc0335ddb71..a9a336b70b3a 100644 --- a/Config/standards.json +++ b/Config/standards.json @@ -5,6 +5,7 @@ "tag": [], "helpText": "Defines the email address to receive general updates and information related to M365 subscriptions. Leave a contact field blank if you do not want to update the contact information.", "docsDescription": "", + "executiveText": "Establishes designated contact email addresses for receiving important Microsoft 365 subscription updates and notifications. This ensures proper communication channels are maintained for general, security, marketing, and technical matters, improving organizational responsiveness to critical system updates.", "addedComponent": [ { "type": "textField", @@ -38,11 +39,86 @@ "powershellEquivalent": "Set-MsolCompanyContactInformation", "recommendedBy": [] }, + { + "name": "standards.DeployMailContact", + "cat": "Exchange Standards", + "tag": [], + "helpText": "Creates a new mail contact in Exchange Online across all selected tenants. The contact will be visible in the Global Address List.", + "docsDescription": "This standard creates a new mail contact in Exchange Online. Mail contacts are useful for adding external email addresses to your organization's address book. They can be used for distribution lists, shared mailboxes, and other collaboration scenarios.", + "executiveText": "Automatically creates external email contacts in the organization's address book, enabling seamless communication with external partners and vendors. This standardizes contact management across all company locations and improves collaboration efficiency.", + "addedComponent": [ + { + "type": "textField", + "name": "standards.DeployMailContact.ExternalEmailAddress", + "label": "External Email Address", + "required": true + }, + { + "type": "textField", + "name": "standards.DeployMailContact.DisplayName", + "label": "Display Name", + "required": true + }, + { + "type": "textField", + "name": "standards.DeployMailContact.FirstName", + "label": "First Name", + "required": false + }, + { + "type": "textField", + "name": "standards.DeployMailContact.LastName", + "label": "Last Name", + "required": false + } + ], + "label": "Deploy Mail Contact", + "impact": "Low Impact", + "impactColour": "info", + "addedDate": "2024-03-19", + "powershellEquivalent": "New-MailContact", + "recommendedBy": ["CIPP"] + }, + { + "name": "standards.DeployContactTemplates", + "cat": "Exchange Standards", + "tag": [], + "helpText": "Creates new mail contacts in Exchange Online across all selected tenants based on the selected templates. The contact will be visible in the Global Address List unless hidden.", + "docsDescription": "This standard creates new mail contacts in Exchange Online based on the selected templates. Mail contacts are useful for adding external email addresses to your organization's address book. They can be used for distribution lists, shared mailboxes, and other collaboration scenarios.", + "executiveText": "Deploys standardized external contact templates across all company locations, ensuring consistent communication channels with key external partners, vendors, and stakeholders. This streamlines contact management and maintains uniform business relationships.", + "addedComponent": [ + { + "type": "autoComplete", + "multiple": true, + "creatable": false, + "label": "Select Mail Contact Templates", + "name": "standards.DeployContactTemplates.templateIds", + "api": { + "url": "/api/ListContactTemplates", + "labelField": "name", + "valueField": "GUID", + "queryKey": "Contact Templates" + } + } + ], + "label": "Deploy Mail Contact Template", + "disabledFeatures": { + "report": false, + "warn": false, + "remediate": false + }, + "impact": "Low Impact", + "impactColour": "info", + "addedDate": "2025-05-31", + "powershellEquivalent": "New-MailContact", + "recommendedBy": ["CIPP"] + }, { "name": "standards.AuditLog", "cat": "Global Standards", - "tag": ["CIS", "mip_search_auditlog"], + "tag": ["CIS M365 5.0 (3.1.1)", "mip_search_auditlog", "NIST CSF 2.0 (DE.CM-09)"], "helpText": "Enables the Unified Audit Log for tracking and auditing activities. Also runs Enable-OrganizationCustomization if necessary.", + "executiveText": "Activates comprehensive activity logging across Microsoft 365 services to track user actions, system changes, and security events. This provides essential audit trails for compliance requirements, security investigations, and regulatory reporting.", "addedComponent": [], "label": "Enable the Unified Audit Log", "impact": "Low Impact", @@ -51,12 +127,28 @@ "powershellEquivalent": "Enable-OrganizationCustomization", "recommendedBy": ["CIS", "CIPP"] }, + { + "name": "standards.RestrictThirdPartyStorageServices", + "cat": "Global Standards", + "tag": ["CIS M365 5.0 (1.3.7)"], + "helpText": "Restricts third-party storage services in Microsoft 365 on the web by managing the Microsoft 365 on the web service principal. This disables integrations with services like Dropbox, Google Drive, Box, and other third-party storage providers.", + "docsDescription": "Third-party storage can be enabled for users in Microsoft 365, allowing them to store and share documents using services such as Dropbox, alongside OneDrive and team sites. This standard ensures Microsoft 365 on the web third-party storage services are restricted by creating and disabling the Microsoft 365 on the web service principal (appId: c1f33bc0-bdb4-4248-ba9b-096807ddb43e). By using external storage services an organization may increase the risk of data breaches and unauthorized access to confidential information. Additionally, third-party services may not adhere to the same security standards as the organization, making it difficult to maintain data privacy and security. Impact is highly dependent upon current practices - if users do not use other storage providers, then minimal impact is likely. However, if users regularly utilize providers outside of the tenant this will affect their ability to continue to do so.", + "executiveText": "Prevents employees from using external cloud storage services like Dropbox, Google Drive, and Box within Microsoft 365, reducing data security risks and ensuring all company data remains within controlled corporate systems. This helps maintain data governance and prevents potential data leaks to unauthorized platforms.", + "addedComponent": [], + "label": "Restrict third-party storage services in Microsoft 365 on the web", + "impact": "Medium Impact", + "impactColour": "warning", + "addedDate": "2025-06-06", + "powershellEquivalent": "New-MgServicePrincipal and Update-MgServicePrincipal", + "recommendedBy": ["CIS"] + }, { "name": "standards.ProfilePhotos", "cat": "Global Standards", "tag": [], "helpText": "Controls whether users can set their own profile photos in Microsoft 365.", "docsDescription": "Controls whether users can set their own profile photos in Microsoft 365. When disabled, only User and Global administrators can update profile photos for users.", + "executiveText": "Manages user profile photo permissions within Microsoft 365, allowing organizations to control whether employees can upload their own photos or require administrative approval. This helps maintain professional appearance standards and prevents inappropriate images in corporate directories.", "addedComponent": [ { "type": "autoComplete", @@ -88,6 +180,7 @@ "cat": "Global Standards", "tag": [], "helpText": "Adds branding to the logon page that only appears if the url is not login.microsoftonline.com. This potentially prevents AITM attacks via EvilNginx. This will also automatically generate alerts if a clone of your login page has been found when set to Remediate.", + "executiveText": "Implements advanced phishing protection by adding visual indicators to login pages that help users identify legitimate Microsoft login pages versus fraudulent copies. This security measure protects against sophisticated phishing attacks that attempt to steal employee credentials.", "addedComponent": [], "label": "Enable Phishing Protection system via branding CSS", "impact": "Low Impact", @@ -106,6 +199,7 @@ "cat": "Global Standards", "tag": [], "helpText": "Sets the branding for the tenant. This includes the login page, and the Office 365 portal.", + "executiveText": "Customizes Microsoft 365 login pages and portals with company branding, including logos, colors, and messaging. This creates a consistent corporate identity experience for employees and reinforces brand recognition while maintaining professional appearance across all Microsoft services.", "addedComponent": [ { "type": "textField", @@ -161,9 +255,10 @@ { "name": "standards.EnableCustomerLockbox", "cat": "Global Standards", - "tag": ["CIS", "CustomerLockBoxEnabled"], + "tag": ["CIS M365 5.0 (1.3.6)", "CustomerLockBoxEnabled"], "helpText": "Enables Customer Lockbox that offers an approval process for Microsoft support to access organization data", "docsDescription": "Customer Lockbox ensures that Microsoft can't access your content to do service operations without your explicit approval. Customer Lockbox ensures only authorized requests allow access to your organizations data.", + "executiveText": "Requires explicit organizational approval before Microsoft support staff can access company data for service operations. This provides an additional layer of data protection and ensures the organization maintains control over who can access sensitive business information, even during technical support scenarios.", "addedComponent": [], "label": "Enable Customer Lockbox", "impact": "Low Impact", @@ -177,6 +272,7 @@ "cat": "Global Standards", "tag": [], "helpText": "Enables the Pronouns feature for the tenant. This allows users to set their pronouns in their profile.", + "executiveText": "Allows employees to display their preferred pronouns in their Microsoft 365 profiles, supporting inclusive workplace practices and helping colleagues communicate respectfully. This feature enhances diversity and inclusion initiatives while fostering a more welcoming work environment.", "addedComponent": [], "label": "Enable Pronouns", "impact": "Low Impact", @@ -185,12 +281,27 @@ "powershellEquivalent": "Update-MgBetaAdminPeoplePronoun -IsEnabledInOrganization:$true", "recommendedBy": [] }, + { + "name": "standards.EnableNamePronunciation", + "cat": "Global Standards", + "tag": [], + "helpText": "Enables the Name Pronunciation feature for the tenant. This allows users to set their name pronunciation in their profile.", + "docsDescription": "Enables the Name Pronunciation feature for the tenant. This allows users to set their name pronunciation in their profile.", + "executiveText": "Enables employees to add pronunciation guides for their names in Microsoft 365 profiles, improving communication and respect in diverse workplaces. This feature helps colleagues pronounce names correctly, enhancing professional relationships and inclusive culture.", + "addedComponent": [], + "label": "Enable Name Pronunciation", + "impact": "Low Impact", + "impactColour": "info", + "addedDate": "2025-06-06", + "recommendedBy": ["CIPP"] + }, { "name": "standards.AnonReportDisable", "cat": "Global Standards", "tag": [], "helpText": "Shows usernames instead of pseudo anonymised names in reports. This standard is required for reporting to work correctly.", "docsDescription": "Microsoft announced some APIs and reports no longer return names, to comply with compliance and legal requirements in specific countries. This proves an issue for a lot of MSPs because those reports are often helpful for engineers. This standard applies a setting that shows usernames in those API calls / reports.", + "executiveText": "Configures Microsoft 365 reports to display actual usernames instead of anonymized identifiers, enabling IT administrators to effectively troubleshoot issues and generate meaningful usage reports. This improves operational efficiency and system management capabilities.", "addedComponent": [], "label": "Enable Usernames instead of pseudo anonymised names in reports", "impact": "Low Impact", @@ -202,9 +313,17 @@ { "name": "standards.DisableGuestDirectory", "cat": "Global Standards", - "tag": [], + "tag": [ + "CIS M365 5.0 (5.1.6.2)", + "CISA (MS.AAD.5.1v1)", + "EIDSCA.AP14", + "EIDSCA.ST08", + "EIDSCA.ST09", + "NIST CSF 2.0 (PR.AA-05)" + ], "helpText": "Disables Guest access to enumerate directory objects. This prevents guest users from seeing other users or guests in the directory.", "docsDescription": "Sets it so guests can view only their own user profile. Permission to view other users isn't allowed. Also restricts guest users from seeing the membership of groups they're in. See exactly what get locked down in the [Microsoft documentation.](https://learn.microsoft.com/en-us/entra/fundamentals/users-default-permissions)", + "executiveText": "Restricts external guest users from viewing the company's employee directory and organizational structure, protecting sensitive information about staff and internal groups. This security measure prevents unauthorized access to corporate contact information while still allowing necessary collaboration.", "addedComponent": [], "label": "Restrict guest user access to directory objects", "impact": "Low Impact", @@ -216,9 +335,10 @@ { "name": "standards.DisableBasicAuthSMTP", "cat": "Global Standards", - "tag": [], + "tag": ["CIS M365 5.0 (6.5.4)", "NIST CSF 2.0 (PR.IR-01)"], "helpText": "Disables SMTP AUTH for the organization and all users. This is the default for new tenants.", "docsDescription": "Disables SMTP basic authentication for the tenant and all users with it explicitly enabled.", + "executiveText": "Disables outdated email authentication methods that are vulnerable to security attacks, forcing applications and devices to use modern, more secure authentication protocols. This reduces the risk of email-based security breaches and credential theft.", "addedComponent": [], "label": "Disable SMTP Basic Authentication", "impact": "Medium Impact", @@ -230,8 +350,9 @@ { "name": "standards.ActivityBasedTimeout", "cat": "Global Standards", - "tag": ["CIS", "spo_idle_session_timeout"], + "tag": ["CIS M365 5.0 (1.3.2)", "spo_idle_session_timeout", "NIST CSF 2.0 (PR.AA-03)"], "helpText": "Enables and sets Idle session timeout for Microsoft 365 to 1 hour. This policy affects most M365 web apps", + "executiveText": "Automatically logs out inactive users from Microsoft 365 applications after a specified time period to prevent unauthorized access to company data on unattended devices. This security measure protects against data breaches when employees leave workstations unlocked.", "addedComponent": [ { "type": "autoComplete", @@ -273,9 +394,10 @@ { "name": "standards.AuthMethodsSettings", "cat": "Entra (AAD) Standards", - "tag": [], + "tag": ["EIDSCA.AG01", "EIDSCA.AG02", "EIDSCA.AG03"], "helpText": "Configures the report suspicious activity settings and system credential preferences in the authentication methods policy.", "docsDescription": "Controls the authentication methods policy settings for reporting suspicious activity and system credential preferences. These settings help enhance the security of authentication in your organization.", + "executiveText": "Configures security settings that allow users to report suspicious login attempts and manages how the system handles authentication credentials. This enhances overall security by enabling early detection of potential security threats and optimizing authentication processes.", "addedComponent": [ { "type": "autoComplete", @@ -329,17 +451,76 @@ "powershellEquivalent": "Update-MgBetaPolicyAuthenticationMethodPolicy", "recommendedBy": [] }, + { + "name": "standards.AuthMethodsPolicyMigration", + "cat": "Entra (AAD) Standards", + "tag": [], + "helpText": "Completes the migration of authentication methods policy to the new format", + "docsDescription": "Sets the authentication methods policy migration state to complete. This is required when migrating from legacy authentication policies to the new unified authentication methods policy.", + "executiveText": "Completes the transition from legacy authentication policies to Microsoft's modern unified authentication methods policy, ensuring the organization benefits from the latest security features and management capabilities. This migration enables enhanced security controls and simplified policy management.", + "addedComponent": [], + "label": "Complete Authentication Methods Policy Migration", + "impact": "Medium Impact", + "impactColour": "warning", + "addedDate": "2025-07-07", + "powershellEquivalent": "Update-MgBetaPolicyAuthenticationMethodPolicy", + "recommendedBy": ["CIPP"] + }, { "name": "standards.AppDeploy", "cat": "Entra (AAD) Standards", "tag": [], "helpText": "Deploys selected applications to the tenant. Use a comma separated list of application IDs to deploy multiple applications. Permissions will be copied from the source application.", "docsDescription": "Uses the CIPP functionality that deploys applications across an entire tenant base as a standard.", + "executiveText": "Automatically deploys approved business applications across all company locations and users, ensuring consistent access to essential tools and maintaining standardized software configurations. This streamlines application management and reduces IT deployment overhead.", "addedComponent": [ + { + "type": "select", + "multiple": false, + "creatable": false, + "label": "App Approval Mode", + "name": "standards.AppDeploy.mode", + "options": [ + { + "label": "Template", + "value": "template" + }, + { + "label": "Copy Permissions", + "value": "copy" + } + ] + }, + { + "type": "autoComplete", + "multiple": true, + "creatable": false, + "label": "Select Applications", + "name": "standards.AppDeploy.templateIds", + "api": { + "url": "/api/ListAppApprovalTemplates", + "labelField": "TemplateName", + "valueField": "TemplateId", + "queryKey": "StdAppApprovalTemplateList", + "addedField": { + "AppId": "AppId" + } + }, + "condition": { + "field": "standards.AppDeploy.mode", + "compareType": "is", + "compareValue": "template" + } + }, { "type": "textField", "name": "standards.AppDeploy.appids", - "label": "Application IDs, comma separated" + "label": "Application IDs, comma separated", + "condition": { + "field": "standards.AppDeploy.mode", + "compareType": "isNot", + "compareValue": "template" + } } ], "label": "Deploy Application", @@ -355,6 +536,7 @@ "tag": [], "helpText": "Enables the tenant to use LAPS. You must still create a policy for LAPS to be active on all devices. Use the template standards to deploy this by default.", "docsDescription": "Enables the LAPS functionality on the tenant. Prerequisite for using Windows LAPS via Azure AD.", + "executiveText": "Enables Local Administrator Password Solution (LAPS) capability, which automatically manages and rotates local administrator passwords on company computers. This significantly improves security by preventing the use of shared or static administrator passwords that could be exploited by attackers.", "addedComponent": [], "label": "Enable LAPS on the tenant", "impact": "Low Impact", @@ -366,9 +548,19 @@ { "name": "standards.PWdisplayAppInformationRequiredState", "cat": "Entra (AAD) Standards", - "tag": ["CIS"], + "tag": [ + "CIS M365 5.0 (2.3.1)", + "EIDSCA.AM03", + "EIDSCA.AM04", + "EIDSCA.AM06", + "EIDSCA.AM07", + "EIDSCA.AM09", + "EIDSCA.AM10", + "NIST CSF 2.0 (PR.AA-03)" + ], "helpText": "Enables the MS authenticator app to display information about the app that is requesting authentication. This displays the application name.", "docsDescription": "Allows users to use Passwordless with Number Matching and adds location information from the last request", + "executiveText": "Enhances authentication security by requiring users to match numbers and showing detailed information about login requests, including application names and location data. This helps employees verify legitimate login attempts and prevents unauthorized access through more secure authentication methods.", "addedComponent": [], "label": "Enable Passwordless with Location information and Number Matching", "impact": "Low Impact", @@ -380,9 +572,10 @@ { "name": "standards.allowOTPTokens", "cat": "Entra (AAD) Standards", - "tag": [], + "tag": ["EIDSCA.AM02"], "helpText": "Allows you to use MS authenticator OTP token generator", "docsDescription": "Allows you to use Microsoft Authenticator OTP token generator. Useful for using the NPS extension as MFA on VPN clients.", + "executiveText": "Enables one-time password generation through Microsoft Authenticator app, providing an additional secure authentication method for employees. This is particularly useful for secure VPN access and other systems requiring multi-factor authentication.", "addedComponent": [], "label": "Enable OTP via Authenticator", "impact": "Low Impact", @@ -394,9 +587,10 @@ { "name": "standards.PWcompanionAppAllowedState", "cat": "Entra (AAD) Standards", - "tag": [], + "tag": ["EIDSCA.AM01"], "helpText": "Sets the state of Authenticator Lite, Authenticator lite is a companion app for passwordless authentication.", "docsDescription": "Sets the Authenticator Lite state to enabled. This allows users to use the Authenticator Lite built into the Outlook app instead of the full Authenticator app.", + "executiveText": "Enables a simplified authentication experience by allowing users to authenticate directly through Outlook without requiring a separate authenticator app. This improves user convenience while maintaining security standards for passwordless authentication.", "addedComponent": [ { "type": "autoComplete", @@ -412,6 +606,10 @@ { "label": "Disabled", "value": "disabled" + }, + { + "label": "Microsoft managed", + "value": "default" } ] } @@ -426,9 +624,18 @@ { "name": "standards.EnableFIDO2", "cat": "Entra (AAD) Standards", - "tag": [], + "tag": [ + "EIDSCA.AF01", + "EIDSCA.AF02", + "EIDSCA.AF03", + "EIDSCA.AF04", + "EIDSCA.AF05", + "EIDSCA.AF06", + "NIST CSF 2.0 (PR.AA-03)" + ], "helpText": "Enables the FIDO2 authenticationMethod for the tenant", "docsDescription": "Enables FIDO2 capabilities for the tenant. This allows users to use FIDO2 keys like a Yubikey for authentication.", + "executiveText": "Enables support for hardware security keys (like YubiKey) that provide the highest level of authentication security. These physical devices prevent phishing attacks and credential theft, offering superior protection for high-value accounts and sensitive business operations.", "addedComponent": [], "label": "Enable FIDO2 capabilities", "impact": "Low Impact", @@ -443,6 +650,7 @@ "tag": [], "helpText": "Enables the HardwareOath authenticationMethod for the tenant. This allows you to use hardware tokens for generating 6 digit MFA codes.", "docsDescription": "Enables Hardware OAuth tokens for the tenant. This allows users to use hardware tokens like a Yubikey for authentication.", + "executiveText": "Enables physical hardware tokens that generate secure authentication codes, providing an alternative to smartphone-based authentication. This is particularly valuable for employees who cannot use mobile devices or require the highest security standards for accessing sensitive systems.", "addedComponent": [], "label": "Enable Hardware OAuth tokens", "impact": "Low Impact", @@ -454,9 +662,10 @@ { "name": "standards.allowOAuthTokens", "cat": "Entra (AAD) Standards", - "tag": [], + "tag": ["EIDSCA.AT01", "EIDSCA.AT02"], "helpText": "Allows you to use any software OAuth token generator", "docsDescription": "Enables OTP Software OAuth tokens for the tenant. This allows users to use OTP codes generated via software, like a password manager to be used as an authentication method.", + "executiveText": "Allows employees to use third-party authentication apps and password managers to generate secure login codes, providing flexibility in authentication methods while maintaining security standards. This accommodates diverse user preferences and existing security tools.", "addedComponent": [], "label": "Enable OTP Software OAuth tokens", "impact": "Low Impact", @@ -465,12 +674,28 @@ "powershellEquivalent": "Update-MgBetaPolicyAuthenticationMethodPolicyAuthenticationMethodConfiguration", "recommendedBy": [] }, + { + "name": "standards.FormsPhishingProtection", + "cat": "Global Standards", + "tag": ["CIS M365 5.0 (1.3.5)", "Security", "PhishingProtection"], + "helpText": "Enables internal phishing protection for Microsoft Forms to help prevent malicious forms from being created and shared within the organization. This feature scans forms created by internal users for potential phishing content and suspicious patterns.", + "docsDescription": "Enables internal phishing protection for Microsoft Forms by setting the isInOrgFormsPhishingScanEnabled property to true. This security feature helps protect organizations from internal phishing attacks through Microsoft Forms by automatically scanning forms created by internal users for potential malicious content, suspicious links, and phishing patterns. When enabled, Forms will analyze form content and block or flag potentially dangerous forms before they can be shared within the organization.", + "executiveText": "Automatically scans Microsoft Forms created by employees for malicious content and phishing attempts, preventing the creation and distribution of harmful forms within the organization. This protects against both internal threats and compromised accounts that might be used to distribute malicious content.", + "addedComponent": [], + "label": "Enable internal phishing protection for Forms", + "impact": "Low Impact", + "impactColour": "info", + "addedDate": "2025-06-06", + "powershellEquivalent": "Graph API", + "recommendedBy": ["CIS", "CIPP"] + }, { "name": "standards.TAP", "cat": "Entra (AAD) Standards", "tag": [], "helpText": "Enables TAP and sets the default TAP lifetime to 1 hour. This configuration also allows you to select if a TAP is single use or multi-logon.", "docsDescription": "Enables Temporary Password generation for the tenant.", + "executiveText": "Enables temporary access passwords that IT administrators can generate for employees who are locked out or need emergency access to systems. These time-limited passwords provide a secure way to restore access without compromising long-term security policies.", "addedComponent": [ { "type": "autoComplete", @@ -500,9 +725,10 @@ { "name": "standards.PasswordExpireDisabled", "cat": "Entra (AAD) Standards", - "tag": ["CIS", "PWAgePolicyNew"], + "tag": ["CIS M365 5.0 (1.3.1)", "PWAgePolicyNew"], "helpText": "Disables the expiration of passwords for the tenant by setting the password expiration policy to never expire for any user.", "docsDescription": "Sets passwords to never expire for tenant, recommended to use in conjunction with secure password requirements.", + "executiveText": "Eliminates mandatory password expiration requirements, allowing employees to keep strong passwords indefinitely rather than forcing frequent changes that often lead to weaker passwords. This modern security approach reduces help desk calls and improves overall password security when combined with multi-factor authentication.", "addedComponent": [], "label": "Do not expire passwords", "impact": "Low Impact", @@ -511,11 +737,34 @@ "powershellEquivalent": "Update-MgDomain", "recommendedBy": ["CIS", "CIPP"] }, + { + "name": "standards.CustomBannedPasswordList", + "cat": "Entra (AAD) Standards", + "tag": ["CIS M365 5.0 (5.2.3.2)"], + "helpText": "**Requires Entra ID P1.** Updates and enables the Entra ID custom banned password list with the supplied words. Enter words separated by commas or semicolons. Each word must be 4-16 characters long. Maximum 1,000 words allowed.", + "docsDescription": "Updates and enables the Entra ID custom banned password list with the supplied words. This supplements the global banned password list maintained by Microsoft. The custom list is limited to 1,000 key base terms of 4-16 characters each. Entra ID will [block variations and common substitutions](https://learn.microsoft.com/en-us/entra/identity/authentication/tutorial-configure-custom-password-protection#configure-custom-banned-passwords) of these words in user passwords. [How are passwords evaluated?](https://learn.microsoft.com/en-us/entra/identity/authentication/concept-password-ban-bad#score-calculation)", + "addedComponent": [ + { + "type": "textField", + "name": "standards.CustomBannedPasswordList.BannedWords", + "label": "Banned Words", + "placeholder": "Banned words separated by commas or semicolons", + "required": true + } + ], + "label": "Set Entra ID Custom Banned Password List", + "impact": "Medium Impact", + "impactColour": "warning", + "addedDate": "2025-06-28", + "powershellEquivalent": "Get-MgBetaDirectorySetting, New-MgBetaDirectorySetting, Update-MgBetaDirectorySetting", + "recommendedBy": ["CIS"] + }, { "name": "standards.ExternalMFATrusted", "cat": "Entra (AAD) Standards", "tag": [], "helpText": "Sets the state of the Cross-tenant access setting to trust external MFA. This allows guest users to use their home tenant MFA to access your tenant.", + "executiveText": "Allows external partners and vendors to use their own organization's multi-factor authentication when accessing company resources, streamlining collaboration while maintaining security standards. This reduces friction for external users while ensuring they still meet authentication requirements.", "addedComponent": [ { "type": "autoComplete", @@ -545,9 +794,10 @@ { "name": "standards.DisableTenantCreation", "cat": "Entra (AAD) Standards", - "tag": ["CIS"], + "tag": ["CIS M365 5.0 (1.2.3)", "CISA (MS.AAD.6.1v1)"], "helpText": "Restricts creation of M365 tenants to the Global Administrator or Tenant Creator roles.", "docsDescription": "Users by default are allowed to create M365 tenants. This disables that so only admins can create new M365 tenants.", + "executiveText": "Prevents regular employees from creating new Microsoft 365 organizations, ensuring all new tenants are properly managed and controlled by IT administrators. This prevents unauthorized shadow IT environments and maintains centralized governance over Microsoft 365 resources.", "addedComponent": [], "label": "Disable M365 Tenant creation by users", "impact": "Low Impact", @@ -559,9 +809,20 @@ { "name": "standards.EnableAppConsentRequests", "cat": "Entra (AAD) Standards", - "tag": ["CIS"], + "tag": [ + "CIS M365 5.0 (1.5.2)", + "CISA (MS.AAD.9.1v1)", + "EIDSCA.CP04", + "EIDSCA.CR01", + "EIDSCA.CR02", + "EIDSCA.CR03", + "EIDSCA.CR04", + "Essential 8 (1507)", + "NIST CSF 2.0 (PR.AA-05)" + ], "helpText": "Enables App consent admin requests for the tenant via the GA role. Does not overwrite existing reviewer settings", "docsDescription": "Enables the ability for users to request admin consent for applications. Should be used in conjunction with the \"Require admin consent for applications\" standards", + "executiveText": "Establishes a formal approval process where employees can request access to business applications that require administrative review. This balances security with productivity by allowing controlled access to necessary tools while preventing unauthorized application installations.", "addedComponent": [ { "type": "AdminRolesMultiSelect", @@ -582,6 +843,7 @@ "tag": [], "helpText": "Sets the state of the registration campaign for the tenant", "docsDescription": "Sets the state of the registration campaign for the tenant. If enabled nudges users to set up the Microsoft Authenticator during sign-in.", + "executiveText": "Prompts employees to set up multi-factor authentication during login, gradually improving the organization's security posture by encouraging adoption of stronger authentication methods. This helps achieve better security compliance without forcing immediate mandatory changes.", "addedComponent": [ { "type": "autoComplete", @@ -617,9 +879,10 @@ { "name": "standards.DisableM365GroupUsers", "cat": "Entra (AAD) Standards", - "tag": [], + "tag": ["CISA (MS.AAD.21.1v1)"], "helpText": "Restricts M365 group creation to certain admin roles. This disables the ability to create Teams, SharePoint sites, Planner, etc", "docsDescription": "Users by default are allowed to create M365 groups. This restricts M365 group creation to certain admin roles. This disables the ability to create Teams, SharePoint sites, Planner, etc", + "executiveText": "Restricts the creation of Microsoft 365 groups, Teams, and SharePoint sites to authorized administrators, preventing uncontrolled proliferation of collaboration spaces. This ensures proper governance, naming conventions, and resource management while maintaining oversight of all collaborative environments.", "addedComponent": [], "label": "Disable M365 Group creation by users", "impact": "Low Impact", @@ -631,9 +894,16 @@ { "name": "standards.DisableAppCreation", "cat": "Entra (AAD) Standards", - "tag": ["CIS"], + "tag": [ + "CIS M365 5.0 (1.2.2)", + "CISA (MS.AAD.4.1v1)", + "EIDSCA.AP10", + "Essential 8 (1175)", + "NIST CSF 2.0 (PR.AA-05)" + ], "helpText": "Disables the ability for users to create App registrations in the tenant.", "docsDescription": "Disables the ability for users to create applications in Entra. Done to prevent breached accounts from creating an app to maintain access to the tenant, even after the breached account has been secured.", + "executiveText": "Prevents regular employees from creating application registrations that could be used to maintain unauthorized access to company systems. This security measure ensures that only authorized IT personnel can create applications, reducing the risk of persistent security breaches through malicious applications.", "addedComponent": [], "label": "Disable App creation by users", "impact": "Low Impact", @@ -645,8 +915,9 @@ { "name": "standards.DisableSecurityGroupUsers", "cat": "Entra (AAD) Standards", - "tag": [], + "tag": ["CISA (MS.AAD.20.1v1)", "NIST CSF 2.0 (PR.AA-05)"], "helpText": "Completely disables the creation of security groups by users. This also breaks the ability to manage groups themselves, or create Teams", + "executiveText": "Restricts the creation of security groups to IT administrators only, preventing employees from creating unauthorized access groups that could bypass security controls. This ensures proper governance of access permissions and maintains centralized control over who can access what resources.", "addedComponent": [], "label": "Disable Security Group creation by users", "impact": "Medium Impact", @@ -660,6 +931,7 @@ "cat": "Entra (AAD) Standards", "tag": [], "helpText": "This standard currently does not function and can be safely disabled", + "executiveText": "This standard is currently non-functional and should be disabled. It was previously designed to remove outdated multi-factor authentication configurations in favor of modern security policies.", "addedComponent": [], "label": "Remove Legacy MFA if SD or CA is active", "impact": "Medium Impact", @@ -672,7 +944,8 @@ "name": "standards.DisableSelfServiceLicenses", "cat": "Entra (AAD) Standards", "tag": [], - "helpText": "This standard disables all self service licenses and enables all exclusions", + "helpText": "Note: requires 'Billing Administrator' GDAP role. This standard disables all self service licenses and enables all exclusions", + "executiveText": "Prevents employees from purchasing Microsoft 365 licenses independently, ensuring all software acquisitions go through proper procurement channels. This maintains budget control, prevents unauthorized spending, and ensures compliance with corporate licensing agreements.", "addedComponent": [ { "type": "textField", @@ -693,6 +966,7 @@ "cat": "Entra (AAD) Standards", "tag": [], "helpText": "Blocks login for guest users that have not logged in for 90 days", + "executiveText": "Automatically disables external guest accounts that haven't been used for 90 days, reducing security risks from dormant accounts while maintaining access for active external collaborators. This helps maintain a clean user directory and reduces potential attack vectors.", "addedComponent": [], "label": "Disable Guest accounts that have not logged on for 90 days", "impact": "Medium Impact", @@ -704,9 +978,17 @@ { "name": "standards.OauthConsent", "cat": "Entra (AAD) Standards", - "tag": ["CIS"], + "tag": [ + "CIS M365 5.0 (1.5.1)", + "CISA (MS.AAD.4.2v1)", + "EIDSCA.AP08", + "EIDSCA.AP09", + "Essential 8 (1175)", + "NIST CSF 2.0 (PR.AA-05)" + ], "helpText": "Disables users from being able to consent to applications, except for those specified in the field below", "docsDescription": "Requires users to get administrator consent before sharing data with applications. You can preapprove specific applications.", + "executiveText": "Requires administrative approval before employees can grant applications access to company data, preventing unauthorized data sharing and potential security breaches. This protects against malicious applications while allowing approved business tools to function normally.", "addedComponent": [ { "type": "textField", @@ -728,6 +1010,7 @@ "tag": ["IntegratedApps"], "helpText": "Sets the default oauth consent level so users can consent to applications that have low risks.", "docsDescription": "Allows users to consent to applications with low assigned risk.", + "executiveText": "Allows employees to approve low-risk applications without administrative intervention, balancing security with productivity. This provides a middle ground between complete restriction and open access, enabling business agility while maintaining protection against high-risk applications.", "label": "Allow users to consent to applications with low security risk (Prevent OAuth phishing. Lower impact, less secure)", "impact": "Medium Impact", "impactColour": "warning", @@ -738,8 +1021,9 @@ { "name": "standards.GuestInvite", "cat": "Entra (AAD) Standards", - "tag": [], + "tag": ["CISA (MS.AAD.18.1v1)", "EIDSCA.AP04", "EIDSCA.AP07"], "helpText": "This setting controls who can invite guests to your directory to collaborate on resources secured by your company, such as SharePoint sites or Azure resources.", + "executiveText": "Controls who within the organization can invite external partners and vendors to access company resources, ensuring proper oversight of external access while enabling necessary business collaboration. This helps maintain security while supporting partnership and vendor relationships.", "addedComponent": [ { "type": "autoComplete", @@ -778,9 +1062,10 @@ { "name": "standards.StaleEntraDevices", "cat": "Entra (AAD) Standards", - "tag": ["CIS"], - "helpText": "Cleans up Entra devices that have not connected/signed in for the specified number of days.", - "docsDescription": "Cleans up Entra devices that have not connected/signed in for the specified number of days. First disables and later deletes the devices. More info can be found in the [Microsoft documentation](https://learn.microsoft.com/en-us/entra/identity/devices/manage-stale-devices)", + "tag": ["Essential 8 (1501)", "NIST CSF 2.0 (ID.AM-08)", "NIST CSF 2.0 (PR.PS-03)"], + "helpText": "Remediate is currently not available. Cleans up Entra devices that have not connected/signed in for the specified number of days.", + "docsDescription": "Remediate is currently not available. Cleans up Entra devices that have not connected/signed in for the specified number of days. First disables and later deletes the devices. More info can be found in the [Microsoft documentation](https://learn.microsoft.com/en-us/entra/identity/devices/manage-stale-devices)", + "executiveText": "Automatically identifies and removes inactive devices that haven't connected to company systems for a specified period, reducing security risks from abandoned or lost devices. This maintains a clean device inventory and prevents potential unauthorized access through dormant device registrations.", "addedComponent": [ { "type": "number", @@ -791,7 +1076,7 @@ "disabledFeatures": { "report": false, "warn": false, - "remediate": true + "remediate": false }, "label": "Cleanup stale Entra devices", "impact": "High Impact", @@ -805,6 +1090,7 @@ "cat": "Entra (AAD) Standards", "tag": [], "helpText": "Disables App consent and set to Allow user consent for apps", + "executiveText": "Reverses application consent restrictions, allowing employees to approve applications independently without administrative oversight. This increases productivity and user autonomy but reduces security controls over data access permissions.", "addedComponent": [], "label": "Undo App Consent Standard", "impact": "High Impact", @@ -816,9 +1102,10 @@ { "name": "standards.SecurityDefaults", "cat": "Entra (AAD) Standards", - "tag": [], + "tag": ["CISA (MS.AAD.11.1v1)"], "helpText": "Enables security defaults for the tenant, for newer tenants this is enabled by default. Do not enable this feature if you use Conditional Access.", "docsDescription": "Enables SD for the tenant, which disables all forms of basic authentication and enforces users to configure MFA. Users are only prompted for MFA when a logon is considered 'suspect' by Microsoft.", + "executiveText": "Activates Microsoft's baseline security configuration that requires multi-factor authentication and blocks legacy authentication methods. This provides essential security protection for organizations without complex conditional access policies, significantly improving security posture with minimal configuration.", "addedComponent": [], "label": "Enable Security Defaults", "impact": "High Impact", @@ -830,9 +1117,10 @@ { "name": "standards.DisableSMS", "cat": "Entra (AAD) Standards", - "tag": [], + "tag": ["CIS M365 5.0 (2.3.5)", "EIDSCA.AS04", "NIST CSF 2.0 (PR.AA-03)"], "helpText": "This blocks users from using SMS as an MFA method. If a user only has SMS as a MFA method, they will be unable to log in.", "docsDescription": "Disables SMS as an MFA method for the tenant. If a user only has SMS as a MFA method, they will be unable to sign in.", + "executiveText": "Disables SMS text messages as a multi-factor authentication method due to security vulnerabilities like SIM swapping attacks. This forces users to adopt more secure authentication methods like authenticator apps or hardware tokens, significantly improving account security.", "addedComponent": [], "label": "Disables SMS as an MFA method", "impact": "High Impact", @@ -844,9 +1132,10 @@ { "name": "standards.DisableVoice", "cat": "Entra (AAD) Standards", - "tag": [], + "tag": ["CIS M365 5.0 (2.3.5)", "EIDSCA.AV01", "NIST CSF 2.0 (PR.AA-03)"], "helpText": "This blocks users from using Voice call as an MFA method. If a user only has Voice as a MFA method, they will be unable to log in.", "docsDescription": "Disables Voice call as an MFA method for the tenant. If a user only has Voice call as a MFA method, they will be unable to sign in.", + "executiveText": "Disables voice call authentication due to security vulnerabilities and social engineering risks. This forces users to adopt more secure authentication methods like authenticator apps, improving overall account security by eliminating phone-based attack vectors.", "addedComponent": [], "label": "Disables Voice call as an MFA method", "impact": "High Impact", @@ -858,8 +1147,9 @@ { "name": "standards.DisableEmail", "cat": "Entra (AAD) Standards", - "tag": [], + "tag": ["CIS M365 5.0 (2.3.5)", "NIST CSF 2.0 (PR.AA-03)"], "helpText": "This blocks users from using email as an MFA method. This disables the email OTP option for guest users, and instead prompts them to create a Microsoft account.", + "executiveText": "Disables email-based authentication codes due to security concerns with email interception and account compromise. This forces users to adopt more secure authentication methods, particularly affecting guest users who must use stronger verification methods.", "addedComponent": [], "label": "Disables Email as an MFA method", "impact": "High Impact", @@ -874,6 +1164,7 @@ "tag": [], "helpText": "This blocks users from using Certificates as an MFA method.", "docsDescription": "", + "executiveText": "Disables certificate-based authentication as a multi-factor authentication method, typically used when organizations want to standardize on other authentication methods or when certificate management becomes too complex for the security benefit provided.", "addedComponent": [], "label": "Disables Certificates as an MFA method", "impact": "High Impact", @@ -888,6 +1179,7 @@ "tag": [], "helpText": "This blocks users from using QR Code Pin as an MFA method. If a user only has QR Code Pin as a MFA method, they will be unable to log in.", "docsDescription": "Disables QR Code Pin as an MFA method for the tenant. If a user only has QR Code Pin as a MFA method, they will be unable to sign in.", + "executiveText": "Disables QR Code Pin authentication method due to security concerns, forcing users to adopt more secure authentication alternatives. This helps standardize authentication methods and reduces potential security vulnerabilities while ensuring employees use more robust multi-factor authentication options.", "addedComponent": [], "label": "Disables QR Code Pin as an MFA method", "impact": "High Impact", @@ -899,8 +1191,19 @@ { "name": "standards.PerUserMFA", "cat": "Entra (AAD) Standards", - "tag": [], + "tag": [ + "CIS M365 5.0 (1.2.1)", + "CIS M365 5.0 (1.1.1)", + "CIS M365 5.0 (1.1.2)", + "CISA (MS.AAD.1.1v1)", + "CISA (MS.AAD.1.2v1)", + "Essential 8 (1504)", + "Essential 8 (1173)", + "Essential 8 (1401)", + "NIST CSF 2.0 (PR.AA-03)" + ], "helpText": "Enables per user MFA for all users.", + "executiveText": "Requires all employees to use multi-factor authentication for enhanced account security, significantly reducing the risk of unauthorized access from compromised passwords. This fundamental security measure protects against the majority of account-based attacks and is essential for maintaining strong cybersecurity posture.", "addedComponent": [], "label": "Enables per user MFA for all users.", "impact": "High Impact", @@ -924,7 +1227,7 @@ "label": "Preferred Language", "api": { "url": "/languageList.json", - "labelField": "language", + "labelField": "tag", "valueField": "tag" } } @@ -939,7 +1242,7 @@ { "name": "standards.OutBoundSpamAlert", "cat": "Exchange Standards", - "tag": ["CIS"], + "tag": ["CIS M365 5.0 (2.1.6)"], "helpText": "Set the Outbound Spam Alert e-mail address", "docsDescription": "Sets the e-mail address to which outbound spam alerts are sent.", "addedComponent": [ @@ -1011,6 +1314,7 @@ "tag": [], "helpText": "Disables Transport Neutral Encapsulation Format (TNEF)/winmail.dat for the tenant. TNEF can cause issues if the recipient is not using a client supporting TNEF.", "docsDescription": "Disables Transport Neutral Encapsulation Format (TNEF)/winmail.dat for the tenant. TNEF can cause issues if the recipient is not using a client supporting TNEF. Cannot be overridden by the user. For more information, see [Microsoft's documentation.](https://learn.microsoft.com/en-us/exchange/mail-flow/content-conversion/tnef-conversion?view=exchserver-2019)", + "executiveText": "Prevents the creation of winmail.dat attachments that can cause compatibility issues when sending emails to external recipients using non-Outlook email clients. This improves email compatibility and reduces support issues with external partners and customers.", "addedComponent": [], "label": "Disable TNEF/winmail.dat", "impact": "Low Impact", @@ -1025,6 +1329,7 @@ "tag": [], "helpText": "Sets the default Focused Inbox state for the tenant. This can be overridden by the user.", "docsDescription": "Sets the default Focused Inbox state for the tenant. This can be overridden by the user in their Outlook settings. For more information, see [Microsoft's documentation.](https://support.microsoft.com/en-us/office/focused-inbox-for-outlook-f445ad7f-02f4-4294-a82e-71d8964e3978)", + "executiveText": "Configures the default setting for Outlook's Focused Inbox feature, which automatically sorts important emails into a focused view while placing less important emails in a separate section. This can improve employee productivity by reducing email clutter, though users can adjust this setting individually.", "addedComponent": [ { "type": "autoComplete", @@ -1056,6 +1361,7 @@ "tag": [], "helpText": "Sets the Cloud Message Recall state for the tenant. This allows users to recall messages from the cloud.", "docsDescription": "Sets the default state for Cloud Message Recall for the tenant. By default this is enabled. You can read more about the feature [here.](https://techcommunity.microsoft.com/t5/exchange-team-blog/cloud-based-message-recall-in-exchange-online/ba-p/3744714)", + "executiveText": "Enables employees to recall or retract emails they've sent, helping prevent embarrassing mistakes or accidental data sharing. This feature can reduce the impact of human errors in email communication and provides a safety net for sensitive information accidentally sent to wrong recipients.", "addedComponent": [ { "type": "autoComplete", @@ -1087,6 +1393,7 @@ "tag": [], "helpText": "Enables auto-expanding archives for the tenant", "docsDescription": "Enables auto-expanding archives for the tenant. Does not enable archives for users.", + "executiveText": "Enables automatic expansion of email archive storage when users approach their archive limits, ensuring continuous email retention without manual intervention. This prevents email storage issues and maintains compliance with data retention policies without requiring ongoing administrative management.", "addedComponent": [], "label": "Enable Auto-expanding archives", "impact": "Low Impact", @@ -1096,10 +1403,44 @@ "recommendedBy": [] }, { - "name": "standards.EnableOnlineArchiving", + "name": "standards.TwoClickEmailProtection", "cat": "Exchange Standards", "tag": [], + "helpText": "Configures the two-click confirmation requirement for viewing encrypted/protected emails in OWA and new Outlook. When enabled, users must click \"View message\" before accessing protected content, providing an additional layer of privacy protection.", + "docsDescription": "Configures the TwoClickMailPreviewEnabled setting in Exchange Online organization configuration. This security feature requires users to click \"View message\" before accessing encrypted or protected emails in Outlook on the web (OWA) and new Outlook for Windows. This provides additional privacy protection by preventing protected content from automatically displaying, giving users time to ensure their screen is not visible to others before viewing sensitive content. The feature helps protect against shoulder surfing and accidental disclosure of confidential information.", + "executiveText": "Requires employees to click twice before viewing encrypted or sensitive emails, preventing accidental exposure of confidential information when screens might be visible to others. This privacy protection helps prevent shoulder surfing and ensures employees are intentional about viewing sensitive content.", + "addedComponent": [ + { + "type": "autoComplete", + "multiple": false, + "creatable": false, + "label": "Select value", + "name": "standards.TwoClickEmailProtection.state", + "options": [ + { + "label": "Enabled", + "value": "enabled" + }, + { + "label": "Disabled", + "value": "disabled" + } + ] + } + ], + "label": "Set two-click confirmation for encrypted emails in New Outlook", + "impact": "Low Impact", + "impactColour": "info", + "addedDate": "2025-06-13", + "powershellEquivalent": "Set-OrganizationConfig -TwoClickMailPreviewEnabled $true | $false", + "recommendedBy": [] + }, + { + "name": "standards.EnableOnlineArchiving", + "cat": "Exchange Standards", + "tag": ["Essential 8 (1511)", "NIST CSF 2.0 (PR.DS-11)"], "helpText": "Enables the In-Place Online Archive for all UserMailboxes with a valid license.", + "executiveText": "Automatically enables online email archiving for all licensed employees, providing additional storage for older emails while maintaining easy access. This helps manage mailbox sizes, improves email performance, and supports compliance with data retention requirements.", "addedComponent": [], "label": "Enable Online Archive for all users", "impact": "Low Impact", @@ -1113,6 +1454,7 @@ "cat": "Exchange Standards", "tag": [], "helpText": "Enables litigation hold for all UserMailboxes with a valid license.", + "executiveText": "Preserves all email content for legal and compliance purposes by preventing permanent deletion of emails, even when users attempt to delete them. This is essential for organizations subject to legal discovery requirements or regulatory compliance mandates.", "addedComponent": [ { "type": "textField", @@ -1131,9 +1473,10 @@ { "name": "standards.SpoofWarn", "cat": "Exchange Standards", - "tag": ["CIS"], + "tag": ["CIS M365 5.0 (6.2.3)"], "helpText": "Adds or removes indicators to e-mail messages received from external senders in Outlook. Works on all Outlook clients/OWA", "docsDescription": "Adds or removes indicators to e-mail messages received from external senders in Outlook. You can read more about this feature on [Microsoft's Exchange Team Blog.](https://techcommunity.microsoft.com/t5/exchange-team-blog/native-external-sender-callouts-on-email-in-outlook/ba-p/2250098)", + "executiveText": "Displays visual warnings in Outlook when emails come from external senders, helping employees identify potentially suspicious messages and reducing the risk of phishing attacks. This security feature makes it easier for staff to distinguish between internal and external communications.", "addedComponent": [ { "type": "autoComplete", @@ -1170,8 +1513,9 @@ { "name": "standards.EnableMailTips", "cat": "Exchange Standards", - "tag": ["CIS", "exo_mailtipsenabled"], + "tag": ["CIS M365 5.0 (6.5.2)", "exo_mailtipsenabled"], "helpText": "Enables all MailTips in Outlook. MailTips are the notifications Outlook and Outlook on the web shows when an email you create, meets some requirements", + "executiveText": "Enables helpful notifications in Outlook that warn users about potential email issues, such as sending to large groups, external recipients, or invalid addresses. This reduces email mistakes and improves communication efficiency by providing real-time guidance to employees.", "addedComponent": [ { "type": "number", @@ -1193,6 +1537,7 @@ "cat": "Exchange Standards", "tag": [], "helpText": "Sets the default state for automatically turning meetings into Teams meetings for the tenant. This can be overridden by the user in Outlook.", + "executiveText": "Automatically adds Microsoft Teams meeting links to calendar invitations by default, streamlining the process of creating virtual meetings. This improves collaboration efficiency and ensures consistent meeting experiences across the organization, though users can override this setting when needed.", "addedComponent": [ { "type": "autoComplete", @@ -1225,6 +1570,7 @@ "tag": [], "helpText": "Disables the daily viva reports for all users. This standard requires the CIPP-SAM application to have the Company Administrator (Global Admin) role in the tenant. Enable this using CIPP > Advanced > Super Admin > SAM App Roles. Activate the roles with a CPV refresh.", "docsDescription": "", + "executiveText": "Disables daily Microsoft Viva Insights reports that are automatically sent to employees, reducing email volume and allowing organizations to control when and how productivity insights are shared. This can help prevent information overload while maintaining the ability to access insights when needed.", "addedComponent": [], "label": "Disable daily Insight/Viva reports", "impact": "Low Impact", @@ -1236,8 +1582,9 @@ { "name": "standards.RotateDKIM", "cat": "Exchange Standards", - "tag": ["CIS"], + "tag": ["CIS M365 5.0 (2.1.9)"], "helpText": "Rotate DKIM keys that are 1024 bit to 2048 bit", + "executiveText": "Upgrades email security by replacing older 1024-bit encryption keys with stronger 2048-bit keys for email authentication. This improves the organization's email security posture and helps prevent email spoofing and tampering, maintaining trust with email recipients.", "addedComponent": [], "label": "Rotate DKIM keys that are 1024 bit to 2048 bit", "impact": "Low Impact", @@ -1249,8 +1596,9 @@ { "name": "standards.AddDKIM", "cat": "Exchange Standards", - "tag": ["CIS"], + "tag": ["CIS M365 5.0 (2.1.9)"], "helpText": "Enables DKIM for all domains that currently support it", + "executiveText": "Enables email authentication technology that digitally signs outgoing emails to verify they actually came from your organization. This prevents email spoofing, improves email deliverability, and protects the company's reputation by ensuring recipients can trust emails from your domains.", "addedComponent": [], "label": "Enables DKIM for all domains that currently support it", "impact": "Low Impact", @@ -1259,12 +1607,52 @@ "powershellEquivalent": "New-DkimSigningConfig and Set-DkimSigningConfig", "recommendedBy": ["CIS", "CIPP"] }, + { + "name": "standards.AddDMARCToMOERA", + "cat": "Global Standards", + "tag": ["CIS M365 5.0 (2.1.10)", "Security", "PhishingProtection"], + "helpText": "Note: requires 'Domain Name Administrator' GDAP role. This should be enabled even if the MOERA (onmicrosoft.com) domains is not used for sending. Enabling this prevents email spoofing. The default value is 'v=DMARC1; p=reject;' recommended because the domain is only used within M365 and reporting is not needed. Omitting pct tag default to 100%", + "docsDescription": "Note: requires 'Domain Name Administrator' GDAP role. Adds a DMARC record to MOERA (onmicrosoft.com) domains. This should be enabled even if the MOERA (onmicrosoft.com) domains is not used for sending. Enabling this prevents email spoofing. The default record is 'v=DMARC1; p=reject;' recommended because the domain is only used within M365 and reporting is not needed. Omitting pct tag default to 100%", + "executiveText": "Implements advanced email security for Microsoft's default domain names (onmicrosoft.com) to prevent criminals from impersonating your organization. This blocks fraudulent emails that could damage your company's reputation and protects partners and customers from phishing attacks using your domain names.", + "addedComponent": [ + { + "type": "autoComplete", + "multiple": false, + "creatable": true, + "required": false, + "placeholder": "v=DMARC1; p=reject; (recommended)", + "label": "Value", + "name": "standards.AddDMARCToMOERA.RecordValue", + "options": [ + { + "label": "v=DMARC1; p=reject; (recommended)", + "value": "v=DMARC1; p=reject;" + } + ] + } + ], + "label": "Enables DMARC on MOERA (onmicrosoft.com) domains", + "impact": "Low Impact", + "impactColour": "info", + "addedDate": "2025-06-16", + "powershellEquivalent": "Portal only", + "recommendedBy": ["CIS", "Microsoft"] + }, { "name": "standards.EnableMailboxAuditing", "cat": "Exchange Standards", - "tag": ["CIS", "exo_mailboxaudit"], + "tag": [ + "CIS M365 5.0 (6.1.1)", + "CIS M365 5.0 (6.1.2)", + "CIS M365 5.0 (6.1.3)", + "exo_mailboxaudit", + "Essential 8 (1509)", + "Essential 8 (1683)", + "NIST CSF 2.0 (DE.CM-09)" + ], "helpText": "Enables Mailbox auditing for all mailboxes and on tenant level. Disables audit bypass on all mailboxes. Unified Audit Log needs to be enabled for this standard to function.", "docsDescription": "Enables mailbox auditing on tenant level and for all mailboxes. Disables audit bypass on all mailboxes. By default Microsoft does not enable mailbox auditing for Resource Mailboxes, Public Folder Mailboxes and DiscoverySearch Mailboxes. Unified Audit Log needs to be enabled for this standard to function.", + "executiveText": "Enables comprehensive logging of all email access and modifications across all employee mailboxes, providing detailed audit trails for security investigations and compliance requirements. This helps detect unauthorized access, data breaches, and supports regulatory compliance efforts.", "addedComponent": [], "label": "Enable Mailbox auditing", "impact": "Low Impact", @@ -1278,6 +1666,7 @@ "cat": "Exchange Standards", "tag": [], "helpText": "Sets the Send and Receive limits for new users. Valid values are 1MB to 150MB", + "executiveText": "Establishes standard email attachment size limits for all new employees, balancing functionality with system performance and security. This prevents email system overload from large attachments while ensuring employees can share necessary files through appropriate channels.", "addedComponent": [ { "type": "number", @@ -1305,6 +1694,7 @@ "tag": [], "helpText": "Sets the default sharing level for the default calendar, for all users", "docsDescription": "Sets the default sharing level for the default calendar for all users in the tenant. You can read about the different sharing levels [here.](https://learn.microsoft.com/en-us/powershell/module/exchange/set-mailboxfolderpermission?view=exchange-ps#-accessrights)", + "executiveText": "Configures how much calendar information employees share by default with colleagues, balancing collaboration needs with privacy. This setting determines whether others can see meeting details, free/busy times, or just availability, helping optimize scheduling while protecting sensitive meeting information.", "disabledFeatures": { "report": true, "warn": true, @@ -1371,12 +1761,68 @@ "powershellEquivalent": "Set-MailboxFolderPermission", "recommendedBy": [] }, + { + "name": "standards.EXOOutboundSpamLimits", + "cat": "Exchange Standards", + "tag": ["CIS M365 5.0 (2.1.6)"], + "helpText": "Configures the outbound spam recipient limits (external per hour, internal per hour, per day) and the action to take when a limit is reached. The 'Set Outbound Spam Alert e-mail' standard is recommended to configure together with this one. ", + "docsDescription": "Configures the Exchange Online outbound spam recipient limits for external per hour, internal per hour, and per day, along with the action to take (e.g., BlockUser, Alert) when these limits are exceeded. This helps prevent abuse and manage email flow. Microsoft's recommendations can be found [here.](https://learn.microsoft.com/en-us/defender-office-365/recommended-settings-for-eop-and-office365#eop-outbound-spam-policy-settings) The 'Set Outbound Spam Alert e-mail' standard is recommended to configure together with this one.", + "executiveText": "Sets limits on how many emails employees can send per hour and per day to prevent spam and protect the organization's email reputation. When limits are exceeded, the system can alert administrators or temporarily block the user, helping detect compromised accounts or prevent abuse.", + "addedComponent": [ + { + "type": "number", + "name": "standards.EXOOutboundSpamLimits.RecipientLimitExternalPerHour", + "label": "External Recipient Limit Per Hour", + "defaultValue": 400 + }, + { + "type": "number", + "name": "standards.EXOOutboundSpamLimits.RecipientLimitInternalPerHour", + "label": "Internal Recipient Limit Per Hour", + "defaultValue": 800 + }, + { + "type": "number", + "name": "standards.EXOOutboundSpamLimits.RecipientLimitPerDay", + "label": "Daily Recipient Limit", + "defaultValue": 800 + }, + { + "type": "autoComplete", + "multiple": false, + "creatable": false, + "name": "standards.EXOOutboundSpamLimits.ActionWhenThresholdReached", + "label": "Action When Threshold Reached", + "options": [ + { + "label": "Alert", + "value": "Alert" + }, + { + "label": "Block User", + "value": "BlockUser" + }, + { + "label": "Block user from sending mail for the rest of the day", + "value": "BlockUserForToday" + } + ] + } + ], + "label": "Set Exchange Outbound Spam Limits", + "impact": "Low Impact", + "impactColour": "info", + "addedDate": "2025-05-13", + "powershellEquivalent": "Set-HostedOutboundSpamFilterPolicy", + "recommendedBy": ["CIPP", "CIS"] + }, { "name": "standards.DisableExternalCalendarSharing", "cat": "Exchange Standards", - "tag": ["CIS", "exo_individualsharing"], + "tag": ["CIS M365 5.0 (1.3.3)", "exo_individualsharing"], "helpText": "Disables the ability for users to share their calendar with external users. Only for the default policy, so exclusions can be made if needed.", "docsDescription": "Disables external calendar sharing for the entire tenant. This is not a widely used feature, and it's therefore unlikely that this will impact users. Only for the default policy, so exclusions can be made if needed by making a new policy and assigning it to users.", + "executiveText": "Prevents employees from sharing their calendars with external parties, protecting sensitive meeting information and internal schedules from unauthorized access. This security measure helps maintain confidentiality of business activities while still allowing internal collaboration.", "addedComponent": [], "label": "Disable external calendar sharing", "impact": "Low Impact", @@ -1388,9 +1834,10 @@ { "name": "standards.AutoAddProxy", "cat": "Exchange Standards", - "tag": ["CIS"], + "tag": [], "helpText": "Automatically adds all available domains as a proxy address.", "docsDescription": "Automatically finds all available domain names in the tenant, and tries to add proxy addresses based on the user's UPN to each of these.", + "executiveText": "Automatically creates email addresses for employees across all company domains, ensuring they can receive emails sent to any of the organization's domain names. This improves email delivery reliability and maintains consistent communication channels across different business units or brands.", "addedComponent": [], "label": "Automatically deploy proxy addresses", "impact": "Medium Impact", @@ -1407,9 +1854,10 @@ { "name": "standards.DisableAdditionalStorageProviders", "cat": "Exchange Standards", - "tag": ["CIS", "exo_storageproviderrestricted"], + "tag": ["CIS M365 5.0 (6.5.3)", "exo_storageproviderrestricted"], "helpText": "Disables the ability for users to open files in Outlook on the Web, from other providers such as Box, Dropbox, Facebook, Google Drive, OneDrive Personal, etc.", "docsDescription": "Disables additional storage providers in OWA. This is to prevent users from using personal storage providers like Dropbox, Google Drive, etc. Usually this has little user impact.", + "executiveText": "Prevents employees from accessing personal cloud storage services like Dropbox or Google Drive through Outlook on the web, reducing data security risks and ensuring company information stays within approved corporate systems. This helps maintain data governance and prevents accidental data leaks.", "addedComponent": [], "label": "Disable additional storage providers in OWA", "impact": "Low Impact", @@ -1421,9 +1869,10 @@ { "name": "standards.AntiSpamSafeList", "cat": "Defender Standards", - "tag": [], + "tag": ["CIS M365 5.0 (2.1.13)"], "helpText": "Sets the anti-spam connection filter policy option 'safe list' in Defender.", "docsDescription": "Sets [Microsoft's built-in 'safe list'](https://learn.microsoft.com/en-us/powershell/module/exchange/set-hostedconnectionfilterpolicy?view=exchange-ps#-enablesafelist) in the anti-spam connection filter policy, rather than setting a custom safe/block list of IPs.", + "executiveText": "Enables Microsoft's pre-approved list of trusted email servers to improve email delivery from legitimate sources while maintaining spam protection. This reduces false positives where legitimate emails might be blocked while still protecting against spam and malicious emails.", "addedComponent": [ { "type": "switch", @@ -1443,6 +1892,7 @@ "cat": "Exchange Standards", "tag": [], "helpText": "Sets the shorten meetings settings on a tenant level. This will shorten meetings by the selected amount of minutes. Valid values are 0 to 29. Short meetings are under 60 minutes, long meetings are over 60 minutes.", + "executiveText": "Automatically shortens calendar meetings by a specified number of minutes to provide buffer time between meetings, reducing back-to-back scheduling stress and allowing employees time to transition between meetings. This improves work-life balance and meeting effectiveness.", "addedComponent": [ { "type": "autoComplete", @@ -1490,6 +1940,7 @@ "tag": [], "helpText": "Sets the state of Bookings on the tenant. Bookings is a scheduling tool that allows users to book appointments with others both internal and external.", "docsDescription": "", + "executiveText": "Controls whether employees can use Microsoft Bookings to create online appointment scheduling pages for internal and external clients. This feature can improve customer service and streamline appointment management, but may need to be controlled for security or business process reasons.", "addedComponent": [ { "type": "autoComplete", @@ -1515,12 +1966,51 @@ "powershellEquivalent": "Set-OrganizationConfig -BookingsEnabled", "recommendedBy": [] }, + { + "name": "standards.EXODirectSend", + "cat": "Exchange Standards", + "tag": [], + "helpText": "Sets the state of Direct Send in Exchange Online. Direct Send allows applications to send emails directly to Exchange Online mailboxes as the tenants domains, without requiring authentication.", + "docsDescription": "Controls whether applications can use Direct Send to send emails directly to Exchange Online mailboxes as the tenants domains, without requiring authentication. A detailed explanation from Microsoft can be found [here.](https://learn.microsoft.com/en-us/exchange/mail-flow-best-practices/how-to-set-up-a-multifunction-device-or-application-to-send-email-using-microsoft-365-or-office-365)", + "executiveText": "Controls whether business applications and devices (like printers or scanners) can send emails through the company's email system without authentication. While this enables convenient features like scan-to-email, it may pose security risks and should be carefully managed.", + "addedComponent": [ + { + "type": "autoComplete", + "multiple": false, + "creatable": false, + "label": "Select value", + "name": "standards.EXODirectSend.state", + "options": [ + { + "label": "Enabled", + "value": "enabled" + }, + { + "label": "Disabled", + "value": "disabled" + } + ] + } + ], + "label": "Set Direct Send state", + "impact": "Medium Impact", + "impactColour": "warning", + "addedDate": "2025-05-28", + "powershellEquivalent": "Set-OrganizationConfig -RejectDirectSend $true/$false", + "recommendedBy": [] + }, { "name": "standards.DisableOutlookAddins", "cat": "Exchange Standards", - "tag": ["CIS", "exo_outlookaddins"], + "tag": [ + "CIS M365 5.0 (6.3.1)", + "exo_outlookaddins", + "NIST CSF 2.0 (PR.AA-05)", + "NIST CSF 2.0 (PR.PS-05)" + ], "helpText": "Disables the ability for users to install add-ins in Outlook. This is to prevent users from installing malicious add-ins.", "docsDescription": "Disables users from being able to install add-ins in Outlook. Only admins are able to approve add-ins for the users. This is done to reduce the threat surface for data exfiltration.", + "executiveText": "Prevents employees from installing third-party add-ins in Outlook without administrative approval, reducing security risks from potentially malicious extensions. This ensures only vetted and approved tools can access company email data while maintaining centralized control over email functionality.", "addedComponent": [], "label": "Disable users from installing add-ins in Outlook", "impact": "Medium Impact", @@ -1534,6 +2024,7 @@ "cat": "Exchange Standards", "tag": [], "helpText": "Loops through all users and removes the Safe Senders list. This is to prevent SPF bypass attacks, as the Safe Senders list is not checked by SPF.", + "executiveText": "Removes user-defined safe sender lists to prevent security bypasses where malicious emails could avoid spam filtering. This ensures all emails go through proper security screening, even if users have previously marked senders as 'safe', improving overall email security.", "addedComponent": [], "disabledFeatures": { "report": true, @@ -1553,6 +2044,7 @@ "tag": [], "helpText": "Sets emails sent as and on behalf of shared mailboxes to also be stored in the shared mailbox sent items folder", "docsDescription": "This makes sure that e-mails sent from shared mailboxes or delegate mailboxes, end up in the mailbox of the shared/delegate mailbox instead of the sender, allowing you to keep replies in the same mailbox as the original e-mail.", + "executiveText": "Ensures emails sent from shared mailboxes (like info@company.com) are stored in the shared mailbox rather than the individual sender's mailbox. This maintains complete email threads in one location, improving collaboration and ensuring all team members can see the full conversation history.", "addedComponent": [ { "type": "switch", @@ -1573,6 +2065,7 @@ "tag": [], "helpText": "Enables the ability for users to send from their alias addresses.", "docsDescription": "Allows users to change the 'from' address to any set in their Azure AD Profile.", + "executiveText": "Allows employees to send emails from their alternative email addresses (aliases) rather than just their primary address. This is useful for employees who manage multiple roles or departments, enabling them to send emails from the most appropriate address for the context.", "addedComponent": [], "label": "Allow users to send from their alias addresses", "impact": "Medium Impact", @@ -1587,6 +2080,7 @@ "tag": [], "helpText": "Set the state of the spam submission button in Outlook", "docsDescription": "Set the state of the built-in Report button in Outlook. This gives the users the ability to report emails as spam or phish.", + "executiveText": "Enables employees to easily report suspicious emails directly from Outlook, helping improve the organization's spam and phishing detection systems. This crowdsourced approach to security allows users to contribute to threat detection while providing valuable feedback to enhance email security filters.", "addedComponent": [ { "type": "autoComplete", @@ -1621,23 +2115,46 @@ { "name": "standards.DisableSharedMailbox", "cat": "Exchange Standards", - "tag": ["CIS"], + "tag": ["CIS M365 5.0 (1.2.2)", "CISA (MS.AAD.10.1v1)", "NIST CSF 2.0 (PR.AA-01)"], "helpText": "Blocks login for all accounts that are marked as a shared mailbox. This is Microsoft best practice to prevent direct logons to shared mailboxes.", "docsDescription": "Shared mailboxes can be directly logged into if the password is reset, this presents a security risk as do all shared login credentials. Microsoft's recommendation is to disable the user account for shared mailboxes. It would be a good idea to review the sign-in reports to establish potential impact.", + "executiveText": "Prevents direct login to shared mailbox accounts (like info@company.com), ensuring they can only be accessed through authorized users' accounts. This security measure eliminates the risk of shared passwords and unauthorized access while maintaining proper access control and audit trails.", "addedComponent": [], - "label": "Disable Shared Mailbox AAD accounts", + "label": "Disable Shared Mailbox Entra accounts", "impact": "Medium Impact", "impactColour": "warning", "addedDate": "2021-11-16", "powershellEquivalent": "Get-Mailbox & Update-MgUser", "recommendedBy": ["CIS", "CIPP"] }, + { + "name": "standards.DisableResourceMailbox", + "cat": "Exchange Standards", + "tag": ["NIST CSF 2.0 (PR.AA-01)"], + "helpText": "Blocks login for all accounts that are marked as a resource mailbox and does not have a license assigned. Accounts that are synced from on-premises AD are excluded, as account state is managed in the on-premises AD.", + "docsDescription": "Resource mailboxes can be directly logged into if the password is reset, this presents a security risk as do all shared login credentials. Microsoft's recommendation is to disable the user account for resource mailboxes. Accounts that are synced from on-premises AD are excluded, as account state is managed in the on-premises AD.", + "executiveText": "Prevents direct login to resource mailbox accounts (like conference rooms or equipment), ensuring they can only be managed through proper administrative channels. This security measure eliminates potential unauthorized access to resource scheduling systems while maintaining proper booking functionality.", + "addedComponent": [], + "label": "Disable Unlicensed Resource Mailbox Entra accounts", + "impact": "Medium Impact", + "impactColour": "warning", + "addedDate": "2025-06-01", + "powershellEquivalent": "Get-Mailbox & Update-MgUser", + "recommendedBy": ["Microsoft", "CIPP"] + }, { "name": "standards.EXODisableAutoForwarding", "cat": "Exchange Standards", - "tag": ["CIS", "mdo_autoforwardingmode", "mdo_blockmailforward"], + "tag": [ + "CIS M365 5.0 (6.2.1)", + "mdo_autoforwardingmode", + "mdo_blockmailforward", + "CISA (MS.EXO.4.1v1)", + "NIST CSF 2.0 (PR.DS-02)" + ], "helpText": "Disables the ability for users to automatically forward e-mails to external recipients.", "docsDescription": "Disables the ability for users to automatically forward e-mails to external recipients. This is to prevent data exfiltration. Please check if there are any legitimate use cases for this feature before implementing, like forwarding invoices and such.", + "executiveText": "Prevents employees from automatically forwarding company emails to external addresses, protecting against data leaks and unauthorized information sharing. This security measure helps maintain control over sensitive business communications while preventing both accidental and intentional data exfiltration.", "addedComponent": [], "label": "Disable automatic forwarding to external recipients", "impact": "High Impact", @@ -1649,9 +2166,10 @@ { "name": "standards.RetentionPolicyTag", "cat": "Exchange Standards", - "tag": [], + "tag": ["CIS M365 5.0 (6.4.1)"], "helpText": "Creates a CIPP - Deleted Items retention policy tag that permanently deletes items in the Deleted Items folder after X days.", "docsDescription": "Creates a CIPP - Deleted Items retention policy tag that permanently deletes items in the Deleted Items folder after X days.", + "executiveText": "Automatically and permanently removes deleted emails after a specified number of days, helping manage storage costs and ensuring compliance with data retention policies. This prevents accumulation of unnecessary deleted items while maintaining a reasonable recovery window for accidentally deleted emails.", "addedComponent": [ { "type": "number", @@ -1673,6 +2191,7 @@ "tag": [], "helpText": "Sets a e-mail address to alert when a User requests to release a quarantined message.", "docsDescription": "Sets a e-mail address to alert when a User requests to release a quarantined message. This is useful for monitoring and ensuring that the correct messages are released.", + "executiveText": "Notifies IT administrators when employees request to release emails that were quarantined for security reasons, enabling oversight of potentially dangerous messages. This helps ensure that legitimate emails are released while maintaining security controls over suspicious content.", "addedComponent": [ { "type": "textField", @@ -1693,6 +2212,7 @@ "tag": [], "helpText": "Sets a e-mail address to alert when a User deletes more than 20 SharePoint files within 60 minutes. NB: Requires a Office 365 E5 subscription, Office 365 E3 with Threat Intelligence or Office 365 EquivioAnalytics add-on.", "docsDescription": "Sets a e-mail address to alert when a User deletes more than 20 SharePoint files within 60 minutes. This is useful for monitoring and ensuring that the correct SharePoint files are deleted. NB: Requires a Office 365 E5 subscription, Office 365 E3 with Threat Intelligence or Office 365 EquivioAnalytics add-on.", + "executiveText": "Alerts administrators when employees delete large numbers of SharePoint files in a short time period, helping detect potential data destruction attacks, ransomware, or accidental mass deletions. This early warning system enables rapid response to protect critical business documents and data.", "addedComponent": [ { "type": "number", @@ -1735,6 +2255,7 @@ "impact": "Medium Impact", "addedDate": "2025-04-29", "helpText": "Deploy and manage SafeLinks policy templates to protect against malicious URLs in emails and Office documents.", + "executiveText": "Deploys standardized URL protection policies that automatically scan and verify links in emails and documents before users click them. This template-based approach ensures consistent protection against malicious websites and phishing attacks across the organization.", "addedComponent": [ { "type": "autoComplete", @@ -1754,7 +2275,12 @@ { "name": "standards.SafeLinksPolicy", "cat": "Defender Standards", - "tag": ["CIS", "mdo_safelinksforemail", "mdo_safelinksforOfficeApps"], + "tag": [ + "CIS M365 5.0 (2.1.1)", + "mdo_safelinksforemail", + "mdo_safelinksforOfficeApps", + "NIST CSF 2.0 (DE.CM-09)" + ], "helpText": "This creates a Safe Links policy that automatically scans, tracks, and and enables safe links for Email, Office, and Teams for both external and internal senders", "addedComponent": [ { @@ -1792,14 +2318,15 @@ "name": "standards.AntiPhishPolicy", "cat": "Defender Standards", "tag": [ - "CIS", "mdo_safeattachments", "mdo_highconfidencespamaction", "mdo_highconfidencephishaction", "mdo_phisspamacation", "mdo_spam_notifications_only_for_admins", "mdo_antiphishingpolicies", - "mdo_phishthresholdlevel" + "mdo_phishthresholdlevel", + "CIS M365 5.0 (2.1.7)", + "NIST CSF 2.0 (DE.CM-09)" ], "helpText": "This creates a Anti-Phishing policy that automatically enables Mailbox Intelligence and spoofing, optional switches for Mail tips.", "addedComponent": [ @@ -1852,6 +2379,7 @@ { "type": "select", "multiple": false, + "creatable": true, "label": "Quarantine policy for Spoof", "name": "standards.AntiPhishPolicy.SpoofQuarantineTag", "options": [ @@ -1892,6 +2420,7 @@ { "type": "select", "multiple": false, + "creatable": true, "label": "Quarantine policy for user impersonation", "name": "standards.AntiPhishPolicy.TargetedUserQuarantineTag", "options": [ @@ -1932,6 +2461,7 @@ { "type": "select", "multiple": false, + "creatable": true, "label": "Quarantine policy for domain impersonation", "name": "standards.AntiPhishPolicy.TargetedDomainQuarantineTag", "options": [ @@ -1972,6 +2502,7 @@ { "type": "select", "multiple": false, + "creatable": true, "label": "Apply quarantine policy", "name": "standards.AntiPhishPolicy.MailboxIntelligenceQuarantineTag", "options": [ @@ -2000,7 +2531,13 @@ { "name": "standards.SafeAttachmentPolicy", "cat": "Defender Standards", - "tag": ["CIS", "mdo_safedocuments", "mdo_commonattachmentsfilter", "mdo_safeattachmentpolicy"], + "tag": [ + "CIS M365 5.0 (2.1.4)", + "mdo_safedocuments", + "mdo_commonattachmentsfilter", + "mdo_safeattachmentpolicy", + "NIST CSF 2.0 (DE.CM-09)" + ], "helpText": "This creates a Safe Attachment policy", "addedComponent": [ { @@ -2026,6 +2563,7 @@ { "type": "select", "multiple": false, + "creatable": true, "label": "QuarantineTag", "name": "standards.SafeAttachmentPolicy.QuarantineTag", "options": [ @@ -2052,7 +2590,12 @@ "type": "textField", "name": "standards.SafeAttachmentPolicy.RedirectAddress", "label": "Redirect Address", - "required": false + "required": false, + "condition": { + "field": "standards.SafeAttachmentPolicy.Redirect", + "compareType": "is", + "compareValue": true + } } ], "label": "Default Safe Attachment Policy", @@ -2065,7 +2608,7 @@ { "name": "standards.AtpPolicyForO365", "cat": "Defender Standards", - "tag": ["CIS"], + "tag": ["CIS M365 5.0 (2.1.5)", "NIST CSF 2.0 (DE.CM-09)"], "helpText": "This creates a Atp policy that enables Defender for Office 365 for SharePoint, OneDrive and Microsoft Teams.", "addedComponent": [ { @@ -2112,6 +2655,13 @@ "required": false, "label": "Phishing Simulation Urls", "name": "standards.PhishingSimulations.PhishingSimUrls" + }, + { + "type": "switch", + "label": "Remove extra urls", + "name": "standards.PhishingSimulations.RemoveExtraUrls", + "defaultValue": false, + "required": false } ], "label": "Phishing Simulation Configuration", @@ -2124,7 +2674,14 @@ { "name": "standards.MalwareFilterPolicy", "cat": "Defender Standards", - "tag": ["CIS", "mdo_zapspam", "mdo_zapphish", "mdo_zapmalware"], + "tag": [ + "CIS M365 5.0 (2.1.2)", + "CIS M365 5.0 (2.1.3)", + "mdo_zapspam", + "mdo_zapphish", + "mdo_zapmalware", + "NIST CSF 2.0 (DE.CM-09)" + ], "helpText": "This creates a Malware filter policy that enables the default File filter and Zero-hour auto purge for malware.", "addedComponent": [ { @@ -2152,6 +2709,7 @@ { "type": "select", "multiple": false, + "creatable": true, "label": "QuarantineTag", "name": "standards.MalwareFilterPolicy.QuarantineTag", "options": [ @@ -2179,7 +2737,12 @@ "type": "textField", "name": "standards.MalwareFilterPolicy.InternalSenderAdminAddress", "required": false, - "label": "Internal Sender Admin Address" + "label": "Internal Sender Admin Address", + "condition": { + "field": "standards.MalwareFilterPolicy.EnableInternalSenderAdminNotifications", + "compareType": "is", + "compareValue": true + } }, { "type": "switch", @@ -2191,7 +2754,12 @@ "type": "textField", "name": "standards.MalwareFilterPolicy.ExternalSenderAdminAddress", "required": false, - "label": "External Sender Admin Address" + "label": "External Sender Admin Address", + "condition": { + "field": "standards.MalwareFilterPolicy.EnableExternalSenderAdminNotifications", + "compareType": "is", + "compareValue": true + } } ], "label": "Default Malware Filter Policy", @@ -2207,6 +2775,13 @@ "tag": [], "helpText": "This adds allowed domains to the Spoof Intelligence Allow/Block List.", "addedComponent": [ + { + "type": "switch", + "label": "Remove extra domains from the allow list", + "name": "standards.PhishSimSpoofIntelligence.RemoveExtraDomains", + "defaultValue": false, + "required": false + }, { "type": "autoComplete", "multiple": true, @@ -2257,7 +2832,7 @@ "type": "autoComplete", "required": true, "multiple": false, - "creatable": false, + "creatable": true, "label": "Spam Quarantine Tag", "name": "standards.SpamFilterPolicy.SpamQuarantineTag", "options": [ @@ -2297,7 +2872,7 @@ "type": "autoComplete", "required": true, "multiple": false, - "creatable": false, + "creatable": true, "label": "High Confidence Spam Quarantine Tag", "name": "standards.SpamFilterPolicy.HighConfidenceSpamQuarantineTag", "options": [ @@ -2337,7 +2912,7 @@ "type": "autoComplete", "required": true, "multiple": false, - "creatable": false, + "creatable": true, "label": "Bulk Quarantine Tag", "name": "standards.SpamFilterPolicy.BulkQuarantineTag", "options": [ @@ -2377,7 +2952,7 @@ "type": "autoComplete", "required": true, "multiple": false, - "creatable": false, + "creatable": true, "label": "Phish Quarantine Tag", "name": "standards.SpamFilterPolicy.PhishQuarantineTag", "options": [ @@ -2399,7 +2974,7 @@ "type": "autoComplete", "required": true, "multiple": false, - "creatable": false, + "creatable": true, "label": "High Confidence Phish Quarantine Tag", "name": "standards.SpamFilterPolicy.HighConfidencePhishQuarantineTag", "options": [ @@ -2477,7 +3052,12 @@ "creatable": true, "required": false, "name": "standards.SpamFilterPolicy.LanguageBlockList", - "label": "Languages to block (uppercase ISO 639-1 two-letter)" + "label": "Languages to block (uppercase ISO 639-1 two-letter)", + "condition": { + "field": "standards.SpamFilterPolicy.EnableLanguageBlockList", + "compareType": "is", + "compareValue": true + } }, { "type": "switch", @@ -2491,7 +3071,12 @@ "creatable": true, "required": false, "name": "standards.SpamFilterPolicy.RegionBlockList", - "label": "Regions to block (uppercase ISO 3166-1 two-letter)" + "label": "Regions to block (uppercase ISO 3166-1 two-letter)", + "condition": { + "field": "standards.SpamFilterPolicy.EnableRegionBlockList", + "compareType": "is", + "compareValue": true + } }, { "type": "autoComplete", @@ -2509,16 +3094,104 @@ "powershellEquivalent": "New-HostedContentFilterPolicy or Set-HostedContentFilterPolicy", "recommendedBy": [] }, + { + "name": "standards.QuarantineTemplate", + "cat": "Defender Standards", + "disabledFeatures": { + "report": false, + "warn": false, + "remediate": false + }, + "tag": [], + "helpText": "This standard creates a Custom Quarantine Policies that can be used in Anti-Spam and all MDO365 policies. Quarantine Policies can be used to specify recipients permissions, enable end-user spam notifications, and specify the release action preference", + "executiveText": "Creates standardized quarantine policies that define how employees can interact with quarantined emails, including permissions to release, delete, or preview suspicious messages. This ensures consistent security handling across the organization while providing appropriate user access to manage quarantined content.", + "addedComponent": [ + { + "type": "autoComplete", + "multiple": false, + "creatable": true, + "name": "displayName", + "label": "Quarantine Display Name", + "required": true + }, + { + "type": "switch", + "label": "Enable end-user spam notifications", + "name": "ESNEnabled", + "defaultValue": true, + "required": false + }, + { + "type": "select", + "multiple": false, + "label": "Select release action preference", + "name": "ReleaseAction", + "options": [ + { + "label": "Allow recipients to request a message to be released from quarantine", + "value": "PermissionToRequestRelease" + }, + { + "label": "Allow recipients to release a message from quarantine", + "value": "PermissionToRelease" + } + ] + }, + { + "type": "switch", + "label": "Include Messages From Blocked Sender Address", + "name": "IncludeMessagesFromBlockedSenderAddress", + "defaultValue": false, + "required": false + }, + { + "type": "switch", + "label": "Allow recipients to delete message", + "name": "PermissionToDelete", + "defaultValue": false, + "required": false + }, + { + "type": "switch", + "label": "Allow recipients to preview message", + "name": "PermissionToPreview", + "defaultValue": false, + "required": false + }, + { + "type": "switch", + "label": "Allow recipients to block Sender Address", + "name": "PermissionToBlockSender", + "defaultValue": false, + "required": false + }, + { + "type": "switch", + "label": "Allow recipients to whitelist Sender Address", + "name": "PermissionToAllowSender", + "defaultValue": false, + "required": false + } + ], + "label": "Custom Quarantine Policy", + "multiple": true, + "impact": "Low Impact", + "impactColour": "info", + "addedDate": "2025-05-16", + "powershellEquivalent": "Set-QuarantinePolicy or New-QuarantinePolicy", + "recommendedBy": [] + }, { "name": "standards.intuneDeviceRetirementDays", "cat": "Intune Standards", "tag": [], - "helpText": "A value between 0 and 270 is supported. A value of 0 disables retirement, retired devices are removed from Intune after the specified number of days.", + "helpText": "A value between 31 and 365 is supported. retired devices are removed from Intune after the specified number of days.", + "executiveText": "Automatically removes inactive devices from management after a specified period, helping maintain a clean device inventory and reducing security risks from abandoned or lost devices. This policy ensures that only actively used corporate devices remain in the management system.", "addedComponent": [ { "type": "number", "name": "standards.intuneDeviceRetirementDays.days", - "label": "Maximum days (0 equals disabled)" + "label": "Maximum days" } ], "label": "Set inactive device retirement days", @@ -2533,6 +3206,7 @@ "cat": "Intune Standards", "tag": [], "helpText": "Sets the branding profile for the Intune Company Portal app. This is a tenant wide setting and overrules any settings set on the app level.", + "executiveText": "Customizes the Intune Company Portal app with company branding, contact information, and support details, providing employees with a consistent corporate experience when managing their devices. This improves user experience and ensures employees know how to get IT support when needed.", "addedComponent": [ { "type": "textField", @@ -2606,6 +3280,7 @@ "cat": "Intune Standards", "tag": [], "helpText": "Sets the mark devices with no compliance policy assigned as compliance/non compliant and Compliance status validity period.", + "executiveText": "Configures how the system treats devices that don't have specific compliance policies and sets how often devices must check in to maintain their compliance status. This ensures proper security oversight of all corporate devices and maintains current compliance information.", "addedComponent": [ { "type": "autoComplete", @@ -2644,15 +3319,25 @@ "tag": [], "helpText": "Configures the MDM user scope. This also sets the terms of use, discovery and compliance URL to default URLs.", "docsDescription": "Configures the MDM user scope. This also sets the terms of use URL, discovery URL and compliance URL to default values.", + "executiveText": "Defines which users can enroll their devices in mobile device management, controlling access to corporate resources and applications. This setting determines the scope of device management coverage and ensures appropriate users have access to necessary business tools.", "addedComponent": [ { "name": "appliesTo", "label": "MDM User Scope?", "type": "radio", "options": [ - { "label": "All", "value": "all" }, - { "label": "None", "value": "none" }, - { "label": "Custom Group", "value": "selected" } + { + "label": "All", + "value": "all" + }, + { + "label": "None", + "value": "none" + }, + { + "label": "Custom Group", + "value": "selected" + } ] }, { @@ -2672,8 +3357,9 @@ { "name": "standards.DefaultPlatformRestrictions", "cat": "Intune Standards", - "tag": [], + "tag": ["CISA (MS.AAD.19.1v1)"], "helpText": "Sets the default platform restrictions for enrolling devices into Intune. Note: Do not block personally owned if platform is blocked.", + "executiveText": "Controls which types of devices (iOS, Android, Windows, macOS) and ownership models (corporate vs. personal) can be enrolled in the company's device management system. This helps maintain security standards while supporting necessary business device types and usage scenarios.", "addedComponent": [ { "type": "switch", @@ -2746,8 +3432,9 @@ { "name": "standards.intuneDeviceReg", "cat": "Intune Standards", - "tag": [], + "tag": ["CISA (MS.AAD.17.1v1)"], "helpText": "Sets the maximum number of devices that can be registered by a user. A value of 0 disables device registration by users", + "executiveText": "Limits how many devices each employee can register for corporate access, preventing excessive device proliferation while accommodating legitimate business needs. This helps maintain security oversight and prevents potential abuse of device registration privileges.", "addedComponent": [ { "type": "number", @@ -2768,6 +3455,7 @@ "cat": "Intune Standards", "tag": [], "helpText": "Requires MFA for all users to register devices with Intune. This is useful when not using Conditional Access.", + "executiveText": "Requires employees to use multi-factor authentication when registering devices for corporate access, adding an extra security layer to prevent unauthorized device enrollment. This helps ensure only legitimate users can connect their devices to company systems.", "label": "Require Multi-factor Authentication to register or join devices with Microsoft Entra", "impact": "Medium Impact", "impactColour": "warning", @@ -2781,6 +3469,7 @@ "tag": [], "helpText": "Sets the retention period for deleted users OneDrive to the specified period of time. The default is 30 days.", "docsDescription": "When a OneDrive user gets deleted, the personal SharePoint site is saved for selected amount of time that data can be retrieved from it.", + "executiveText": "Preserves departed employees' OneDrive files for a specified period, allowing time to recover important business documents before permanent deletion. This helps prevent data loss while managing storage costs and maintaining compliance with data retention policies.", "addedComponent": [ { "type": "autoComplete", @@ -2851,6 +3540,7 @@ "cat": "SharePoint Standards", "tag": [], "helpText": "Sets the default timezone for the tenant. This will be used for all new users and sites.", + "executiveText": "Standardizes the timezone setting across all SharePoint sites and new user accounts, ensuring consistent scheduling and time-based operations throughout the organization. This improves collaboration efficiency and reduces confusion in global or multi-timezone organizations.", "addedComponent": [ { "type": "TimezoneSelect", @@ -2868,8 +3558,9 @@ { "name": "standards.SPAzureB2B", "cat": "SharePoint Standards", - "tag": ["CIS"], + "tag": ["CIS M365 5.0 (7.2.2)"], "helpText": "Ensure SharePoint and OneDrive integration with Azure AD B2B is enabled", + "executiveText": "Enables secure collaboration with external partners through SharePoint and OneDrive by integrating with Azure B2B guest access. This allows controlled sharing with external organizations while maintaining security oversight and proper access management.", "addedComponent": [], "label": "Enable SharePoint and OneDrive integration with Azure AD B2B", "impact": "Low Impact", @@ -2881,8 +3572,9 @@ { "name": "standards.SPDisallowInfectedFiles", "cat": "SharePoint Standards", - "tag": ["CIS"], + "tag": ["CIS M365 5.0 (7.3.1)", "CISA (MS.SPO.3.1v1)", "NIST CSF 2.0 (DE.CM-09)"], "helpText": "Ensure Office 365 SharePoint infected files are disallowed for download", + "executiveText": "Prevents employees from downloading files that have been identified as containing malware or viruses from SharePoint and OneDrive. This security measure protects against malware distribution through file sharing while maintaining access to clean, safe documents.", "addedComponent": [], "label": "Disallow downloading infected files from SharePoint", "impact": "Low Impact", @@ -2896,6 +3588,7 @@ "cat": "SharePoint Standards", "tag": [], "helpText": "Disables the creation of new SharePoint 2010 and 2013 classic workflows and removes the 'Return to classic SharePoint' link on modern SharePoint list and library pages.", + "executiveText": "Disables outdated SharePoint workflow features and classic interface options, encouraging use of modern, more secure and efficient collaboration tools. This helps maintain security standards while guiding users toward current, supported functionality.", "addedComponent": [], "label": "Disable Legacy Workflows", "impact": "Low Impact", @@ -2907,8 +3600,9 @@ { "name": "standards.SPDirectSharing", "cat": "SharePoint Standards", - "tag": ["CIS"], - "helpText": "Ensure default link sharing is set to Direct in SharePoint and OneDrive", + "tag": [], + "helpText": "This standard has been deprecated in favor of the Default Sharing Link standard. ", + "executiveText": "Configures SharePoint and OneDrive to share files directly with specific people rather than creating anonymous links, improving security by ensuring only intended recipients can access shared documents. This reduces the risk of accidental data exposure through link sharing.", "addedComponent": [], "label": "Default sharing to Direct users", "impact": "Medium Impact", @@ -2920,8 +3614,9 @@ { "name": "standards.SPExternalUserExpiration", "cat": "SharePoint Standards", - "tag": ["CIS"], + "tag": ["CIS M365 5.0 (7.2.9)", "CISA (MS.SPO.1.5v1)"], "helpText": "Ensure guest access to a site or OneDrive will expire automatically", + "executiveText": "Automatically expires external user access to SharePoint sites and OneDrive after a specified period, reducing security risks from forgotten or unnecessary guest accounts. This ensures external access is regularly reviewed and maintained only when actively needed.", "addedComponent": [ { "type": "number", @@ -2939,8 +3634,9 @@ { "name": "standards.SPEmailAttestation", "cat": "SharePoint Standards", - "tag": ["CIS"], + "tag": ["CIS M365 5.0 (7.2.10)", "CISA (MS.SPO.1.6v1)"], "helpText": "Ensure re-authentication with verification code is restricted", + "executiveText": "Requires external users to periodically re-verify their identity through email verification codes when accessing SharePoint resources, adding an extra security layer for external collaboration. This helps ensure continued legitimacy of external access over time.", "addedComponent": [ { "type": "number", @@ -2955,11 +3651,46 @@ "powershellEquivalent": "Set-SPOTenant -EmailAttestationRequired $true -EmailAttestationReAuthDays 15", "recommendedBy": ["CIS", "CIPP"] }, + { + "name": "standards.DefaultSharingLink", + "cat": "SharePoint Standards", + "tag": ["CIS M365 5.0 (7.2.7)", "CIS M365 5.0 (7.2.11)", "CISA (MS.SPO.1.4v1)"], + "helpText": "Configure the SharePoint default sharing link type and permission. This setting controls both the type of sharing link created by default and the permission level assigned to those links.", + "docsDescription": "Sets the default sharing link type (Direct or Internal) and permission (View) in SharePoint and OneDrive. Direct sharing means links only work for specific people, while Internal sharing means links work for anyone in the organization. Setting the view permission as the default ensures that users must deliberately select the edit permission when sharing a link, reducing the risk of unintentionally granting edit privileges.", + "executiveText": "Configures SharePoint default sharing links to implement the principle of least privilege for document sharing. This security measure reduces the risk of accidental data modification while maintaining collaboration functionality, requiring users to explicitly select Edit permissions when necessary. The sharing type setting controls whether links are restricted to specific recipients or available to the entire organization. This reduces the risk of accidental data exposure through link sharing.", + "addedComponent": [ + { + "type": "autoComplete", + "multiple": false, + "creatable": false, + "required": true, + "label": "Default Sharing Link Type", + "name": "standards.DefaultSharingLink.SharingLinkType", + "options": [ + { + "label": "Direct - Only the people the user specifies", + "value": "Direct" + }, + { + "label": "Internal - Only people in your organization", + "value": "Internal" + } + ] + } + ], + "label": "Set Default Sharing Link Settings", + "impact": "Low Impact", + "impactColour": "info", + "addedDate": "2025-06-13", + "powershellEquivalent": "Set-SPOTenant -DefaultSharingLinkType [Direct|Internal] -DefaultLinkPermission View", + "recommendedBy": ["CIS", "CIPP"] + }, { "name": "standards.DisableAddShortcutsToOneDrive", "cat": "SharePoint Standards", "tag": [], "helpText": "If disabled, the button Add shortcut to OneDrive will be removed and users in the tenant will no longer be able to add new shortcuts to their OneDrive. Existing shortcuts will remain functional", + "executiveText": "Controls whether employees can create shortcuts to SharePoint libraries in their OneDrive, managing how users organize and access shared content. This setting helps maintain organized file structures and can prevent confusion from excessive shortcuts while preserving existing workflows.", "addedComponent": [ { "type": "autoComplete", @@ -2991,6 +3722,7 @@ "cat": "SharePoint Standards", "tag": [], "helpText": "If disabled, users in the tenant will no longer be able to use the Sync button to sync SharePoint content on all sites. However, existing synced content will remain functional on the user's computer.", + "executiveText": "Controls whether employees can synchronize SharePoint files to their local devices, balancing productivity benefits with data security concerns. This setting helps manage data distribution while maintaining access to cloud-based collaboration when sync is disabled.", "addedComponent": [ { "type": "autoComplete", @@ -3020,9 +3752,16 @@ { "name": "standards.DisableSharePointLegacyAuth", "cat": "SharePoint Standards", - "tag": ["CIS", "spo_legacy_auth"], + "tag": [ + "CIS M365 5.0 (6.5.1)", + "CIS M365 5.0 (7.2.1)", + "spo_legacy_auth", + "CISA (MS.AAD.3.1v1)", + "NIST CSF 2.0 (PR.IR-01)" + ], "helpText": "Disables the ability to authenticate with SharePoint using legacy authentication methods. Any applications that use legacy authentication will need to be updated to use modern authentication.", "docsDescription": "Disables the ability for users and applications to access SharePoint via legacy basic authentication. This will likely not have any user impact, but will block systems/applications depending on basic auth or the SharePointOnlineCredentials class.", + "executiveText": "Disables outdated authentication methods for SharePoint access, forcing applications and users to use modern, more secure authentication protocols. This significantly improves security by eliminating vulnerable authentication pathways while requiring updates to older applications.", "addedComponent": [], "label": "Disable legacy basic authentication for SharePoint", "impact": "Medium Impact", @@ -3034,8 +3773,9 @@ { "name": "standards.sharingCapability", "cat": "SharePoint Standards", - "tag": ["CIS"], + "tag": ["CIS M365 5.0 (7.2.3)", "CISA (MS.AAD.14.1v1)", "CISA (MS.SPO.1.1v1)"], "helpText": "Sets the default sharing level for OneDrive and SharePoint. This is a tenant wide setting and overrules any settings set on the site level", + "executiveText": "Defines the organization's default policy for sharing files and folders in SharePoint and OneDrive, balancing collaboration needs with security requirements. This fundamental setting determines whether employees can share with external users, anonymous links, or only internal colleagues.", "addedComponent": [ { "type": "autoComplete", @@ -3072,9 +3812,10 @@ { "name": "standards.DisableReshare", "cat": "SharePoint Standards", - "tag": ["CIS"], + "tag": ["CIS M365 5.0 (7.2.5)", "CISA (MS.AAD.14.2v1)", "CISA (MS.SPO.1.2v1)"], "helpText": "Disables the ability for external users to share files they don't own. Sharing links can only be made for People with existing access", "docsDescription": "Disables the ability for external users to share files they don't own. Sharing links can only be made for People with existing access. This is a tenant wide setting and overrules any settings set on the site level", + "executiveText": "Prevents external users from sharing company documents with additional people, maintaining control over document distribution and preventing unauthorized access expansion. This security measure ensures that external sharing remains within intended boundaries set by internal employees.", "addedComponent": [], "label": "Disable Re-sharing by External Users", "impact": "High Impact", @@ -3089,6 +3830,7 @@ "tag": [], "helpText": "Disables users from creating new SharePoint sites", "docsDescription": "Disables standard users from creating SharePoint sites, also disables the ability to fully create teams", + "executiveText": "Restricts the creation of new SharePoint sites to authorized administrators, preventing uncontrolled proliferation of collaboration spaces and ensuring proper governance. This maintains organized information architecture while requiring approval for new collaborative environments.", "addedComponent": [], "label": "Disable site creation by standard users", "impact": "High Impact", @@ -3102,6 +3844,7 @@ "cat": "SharePoint Standards", "tag": [], "helpText": "Sets the file extensions that are excluded from syncing with OneDrive. These files will be blocked from upload. '*.' is automatically added to the extension and can be omitted.", + "executiveText": "Blocks specific file types from being uploaded or synchronized to OneDrive, helping prevent security risks from potentially dangerous file formats. This security measure protects against malware distribution while allowing legitimate business file types to be shared safely.", "addedComponent": [ { "type": "textField", @@ -3121,6 +3864,7 @@ "cat": "SharePoint Standards", "tag": [], "helpText": "Disables the ability for Mac devices to sync with OneDrive.", + "executiveText": "Prevents Mac computers from synchronizing files with OneDrive, typically implemented for security or compliance reasons in Windows-centric environments. This restriction helps maintain standardized device management while potentially limiting collaboration for Mac users.", "addedComponent": [], "label": "Do not allow Mac devices to sync using OneDrive", "impact": "High Impact", @@ -3132,21 +3876,43 @@ { "name": "standards.unmanagedSync", "cat": "SharePoint Standards", - "tag": [], - "helpText": "The unmanaged Sync standard has been temporarily disabled and does nothing.", - "addedComponent": [], - "label": "Only allow users to sync OneDrive from AAD joined devices", + "tag": ["CIS M365 5.0 (7.2.3)", "CISA (MS.SPO.2.1v1)", "NIST CSF 2.0 (PR.AA-05)"], + "helpText": "Entra P1 required. Block or limit access to SharePoint and OneDrive content from unmanaged devices (those not hybrid AD joined or compliant in Intune). These controls rely on Microsoft Entra Conditional Access policies and can take up to 24 hours to take effect.", + "docsDescription": "Entra P1 required. Block or limit access to SharePoint and OneDrive content from unmanaged devices (those not hybrid AD joined or compliant in Intune). These controls rely on Microsoft Entra Conditional Access policies and can take up to 24 hours to take effect. 0 = Allow Access, 1 = Allow limited, web-only access, 2 = Block access. All information about this can be found in Microsofts documentation [here.](https://learn.microsoft.com/en-us/sharepoint/control-access-from-unmanaged-devices)", + "executiveText": "Restricts access to company files from personal or unmanaged devices, ensuring corporate data can only be accessed from properly secured and monitored devices. This critical security control prevents data leaks while allowing controlled access through web browsers when necessary.", + "addedComponent": [ + { + "type": "autoComplete", + "multiple": false, + "creatable": false, + "name": "standards.unmanagedSync.state", + "label": "State", + "options": [ + { + "label": "Allow limited, web-only access", + "value": "1" + }, + { + "label": "Block access", + "value": "2" + } + ], + "required": false + } + ], + "label": "Restrict access to SharePoint and OneDrive from unmanaged devices", "impact": "High Impact", "impactColour": "danger", - "addedDate": "2022-06-15", - "powershellEquivalent": "Update-MgAdminSharePointSetting", - "recommendedBy": [] + "addedDate": "2025-06-13", + "powershellEquivalent": "Set-SPOTenant -ConditionalAccessPolicy AllowFullAccess | AllowLimitedAccess | BlockAccess", + "recommendedBy": ["CIS"] }, { "name": "standards.sharingDomainRestriction", "cat": "SharePoint Standards", - "tag": ["CIS"], + "tag": ["CIS M365 5.0 (7.2.6)", "CISA (MS.AAD.14.3v1)", "CISA (MS.SPO.1.3v1)"], "helpText": "Restricts sharing to only users with the specified domain. This is useful for organizations that only want to share with their own domain.", + "executiveText": "Controls which external domains employees can share files with, enabling secure collaboration with trusted partners while blocking sharing with unauthorized organizations. This targeted approach maintains necessary business relationships while preventing data exposure to unknown entities.", "addedComponent": [ { "type": "autoComplete", @@ -3185,8 +3951,16 @@ { "name": "standards.TeamsGlobalMeetingPolicy", "cat": "Teams Standards", - "tag": [], + "tag": [ + "CIS M365 5.0 (8.5.1)", + "CIS M365 5.0 (8.5.2)", + "CIS M365 5.0 (8.5.3)", + "CIS M365 5.0 (8.5.4)", + "CIS M365 5.0 (8.5.5)", + "CIS M365 5.0 (8.5.6)" + ], "helpText": "Defines the CIS recommended global meeting policy for Teams. This includes AllowAnonymousUsersToJoinMeeting, AllowAnonymousUsersToStartMeeting, AutoAdmittedUsers, AllowPSTNUsersToBypassLobby, MeetingChatEnabledType, DesignatedPresenterRoleMode, AllowExternalParticipantGiveRequestControl", + "executiveText": "Establishes security-focused default settings for Teams meetings, controlling who can join meetings, present content, and participate in chats. These policies balance collaboration needs with security requirements, ensuring meetings remain productive while protecting against unauthorized access and disruption.", "addedComponent": [ { "type": "autoComplete", @@ -3257,9 +4031,9 @@ { "name": "standards.TeamsEmailIntegration", "cat": "Teams Standards", - "tag": [], "helpText": "Should users be allowed to send emails directly to a channel email addresses?", "docsDescription": "Teams channel email addresses are an optional feature that allows users to email the Teams channel directly.", + "executiveText": "Controls whether Teams channels can receive emails directly, enabling integration between email and team collaboration. This feature can improve workflow efficiency by allowing external communications to flow into team discussions, though it may need management for security or organizational reasons.", "addedComponent": [ { "type": "switch", @@ -3272,13 +4046,69 @@ "impactColour": "info", "addedDate": "2024-07-30", "powershellEquivalent": "Set-CsTeamsClientConfiguration -AllowEmailIntoChannel $false", - "recommendedBy": ["CIS"] + "recommendedBy": ["CIS"], + "tag": ["CIS M365 5.0 (8.1.2)"] }, { - "name": "standards.TeamsExternalFileSharing", + "name": "standards.TeamsGuestAccess", + "cat": "Teams Standards", + "tag": [], + "helpText": "Allow guest users access to teams.", + "docsDescription": "Allow guest users access to teams. Guest users are users who are not part of your organization but have been invited to collaborate with your organization in Teams. This setting allows you to control whether guest users can access Teams.", + "executiveText": "Determines whether external partners, vendors, and collaborators can be invited to participate in Teams conversations and meetings. This fundamental setting enables external collaboration while requiring careful management to balance openness with security and information protection.", + "addedComponent": [ + { + "type": "switch", + "name": "standards.TeamsGuestAccess.AllowGuestUser", + "label": "Allow guest users" + } + ], + "label": "Allow guest users in Teams", + "impact": "Low Impact", + "impactColour": "info", + "addedDate": "2025-06-03", + "powershellEquivalent": "Set-CsTeamsClientConfiguration -AllowGuestUser $true", + "recommendedBy": [] + }, + { + "name": "standards.TeamsMeetingVerification", "cat": "Teams Standards", "tag": [], + "helpText": "Configures CAPTCHA verification for external users joining Teams meetings. This helps prevent unauthorized AI notetakers and bots from joining meetings.", + "docsDescription": "Configures CAPTCHA verification for external users joining Teams meetings. This security feature requires external participants to complete a CAPTCHA challenge before joining, which helps prevent unauthorized AI notetakers, bots, and other automated systems from accessing meetings.", + "executiveText": "Requires external meeting participants to complete verification challenges before joining Teams meetings, preventing automated bots and unauthorized AI systems from accessing confidential discussions. This security measure protects against meeting infiltration while maintaining legitimate external collaboration.", + "addedComponent": [ + { + "type": "autoComplete", + "multiple": false, + "creatable": false, + "label": "CAPTCHA Verification Setting", + "name": "standards.TeamsMeetingVerification.CaptchaVerificationForMeetingJoin", + "options": [ + { + "label": "Not Required", + "value": "NotRequired" + }, + { + "label": "Anonymous Users and Untrusted Organizations", + "value": "AnonymousUsersAndUntrustedOrganizations" + } + ] + } + ], + "label": "Teams Meeting Verification (CAPTCHA)", + "impact": "Low Impact", + "impactColour": "info", + "addedDate": "2025-06-14", + "powershellEquivalent": "Set-CsTeamsMeetingPolicy -CaptchaVerificationForMeetingJoin", + "recommendedBy": ["CIPP"] + }, + { + "name": "standards.TeamsExternalFileSharing", + "cat": "Teams Standards", + "tag": ["CIS M365 5.0 (8.4.1)"], "helpText": "Ensure external file sharing in Teams is enabled for only approved cloud storage services.", + "executiveText": "Controls which external cloud storage services (like Google Drive, Dropbox, Box) employees can access through Teams, ensuring file sharing occurs only through approved and secure platforms. This helps maintain data governance while supporting necessary business integrations.", "addedComponent": [ { "type": "switch", @@ -3319,6 +4149,7 @@ "tag": [], "helpText": "Controls whether users with this policy can set the voice profile capture and enrollment through the Recognition tab in their Teams client settings.", "docsDescription": "Controls whether users with this policy can set the voice profile capture and enrollment through the Recognition tab in their Teams client settings.", + "executiveText": "Determines whether employees can enroll their voice and face profiles for recognition features in Teams, enabling personalized experiences like voice identification. This setting balances convenience features with privacy considerations and organizational policies regarding biometric data collection.", "addedComponent": [ { "type": "autoComplete", @@ -3352,17 +4183,13 @@ "tag": [], "helpText": "Sets the properties of the Global external access policy.", "docsDescription": "Sets the properties of the Global external access policy. External access policies determine whether or not your users can: 1) communicate with users who have Session Initiation Protocol (SIP) accounts with a federated organization; 2) communicate with users who are using custom applications built with Azure Communication Services; 3) access Skype for Business Server over the Internet, without having to log on to your internal network; 4) communicate with users who have SIP accounts with a public instant messaging (IM) provider such as Skype; and, 5) communicate with people who are using Teams with an account that's not managed by an organization.", + "executiveText": "Defines the organization's policy for communicating with external users through Teams, including other organizations, Skype users, and unmanaged accounts. This fundamental setting determines the scope of external collaboration while maintaining security boundaries for business communications.", "addedComponent": [ { "type": "switch", "name": "standards.TeamsExternalAccessPolicy.EnableFederationAccess", "label": "Allow communication from trusted organizations" }, - { - "type": "switch", - "name": "standards.TeamsExternalAccessPolicy.EnablePublicCloudAccess", - "label": "Allow user to communicate with Skype users" - }, { "type": "switch", "name": "standards.TeamsExternalAccessPolicy.EnableTeamsConsumerAccess", @@ -3382,17 +4209,13 @@ "tag": [], "helpText": "Sets the properties of the Global federation configuration.", "docsDescription": "Sets the properties of the Global federation configuration. Federation configuration settings determine whether or not your users can communicate with users who have SIP accounts with a federated organization.", + "executiveText": "Configures how the organization federates with external organizations for Teams communication, controlling whether employees can communicate with specific external domains or all external organizations. This setting enables secure inter-organizational collaboration while maintaining control over external communications.", "addedComponent": [ { "type": "switch", "name": "standards.TeamsFederationConfiguration.AllowTeamsConsumer", "label": "Allow users to communicate with other organizations" }, - { - "type": "switch", - "name": "standards.TeamsFederationConfiguration.AllowPublicUsers", - "label": "Allow users to communicate with Skype Users" - }, { "type": "autoComplete", "required": true, @@ -3433,12 +4256,35 @@ "powershellEquivalent": "Set-CsTenantFederationConfiguration", "recommendedBy": [] }, + { + "name": "standards.TeamsMeetingRecordingExpiration", + "cat": "Teams Standards", + "tag": [], + "helpText": "Sets the default number of days after which Teams meeting recordings automatically expire. Valid values are -1 (Never Expire) or between 1 and 99999. The default value is 120 days.", + "docsDescription": "Allows administrators to configure a default expiration period (in days) for Teams meeting recordings. Recordings older than this period will be automatically moved to the recycle bin. This setting helps manage storage consumption and enforce data retention policies.", + "executiveText": "Automatically removes old Teams meeting recordings after a specified period to manage storage costs and comply with data retention policies. This helps organizations balance the need to preserve important meeting content with storage efficiency and regulatory compliance requirements.", + "addedComponent": [ + { + "type": "number", + "name": "standards.TeamsMeetingRecordingExpiration.ExpirationDays", + "label": "Recording Expiration Days (e.g., 365)", + "required": true + } + ], + "label": "Set Teams Meeting Recording Expiration", + "impact": "Medium Impact", + "impactColour": "warning", + "addedDate": "2025-04-17", + "powershellEquivalent": "Set-CsTeamsMeetingPolicy -Identity Global -MeetingRecordingExpirationDays ", + "recommendedBy": [] + }, { "name": "standards.TeamsMessagingPolicy", "cat": "Teams Standards", "tag": [], "helpText": "Sets the properties of the Global messaging policy.", "docsDescription": "Sets the properties of the Global messaging policy. Messaging policies control which chat and channel messaging features are available to users in Teams.", + "executiveText": "Defines what messaging capabilities employees have in Teams, including the ability to edit or delete messages, create custom emojis, and report inappropriate content. These policies help maintain professional communication standards while enabling necessary collaboration features.", "addedComponent": [ { "type": "switch", @@ -3523,12 +4369,13 @@ "cat": "Device Management Standards", "tag": [], "disabledFeatures": { - "report": true, - "warn": true, + "report": false, + "warn": false, "remediate": false }, "helpText": "Deploy the Autopilot Status Page, which shows progress during device setup through Autopilot.", "docsDescription": "This standard allows configuration of the Autopilot Status Page, providing users with a visual representation of the progress during device setup. It includes options like timeout, logging, and retry settings.", + "executiveText": "Provides employees with a visual progress indicator during automated device setup, improving the user experience when receiving new computers. This reduces IT support calls and helps ensure successful device deployment by guiding users through the setup process.", "addedComponent": [ { "type": "number", @@ -3596,8 +4443,8 @@ "cat": "Device Management Standards", "tag": [], "disabledFeatures": { - "report": true, - "warn": true, + "report": false, + "warn": false, "remediate": false }, "helpText": "Assign the appropriate Autopilot profile to streamline device deployment.", @@ -3616,12 +4463,14 @@ { "type": "textField", "name": "standards.AutopilotProfile.DeviceNameTemplate", - "label": "Unique Device Name Template" + "label": "Unique Device Name Template", + "required": false }, { "type": "autoComplete", "multiple": false, "creatable": false, + "required": false, "name": "standards.AutopilotProfile.Languages", "label": "Languages", "api": { @@ -3704,6 +4553,7 @@ "impact": "High Impact", "addedDate": "2023-12-30", "helpText": "Deploy and manage Intune templates across devices.", + "executiveText": "Deploys standardized device management configurations across all corporate devices, ensuring consistent security policies, application settings, and compliance requirements. This template-based approach streamlines device management while maintaining uniform security standards across the organization.", "addedComponent": [ { "type": "autoComplete", @@ -3723,11 +4573,26 @@ "label": "Who should this template be assigned to?", "type": "radio", "options": [ - { "label": "Do not assign", "value": "On" }, - { "label": "Assign to all users", "value": "allLicensedUsers" }, - { "label": "Assign to all devices", "value": "AllDevices" }, - { "label": "Assign to all users and devices", "value": "AllDevicesAndUsers" }, - { "label": "Assign to Custom Group", "value": "customGroup" } + { + "label": "Do not assign", + "value": "On" + }, + { + "label": "Assign to all users", + "value": "allLicensedUsers" + }, + { + "label": "Assign to all devices", + "value": "AllDevices" + }, + { + "label": "Assign to all users and devices", + "value": "AllDevicesAndUsers" + }, + { + "label": "Assign to Custom Group", + "value": "customGroup" + } ] }, { @@ -3757,6 +4622,7 @@ "impact": "Medium Impact", "addedDate": "2023-12-30", "helpText": "Deploy transport rules to manage email flow.", + "executiveText": "Deploys standardized email flow rules that automatically manage how emails are processed, filtered, and routed within the organization. These templates ensure consistent email security policies, compliance requirements, and business rules are applied across all email communications.", "addedComponent": [ { "type": "autoComplete", @@ -3784,6 +4650,7 @@ "impact": "High Impact", "addedDate": "2023-12-30", "helpText": "Manage conditional access policies for better security.", + "executiveText": "Deploys standardized conditional access policies that automatically enforce security requirements based on user location, device compliance, and risk factors. These templates ensure consistent security controls across the organization while enabling secure access to business resources.", "addedComponent": [ { "type": "autoComplete", @@ -3802,17 +4669,35 @@ "label": "What state should we deploy this template in?", "type": "radio", "options": [ - { "value": "donotchange", "label": "Do not change state" }, - { "value": "Enabled", "label": "Set to enabled" }, - { "value": "Disabled", "label": "Set to disabled" }, - { "value": "enabledForReportingButNotEnforced", "label": "Set to report only" } + { + "value": "donotchange", + "label": "Do not change state" + }, + { + "value": "Enabled", + "label": "Set to enabled" + }, + { + "value": "Disabled", + "label": "Set to disabled" + }, + { + "value": "enabledForReportingButNotEnforced", + "label": "Set to report only" + } ] + }, + { + "type": "switch", + "name": "DisableSD", + "label": "Disable Security Defaults when deploying policy" } ] }, { "name": "standards.ExchangeConnectorTemplate", "label": "Exchange Connector Template", + "cat": "Templates", "disabledFeatures": { "report": true, "warn": true, @@ -3821,6 +4706,7 @@ "impact": "Medium Impact", "addedDate": "2023-12-30", "helpText": "Deploy and manage Exchange connectors.", + "executiveText": "Configures standardized Exchange connectors that control how email flows between your organization and external systems. These templates ensure secure and reliable email delivery while maintaining proper routing and security policies for business communications.", "addedComponent": [ { "type": "autoComplete", @@ -3848,6 +4734,7 @@ "impact": "Medium Impact", "addedDate": "2023-12-30", "helpText": "Deploy and manage group templates.", + "executiveText": "Creates standardized groups with predefined settings, permissions, and membership rules. These templates ensure consistent group configurations across the organization, streamlining collaboration and access management while maintaining security standards.", "addedComponent": [ { "type": "autoComplete", @@ -3856,10 +4743,47 @@ "api": { "url": "/api/ListGroupTemplates", "labelField": "Displayname", + "altLabelField": "displayName", "valueField": "GUID", "queryKey": "ListGroupTemplates" } } ] + }, + { + "name": "standards.MailboxRecipientLimits", + "cat": "Exchange Standards", + "tag": [], + "helpText": "Sets the maximum number of recipients that can be specified in the To, Cc, and Bcc fields of a message for all mailboxes in the tenant.", + "docsDescription": "This standard configures the recipient limits for all mailboxes in the tenant. The recipient limit determines the maximum number of recipients that can be specified in the To, Cc, and Bcc fields of a message. This helps prevent spam and manage email flow.", + "executiveText": "Controls how many recipients employees can include in a single email, helping prevent spam distribution and managing email server load. This security measure protects against both accidental mass mailings and potential abuse while ensuring legitimate business communications can still reach necessary recipients.", + "addedComponent": [ + { + "type": "number", + "name": "standards.MailboxRecipientLimits.RecipientLimit", + "label": "Recipient Limit", + "defaultValue": 500 + } + ], + "label": "Set Mailbox Recipient Limits", + "impact": "Low Impact", + "impactColour": "info", + "addedDate": "2025-05-28", + "powershellEquivalent": "Set-Mailbox -RecipientLimits", + "recommendedBy": ["CIPP"] + }, + { + "name": "standards.DisableExchangeOnlinePowerShell", + "cat": "Exchange Standards", + "tag": ["CIS M365 5.0 (6.1.1)", "Security", "NIST CSF 2.0 (PR.AA-05)"], + "helpText": "Disables Exchange Online PowerShell access for non-admin users by setting the RemotePowerShellEnabled property to false for each user. This helps prevent attackers from using PowerShell to run malicious commands, access file systems, registry, and distribute ransomware throughout networks. Users with admin roles are automatically excluded.", + "docsDescription": "Disables Exchange Online PowerShell access for non-admin users by setting the RemotePowerShellEnabled property to false for each user. This security measure follows a least privileged access approach, preventing potential attackers from using PowerShell to execute malicious commands, access sensitive systems, or distribute malware. Users with management roles containing 'Admin' are automatically excluded to ensure administrators retain PowerShell access to perform necessary management tasks.", + "executiveText": "Restricts PowerShell access to Exchange Online for regular employees while maintaining access for administrators, significantly reducing security risks from compromised accounts. This prevents attackers from using PowerShell to execute malicious commands or distribute ransomware while preserving necessary administrative capabilities.", + "label": "Disable Exchange Online PowerShell for non-admin users", + "impact": "Medium Impact", + "impactColour": "warning", + "addedDate": "2025-06-19", + "powershellEquivalent": "Set-User -Identity $user -RemotePowerShellEnabled $false", + "recommendedBy": ["CIS", "CIPP"] } ] diff --git a/ConversionTable.csv b/ConversionTable.csv index 5b7cea1f09ea..2658524b8cf2 100644 --- a/ConversionTable.csv +++ b/ConversionTable.csv @@ -361,6 +361,17 @@ Dynamics 365 Contact Center Voice Add-on for Customer Service Enterprise,DYNAMIC Dynamics 365 Contact Center Voice Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_VOICE_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,73e8b747-20bf-463d-8ffd-274a7d65d0bc,SHAREPOINTENTERPRISE,5dbe027f-2339-4123-9542-606e4d348a72,SharePoint (Plan 2) Dynamics 365 Contact Center Voice Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_VOICE_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,73e8b747-20bf-463d-8ffd-274a7d65d0bc,POWERAPPS_DYN_APPS,874fc546-6efe-4d22-90b8-5c4e7aa59f4b,Power Apps for Dynamics 365 Dynamics 365 Contact Center Voice Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_VOICE_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,73e8b747-20bf-463d-8ffd-274a7d65d0bc,FLOW_DYN_APPS,7e6d7d78-73de-46ba-83b1-6d25117334ba,Power Automate for Dynamics 365 +Dynamics 365 Customer Insights Attach,Dynamics_365_Customer_Insights_Attach_New,ff22b8d4-5073-4b24-ba45-84ad5d9b6642,CDS_CUSTOMER_INSIGHTS_BASE,d04ca659-b119-4a92-b8fc-3ede584a9d65,Dataverse for Cust Insights BASE +Dynamics 365 Customer Insights Attach,Dynamics_365_Customer_Insights_Attach_New,ff22b8d4-5073-4b24-ba45-84ad5d9b6642,CDS_CUSTOMER_INSIGHTS_COMBINED_BASE,d66ee5da-07d5-49d6-a1d8-45662c3f37be,Dataverse for Customer Insights Combined Base +Dynamics 365 Customer Insights Attach,Dynamics_365_Customer_Insights_Attach_New,ff22b8d4-5073-4b24-ba45-84ad5d9b6642,DYN365_CUSTOMER_INSIGHTS_JOURNEYS_BASE,1720c3f7-7da3-4a11-8324-92aad283eb68,Dynamics 365 Customer Insights Journeys +Dynamics 365 Customer Insights Attach,Dynamics_365_Customer_Insights_Attach_New,ff22b8d4-5073-4b24-ba45-84ad5d9b6642,Forms_Pro_Marketing_App,22b657cf-0a9e-467b-8a91-5e31f21bc570,Microsoft Dynamics 365 Customer Voice for Marketing Application +Dynamics 365 Customer Insights Attach,Dynamics_365_Customer_Insights_Attach_New,ff22b8d4-5073-4b24-ba45-84ad5d9b6642,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,Exchange Foundation +Dynamics 365 Customer Insights Journeys T3 Interacted People,Dynamics_365_Customer_Insights_Journeys_T3_Interacted_People,05735051-46c0-4c84-9107-bb13d77d0b88,CDS_CUSTOMER_INSIGHTS_JOURNEYS_ADD-ON,2f2e81a6-15de-4041-9f33-73c06fed3801,Dataverse for Customer Insights Journeys add-on +Dynamics 365 Customer Insights Journeys T3 Interacted People,Dynamics_365_Customer_Insights_Journeys_T3_Interacted_People,05735051-46c0-4c84-9107-bb13d77d0b88,DYN365_MARKETING_50K_CONTACT_ADDON,e626a4ec-1ba2-409e-bf75-9bc0bc30cca7,Dynamics 365 for Marketing 50K Addnl Contacts +Dynamics 365 Customer Insights Journeys T3 Interacted People,Dynamics_365_Customer_Insights_Journeys_T3_Interacted_People,05735051-46c0-4c84-9107-bb13d77d0b88,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,Exchange Foundation +Dynamics 365 Customer Insights User License,Dynamics_365_Customer_Insights_User_License,12b5a442-a6f2-49e4-868b-2d7408c2356f,DYN365_MARKETING_MSE_USER,2824c69a-1ac5-4397-8592-eae51cb8b581,Dynamics 365 for Marketing MSE User +Dynamics 365 Customer Insights User License,Dynamics_365_Customer_Insights_User_License,12b5a442-a6f2-49e4-868b-2d7408c2356f,DYN365_MARKETING_USER,5d7a6abc-eebd-46ab-96e1-e4a2f54a2248,Dynamics 365 for Marketing USL +Dynamics 365 Customer Insights User License,Dynamics_365_Customer_Insights_User_License,12b5a442-a6f2-49e4-868b-2d7408c2356f,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,Exchange Foundation Dynamics 365 for Customer Service Chat,DYN365_CS_CHAT,7d7af6c2-0be6-46df-84d1-c181b0272909,DYN365_CS_CHAT_FPA,426ec19c-d5b1-4548-b894-6fe75028c30d,Dynamics 365 Customer Service Chat Application Integration Dynamics 365 for Customer Service Chat,DYN365_CS_CHAT,7d7af6c2-0be6-46df-84d1-c181b0272909,DYN365_CS_CHAT,f69129db-6dc1-4107-855e-0aaebbcd9dd4,Dynamics 365 for Customer Service Chat Dynamics 365 for Customer Service Chat,DYN365_CS_CHAT,7d7af6c2-0be6-46df-84d1-c181b0272909,POWER_VIRTUAL_AGENTS_D365_CS_CHAT,19e4c3a8-3ebe-455f-a294-4f3479873ae3,Power Virtual Agents for Chat @@ -430,6 +441,8 @@ Dynamics 365 Hybrid Connector,CRM_HYBRIDCONNECTOR,de176c31-616d-4eae-829a-718918 Dynamics 365 Hybrid Connector,CRM_HYBRIDCONNECTOR,de176c31-616d-4eae-829a-718918d7ec23,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,Exchange Foundation Dynamics 365 for Marketing Additional Application,DYN365_MARKETING_APPLICATION_ADDON,99c5688b-6c75-4496-876f-07f0fbd69add,DYN365_MARKETING_APPLICATION_ADDON,51cf0638-4861-40c0-8b20-1161ab2f80be,Dynamics 365 for Marketing Additional Application Dynamics 365 for Marketing Additional Application,DYN365_MARKETING_APPLICATION_ADDON,99c5688b-6c75-4496-876f-07f0fbd69add,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,Exchange Foundation +Dynamics 365 for Marketing Addnl Contacts Tier 1,DYN365_MARKETING_CONTACT_ADDON,fc4581aa-6b1f-459d-95b6-84bd49d6f843,DYN365_MARKETING_CONTACT_ADDON,18db5075-2c70-408d-a82b-929059d782af,Dynamics 365 for Marketing Additional Contacts Tier 1 +Dynamics 365 for Marketing Addnl Contacts Tier 1,DYN365_MARKETING_CONTACT_ADDON,fc4581aa-6b1f-459d-95b6-84bd49d6f843,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,Exchange Foundation Dynamics 365 for Marketing Addnl Contacts Tier 3,DYN365_MARKETING_CONTACT_ADDON_T3,23053933-0fda-431f-9a5b-a00fd78444c1,DYN365_MARKETING_50K_CONTACT_ADDON,e626a4ec-1ba2-409e-bf75-9bc0bc30cca7,Dynamics 365 for Marketing 50K Addnl Contacts Dynamics 365 for Marketing Addnl Contacts Tier 3,DYN365_MARKETING_CONTACT_ADDON_T3,23053933-0fda-431f-9a5b-a00fd78444c1,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,Exchange Foundation Dynamics 365 for Marketing Addnl Contacts Tier 5,DYN365_MARKETING_CONTACT_ADDON_T5,d8eec316-778c-4f14-a7d1-a0aca433b4e7,DYN365_MARKETING_50K_CONTACT_ADDON,e626a4ec-1ba2-409e-bf75-9bc0bc30cca7,Dynamics 365 for Marketing 50K Addnl Contacts @@ -3682,6 +3695,8 @@ Microsoft Intune Device for Government,INTUNE_A_D_GOV,2c21e77a-e0d6-4570-b38a-7f Microsoft Intune Device for Government,INTUNE_A_D_GOV,2c21e77a-e0d6-4570-b38a-7ff2dc17d2ca,INTUNE_A,c1ec4a95-1f05-45b3-a911-aa3fa01094f5,Microsoft Intune Microsoft Intune Government,INTUNE_A_GOV,2b26f637-35a0-4dbc-b69e-ff674782be9d,EXCHANGE_S_FOUNDATION_GOV,922ba911-5694-4e99-a794-73aed9bfeec8,Exchange Foundation for Government Microsoft Intune Government,INTUNE_A_GOV,2b26f637-35a0-4dbc-b69e-ff674782be9d,INTUNE_A_GOV,d216f254-796f-4dab-bbfa-710686e646b9,Microsoft Intune G +Microsoft Intune Plan 1 A VL,INTUNE_A_VL,99fc2803-fa72-42d3-ae78-b055e177d275,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,Exchange Foundation +Microsoft Intune Plan 1 A VL,INTUNE_A_VL,99fc2803-fa72-42d3-ae78-b055e177d275,INTUNE_A_VL,3e170737-c728-4eae-bbb9-3f3360f7184c,Microsoft Intune Plan 1 Microsoft Intune Plan 1 A VL_USGOV_GCCHIGH,INTUNE_A_VL_USGOV_GCCHIGH,b4288abe-01be-47d9-ad20-311d6e83fc24,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,Exchange Foundation Microsoft Intune Plan 1 A VL_USGOV_GCCHIGH,INTUNE_A_VL_USGOV_GCCHIGH,b4288abe-01be-47d9-ad20-311d6e83fc24,INTUNE_A_VL,3e170737-c728-4eae-bbb9-3f3360f7184c,Microsoft Intune Plan 1 Microsoft Power Apps for Developer,POWERAPPS_DEV,5b631642-bd26-49fe-bd20-1daaa972ef80,DYN365_CDS_DEV_VIRAL,d8c638e2-9508-40e3-9877-feb87603837b,Common Data Service - DEV VIRAL diff --git a/Modules/CIPPCore/Public/Add-CIPPAlias.ps1 b/Modules/CIPPCore/Public/Add-CIPPAlias.ps1 index f5579a06d493..075f114f767e 100644 --- a/Modules/CIPPCore/Public/Add-CIPPAlias.ps1 +++ b/Modules/CIPPCore/Public/Add-CIPPAlias.ps1 @@ -5,7 +5,7 @@ function Add-CIPPAlias { $Aliases, $UserprincipalName, $TenantFilter, - $APIName = 'Set Manager', + $APIName = 'Add Alias', $Headers ) diff --git a/Modules/CIPPCore/Public/ConversionTable.csv b/Modules/CIPPCore/Public/ConversionTable.csv index 5b7cea1f09ea..2658524b8cf2 100644 --- a/Modules/CIPPCore/Public/ConversionTable.csv +++ b/Modules/CIPPCore/Public/ConversionTable.csv @@ -361,6 +361,17 @@ Dynamics 365 Contact Center Voice Add-on for Customer Service Enterprise,DYNAMIC Dynamics 365 Contact Center Voice Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_VOICE_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,73e8b747-20bf-463d-8ffd-274a7d65d0bc,SHAREPOINTENTERPRISE,5dbe027f-2339-4123-9542-606e4d348a72,SharePoint (Plan 2) Dynamics 365 Contact Center Voice Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_VOICE_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,73e8b747-20bf-463d-8ffd-274a7d65d0bc,POWERAPPS_DYN_APPS,874fc546-6efe-4d22-90b8-5c4e7aa59f4b,Power Apps for Dynamics 365 Dynamics 365 Contact Center Voice Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_VOICE_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,73e8b747-20bf-463d-8ffd-274a7d65d0bc,FLOW_DYN_APPS,7e6d7d78-73de-46ba-83b1-6d25117334ba,Power Automate for Dynamics 365 +Dynamics 365 Customer Insights Attach,Dynamics_365_Customer_Insights_Attach_New,ff22b8d4-5073-4b24-ba45-84ad5d9b6642,CDS_CUSTOMER_INSIGHTS_BASE,d04ca659-b119-4a92-b8fc-3ede584a9d65,Dataverse for Cust Insights BASE +Dynamics 365 Customer Insights Attach,Dynamics_365_Customer_Insights_Attach_New,ff22b8d4-5073-4b24-ba45-84ad5d9b6642,CDS_CUSTOMER_INSIGHTS_COMBINED_BASE,d66ee5da-07d5-49d6-a1d8-45662c3f37be,Dataverse for Customer Insights Combined Base +Dynamics 365 Customer Insights Attach,Dynamics_365_Customer_Insights_Attach_New,ff22b8d4-5073-4b24-ba45-84ad5d9b6642,DYN365_CUSTOMER_INSIGHTS_JOURNEYS_BASE,1720c3f7-7da3-4a11-8324-92aad283eb68,Dynamics 365 Customer Insights Journeys +Dynamics 365 Customer Insights Attach,Dynamics_365_Customer_Insights_Attach_New,ff22b8d4-5073-4b24-ba45-84ad5d9b6642,Forms_Pro_Marketing_App,22b657cf-0a9e-467b-8a91-5e31f21bc570,Microsoft Dynamics 365 Customer Voice for Marketing Application +Dynamics 365 Customer Insights Attach,Dynamics_365_Customer_Insights_Attach_New,ff22b8d4-5073-4b24-ba45-84ad5d9b6642,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,Exchange Foundation +Dynamics 365 Customer Insights Journeys T3 Interacted People,Dynamics_365_Customer_Insights_Journeys_T3_Interacted_People,05735051-46c0-4c84-9107-bb13d77d0b88,CDS_CUSTOMER_INSIGHTS_JOURNEYS_ADD-ON,2f2e81a6-15de-4041-9f33-73c06fed3801,Dataverse for Customer Insights Journeys add-on +Dynamics 365 Customer Insights Journeys T3 Interacted People,Dynamics_365_Customer_Insights_Journeys_T3_Interacted_People,05735051-46c0-4c84-9107-bb13d77d0b88,DYN365_MARKETING_50K_CONTACT_ADDON,e626a4ec-1ba2-409e-bf75-9bc0bc30cca7,Dynamics 365 for Marketing 50K Addnl Contacts +Dynamics 365 Customer Insights Journeys T3 Interacted People,Dynamics_365_Customer_Insights_Journeys_T3_Interacted_People,05735051-46c0-4c84-9107-bb13d77d0b88,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,Exchange Foundation +Dynamics 365 Customer Insights User License,Dynamics_365_Customer_Insights_User_License,12b5a442-a6f2-49e4-868b-2d7408c2356f,DYN365_MARKETING_MSE_USER,2824c69a-1ac5-4397-8592-eae51cb8b581,Dynamics 365 for Marketing MSE User +Dynamics 365 Customer Insights User License,Dynamics_365_Customer_Insights_User_License,12b5a442-a6f2-49e4-868b-2d7408c2356f,DYN365_MARKETING_USER,5d7a6abc-eebd-46ab-96e1-e4a2f54a2248,Dynamics 365 for Marketing USL +Dynamics 365 Customer Insights User License,Dynamics_365_Customer_Insights_User_License,12b5a442-a6f2-49e4-868b-2d7408c2356f,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,Exchange Foundation Dynamics 365 for Customer Service Chat,DYN365_CS_CHAT,7d7af6c2-0be6-46df-84d1-c181b0272909,DYN365_CS_CHAT_FPA,426ec19c-d5b1-4548-b894-6fe75028c30d,Dynamics 365 Customer Service Chat Application Integration Dynamics 365 for Customer Service Chat,DYN365_CS_CHAT,7d7af6c2-0be6-46df-84d1-c181b0272909,DYN365_CS_CHAT,f69129db-6dc1-4107-855e-0aaebbcd9dd4,Dynamics 365 for Customer Service Chat Dynamics 365 for Customer Service Chat,DYN365_CS_CHAT,7d7af6c2-0be6-46df-84d1-c181b0272909,POWER_VIRTUAL_AGENTS_D365_CS_CHAT,19e4c3a8-3ebe-455f-a294-4f3479873ae3,Power Virtual Agents for Chat @@ -430,6 +441,8 @@ Dynamics 365 Hybrid Connector,CRM_HYBRIDCONNECTOR,de176c31-616d-4eae-829a-718918 Dynamics 365 Hybrid Connector,CRM_HYBRIDCONNECTOR,de176c31-616d-4eae-829a-718918d7ec23,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,Exchange Foundation Dynamics 365 for Marketing Additional Application,DYN365_MARKETING_APPLICATION_ADDON,99c5688b-6c75-4496-876f-07f0fbd69add,DYN365_MARKETING_APPLICATION_ADDON,51cf0638-4861-40c0-8b20-1161ab2f80be,Dynamics 365 for Marketing Additional Application Dynamics 365 for Marketing Additional Application,DYN365_MARKETING_APPLICATION_ADDON,99c5688b-6c75-4496-876f-07f0fbd69add,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,Exchange Foundation +Dynamics 365 for Marketing Addnl Contacts Tier 1,DYN365_MARKETING_CONTACT_ADDON,fc4581aa-6b1f-459d-95b6-84bd49d6f843,DYN365_MARKETING_CONTACT_ADDON,18db5075-2c70-408d-a82b-929059d782af,Dynamics 365 for Marketing Additional Contacts Tier 1 +Dynamics 365 for Marketing Addnl Contacts Tier 1,DYN365_MARKETING_CONTACT_ADDON,fc4581aa-6b1f-459d-95b6-84bd49d6f843,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,Exchange Foundation Dynamics 365 for Marketing Addnl Contacts Tier 3,DYN365_MARKETING_CONTACT_ADDON_T3,23053933-0fda-431f-9a5b-a00fd78444c1,DYN365_MARKETING_50K_CONTACT_ADDON,e626a4ec-1ba2-409e-bf75-9bc0bc30cca7,Dynamics 365 for Marketing 50K Addnl Contacts Dynamics 365 for Marketing Addnl Contacts Tier 3,DYN365_MARKETING_CONTACT_ADDON_T3,23053933-0fda-431f-9a5b-a00fd78444c1,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,Exchange Foundation Dynamics 365 for Marketing Addnl Contacts Tier 5,DYN365_MARKETING_CONTACT_ADDON_T5,d8eec316-778c-4f14-a7d1-a0aca433b4e7,DYN365_MARKETING_50K_CONTACT_ADDON,e626a4ec-1ba2-409e-bf75-9bc0bc30cca7,Dynamics 365 for Marketing 50K Addnl Contacts @@ -3682,6 +3695,8 @@ Microsoft Intune Device for Government,INTUNE_A_D_GOV,2c21e77a-e0d6-4570-b38a-7f Microsoft Intune Device for Government,INTUNE_A_D_GOV,2c21e77a-e0d6-4570-b38a-7ff2dc17d2ca,INTUNE_A,c1ec4a95-1f05-45b3-a911-aa3fa01094f5,Microsoft Intune Microsoft Intune Government,INTUNE_A_GOV,2b26f637-35a0-4dbc-b69e-ff674782be9d,EXCHANGE_S_FOUNDATION_GOV,922ba911-5694-4e99-a794-73aed9bfeec8,Exchange Foundation for Government Microsoft Intune Government,INTUNE_A_GOV,2b26f637-35a0-4dbc-b69e-ff674782be9d,INTUNE_A_GOV,d216f254-796f-4dab-bbfa-710686e646b9,Microsoft Intune G +Microsoft Intune Plan 1 A VL,INTUNE_A_VL,99fc2803-fa72-42d3-ae78-b055e177d275,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,Exchange Foundation +Microsoft Intune Plan 1 A VL,INTUNE_A_VL,99fc2803-fa72-42d3-ae78-b055e177d275,INTUNE_A_VL,3e170737-c728-4eae-bbb9-3f3360f7184c,Microsoft Intune Plan 1 Microsoft Intune Plan 1 A VL_USGOV_GCCHIGH,INTUNE_A_VL_USGOV_GCCHIGH,b4288abe-01be-47d9-ad20-311d6e83fc24,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,Exchange Foundation Microsoft Intune Plan 1 A VL_USGOV_GCCHIGH,INTUNE_A_VL_USGOV_GCCHIGH,b4288abe-01be-47d9-ad20-311d6e83fc24,INTUNE_A_VL,3e170737-c728-4eae-bbb9-3f3360f7184c,Microsoft Intune Plan 1 Microsoft Power Apps for Developer,POWERAPPS_DEV,5b631642-bd26-49fe-bd20-1daaa972ef80,DYN365_CDS_DEV_VIRAL,d8c638e2-9508-40e3-9877-feb87603837b,Common Data Service - DEV VIRAL diff --git a/Modules/CIPPCore/Public/Entrypoints/Activity Triggers/Push-ExecScheduledCommand.ps1 b/Modules/CIPPCore/Public/Entrypoints/Activity Triggers/Push-ExecScheduledCommand.ps1 index 3ed8752ba62d..cbc9cc65fc8f 100644 --- a/Modules/CIPPCore/Public/Entrypoints/Activity Triggers/Push-ExecScheduledCommand.ps1 +++ b/Modules/CIPPCore/Public/Entrypoints/Activity Triggers/Push-ExecScheduledCommand.ps1 @@ -5,7 +5,7 @@ function Push-ExecScheduledCommand { #> param($Item) $item = $Item | ConvertTo-Json -Depth 100 | ConvertFrom-Json - Write-Host "We are going to be running a scheduled task: $($Item.TaskInfo | ConvertTo-Json -Depth 10)" + Write-Information "We are going to be running a scheduled task: $($Item.TaskInfo | ConvertTo-Json -Depth 10)" $Table = Get-CippTable -tablename 'ScheduledTasks' $task = $Item.TaskInfo @@ -51,37 +51,45 @@ function Push-ExecScheduledCommand { $commandParameters.Remove($key) } } catch { - Write-Host "Failed to remove parameters: $($_.Exception.Message)" + Write-Information "Failed to remove parameters: $($_.Exception.Message)" } - Write-Host "Started Task: $($Item.Command) for tenant: $Tenant" + Write-Information "Started Task: $($Item.Command) for tenant: $Tenant" try { try { - Write-Host "Starting task: $($Item.Command) with parameters: $($commandParameters | ConvertTo-Json)" + Write-Information "Starting task: $($Item.Command) with parameters: $($commandParameters | ConvertTo-Json)" $results = & $Item.Command @commandParameters } catch { $results = "Task Failed: $($_.Exception.Message)" $State = 'Failed' } - Write-Host 'ran the command. Processing results' + Write-Information 'Ran the command. Processing results' + Write-Information "Results: $($results | ConvertTo-Json -Depth 10)" if ($item.command -like 'Get-CIPPAlert*') { + Write-Information 'This is an alert task. Processing results as alerts.' $results = @($results) $TaskType = 'Alert' } else { + Write-Information 'This is a scheduled task. Processing results as scheduled task.' $TaskType = 'Scheduled Task' + + if (!$results) { + $results = 'Task completed successfully' + } + if ($results -is [String]) { $results = @{ Results = $results } - } - if ($results -is [array] -and $results[0] -is [string] -or $results[0].resultText -is [string]) { + } elseif ($results -is [array] -and $results[0] -is [string] -or $results[0].resultText -is [string]) { $results = $results | Where-Object { $_ -is [string] -or $_.resultText -is [string] } $results = $results | ForEach-Object { $Message = $_.resultText ?? $_ @{ Results = $Message } } } - + Write-Information "Results after processing: $($results | ConvertTo-Json -Depth 10)" + Write-Information 'Moving onto storing results' if ($results -is [string]) { $StoredResults = $results } else { @@ -89,7 +97,7 @@ function Push-ExecScheduledCommand { $StoredResults = $results | ConvertTo-Json -Compress -Depth 20 | Out-String } } - + Write-Information "Results: $($results | ConvertTo-Json -Depth 10)" if ($StoredResults.Length -gt 64000 -or $task.Tenant -eq 'AllTenants' -or $task.TenantGroup) { $TaskResultsTable = Get-CippTable -tablename 'ScheduledTaskResults' $TaskResults = @{ @@ -101,25 +109,47 @@ function Push-ExecScheduledCommand { $StoredResults = @{ Results = 'Completed, details are available in the More Info pane' } | ConvertTo-Json -Compress } } catch { + Write-Information "Failed to run task: $($_.Exception.Message)" $errorMessage = $_.Exception.Message + #if recurrence is just a number, add it in days. + if ($task.Recurrence -match '^\d+$') { + $task.Recurrence = $task.Recurrence + 'd' + } + $secondsToAdd = switch -Regex ($task.Recurrence) { + '(\d+)m$' { [int64]$matches[1] * 60 } + '(\d+)h$' { [int64]$matches[1] * 3600 } + '(\d+)d$' { [int64]$matches[1] * 86400 } + default { 0 } + } + + if ($secondsToAdd -gt 0) { + $unixtimeNow = [int64](([datetime]::UtcNow) - (Get-Date '1/1/1970')).TotalSeconds + if ([int64]$task.ScheduledTime -lt ($unixtimeNow - $secondsToAdd)) { + $task.ScheduledTime = $unixtimeNow + } + } + + $nextRunUnixTime = [int64]$task.ScheduledTime + [int64]$secondsToAdd if ($task.Recurrence -ne 0) { $State = 'Failed - Planned' } else { $State = 'Failed' } + Write-Information "The job is recurring, but failed. It was scheduled for $($task.ScheduledTime). The next runtime should be $nextRunUnixTime" Update-AzDataTableEntity -Force @Table -Entity @{ - PartitionKey = $task.PartitionKey - RowKey = $task.RowKey - Results = "$errorMessage" - TaskState = $State + PartitionKey = $task.PartitionKey + RowKey = $task.RowKey + Results = "$errorMessage" + ScheduledTime = "$nextRunUnixTime" + TaskState = $State } Write-LogMessage -API 'Scheduler_UserTasks' -tenant $Tenant -tenantid $TenantInfo.customerId -message "Failed to execute task $($task.Name): $errorMessage" -sev Error -LogData (Get-CippExceptionData -Exception $_.Exception) } - Write-Host 'Sending task results to target. Updating the task state.' + Write-Information 'Sending task results to target. Updating the task state.' if ($Results) { $TableDesign = '' $FinalResults = if ($results -is [array] -and $results[0] -is [string]) { $Results | ConvertTo-Html -Fragment -Property @{ l = 'Text'; e = { $_ } } } else { $Results | ConvertTo-Html -Fragment } $HTML = $FinalResults -replace '', "This alert is for tenant $Tenant.

$TableDesign
" | Out-String $title = "$TaskType - $Tenant - $($task.Name)" - Write-Host 'Scheduler: Sending the results to the target.' - Write-Host "The content of results is: $Results" + Write-Information 'Scheduler: Sending the results to the target.' + Write-Information "The content of results is: $Results" switch -wildcard ($task.PostExecution) { '*psa*' { Send-CIPPAlert -Type 'psa' -Title $title -HTMLContent $HTML -TenantFilter $Tenant } '*email*' { Send-CIPPAlert -Type 'email' -Title $title -HTMLContent $HTML -TenantFilter $Tenant } @@ -134,11 +164,11 @@ function Push-ExecScheduledCommand { } } } - Write-Host 'Sent the results to the target. Updating the task state.' + Write-Information 'Sent the results to the target. Updating the task state.' try { if ($task.Recurrence -eq '0' -or [string]::IsNullOrEmpty($task.Recurrence)) { - Write-Host 'Recurrence empty or 0. Task is not recurring. Setting task state to completed.' + Write-Information 'Recurrence empty or 0. Task is not recurring. Setting task state to completed.' Update-AzDataTableEntity -Force @Table -Entity @{ PartitionKey = $task.PartitionKey RowKey = $task.RowKey @@ -165,7 +195,7 @@ function Push-ExecScheduledCommand { } $nextRunUnixTime = [int64]$task.ScheduledTime + [int64]$secondsToAdd - Write-Host "The job is recurring. It was scheduled for $($task.ScheduledTime). The next runtime should be $nextRunUnixTime" + Write-Information "The job is recurring. It was scheduled for $($task.ScheduledTime). The next runtime should be $nextRunUnixTime" Update-AzDataTableEntity -Force @Table -Entity @{ PartitionKey = $task.PartitionKey RowKey = $task.RowKey diff --git a/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Tenant/Administration/Alerts/Invoke-PublicWebhooks.ps1 b/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Tenant/Administration/Alerts/Invoke-PublicWebhooks.ps1 index d0828455b311..3518ac87bf36 100644 --- a/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Tenant/Administration/Alerts/Invoke-PublicWebhooks.ps1 +++ b/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Tenant/Administration/Alerts/Invoke-PublicWebhooks.ps1 @@ -74,7 +74,7 @@ function Invoke-PublicWebhooks { $Body = 'This webhook is not authorized.' $StatusCode = [HttpStatusCode]::Forbidden } - $Body = 'Webhook Recieved' + $Body = 'Webhook Received' $StatusCode = [HttpStatusCode]::OK } else { diff --git a/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Tenant/Administration/Invoke-ExecOffboardTenant.ps1 b/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Tenant/Administration/Invoke-ExecOffboardTenant.ps1 index 6abc2c461279..2299049da727 100644 --- a/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Tenant/Administration/Invoke-ExecOffboardTenant.ps1 +++ b/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Tenant/Administration/Invoke-ExecOffboardTenant.ps1 @@ -62,7 +62,7 @@ Function Invoke-ExecOffboardTenant { } if ($request.body.RemoveCSPnotificationContacts -eq $true) { - # Remove all email adresses that match the CSP tenants domains from the contact properties in /organization + # Remove all email addresses that match the CSP tenants domains from the contact properties in /organization try { try { $domains = (New-GraphGETRequest -Uri "https://graph.microsoft.com/v1.0/domains?`$select=id" -tenantid $env:TenantID -NoAuthCheck:$true).id diff --git a/Modules/CippExtensions/ConversionTable.csv b/Modules/CippExtensions/ConversionTable.csv index 5b7cea1f09ea..2658524b8cf2 100644 --- a/Modules/CippExtensions/ConversionTable.csv +++ b/Modules/CippExtensions/ConversionTable.csv @@ -361,6 +361,17 @@ Dynamics 365 Contact Center Voice Add-on for Customer Service Enterprise,DYNAMIC Dynamics 365 Contact Center Voice Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_VOICE_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,73e8b747-20bf-463d-8ffd-274a7d65d0bc,SHAREPOINTENTERPRISE,5dbe027f-2339-4123-9542-606e4d348a72,SharePoint (Plan 2) Dynamics 365 Contact Center Voice Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_VOICE_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,73e8b747-20bf-463d-8ffd-274a7d65d0bc,POWERAPPS_DYN_APPS,874fc546-6efe-4d22-90b8-5c4e7aa59f4b,Power Apps for Dynamics 365 Dynamics 365 Contact Center Voice Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_VOICE_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,73e8b747-20bf-463d-8ffd-274a7d65d0bc,FLOW_DYN_APPS,7e6d7d78-73de-46ba-83b1-6d25117334ba,Power Automate for Dynamics 365 +Dynamics 365 Customer Insights Attach,Dynamics_365_Customer_Insights_Attach_New,ff22b8d4-5073-4b24-ba45-84ad5d9b6642,CDS_CUSTOMER_INSIGHTS_BASE,d04ca659-b119-4a92-b8fc-3ede584a9d65,Dataverse for Cust Insights BASE +Dynamics 365 Customer Insights Attach,Dynamics_365_Customer_Insights_Attach_New,ff22b8d4-5073-4b24-ba45-84ad5d9b6642,CDS_CUSTOMER_INSIGHTS_COMBINED_BASE,d66ee5da-07d5-49d6-a1d8-45662c3f37be,Dataverse for Customer Insights Combined Base +Dynamics 365 Customer Insights Attach,Dynamics_365_Customer_Insights_Attach_New,ff22b8d4-5073-4b24-ba45-84ad5d9b6642,DYN365_CUSTOMER_INSIGHTS_JOURNEYS_BASE,1720c3f7-7da3-4a11-8324-92aad283eb68,Dynamics 365 Customer Insights Journeys +Dynamics 365 Customer Insights Attach,Dynamics_365_Customer_Insights_Attach_New,ff22b8d4-5073-4b24-ba45-84ad5d9b6642,Forms_Pro_Marketing_App,22b657cf-0a9e-467b-8a91-5e31f21bc570,Microsoft Dynamics 365 Customer Voice for Marketing Application +Dynamics 365 Customer Insights Attach,Dynamics_365_Customer_Insights_Attach_New,ff22b8d4-5073-4b24-ba45-84ad5d9b6642,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,Exchange Foundation +Dynamics 365 Customer Insights Journeys T3 Interacted People,Dynamics_365_Customer_Insights_Journeys_T3_Interacted_People,05735051-46c0-4c84-9107-bb13d77d0b88,CDS_CUSTOMER_INSIGHTS_JOURNEYS_ADD-ON,2f2e81a6-15de-4041-9f33-73c06fed3801,Dataverse for Customer Insights Journeys add-on +Dynamics 365 Customer Insights Journeys T3 Interacted People,Dynamics_365_Customer_Insights_Journeys_T3_Interacted_People,05735051-46c0-4c84-9107-bb13d77d0b88,DYN365_MARKETING_50K_CONTACT_ADDON,e626a4ec-1ba2-409e-bf75-9bc0bc30cca7,Dynamics 365 for Marketing 50K Addnl Contacts +Dynamics 365 Customer Insights Journeys T3 Interacted People,Dynamics_365_Customer_Insights_Journeys_T3_Interacted_People,05735051-46c0-4c84-9107-bb13d77d0b88,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,Exchange Foundation +Dynamics 365 Customer Insights User License,Dynamics_365_Customer_Insights_User_License,12b5a442-a6f2-49e4-868b-2d7408c2356f,DYN365_MARKETING_MSE_USER,2824c69a-1ac5-4397-8592-eae51cb8b581,Dynamics 365 for Marketing MSE User +Dynamics 365 Customer Insights User License,Dynamics_365_Customer_Insights_User_License,12b5a442-a6f2-49e4-868b-2d7408c2356f,DYN365_MARKETING_USER,5d7a6abc-eebd-46ab-96e1-e4a2f54a2248,Dynamics 365 for Marketing USL +Dynamics 365 Customer Insights User License,Dynamics_365_Customer_Insights_User_License,12b5a442-a6f2-49e4-868b-2d7408c2356f,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,Exchange Foundation Dynamics 365 for Customer Service Chat,DYN365_CS_CHAT,7d7af6c2-0be6-46df-84d1-c181b0272909,DYN365_CS_CHAT_FPA,426ec19c-d5b1-4548-b894-6fe75028c30d,Dynamics 365 Customer Service Chat Application Integration Dynamics 365 for Customer Service Chat,DYN365_CS_CHAT,7d7af6c2-0be6-46df-84d1-c181b0272909,DYN365_CS_CHAT,f69129db-6dc1-4107-855e-0aaebbcd9dd4,Dynamics 365 for Customer Service Chat Dynamics 365 for Customer Service Chat,DYN365_CS_CHAT,7d7af6c2-0be6-46df-84d1-c181b0272909,POWER_VIRTUAL_AGENTS_D365_CS_CHAT,19e4c3a8-3ebe-455f-a294-4f3479873ae3,Power Virtual Agents for Chat @@ -430,6 +441,8 @@ Dynamics 365 Hybrid Connector,CRM_HYBRIDCONNECTOR,de176c31-616d-4eae-829a-718918 Dynamics 365 Hybrid Connector,CRM_HYBRIDCONNECTOR,de176c31-616d-4eae-829a-718918d7ec23,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,Exchange Foundation Dynamics 365 for Marketing Additional Application,DYN365_MARKETING_APPLICATION_ADDON,99c5688b-6c75-4496-876f-07f0fbd69add,DYN365_MARKETING_APPLICATION_ADDON,51cf0638-4861-40c0-8b20-1161ab2f80be,Dynamics 365 for Marketing Additional Application Dynamics 365 for Marketing Additional Application,DYN365_MARKETING_APPLICATION_ADDON,99c5688b-6c75-4496-876f-07f0fbd69add,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,Exchange Foundation +Dynamics 365 for Marketing Addnl Contacts Tier 1,DYN365_MARKETING_CONTACT_ADDON,fc4581aa-6b1f-459d-95b6-84bd49d6f843,DYN365_MARKETING_CONTACT_ADDON,18db5075-2c70-408d-a82b-929059d782af,Dynamics 365 for Marketing Additional Contacts Tier 1 +Dynamics 365 for Marketing Addnl Contacts Tier 1,DYN365_MARKETING_CONTACT_ADDON,fc4581aa-6b1f-459d-95b6-84bd49d6f843,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,Exchange Foundation Dynamics 365 for Marketing Addnl Contacts Tier 3,DYN365_MARKETING_CONTACT_ADDON_T3,23053933-0fda-431f-9a5b-a00fd78444c1,DYN365_MARKETING_50K_CONTACT_ADDON,e626a4ec-1ba2-409e-bf75-9bc0bc30cca7,Dynamics 365 for Marketing 50K Addnl Contacts Dynamics 365 for Marketing Addnl Contacts Tier 3,DYN365_MARKETING_CONTACT_ADDON_T3,23053933-0fda-431f-9a5b-a00fd78444c1,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,Exchange Foundation Dynamics 365 for Marketing Addnl Contacts Tier 5,DYN365_MARKETING_CONTACT_ADDON_T5,d8eec316-778c-4f14-a7d1-a0aca433b4e7,DYN365_MARKETING_50K_CONTACT_ADDON,e626a4ec-1ba2-409e-bf75-9bc0bc30cca7,Dynamics 365 for Marketing 50K Addnl Contacts @@ -3682,6 +3695,8 @@ Microsoft Intune Device for Government,INTUNE_A_D_GOV,2c21e77a-e0d6-4570-b38a-7f Microsoft Intune Device for Government,INTUNE_A_D_GOV,2c21e77a-e0d6-4570-b38a-7ff2dc17d2ca,INTUNE_A,c1ec4a95-1f05-45b3-a911-aa3fa01094f5,Microsoft Intune Microsoft Intune Government,INTUNE_A_GOV,2b26f637-35a0-4dbc-b69e-ff674782be9d,EXCHANGE_S_FOUNDATION_GOV,922ba911-5694-4e99-a794-73aed9bfeec8,Exchange Foundation for Government Microsoft Intune Government,INTUNE_A_GOV,2b26f637-35a0-4dbc-b69e-ff674782be9d,INTUNE_A_GOV,d216f254-796f-4dab-bbfa-710686e646b9,Microsoft Intune G +Microsoft Intune Plan 1 A VL,INTUNE_A_VL,99fc2803-fa72-42d3-ae78-b055e177d275,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,Exchange Foundation +Microsoft Intune Plan 1 A VL,INTUNE_A_VL,99fc2803-fa72-42d3-ae78-b055e177d275,INTUNE_A_VL,3e170737-c728-4eae-bbb9-3f3360f7184c,Microsoft Intune Plan 1 Microsoft Intune Plan 1 A VL_USGOV_GCCHIGH,INTUNE_A_VL_USGOV_GCCHIGH,b4288abe-01be-47d9-ad20-311d6e83fc24,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,Exchange Foundation Microsoft Intune Plan 1 A VL_USGOV_GCCHIGH,INTUNE_A_VL_USGOV_GCCHIGH,b4288abe-01be-47d9-ad20-311d6e83fc24,INTUNE_A_VL,3e170737-c728-4eae-bbb9-3f3360f7184c,Microsoft Intune Plan 1 Microsoft Power Apps for Developer,POWERAPPS_DEV,5b631642-bd26-49fe-bd20-1daaa972ef80,DYN365_CDS_DEV_VIRAL,d8c638e2-9508-40e3-9877-feb87603837b,Common Data Service - DEV VIRAL diff --git a/Modules/CippExtensions/Public/ConversionTable.csv b/Modules/CippExtensions/Public/ConversionTable.csv index 5b7cea1f09ea..2658524b8cf2 100644 --- a/Modules/CippExtensions/Public/ConversionTable.csv +++ b/Modules/CippExtensions/Public/ConversionTable.csv @@ -361,6 +361,17 @@ Dynamics 365 Contact Center Voice Add-on for Customer Service Enterprise,DYNAMIC Dynamics 365 Contact Center Voice Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_VOICE_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,73e8b747-20bf-463d-8ffd-274a7d65d0bc,SHAREPOINTENTERPRISE,5dbe027f-2339-4123-9542-606e4d348a72,SharePoint (Plan 2) Dynamics 365 Contact Center Voice Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_VOICE_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,73e8b747-20bf-463d-8ffd-274a7d65d0bc,POWERAPPS_DYN_APPS,874fc546-6efe-4d22-90b8-5c4e7aa59f4b,Power Apps for Dynamics 365 Dynamics 365 Contact Center Voice Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_VOICE_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,73e8b747-20bf-463d-8ffd-274a7d65d0bc,FLOW_DYN_APPS,7e6d7d78-73de-46ba-83b1-6d25117334ba,Power Automate for Dynamics 365 +Dynamics 365 Customer Insights Attach,Dynamics_365_Customer_Insights_Attach_New,ff22b8d4-5073-4b24-ba45-84ad5d9b6642,CDS_CUSTOMER_INSIGHTS_BASE,d04ca659-b119-4a92-b8fc-3ede584a9d65,Dataverse for Cust Insights BASE +Dynamics 365 Customer Insights Attach,Dynamics_365_Customer_Insights_Attach_New,ff22b8d4-5073-4b24-ba45-84ad5d9b6642,CDS_CUSTOMER_INSIGHTS_COMBINED_BASE,d66ee5da-07d5-49d6-a1d8-45662c3f37be,Dataverse for Customer Insights Combined Base +Dynamics 365 Customer Insights Attach,Dynamics_365_Customer_Insights_Attach_New,ff22b8d4-5073-4b24-ba45-84ad5d9b6642,DYN365_CUSTOMER_INSIGHTS_JOURNEYS_BASE,1720c3f7-7da3-4a11-8324-92aad283eb68,Dynamics 365 Customer Insights Journeys +Dynamics 365 Customer Insights Attach,Dynamics_365_Customer_Insights_Attach_New,ff22b8d4-5073-4b24-ba45-84ad5d9b6642,Forms_Pro_Marketing_App,22b657cf-0a9e-467b-8a91-5e31f21bc570,Microsoft Dynamics 365 Customer Voice for Marketing Application +Dynamics 365 Customer Insights Attach,Dynamics_365_Customer_Insights_Attach_New,ff22b8d4-5073-4b24-ba45-84ad5d9b6642,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,Exchange Foundation +Dynamics 365 Customer Insights Journeys T3 Interacted People,Dynamics_365_Customer_Insights_Journeys_T3_Interacted_People,05735051-46c0-4c84-9107-bb13d77d0b88,CDS_CUSTOMER_INSIGHTS_JOURNEYS_ADD-ON,2f2e81a6-15de-4041-9f33-73c06fed3801,Dataverse for Customer Insights Journeys add-on +Dynamics 365 Customer Insights Journeys T3 Interacted People,Dynamics_365_Customer_Insights_Journeys_T3_Interacted_People,05735051-46c0-4c84-9107-bb13d77d0b88,DYN365_MARKETING_50K_CONTACT_ADDON,e626a4ec-1ba2-409e-bf75-9bc0bc30cca7,Dynamics 365 for Marketing 50K Addnl Contacts +Dynamics 365 Customer Insights Journeys T3 Interacted People,Dynamics_365_Customer_Insights_Journeys_T3_Interacted_People,05735051-46c0-4c84-9107-bb13d77d0b88,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,Exchange Foundation +Dynamics 365 Customer Insights User License,Dynamics_365_Customer_Insights_User_License,12b5a442-a6f2-49e4-868b-2d7408c2356f,DYN365_MARKETING_MSE_USER,2824c69a-1ac5-4397-8592-eae51cb8b581,Dynamics 365 for Marketing MSE User +Dynamics 365 Customer Insights User License,Dynamics_365_Customer_Insights_User_License,12b5a442-a6f2-49e4-868b-2d7408c2356f,DYN365_MARKETING_USER,5d7a6abc-eebd-46ab-96e1-e4a2f54a2248,Dynamics 365 for Marketing USL +Dynamics 365 Customer Insights User License,Dynamics_365_Customer_Insights_User_License,12b5a442-a6f2-49e4-868b-2d7408c2356f,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,Exchange Foundation Dynamics 365 for Customer Service Chat,DYN365_CS_CHAT,7d7af6c2-0be6-46df-84d1-c181b0272909,DYN365_CS_CHAT_FPA,426ec19c-d5b1-4548-b894-6fe75028c30d,Dynamics 365 Customer Service Chat Application Integration Dynamics 365 for Customer Service Chat,DYN365_CS_CHAT,7d7af6c2-0be6-46df-84d1-c181b0272909,DYN365_CS_CHAT,f69129db-6dc1-4107-855e-0aaebbcd9dd4,Dynamics 365 for Customer Service Chat Dynamics 365 for Customer Service Chat,DYN365_CS_CHAT,7d7af6c2-0be6-46df-84d1-c181b0272909,POWER_VIRTUAL_AGENTS_D365_CS_CHAT,19e4c3a8-3ebe-455f-a294-4f3479873ae3,Power Virtual Agents for Chat @@ -430,6 +441,8 @@ Dynamics 365 Hybrid Connector,CRM_HYBRIDCONNECTOR,de176c31-616d-4eae-829a-718918 Dynamics 365 Hybrid Connector,CRM_HYBRIDCONNECTOR,de176c31-616d-4eae-829a-718918d7ec23,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,Exchange Foundation Dynamics 365 for Marketing Additional Application,DYN365_MARKETING_APPLICATION_ADDON,99c5688b-6c75-4496-876f-07f0fbd69add,DYN365_MARKETING_APPLICATION_ADDON,51cf0638-4861-40c0-8b20-1161ab2f80be,Dynamics 365 for Marketing Additional Application Dynamics 365 for Marketing Additional Application,DYN365_MARKETING_APPLICATION_ADDON,99c5688b-6c75-4496-876f-07f0fbd69add,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,Exchange Foundation +Dynamics 365 for Marketing Addnl Contacts Tier 1,DYN365_MARKETING_CONTACT_ADDON,fc4581aa-6b1f-459d-95b6-84bd49d6f843,DYN365_MARKETING_CONTACT_ADDON,18db5075-2c70-408d-a82b-929059d782af,Dynamics 365 for Marketing Additional Contacts Tier 1 +Dynamics 365 for Marketing Addnl Contacts Tier 1,DYN365_MARKETING_CONTACT_ADDON,fc4581aa-6b1f-459d-95b6-84bd49d6f843,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,Exchange Foundation Dynamics 365 for Marketing Addnl Contacts Tier 3,DYN365_MARKETING_CONTACT_ADDON_T3,23053933-0fda-431f-9a5b-a00fd78444c1,DYN365_MARKETING_50K_CONTACT_ADDON,e626a4ec-1ba2-409e-bf75-9bc0bc30cca7,Dynamics 365 for Marketing 50K Addnl Contacts Dynamics 365 for Marketing Addnl Contacts Tier 3,DYN365_MARKETING_CONTACT_ADDON_T3,23053933-0fda-431f-9a5b-a00fd78444c1,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,Exchange Foundation Dynamics 365 for Marketing Addnl Contacts Tier 5,DYN365_MARKETING_CONTACT_ADDON_T5,d8eec316-778c-4f14-a7d1-a0aca433b4e7,DYN365_MARKETING_50K_CONTACT_ADDON,e626a4ec-1ba2-409e-bf75-9bc0bc30cca7,Dynamics 365 for Marketing 50K Addnl Contacts @@ -3682,6 +3695,8 @@ Microsoft Intune Device for Government,INTUNE_A_D_GOV,2c21e77a-e0d6-4570-b38a-7f Microsoft Intune Device for Government,INTUNE_A_D_GOV,2c21e77a-e0d6-4570-b38a-7ff2dc17d2ca,INTUNE_A,c1ec4a95-1f05-45b3-a911-aa3fa01094f5,Microsoft Intune Microsoft Intune Government,INTUNE_A_GOV,2b26f637-35a0-4dbc-b69e-ff674782be9d,EXCHANGE_S_FOUNDATION_GOV,922ba911-5694-4e99-a794-73aed9bfeec8,Exchange Foundation for Government Microsoft Intune Government,INTUNE_A_GOV,2b26f637-35a0-4dbc-b69e-ff674782be9d,INTUNE_A_GOV,d216f254-796f-4dab-bbfa-710686e646b9,Microsoft Intune G +Microsoft Intune Plan 1 A VL,INTUNE_A_VL,99fc2803-fa72-42d3-ae78-b055e177d275,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,Exchange Foundation +Microsoft Intune Plan 1 A VL,INTUNE_A_VL,99fc2803-fa72-42d3-ae78-b055e177d275,INTUNE_A_VL,3e170737-c728-4eae-bbb9-3f3360f7184c,Microsoft Intune Plan 1 Microsoft Intune Plan 1 A VL_USGOV_GCCHIGH,INTUNE_A_VL_USGOV_GCCHIGH,b4288abe-01be-47d9-ad20-311d6e83fc24,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,Exchange Foundation Microsoft Intune Plan 1 A VL_USGOV_GCCHIGH,INTUNE_A_VL_USGOV_GCCHIGH,b4288abe-01be-47d9-ad20-311d6e83fc24,INTUNE_A_VL,3e170737-c728-4eae-bbb9-3f3360f7184c,Microsoft Intune Plan 1 Microsoft Power Apps for Developer,POWERAPPS_DEV,5b631642-bd26-49fe-bd20-1daaa972ef80,DYN365_CDS_DEV_VIRAL,d8c638e2-9508-40e3-9877-feb87603837b,Common Data Service - DEV VIRAL diff --git a/Modules/CippExtensions/Public/Extension Functions/Sync-CippExtensionData.ps1 b/Modules/CippExtensions/Public/Extension Functions/Sync-CippExtensionData.ps1 index c5c5f4fa6f71..d08a46c09027 100644 --- a/Modules/CippExtensions/Public/Extension Functions/Sync-CippExtensionData.ps1 +++ b/Modules/CippExtensions/Public/Extension Functions/Sync-CippExtensionData.ps1 @@ -217,7 +217,7 @@ function Sync-CippExtensionData { try { $TenantResults = New-GraphBulkRequest -Requests @($TenantRequests) -tenantid $TenantFilter } catch { - Throw "Failed to fetch bulk company data: $_" + throw "Failed to fetch bulk company data: $_" } $TenantResults | Select-Object id, body | ForEach-Object { @@ -302,7 +302,6 @@ function Sync-CippExtensionData { } } - $LastSync.LastSync = [datetime]::UtcNow.ToString('yyyy-MM-ddTHH:mm:ssZ') $LastSync.Status = 'Completed' $LastSync.Error = '' @@ -313,4 +312,5 @@ function Sync-CippExtensionData { } finally { Add-CIPPAzDataTableEntity @Table -Entity $LastSync -Force } + return $LastSync } diff --git a/Modules/CippExtensions/Public/NinjaOne/Invoke-NinjaOneDeviceWebhook.ps1 b/Modules/CippExtensions/Public/NinjaOne/Invoke-NinjaOneDeviceWebhook.ps1 index 0a980c96291c..f230a6078d6b 100644 --- a/Modules/CippExtensions/Public/NinjaOne/Invoke-NinjaOneDeviceWebhook.ps1 +++ b/Modules/CippExtensions/Public/NinjaOne/Invoke-NinjaOneDeviceWebhook.ps1 @@ -13,7 +13,7 @@ function Invoke-NinjaOneDeviceWebhook { } if ($MappedFields.DeviceCompliance) { - Write-LogMessage -Headers $Headers -API $APIName -message "Webhook Recieved - Updating NinjaOne Device compliance for $($Data.resourceData.id) in $($Data.tenantId)" -Sev 'Info' -tenant $TenantFilter + Write-LogMessage -Headers $Headers -API $APIName -message "Webhook Received - Updating NinjaOne Device compliance for $($Data.resourceData.id) in $($Data.tenantId)" -Sev 'Info' -tenant $TenantFilter $tenantfilter = $Data.tenantId $M365DeviceID = $Data.resourceData.id diff --git a/Modules/CippExtensions/Public/NinjaOne/Invoke-NinjaOneTenantSync.ps1 b/Modules/CippExtensions/Public/NinjaOne/Invoke-NinjaOneTenantSync.ps1 index 245ff267103c..aeb7cabfd00d 100644 --- a/Modules/CippExtensions/Public/NinjaOne/Invoke-NinjaOneTenantSync.ps1 +++ b/Modules/CippExtensions/Public/NinjaOne/Invoke-NinjaOneTenantSync.ps1 @@ -48,7 +48,7 @@ function Invoke-NinjaOneTenantSync { Write-LogMessage -tenant $Customer.defaultDomainName -API 'NinjaOneSync' -message "Processing NinjaOne Synchronization for $($Customer.displayName) - Queued for $((New-TimeSpan -Start $StartQueueTime -End $StartTime).TotalSeconds)" -Sev 'Info' if (($Customer | Measure-Object).count -ne 1) { - throw "Unable to match the recieved ID to a tenant QueueItem: $($QueueItem | ConvertTo-Json -Depth 100 | Out-String) Matched Customer: $($Customer| ConvertTo-Json -Depth 100 | Out-String)" + throw "Unable to match the received ID to a tenant QueueItem: $($QueueItem | ConvertTo-Json -Depth 100 | Out-String) Matched Customer: $($Customer| ConvertTo-Json -Depth 100 | Out-String)" } $TenantFilter = $Customer.defaultDomainName @@ -611,7 +611,7 @@ function Invoke-NinjaOneTenantSync { if ($Device.complianceState -eq 'compliant') { $Compliance = '   Compliant' } else { - $Compliance = '   Not Compliant' + $Compliance = '   Not Compliant' } # Device Details @@ -809,7 +809,7 @@ function Invoke-NinjaOneTenantSync { $UserMailSettings = [pscustomobject]@{ ForwardAndDeliver = $MailboxDetailedRequest.DeliverToMailboxAndForward ForwardingAddress = $MailboxDetailedRequest.ForwardingAddress + ' ' + $MailboxDetailedRequest.ForwardingSmtpAddress - LitiationHold = $MailboxDetailedRequest.LitigationHoldEnabled + LitigationHold = $MailboxDetailedRequest.LitigationHoldEnabled HiddenFromAddressLists = $MailboxDetailedRequest.HiddenFromAddressListsEnabled EWSEnabled = $CASRequest.EwsEnabled MailboxMAPIEnabled = $CASRequest.MAPIEnabled @@ -843,7 +843,7 @@ function Invoke-NinjaOneTenantSync { if ($UserDevice.Compliance -eq 'compliant') { $ComplianceIcon = '' } else { - $ComplianceIcon = '' + $ComplianceIcon = '' } # OS Icon @@ -973,7 +973,7 @@ function Invoke-NinjaOneTenantSync { $MailboxSettingsCard = [PSCustomObject]@{ 'Forward and Deliver' = "$($UserMailSettings.ForwardAndDeliver)" 'Forwarding Address' = "$($UserMailSettings.ForwardingAddress)" - 'Litiation Hold' = "$($UserMailSettings.LitiationHold)" + 'Litigation Hold' = "$($UserMailSettings.LitigationHold)" 'Hidden From Address Lists' = "$($UserMailSettings.HiddenFromAddressLists)" 'EWS Enabled' = "$($UserMailSettings.EWSEnabled)" 'MAPI Enabled' = "$($UserMailSettings.MailboxMAPIEnabled)" @@ -1236,7 +1236,7 @@ function Invoke-NinjaOneTenantSync { } } catch { - Write-Error "User $($User.UserPrincipalName): A fatal error occured while processing user $_" + Write-Error "User $($User.UserPrincipalName): A fatal error occurred while processing user $_" } } diff --git a/Tools/Update-StandardsJson.ps1 b/Tools/Update-StandardsJson.ps1 new file mode 100644 index 000000000000..8512ebb35268 --- /dev/null +++ b/Tools/Update-StandardsJson.ps1 @@ -0,0 +1,51 @@ +<# +.SYNOPSIS +Copies standards.json from the CIPP frontend to the backend Config folder. + +.DESCRIPTION +This script copies the standards.json file from ../CIPP/src/data/standards.json (frontend) to Config/standards.json (backend). +Run this script from the Tools folder in the CIPP-API project. + +.EXAMPLE +Copy-StandardsJson.ps1 + +.NOTES +Date: 2025-07-16 +Version: 1.2 - Only overwrites if SHA values differ + +Needs to be run from the "Tools" folder in the CIPP-API project. +#> + +# Ensure script runs from Tools folder +Set-Location $PSScriptRoot + +# Go to project root +Set-Location .. +Set-Location .. + +# Source and destination paths +$source = 'CIPP\src\data\standards.json' +$destination = 'CIPP-API\Config\standards.json' + +function Get-FileSHA256 { + param ( + $Path + ) + if (Test-Path $Path) { + return (Get-FileHash -Path $Path -Algorithm SHA256).Hash + } + return $null +} + +if (Test-Path $source) { + $srcSHA = Get-FileSHA256 $source + $dstSHA = Get-FileSHA256 $destination + if ($srcSHA -ne $dstSHA) { + Copy-Item -Path $source -Destination $destination -Force + Write-Host "Copied $source to $destination." -ForegroundColor Green + } else { + Write-Host 'No changes detected (SHA256 match). Destination not overwritten.' -ForegroundColor Yellow + } +} else { + Write-Host "Source file not found: $source" -ForegroundColor Red +} diff --git a/version_latest.txt b/version_latest.txt index 2b0aa21219df..6c9616431ff5 100644 --- a/version_latest.txt +++ b/version_latest.txt @@ -1 +1 @@ -8.2.1 +8.2.2 \ No newline at end of file