Skip to content

feat(cisa)!: take parked domains from the ParkedDomains setting in the Exchange email checks - #2787

Merged
merill merged 2 commits into
mainfrom
claude/cisa-exo-parked-domains-6d6501
Nov 11, 2026
Merged

merill merged 2 commits into
mainfrom
claude/cisa-exo-parked-domains-6d6501

Conversation

@merill

@merill merill commented Nov 10, 2026 •

Copy link
Copy Markdown
Contributor

Stacked on #2758 (base feat/parameter-settings). Design: #2775.

The CISA Exchange email-authentication tests no longer decide which accepted domains are parked from Exchange's SendingFromDomainDisabled. A domain is parked only when it is listed in the shared ParkedDomains setting, which the engine binds to a test parameter. No test calls Get-MtSetting.

Breaking change

Results change for tenants that relied on Allow mail to be sent from this domain being turned off:

Test Before After
CISA.MS.EXO.2.2 (SPF) A domain with sending disabled was left out of the test It is checked as a sending domain (needs the Exchange Online include) unless it is listed in ParkedDomains. A listed domain must publish a policy ending in -all or ~all
CISA.MS.EXO.3.1 (DKIM) A domain with sending disabled was skipped as "Parked domain" It is checked like every other domain and fails without an enabled DKIM configuration and a valid record

To keep a parked domain passing 2.2, list it once:

{ "GlobalSettings": { "ParkedDomains": ["contoso-old.com"] } }

What SCuBA asks of a parked domain

Read from the ScubaGear baseline (baselines/exo.md), EXOConfig.rego and ExportEXOProvider.psm1. ScubaGear has no notion of a parked domain: it runs every policy against every accepted domain (the coexistence domain aside) and never reads SendingFromDomainDisabled.

Policy Baseline text What a parked domain must publish In this PR
MS.EXO.2.2v3 An SPF policy for each domain "that fails all non-approved senders"; -all or ~all both comply An SPF policy ending in -all or ~all. With no approved senders that is v=spf1 -all Uses ParkedDomains. A listed domain is not asked for the Exchange Online include (Maester's check for a sending domain) and must fail all senders
MS.EXO.3.1v1 DKIM "SHOULD be enabled for all domains" No separate rule. Same as a sending domain No parameter. The parked-domain skip is removed and every domain gets the sending-domain check
MS.EXO.4.1v1 A DMARC policy for every second-level domain No separate rule. A DMARC record Unchanged; already checks every domain
MS.EXO.4.2v1 p=reject No separate rule. p=reject Unchanged; already checks every domain
MS.EXO.4.3v1 rua includes reports@dmarc.cyber.dhs.gov No separate rule Unchanged
MS.EXO.4.4v1 (Test-MtCisaDmarcReport) Agency contact in rua and ruf No separate rule Unchanged

So only MS.EXO.2.2 takes ParkedDomains. The others keep the sending-domain check for every domain because the baseline gives no other rule.

Decided in #2775 (decision 6): the CISA Exchange tests use the ParkedDomains setting instead of inferring from SendingFromDomainDisabled, and CISA.MS.EXO.3.1 keeps checking DKIM on every domain, parked or not, because SCuBA has no separate rule for a parked domain.

Changes

  • Test.CISA.MS.EXO.2.2.ps1: ParkedDomains parameter bound to the setting; parked-domain rule; checks all accepted domains. Names are matched without regard to case or a trailing dot.
  • Test.CISA.MS.EXO.3.1.ps1: removes the SendingFromDomainDisabled skip and the "Disable sending from domain" recommendation that depended on it.
  • Test.CISA.MS.EXO.4.2.ps1, Test.CISA.MS.EXO.4.3.ps1, Test-MtCisaDmarcReport.ps1: the commented-out inference becomes a one-line comment. No behaviour change.
  • Guides for 2.2 and 3.1 updated; 3.1 loses "Option 2: Disallow mail to be sent from domain".
  • New Test-MtCisaSpfDirective.Tests.ps1 (11 cases); Test-MtDkim.Tests.ps1 expects a failure for the CISA parked case.

Not changed: tests/cis/, MaesterSettings.psd1, powershell/internal/engine/. website/docs/configuration/ does not list tests per setting, and Update-MtTestBuilderData.ps1 produced no diff.

Notes

  • Apply parked-domain criteria to CIS 2.1.8-2.1.10 #2673 also edits powershell/tests/functions/Test-MtDkim.Tests.ps1 (the same parked case, for CIS), so whichever merges second has a small conflict there.
  • The sending-domain rule in 2.2 is unchanged: it still asks for the Exchange Online include and does not check -all, which is narrower than MS.EXO.2.2v3. Left for a separate change.

Testing

./powershell/tests/pester.ps1: 8542 tests, no failures. Not run against a tenant.

🤖 Generated with Claude Code

Summary by CodeRabbit

  • New Features

    • SPF checks now evaluate all accepted domains. Parked domains must have no approved senders and use a fail-all SPF policy; other domains retain the Exchange Online SPF check.
    • Parked domains can be specified in test settings.
  • Bug Fixes

    • DKIM checks no longer skip parked domains; they are evaluated alongside other accepted domains.
  • Documentation

    • Clarified how parked domains are treated in SPF and DKIM checks, including how to configure them and which remediation steps apply.

@merill
merill requested review from a team as code owners November 10, 2026 20:07
@merill merill added the breaking change Changes behaviour, a parameter, an output or a test ID that users rely on label Nov 10, 2026
@coderabbitai

coderabbitai Bot commented Nov 10, 2026 •

Copy link
Copy Markdown
Contributor

Explain Change →

Caution

Review failed

The pull request is closed.

Walkthrough

The CISA Exchange SPF check now accepts an explicit list of parked domains and applies SPF policy checks to them. The DKIM check no longer skips parked domains. Related tests and documentation describe the accepted-domain scope and configuration.

Changes: CISA Exchange accepted-domain checks

Layer / File(s) Summary
SPF evaluation for parked and sending domains
tests/cisa/exchange/Test.CISA.MS.EXO.2.2.ps1, powershell/tests/functions/Test-MtCisaSpfDirective.Tests.ps1, tests/cisa/exchange/Test.CISA.MS.EXO.2.2.md, website/src/data/test-builder.json, powershell/internal/checks/cisa/exchange/Test-MtCisaDmarcReport.ps1, tests/cisa/exchange/Test.CISA.MS.EXO.4.2.ps1, tests/cisa/exchange/Test.CISA.MS.EXO.4.3.ps1
Test-MtCisaSpfDirective accepts ParkedDomains. Listed domains are checked for an SPF -all or ~all term; other accepted domains retain the Exchange Online directive check. Tests cover both paths and unavailable DNS results. Documentation describes the parameter and parked-domain settings.
DKIM checks and accepted-domain scope
tests/cisa/exchange/Test.CISA.MS.EXO.3.1.ps1, powershell/tests/functions/Test-MtDkim.Tests.ps1, tests/cisa/exchange/Test.CISA.MS.EXO.3.1.md
The DKIM check no longer skips domains when sending is disabled. Tests and documentation reflect that parked domains are checked.

Estimated code review effort: 3 (Moderate) | ~20 minutes

Change: Feature

Possibly related issues

Possibly related PRs

  • maester365/maester#2756: Both changes remove the sending-disabled exclusion from CISA Exchange SPF domain evaluation.
  • maester365/maester#2673: Both changes use explicit ParkedDomains input instead of inferring parked status from the Exchange sending setting.

Suggested labels: product: exchange, enhancement, new test

Suggested reviewers: soulemike, samerde

Merge Risk: Low · up to 8b6f8

The check can pass without verifying a parked domain in a narrow DNS-unavailable case, and its success report can overstate what a parked domain’s SPF policy does. Address these before relying on the result, or merge with explicit owner acceptance.

- [ ] Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

Share

@codacy-production

Copy link
Copy Markdown

Up to standards ✅

🟢 Issues 0 issues

Results:
0 new issues

View in Codacy

NEW Get contextual insights on your PRs based on Codacy's metrics, along with PR and Jira context, without leaving GitHub. Enable AI reviewer
TIP This summary will be updated as you push new changes.

merill and others added 2 commits November 11, 2026 12:47
…e Exchange email checks

CISA.MS.EXO.2.2 and CISA.MS.EXO.3.1 no longer read Exchange's
SendingFromDomainDisabled to decide which accepted domains are parked.

- MS.EXO.2.2 (SPF) takes a ParkedDomains parameter bound to the shared
  setting. A listed domain must publish a policy that fails all senders
  (-all or ~all, as MS.EXO.2.2v3 allows); every other accepted domain gets
  the sending-domain check, including one that cannot send.
- MS.EXO.3.1 (DKIM) checks every accepted domain except the coexistence
  domain. SCuBA gives no separate rule for a domain that never sends, so
  the skip for parked domains is removed rather than moved to the setting.
- MS.EXO.4.2, 4.3 and Test-MtCisaDmarcReport already check every domain;
  the commented-out inference is replaced by a comment that says so.

Co-Authored-By: Claude <noreply@anthropic.com>
Entire-Checkpoint: 01M73H4Z79A9A32WNWWS1A4B92
…data

Co-Authored-By: Claude <noreply@anthropic.com>
Entire-Checkpoint: 01M74513ATGD00B8M71K7WEFPQ
@merill
merill force-pushed the claude/cisa-exo-parked-domains-6d6501 branch from 98f45d9 to 8b6f8ab Compare November 11, 2026 01:54
@merill
merill requested review from a team as code owners November 11, 2026 01:54
@merill
merill changed the base branch from feat/parameter-settings to main November 11, 2026 01:55
@merill
merill merged commit b378640 into main Nov 11, 2026
2 of 3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

breaking change Changes behaviour, a parameter, an output or a test ID that users rely on

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant