Author SHA1 Message Date
Wesley van TilburgandClaude Opus 5.5 e8cfa8d4cf fedora-intune: don't repeat the version in the reported OS version
Build containers / fedora-cosmic (44) (pull_request) Canceled after 0s
Build containers / fedora-cosmic (rawhide) (pull_request) Canceled after 0s
Build containers / fedora-remote (44) (pull_request) Canceled after 0s
Build containers / fedora-intune (44) (pull_request) Canceled after 0s
Build containers / Compute changes (pull_request) Canceled after 13s
Build containers / Prune old releases and tags (pull_request) Skipped
libhimmelblau reports "PRETTY_NAME VERSION_ID" as the OS version, and
Fedora's PRETTY_NAME already contains the version, so Entra showed
"Fedora Linux 44.20261020.0 (Forty Four) 44.20261020.0". In the
os-release the Himmelblau daemons see, set PRETTY_NAME to NAME, giving
"Fedora Linux 44.20261020.0". Nothing else in Himmelblau reads
PRETTY_NAME.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
2026-10-20 12:48:44 +00:00
Wesley van TilburgandClaude Opus 5.5 5504f4e7aa fedora-intune: install the Defender managed config when Defender starts
The managed config shipped in /etc never reached updated devices:
mdatp-firstboot creates /etc/opt/microsoft/mdatp on the device, so ostree's
/etc merge treats that directory as local and doesn't add new image files
under it. VM 123 had the file in /usr/etc but not in /etc, and Defender
kept its defaults.

Ship it in /usr/share/mdatp-managed/ and install it into
/etc/opt/microsoft/mdatp/managed/ from an ExecStartPre in mdatp.service.
This also applies changes from newer images and undoes local edits.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
2026-10-20 12:48:44 +00:00
Misthios 561036582c Merge pull request 'Misthios/defender onboarding validation' (#4) from misthios/defender-onboarding-validation into main
Build containers / Compute changes (push) Successful in 21s
Build containers / fedora-cosmic (44) (push) Skipped
Build containers / fedora-cosmic (rawhide) (push) Skipped
Build containers / fedora-remote (44) (push) Skipped
Build containers / fedora-intune (44) (push) Successful in 12m40s
Build containers / Prune old releases and tags (push) Successful in 28s
Reviewed-on: #4
2026-10-20 12:23:30 +00:00
Wesley van TilburgandClaude Opus 5.5 86039eeb9d fedora-intune: enforce Defender protection settings
Defender's defaults left behavior monitoring off and every setting
unmanaged. Ship /etc/opt/microsoft/mdatp/managed/mdatp_managed.json:
real-time protection, behavior monitoring, PUA blocking, cloud-delivered
protection at the high block level, automatic definition updates and
sample submission, and scheduled scans (daily quick at 12:00, weekly full
on Wednesday 12:30, low priority). Users can't change managed settings.
The build fails if the file isn't valid JSON.

Network protection (Insiders channels only) and tamper protection
(audit-only preview on Linux) are left out.

The compliance script and rules now also check behavior monitoring and
cloud-delivered protection.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
2026-10-20 12:23:30 +00:00
Wesley van TilburgandClaude Opus 5.5 3afef0d821 fedora-intune: validate the onboarding JSON in the Defender script
A paste into Intune that lost the first "{" line produced an unreadable
mdatp_onboard.json, and Defender reported "No license found". Check that
the pasted JSON parses and has onboardingInfo before writing it, and log
what to fix otherwise.

The placeholder also appeared twice, so a find-and-replace of it broke
the script; match it by prefix so it appears only once.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
2026-10-20 12:23:30 +00:00
Misthios 07434cedab Merge pull request 'fedora-intune: grant sudo to the Linux admins Entra group' (#3) from misthios/fedora-intune-sudo-groups into main
Build containers / fedora-cosmic (44) (push) Canceled after 0s
Build containers / fedora-cosmic (rawhide) (push) Canceled after 0s
Build containers / fedora-remote (44) (push) Canceled after 0s
Build containers / fedora-intune (44) (push) Canceled after 0s
Build containers / Compute changes (push) Canceled after 12s
Build containers / Prune old releases and tags (push) Successful in 26s
Reviewed-on: #3
2026-10-20 12:22:57 +00:00
Wesley van TilburgandClaude Opus 5.5 0e76505715 fedora-intune: grant sudo to the Linux admins Entra group
Build containers / fedora-cosmic (44) (pull_request) Canceled after 0s
Build containers / fedora-cosmic (rawhide) (pull_request) Canceled after 0s
Build containers / fedora-remote (44) (pull_request) Canceled after 0s
Build containers / fedora-intune (44) (pull_request) Canceled after 0s
Build containers / Compute changes (pull_request) Canceled after 12s
Build containers / Prune old releases and tags (pull_request) Skipped
local_sudo_group was set to wheel but sudo_groups was empty, so no Entra
user ever got sudo. Members of the Entra group
c3b1cfcc-7834-47eb-948b-a22204276453 now get wheel at sign-in, and lose
it again after leaving the group.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
2026-10-20 11:30:20 +00:00
Misthios f48a0ffaf6 Merge pull request 'Misthios/fedora intune os version defender' (#2) from misthios/fedora-intune-os-version-defender into main
Build containers / Compute changes (push) Successful in 20s
Build containers / fedora-intune (44) (push) Canceled after 0s
Build containers / fedora-cosmic (44) (push) Canceled after 33s
Build containers / fedora-cosmic (rawhide) (push) Canceled after 33s
Build containers / fedora-remote (44) (push) Canceled after 34s
Build containers / Prune old releases and tags (push) Successful in 24s
Reviewed-on: #2
2026-10-20 09:22:41 +00:00
Wesley van TilburgandClaude Opus 5.5 1dbe7f6895 ci: only rebuild changed images
Build containers / fedora-cosmic (44) (pull_request) Canceled after 0s
Build containers / fedora-cosmic (rawhide) (pull_request) Canceled after 0s
Build containers / fedora-remote (44) (pull_request) Canceled after 0s
Build containers / fedora-intune (44) (pull_request) Canceled after 0s
Build containers / Compute changes (pull_request) Canceled after 9s
Build containers / Prune old releases and tags (pull_request) Skipped
The changes job ran on the bare runner, which has no git (the build jobs
install it before checkout). actions/checkout then fell back to a tarball
without history, `git diff` failed, `|| true` turned that into an empty
change list, and an empty list means "rebuild everything" - on every push
and PR.

Run the job in the buildroot container with git and nodejs, warn when the
diff fails instead of hiding it, treat a diff with no changes as "build
nothing", and let a manual run pick one image. The weekly scheduled run
still rebuilds all images for package updates.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
2026-10-20 09:21:08 +00:00
Wesley van TilburgandClaude Opus 5.5 2b78113124 fedora-intune: install Defender from Microsoft's Fedora 44 repo
The RHEL 10 repo was there for the Intune app, which only ships for RHEL;
that app is gone and the repo now only provides mdatp. Use Microsoft's
Fedora 44 repo instead: Fedora is a supported Defender distribution
(servers and the Linux desktop preview), and it carries a newer build
(101.26091.0003 vs 101.26081.0010 in the RHEL 10 repo). Same signing key
and signed metadata.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
2026-10-20 09:19:16 +00:00
Wesley van TilburgandClaude Opus 5.5 6afa1d21e6 fedora-intune: cron for Intune config scripts, Defender remediation script
Himmelblau installs Intune Linux custom configuration scripts as
/etc/cron.d jobs, and the image had no cron, so a script policy failed to
apply. Add cronie and enable crond.

Add a custom configuration script that repairs Microsoft Defender on its
schedule: finishes first-boot setup, restarts a stopped daemon, onboards with
the tenant's mdatp_onboard.json (pasted into the script in Intune), and
re-enables real-time protection and updates definitions when needed.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
2026-10-20 09:15:28 +00:00
Wesley van TilburgandClaude Opus 5.5 75c3b502d7 fedora-intune: report full image version to Intune, Defender compliance script
Himmelblau reports VERSION_ID from /etc/os-release as the device OS version,
so Intune showed "44". Give himmelblaud and himmelblaud-tasks their own
os-release (bind-mounted in their mount namespace only) with VERSION_ID set to
OSTREE_VERSION, e.g. 44.20261019.0. The rest of the system keeps the stock
VERSION_ID that toolbox, flatpak and dnf expect.

Add an Intune custom compliance discovery script and rules for Microsoft
Defender for Endpoint (installed, running, onboarded, licensed, healthy,
real-time protection, definitions up to date). These are uploaded to Intune,
not shipped in the image.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
2026-10-20 09:13:03 +00:00
16 changed files with 493 additions and 18 deletions

No files matched your search

+57 -9
View File
@@ -2,6 +2,12 @@ name: Build containers
on: on:
workflow_dispatch: workflow_dispatch:
inputs:
image:
description: Image to build
type: choice
options: [all, fedora-cosmic, fedora-remote, fedora-intune]
default: all
pull_request: pull_request:
branches: ["main"] branches: ["main"]
push: push:
@@ -15,11 +21,17 @@ jobs:
changes: changes:
name: Compute changes name: Compute changes
runs-on: job-v2 runs-on: job-v2
# The runner has no git: without it actions/checkout falls back to a
# tarball with no history, `git diff` fails and every image is rebuilt.
container:
image: "quay.io/fedora-ostree-desktops/buildroot:44"
outputs: outputs:
cosmic: ${{ steps.changes.outputs.cosmic }} cosmic: ${{ steps.changes.outputs.cosmic }}
remote: ${{ steps.changes.outputs.remote }} remote: ${{ steps.changes.outputs.remote }}
intune: ${{ steps.changes.outputs.intune }} intune: ${{ steps.changes.outputs.intune }}
steps: steps:
- name: Install tools
run: dnf install -y nodejs git
- name: Checkout - name: Checkout
uses: actions/checkout@v4 uses: actions/checkout@v4
with: with:
@@ -27,17 +39,53 @@ jobs:
- name: Detect changed images - name: Detect changed images
id: changes id: changes
shell: bash shell: bash
env:
EVENT: ${{ github.event_name }}
BEFORE: ${{ github.event.before }}
SHA: ${{ github.sha }}
BASE_REF: ${{ github.base_ref }}
DISPATCH_IMAGE: ${{ inputs.image }}
run: | run: |
set -euo pipefail set -euo pipefail
if [[ "${{ github.event_name }}" == "push" \ # Diff the event's commits; any failure rebuilds everything, but
&& -n "${{ github.event.before }}" \ # say so instead of hiding it.
&& "${{ github.event.before }}" != "0000000000000000000000000000000000000000" ]]; then diff_or_all() {
changed="$(git diff --name-only "${{ github.event.before }}" "${{ github.sha }}" || true)" if ! changed="$(git diff --name-only "$@")"; then
elif [[ "${{ github.event_name }}" == "pull_request" ]]; then echo "::warning::git diff $* failed; rebuilding every image"
changed="$(git diff --name-only "origin/${{ github.base_ref }}...HEAD" || true)" changed=""
else elif [[ -z "${changed}" ]]; then
changed="" # Nothing changed (e.g. an empty merge): build nothing rather
fi # than everything.
changed="(none)"
fi
}
case "${EVENT}" in
push)
if [[ -n "${BEFORE}" && "${BEFORE}" != 0000000000000000000000000000000000000000 ]]; then
diff_or_all "${BEFORE}" "${SHA}"
else
echo "::warning::push without a previous commit; rebuilding every image"
changed=""
fi
;;
pull_request)
diff_or_all "origin/${BASE_REF}...HEAD"
;;
workflow_dispatch)
# Pretend the chosen image's directory changed; "all" (or no
# input) rebuilds everything.
if [[ -n "${DISPATCH_IMAGE}" && "${DISPATCH_IMAGE}" != all ]]; then
changed="images/${DISPATCH_IMAGE}/"
else
changed=""
fi
;;
*)
# schedule: the weekly rebuild picks up package updates for all.
changed=""
;;
esac
printf 'Changed paths:\n%s\n' "${changed:-(all)}"
eval "$(printf '%s\n' "${changed}" | ./ci-changes.sh)" eval "$(printf '%s\n' "${changed}" | ./ci-changes.sh)"
echo "cosmic=${cosmic}" >> "$GITHUB_OUTPUT" echo "cosmic=${cosmic}" >> "$GITHUB_OUTPUT"
echo "remote=${remote}" >> "$GITHUB_OUTPUT" echo "remote=${remote}" >> "$GITHUB_OUTPUT"
+1 -1
View File
@@ -4,7 +4,7 @@ BUILD_MODE=upstream
UPSTREAM_REPO="https://gitlab.com/fedora/ostree/ci-test.git" UPSTREAM_REPO="https://gitlab.com/fedora/ostree/ci-test.git"
# Stable only; Defender comes from Microsoft's RHEL 10 repo, not rawhide. # Stable only; Microsoft's Defender repo (fedora/44) has no rawhide build.
declare -A UPSTREAM_REFS=( declare -A UPSTREAM_REFS=(
[44]=f44 [44]=f44
) )
+17 -3
View File
@@ -1,5 +1,5 @@
# Microsoft Defender for Endpoint on Linux (mdatp), RHEL 10 build, from the # Microsoft Defender for Endpoint on Linux (mdatp), Fedora 44 build, from the
# microsoft-rhel10 repo (repos/microsoft.repo). # microsoft-fedora44 repo (repos/microsoft.repo).
# #
# mdatp's %post does the real install: units, SELinux module, and per-machine # mdatp's %post does the real install: units, SELinux module, and per-machine
# state under /var/opt/microsoft/mdatp (machine GUID, definitions database, # state under /var/opt/microsoft/mdatp (machine GUID, definitions database,
@@ -11,7 +11,7 @@
# from the Defender portal on the device. # from the Defender portal on the device.
repo-packages: repo-packages:
- repo: microsoft-rhel10 - repo: microsoft-fedora44
packages: packages:
- mdatp - mdatp
@@ -26,6 +26,18 @@ add-files:
- ["mdatp-firstboot.service", "/usr/lib/systemd/system/mdatp-firstboot.service"] - ["mdatp-firstboot.service", "/usr/lib/systemd/system/mdatp-firstboot.service"]
- ["mdatp-firstboot.conf", "/usr/lib/systemd/system/mdatp.service.d/10-firstboot.conf"] - ["mdatp-firstboot.conf", "/usr/lib/systemd/system/mdatp.service.d/10-firstboot.conf"]
- ["50-defender.preset", "/usr/lib/systemd/system-preset/50-defender.preset"] - ["50-defender.preset", "/usr/lib/systemd/system-preset/50-defender.preset"]
# Enforced Defender settings (shown as "[managed]" in `mdatp health`; local
# changes are refused): real-time protection, behavior monitoring, PUA
# blocking, cloud protection at the "high" block level, automatic updates
# and sample submission, a daily quick scan at 12:00 and a weekly full scan
# on Wednesday 12:30 (low priority, up to 2 h later at random). Settings
# reference: https://learn.microsoft.com/defender-endpoint/linux-preferences
# Not set here: network protection (Insiders channels only) and tamper
# protection (audit-only preview on Linux).
- ["mdatp_managed.json", "/usr/share/mdatp-managed/mdatp_managed.json"]
# Installed into /etc/opt/microsoft/mdatp/managed/ whenever Defender starts;
# see the drop-in.
- ["mdatp-managed-config.conf", "/usr/lib/systemd/system/mdatp.service.d/20-managed-config.conf"]
postprocess: postprocess:
- | - |
@@ -42,5 +54,7 @@ postprocess:
[[ -f "${pp}" ]] && break [[ -f "${pp}" ]] && break
done done
semodule -n -i "${pp}" semodule -n -i "${pp}"
# Fail the build on a typo rather than ship a config Defender can't read.
python3 -m json.tool /usr/share/mdatp-managed/mdatp_managed.json > /dev/null
rpm -q --qf '%{POSTIN}' mdatp > /usr/libexec/mdatp-postinst rpm -q --qf '%{POSTIN}' mdatp > /usr/libexec/mdatp-postinst
chmod 0755 /usr/libexec/mdatp-firstboot /usr/libexec/mdatp-postinst chmod 0755 /usr/libexec/mdatp-firstboot /usr/libexec/mdatp-postinst
@@ -0,0 +1,9 @@
# Report the full image version (VERSION_ID=44.20261019.0) to Entra ID and
# Intune instead of "44"; see /usr/libexec/himmelblau-os-release. Only this
# service's mount namespace sees the replacement os-release.
[Unit]
Requires=himmelblau-os-release.service
After=himmelblau-os-release.service
[Service]
BindReadOnlyPaths=/run/himmelblau-os-release:/etc/os-release
@@ -2,3 +2,5 @@
enable himmelblaud.service enable himmelblaud.service
enable himmelblaud-tasks.service enable himmelblaud-tasks.service
enable himmelblau-hsm-pin-init.service enable himmelblau-hsm-pin-init.service
# Runs the Intune custom configuration scripts Himmelblau puts in /etc/cron.d.
enable crond.service
@@ -0,0 +1,30 @@
#!/usr/bin/env bash
# Write the os-release that the Himmelblau daemons see (10-os-release.conf):
# the image's /usr/lib/os-release with VERSION_ID set to the full image version
# (OSTREE_VERSION, e.g. 44.20261019.0), so Intune shows the build and not just
# "44". Himmelblau reports VERSION_ID as the device's OS version and has no
# setting for it. The rest of the system keeps the stock VERSION_ID, which
# toolbox, flatpak and dnf expect to be the plain release.
#
# PRETTY_NAME becomes just NAME: libhimmelblau reports "PRETTY_NAME VERSION_ID"
# as the OS version string, and Fedora's PRETTY_NAME already contains the
# version ("Fedora Linux 44.20261020.0 (Forty Four) 44.20261020.0"). Nothing
# else in Himmelblau reads PRETTY_NAME.
set -euo pipefail
SRC=/usr/lib/os-release
DEST=/run/himmelblau-os-release
version="$(. "${SRC}" && echo "${OSTREE_VERSION:-${IMAGE_VERSION:-}}")"
name="$(. "${SRC}" && echo "${NAME:-Linux}")"
tmp="$(mktemp "${DEST}.XXXXXX")"
if [[ -n "${version}" ]]; then
sed -e "s/^VERSION_ID=.*/VERSION_ID=${version}/" \
-e "s/^PRETTY_NAME=.*/PRETTY_NAME=\"${name}\"/" "${SRC}" > "${tmp}"
else
# No image version (not an ostree/bootc deployment): pass it through as-is.
cat "${SRC}" > "${tmp}"
fi
chmod 0644 "${tmp}"
mv -f "${tmp}" "${DEST}"
@@ -0,0 +1,10 @@
[Unit]
Description=Generate the os-release reported by Himmelblau to Intune
DefaultDependencies=no
After=local-fs.target
Before=himmelblaud.service himmelblaud-tasks.service
[Service]
Type=oneshot
ExecStart=/usr/libexec/himmelblau-os-release
RemainAfterExit=yes
@@ -11,6 +11,9 @@ apply_policy = true
# Fedora's admin group; members of sudo_groups (Entra group object IDs) are # Fedora's admin group; members of sudo_groups (Entra group object IDs) are
# added to it. # added to it.
local_sudo_group = wheel local_sudo_group = wheel
# Linux admins: members get wheel (sudo) at sign-in, and lose it again within
# local_groups_reconcile_interval after leaving the group.
sudo_groups = c3b1cfcc-7834-47eb-948b-a22204276453
# Home directories named after the account (e.g. /home/jdoe), with a UPN alias. # Home directories named after the account (e.g. /home/jdoe), with a UPN alias.
home_attr = CN home_attr = CN
home_alias = SPN home_alias = SPN
@@ -0,0 +1,7 @@
# Install the image's enforced Defender settings each time Defender starts.
# The image can't ship them in /etc directly: mdatp-firstboot creates
# /etc/opt/microsoft/mdatp on the device, so on updates that directory counts
# as local and ostree's /etc merge never adds new files under it. Copying on
# every start also picks up changes from newer images and undoes local edits.
[Service]
ExecStartPre=+/usr/bin/install -D -Z -m 0644 /usr/share/mdatp-managed/mdatp_managed.json /etc/opt/microsoft/mdatp/managed/mdatp_managed.json
@@ -0,0 +1,29 @@
{
"antivirusEngine": {
"enforcementLevel": "real_time",
"behaviorMonitoring": "enabled",
"scanAfterDefinitionUpdate": true,
"scanArchives": true,
"disallowedThreatActions": ["allow", "restore"],
"threatTypeSettingsMergePolicy": "admin_only",
"threatTypeSettings": [
{ "key": "potentially_unwanted_application", "value": "block" },
{ "key": "archive_bomb", "value": "audit" }
],
"scheduledScan": "enabled"
},
"scheduledScan": {
"dailyConfiguration": { "timeOfDay": 720 },
"weeklyConfiguration": { "dayOfWeek": 4, "scanType": "full", "timeOfDay": 750 },
"lowPriorityScheduledScan": true,
"checkForDefinitionsUpdate": true,
"randomizeScanStartTime": 2
},
"cloudService": {
"enabled": true,
"diagnosticLevel": "required",
"automaticSampleSubmissionConsent": "safe",
"automaticDefinitionUpdateEnabled": true,
"cloudBlockLevel": "high"
}
}
+9
View File
@@ -20,11 +20,18 @@ packages:
# himmelblau-selinux compiles its policy module at install time. # himmelblau-selinux compiles its policy module at install time.
- make - make
- selinux-policy-devel - selinux-policy-devel
# Intune custom configuration scripts are installed as /etc/cron.d jobs.
- cronie
add-files: add-files:
- ["himmelblau.conf", "/etc/himmelblau/himmelblau.conf"] - ["himmelblau.conf", "/etc/himmelblau/himmelblau.conf"]
- ["50-himmelblau.preset", "/usr/lib/systemd/system-preset/50-himmelblau.preset"] - ["50-himmelblau.preset", "/usr/lib/systemd/system-preset/50-himmelblau.preset"]
- ["50-himmelblau-user.preset", "/usr/lib/systemd/user-preset/50-himmelblau-user.preset"] - ["50-himmelblau-user.preset", "/usr/lib/systemd/user-preset/50-himmelblau-user.preset"]
# Report the full image version (44.20261019.0) as the OS version in Intune.
- ["himmelblau-os-release", "/usr/libexec/himmelblau-os-release"]
- ["himmelblau-os-release.service", "/usr/lib/systemd/system/himmelblau-os-release.service"]
- ["10-himmelblau-os-release.conf", "/usr/lib/systemd/system/himmelblaud.service.d/10-os-release.conf"]
- ["10-himmelblau-os-release.conf", "/usr/lib/systemd/system/himmelblaud-tasks.service.d/10-os-release.conf"]
postprocess: postprocess:
# The package's %post selects its authselect vendor profile but drops # The package's %post selects its authselect vendor profile but drops
@@ -38,6 +45,8 @@ postprocess:
getent passwd "${user}" >/dev/null getent passwd "${user}" >/dev/null
done done
grep -q pam_himmelblau.so /etc/pam.d/system-auth grep -q pam_himmelblau.so /etc/pam.d/system-auth
chmod 0755 /usr/libexec/himmelblau-os-release
test -d /etc/cron.d
# himmelblau-selinux builds and loads its module in %posttrans, which does # himmelblau-selinux builds and loads its module in %posttrans, which does
# nothing in a compose; do it here. # nothing in a compose; do it here.
@@ -0,0 +1,130 @@
{
"Rules": [
{
"SettingName": "DefenderInstalled",
"Operator": "IsEquals",
"DataType": "Boolean",
"Operand": true,
"MoreInfoUrl": "https://learn.microsoft.com/en-us/defender-endpoint/linux-install-manually",
"RemediationStrings": [
{
"Language": "en_US",
"Title": "Microsoft Defender is not installed.",
"Description": "Microsoft Defender for Endpoint (mdatp) must be installed on this device."
}
]
},
{
"SettingName": "DefenderRunning",
"Operator": "IsEquals",
"DataType": "Boolean",
"Operand": true,
"MoreInfoUrl": "https://learn.microsoft.com/en-us/defender-endpoint/linux-install-manually",
"RemediationStrings": [
{
"Language": "en_US",
"Title": "Microsoft Defender is not running.",
"Description": "The Microsoft Defender service (mdatp.service) is not responding. Restart the device or contact IT."
}
]
},
{
"SettingName": "DefenderOnboarded",
"Operator": "IsEquals",
"DataType": "Boolean",
"Operand": true,
"MoreInfoUrl": "https://learn.microsoft.com/en-us/defender-endpoint/linux-install-manually",
"RemediationStrings": [
{
"Language": "en_US",
"Title": "Microsoft Defender is not onboarded.",
"Description": "This device is not onboarded to your organization's Microsoft Defender tenant. Contact IT."
}
]
},
{
"SettingName": "DefenderLicensed",
"Operator": "IsEquals",
"DataType": "Boolean",
"Operand": true,
"MoreInfoUrl": "https://learn.microsoft.com/en-us/defender-endpoint/linux-install-manually",
"RemediationStrings": [
{
"Language": "en_US",
"Title": "Microsoft Defender is not licensed.",
"Description": "Microsoft Defender has no valid license on this device. Contact IT."
}
]
},
{
"SettingName": "DefenderHealthy",
"Operator": "IsEquals",
"DataType": "Boolean",
"Operand": true,
"MoreInfoUrl": "https://learn.microsoft.com/en-us/defender-endpoint/linux-install-manually",
"RemediationStrings": [
{
"Language": "en_US",
"Title": "Microsoft Defender reports a problem.",
"Description": "Run 'mdatp health' to see the reported issues, or contact IT."
}
]
},
{
"SettingName": "DefenderRealTimeProtection",
"Operator": "IsEquals",
"DataType": "Boolean",
"Operand": true,
"MoreInfoUrl": "https://learn.microsoft.com/en-us/defender-endpoint/linux-install-manually",
"RemediationStrings": [
{
"Language": "en_US",
"Title": "Real-time protection is off.",
"Description": "Microsoft Defender real-time protection must be enabled."
}
]
},
{
"SettingName": "DefenderBehaviorMonitoring",
"Operator": "IsEquals",
"DataType": "Boolean",
"Operand": true,
"MoreInfoUrl": "https://learn.microsoft.com/en-us/defender-endpoint/linux-install-manually",
"RemediationStrings": [
{
"Language": "en_US",
"Title": "Behavior monitoring is off.",
"Description": "Microsoft Defender behavior monitoring must be enabled. Update the device to the latest image or contact IT."
}
]
},
{
"SettingName": "DefenderCloudProtection",
"Operator": "IsEquals",
"DataType": "Boolean",
"Operand": true,
"MoreInfoUrl": "https://learn.microsoft.com/en-us/defender-endpoint/linux-install-manually",
"RemediationStrings": [
{
"Language": "en_US",
"Title": "Cloud-delivered protection is off.",
"Description": "Microsoft Defender cloud-delivered protection must be enabled. Update the device to the latest image or contact IT."
}
]
},
{
"SettingName": "DefenderDefinitionsUpToDate",
"Operator": "IsEquals",
"DataType": "Boolean",
"Operand": true,
"MoreInfoUrl": "https://learn.microsoft.com/en-us/defender-endpoint/linux-install-manually",
"RemediationStrings": [
{
"Language": "en_US",
"Title": "Microsoft Defender definitions are out of date.",
"Description": "Connect the device to the network so Microsoft Defender can update its security intelligence."
}
]
}
]
}
+70
View File
@@ -0,0 +1,70 @@
#!/bin/bash
# Intune custom compliance discovery script for Linux: is Microsoft Defender
# for Endpoint (mdatp) installed, onboarded, licensed and protecting?
#
# Upload in Intune > Devices > Compliance > Scripts (Linux), and pair it with
# defender-compliance.json in a Linux compliance policy (Custom compliance).
# Himmelblau runs it as root inside himmelblaud-tasks.service and sends the
# JSON on stdout to Intune, which evaluates it against the rules. Every setting
# is always emitted, so a missing or stopped Defender reads as non-compliant
# instead of as a script error.
MDATP=/usr/bin/mdatp
# Print one `mdatp health` field without quotes or a trailing " [managed]".
# Unlicensed or unonboarded, mdatp prints "ATTENTION: ..." lines first.
field() {
"${MDATP}" health --field "$1" 2>/dev/null | grep -v '^ATTENTION' | tail -n1 \
| sed -e 's/ \[managed\]$//' -e 's/^"//' -e 's/"$//'
}
bool() {
[[ "$1" == true ]] && echo true || echo false
}
installed=false
running=false
healthy=false
licensed=false
onboarded=false
rtp=false
behavior_monitoring=false
cloud_protection=false
definitions_ok=false
definitions_age=-1
version=""
if [[ -x "${MDATP}" ]]; then
installed=true
if [[ "$(field healthy)" =~ ^(true|false)$ ]]; then
# The daemon answered.
running=true
healthy="$(bool "$(field healthy)")"
licensed="$(bool "$(field licensed)")"
rtp="$(bool "$(field real_time_protection_enabled)")"
[[ "$(field behavior_monitoring)" == enabled ]] && behavior_monitoring=true
cloud_protection="$(bool "$(field cloud_enabled)")"
[[ -n "$(field org_id)" ]] && onboarded=true
[[ "$(field definitions_status)" == up_to_date ]] && definitions_ok=true
age="$(field definitions_updated_minutes_ago)"
[[ "${age}" =~ ^[0-9]+$ ]] && definitions_age=$(( age / 1440 ))
version="$(field app_version)"
version="${version//[^0-9A-Za-z._-]/}"
fi
fi
cat <<EOF
{
"DefenderInstalled": ${installed},
"DefenderRunning": ${running},
"DefenderHealthy": ${healthy},
"DefenderLicensed": ${licensed},
"DefenderOnboarded": ${onboarded},
"DefenderRealTimeProtection": ${rtp},
"DefenderBehaviorMonitoring": ${behavior_monitoring},
"DefenderCloudProtection": ${cloud_protection},
"DefenderDefinitionsUpToDate": ${definitions_ok},
"DefenderDefinitionsAgeDays": ${definitions_age},
"DefenderVersion": "${version}"
}
EOF
+110
View File
@@ -0,0 +1,110 @@
#!/bin/bash
# Intune custom configuration script for Linux: bring Microsoft Defender for
# Endpoint (mdatp) back to the state defender-compliance.sh checks for.
#
# Intune has no "run only when non-compliant" trigger for Linux, so this runs
# on the policy's schedule and only acts on what is wrong; on a healthy device
# it only reads `mdatp health`. Himmelblau installs it as an /etc/cron.d job.
#
# Intune > Devices > Configuration > Create > Linux > Settings catalog >
# Custom Configuration:
# Execution context: root
# Execution frequency: every 1 hour (or 15 minutes while rolling out)
# Execution retries: 1
# Script: this file, with ONBOARDING_JSON filled in
#
# Exit status is non-zero when Defender is still not healthy afterwards.
# Contents of mdatp_onboard.json from the Defender portal: Settings > Endpoints
# > Onboarding > Linux Server > "Local Script (Python)". The downloaded
# MicrosoftDefenderATPOnboardingLinuxServer.py writes this file to
# /etc/opt/microsoft/mdatp/ on the machine it runs on; paste that file's
# contents here. Leave the placeholder to skip onboarding.
ONBOARDING_JSON=$(cat <<'JSON'
REPLACE_WITH_MDATP_ONBOARD_JSON
JSON
)
MDATP=/usr/bin/mdatp
ONBOARD_FILE=/etc/opt/microsoft/mdatp/mdatp_onboard.json
log() {
logger -t defender-remediation -- "$*"
echo "$*"
}
# Print one `mdatp health` field without quotes, a trailing " [managed]" or
# the "ATTENTION: ..." lines mdatp prints while unlicensed.
field() {
"${MDATP}" health --field "$1" 2>/dev/null | grep -v '^ATTENTION' | tail -n1 \
| sed -e 's/ \[managed\]$//' -e 's/^"//' -e 's/"$//'
}
# Wait up to 2 minutes for the daemon to answer.
wait_for_daemon() {
local i
for i in $(seq 1 24); do
[[ "$(field healthy)" =~ ^(true|false)$ ]] && return 0
sleep 5
done
return 1
}
if [[ ! -x "${MDATP}" ]]; then
log "mdatp is not installed; it ships in the image, so update or rebase the device."
exit 1
fi
# The image finishes the Defender install on first boot (mdatp-firstboot).
if [[ ! -f /var/lib/mdatp-firstboot.done ]]; then
log "Defender first-boot setup has not completed; starting it."
systemctl start mdatp-firstboot.service
fi
if ! systemctl is-active --quiet mdatp.service; then
log "mdatp.service is not running; restarting it."
systemctl restart mdatp.service
fi
if ! wait_for_daemon; then
log "The Defender daemon does not respond."
exit 1
fi
if [[ -z "$(field org_id)" ]]; then
# Prefix match, so the placeholder appears only once in this file and a
# find-and-replace of it can't hit this line.
if [[ "${ONBOARDING_JSON}" == REPLACE_WITH_* ]]; then
log "Defender is not onboarded and this script has no onboarding JSON."
elif ! printf '%s\n' "${ONBOARDING_JSON}" \
| python3 -c 'import json, sys; assert "onboardingInfo" in json.load(sys.stdin)' 2>/dev/null; then
# A paste that lost the first "{" or last "}" line would otherwise leave
# Defender with an unreadable onboarding file ("No license found").
log "The onboarding JSON in this script is not valid; paste mdatp_onboard.json again, including its first '{' and last '}' lines."
exit 1
else
log "Defender is not onboarded; writing ${ONBOARD_FILE}."
install -d -m 0755 "$(dirname "${ONBOARD_FILE}")"
printf '%s\n' "${ONBOARDING_JSON}" > "${ONBOARD_FILE}.tmp"
chown root:mdatp "${ONBOARD_FILE}.tmp"
chmod 0600 "${ONBOARD_FILE}.tmp"
mv -f "${ONBOARD_FILE}.tmp" "${ONBOARD_FILE}"
systemctl restart mdatp.service
wait_for_daemon || { log "The Defender daemon does not respond after onboarding."; exit 1; }
fi
fi
# Settings Defender's own policy manages show " [managed]" and can't be
# changed locally; this only fixes a locally disabled real-time protection.
if [[ "$(field real_time_protection_enabled)" != true ]]; then
log "Real-time protection is off; enabling it."
"${MDATP}" config real-time-protection --value enabled
fi
if [[ "$(field definitions_status)" != up_to_date ]]; then
log "Definitions are not up to date; updating them."
"${MDATP}" definitions update
fi
healthy="$(field healthy)"
log "healthy=${healthy} licensed=$(field licensed) org_id=$(field org_id) rtp=$(field real_time_protection_enabled) definitions=$(field definitions_status)"
[[ "${healthy}" == true ]]
+1 -1
View File
@@ -27,7 +27,7 @@ opt-usrlocal: root
repos: repos:
- himmelblau - himmelblau
- microsoft-rhel10 - microsoft-fedora44
- microsoft-edge - microsoft-edge
include: include:
+8 -4
View File
@@ -1,9 +1,13 @@
# packages.microsoft.com, limited with includepkgs to the packages the image # packages.microsoft.com, limited with includepkgs to the packages the image
# uses, so nothing else from the RHEL repo can replace a Fedora package. # uses, so nothing else from the Microsoft repo can replace a Fedora package.
#
# Fedora 44 build of Defender (mdatp): Fedora is a supported Defender
# distribution, servers and desktops. Pinned to 44 rather than $releasever so a
# new Fedora release doesn't fail the build before Microsoft publishes its repo.
[microsoft-rhel10] [microsoft-fedora44]
name=Microsoft Production (RHEL 10) name=Microsoft Production (Fedora 44)
baseurl=https://packages.microsoft.com/rhel/10/prod/ baseurl=https://packages.microsoft.com/fedora/44/prod/
enabled=1 enabled=1
gpgcheck=1 gpgcheck=1
repo_gpgcheck=1 repo_gpgcheck=1