Ports 37 of Benjamin Baker's commits from the wilm branch, mirrored from the
corporate GitHub at 7905917c. wilm rides the publication lineage and shares no
ancestor with wj, so this is a filtered tree patch rather than a merge:
94 files, and every path the publication export strips (docs/, tools/, mcp/,
CLAUDE.md, start-*.sh, .gitea/, the three excluded tests) is held back, because
a raw diff would delete each of them from this tree.
What comes across:
* Endpoint telemetry, phase 2. Physical disk health from two sources, NIC link
state, boot type, Defender health, processor/memory/chassis inventory, the
listening TCP set, mapped network drives and Windows Update history. Five
additive migrations, 0012 through 0016, off the 0011 head.
* Mapped drives are collected by a probe running in the interactive user's
session, because they do not exist in the agent's session 0. Two Windows
sources can disagree about one drive and the worse status wins, so a
half-broken share is never rendered as healthy.
* Windows events are reported once each, keyed on the channel's own record id,
instead of being re-sent whenever a report overlapped the last one.
* PC Detail rework: Details cards flow, the hand-written Network card gives way
to a full address history, Storage and disk health merge into one card with
two sections, Operator Reports and Corporate Tools get their own tabs.
* An opt-in restic backup overlay with a third container, restore gated on the
dump's own data revision rather than the code head, and backup/restore history.
* The agent's version is read from the binary's PE version rather than trusted
from the csproj, and the Fleet view gains an Agent Version column.
* The enqueue route now asks caller_holds instead of the owner's permissions,
which closes the scoped-token elevation on run_script, update_app and
system_restart.
Held back deliberately:
* agent/installer/install-shopdbagent.ps1 stays deleted, as upstream deleted it.
The installer that reaches a bay is generated by _install_script() in
plugins/endpoints/api/siteagent.py; the standalone script had stopped being
shipped and was collecting fixes no endpoint ever ran.
* The .gitignore hunk adding docs/*.md. Correct on the publication lineage,
where docs/ becomes the wiki and its absence is how the gates detect a
published checkout. Here it would silently ignore every new doc.
* Their deletions of docs/DEV-BUILD-TEST.md and docs/PLUGIN-HOOKS.md. Upstream
those were stubs; here PLUGIN-HOOKS.md is the 31KB document CLAUDE.md points
readers at.
* Five zero-byte files committed by an accidental `git add -A`, a run log from
the author's own machine, and docs/notes/, which is working scratch that says
so in its own header and belongs in devnotes/ on this side.
Carried with the import so it lands green: the 17 new routes are described in
docs/api-inventory.json with the spec and project map regenerated, and two new
frontend specs read fixtures through fileURLToPath(URL) which node rejects under
jsdom's own URL global.
Suite 2591 passed / 9 skipped; frontend 391 passed; naming, style and doc gates
clean.
Scope: product
187 lines
6.7 KiB
Python
187 lines
6.7 KiB
Python
"""Mapped-drive merge: two disagreeing Windows sources into one honest row.
|
|
|
|
Windows reports mapped drives twice - Win32_NetworkConnection (the 'net use'
|
|
table) and Get-SmbMapping - and the two do not agree. Captured on one machine at
|
|
one moment, same two mappings, Get-SmbMapping said OK for both while net use
|
|
said Disconnected and Reconnecting. Trusting the structured source alone would
|
|
have rendered a healthy Q: on a box whose Q: was down.
|
|
|
|
So the probe collects both without reconciling them and _mapped_drives() decides
|
|
what an operator is shown. Every test here pins a way that decision could
|
|
silently start rendering a broken drive as a working one, which is the only
|
|
failure mode of this card that matters: nobody reports a drive that looks fine.
|
|
"""
|
|
|
|
from plugins.endpoints.api.routes import _mapped_drives
|
|
|
|
|
|
def _netuse(localname, remotename, status):
|
|
return {'localname': localname, 'remotename': remotename, 'status': status}
|
|
|
|
|
|
def _smb(localpath, remotepath, status):
|
|
return {'localpath': localpath, 'remotepath': remotepath, 'status': status}
|
|
|
|
|
|
def test_the_worse_of_two_disagreeing_sources_is_what_gets_shown():
|
|
"""The real capture: Get-SmbMapping says OK, net use says Disconnected.
|
|
|
|
The drive was down. Showing OK because one source said so is the exact bug
|
|
this merge exists to prevent.
|
|
"""
|
|
rows = _mapped_drives({
|
|
'netuse': [_netuse('Q:', r'\\server\specdata', 'Disconnected')],
|
|
'smbmapping': [_smb('Q:', r'\\server\specdata', 'OK')],
|
|
})
|
|
|
|
assert rows == [r'Q: \\server\specdata (Disconnected)']
|
|
|
|
|
|
def test_reconnecting_is_worse_than_ok_and_survives_the_merge():
|
|
"""Reconnecting is a real status from the capture, not a synonym for OK."""
|
|
rows = _mapped_drives({
|
|
'netuse': [_netuse('S:', r'\\server\shared', 'Reconnecting')],
|
|
'smbmapping': [_smb('S:', r'\\server\shared', 'OK')],
|
|
})
|
|
|
|
assert rows == [r'S: \\server\shared (Reconnecting)']
|
|
|
|
|
|
def test_a_drive_both_sources_call_healthy_is_not_annotated():
|
|
"""Only problems are labelled; tagging every drive '(OK)' buries the bad one."""
|
|
rows = _mapped_drives({
|
|
'netuse': [_netuse('H:', r'\\server\home', 'OK')],
|
|
'smbmapping': [_smb('H:', r'\\server\home', 'OK')],
|
|
})
|
|
|
|
assert rows == [r'H: \\server\home']
|
|
|
|
|
|
def test_a_drive_only_one_source_knows_about_is_still_reported():
|
|
"""Get-SmbMapping is absent on some builds and session types.
|
|
|
|
Requiring agreement between the sources would hide every mapped drive on
|
|
those machines rather than showing what is known about them.
|
|
"""
|
|
rows = _mapped_drives({
|
|
'netuse': [_netuse('P:', r'\\server\programs', 'Disconnected')],
|
|
'smbmapping': [],
|
|
})
|
|
|
|
assert rows == [r'P: \\server\programs (Disconnected)']
|
|
|
|
|
|
def test_the_smbmapping_key_missing_entirely_degrades_to_netuse():
|
|
"""Old agents predate the second source; the panel must still work.
|
|
|
|
The server ships ahead of the agent republish, so this is the live shape
|
|
until every endpoint has the new probe.
|
|
"""
|
|
rows = _mapped_drives({
|
|
'netuse': [_netuse('Q:', r'\\server\specdata', 'OK')],
|
|
})
|
|
|
|
assert rows == [r'Q: \\server\specdata']
|
|
|
|
|
|
def test_a_drive_with_no_status_from_either_source_reads_as_unknown():
|
|
"""A blank annotation reads as healthy, so a failed check must not be blank."""
|
|
rows = _mapped_drives({
|
|
'netuse': [_netuse('Z:', r'\\server\scratch', None)],
|
|
'smbmapping': [],
|
|
})
|
|
|
|
assert rows == [r'Z: \\server\scratch (Unknown)']
|
|
|
|
|
|
def test_an_unrecognised_status_is_not_assumed_healthy():
|
|
"""Unknown vocabulary ranks below OK deliberately.
|
|
|
|
Paired against OK specifically: a status the server does not recognise must
|
|
LOSE to a healthy one, or an unseen fault renders green. Pairing it against
|
|
a known-bad status would prove nothing, since the known-bad value would win
|
|
however unknowns are ranked.
|
|
"""
|
|
rows = _mapped_drives({
|
|
'netuse': [_netuse('X:', r'\\server\thing', 'SomeNewStatus')],
|
|
'smbmapping': [_smb('X:', r'\\server\thing', 'OK')],
|
|
})
|
|
|
|
assert rows == [r'X: \\server\thing (SomeNewStatus)']
|
|
|
|
|
|
def test_a_known_bad_status_beats_an_unrecognised_one():
|
|
"""Unavailable outranks an unknown string; the worst named state wins."""
|
|
rows = _mapped_drives({
|
|
'netuse': [_netuse('X:', r'\\server\thing', 'Unavailable')],
|
|
'smbmapping': [_smb('X:', r'\\server\thing', 'SomeNewStatus')],
|
|
})
|
|
|
|
assert rows == [r'X: \\server\thing (Unavailable)']
|
|
|
|
|
|
def test_which_source_reported_a_status_does_not_change_the_verdict():
|
|
"""The same pair of statuses must resolve identically whichever side sent it.
|
|
|
|
_worse_drive_status ranks by severity and breaks ties by argument order, so
|
|
if two statuses ever rank EQUAL the answer silently depends on which source
|
|
happened to report which - and a drive would read healthy or broken based on
|
|
enumeration order. Asserting both directions is what makes an accidental tie
|
|
visible; a single-direction test passes on luck.
|
|
"""
|
|
remote = r'\\server\thing'
|
|
pairs = [
|
|
('OK', 'Disconnected'),
|
|
('OK', 'SomeNewStatus'),
|
|
('Reconnecting', 'Unavailable'),
|
|
('OK', 'Reconnecting'),
|
|
]
|
|
|
|
for first, second in pairs:
|
|
forward = _mapped_drives({
|
|
'netuse': [_netuse('X:', remote, first)],
|
|
'smbmapping': [_smb('X:', remote, second)],
|
|
})
|
|
backward = _mapped_drives({
|
|
'netuse': [_netuse('X:', remote, second)],
|
|
'smbmapping': [_smb('X:', remote, first)],
|
|
})
|
|
assert forward == backward, (
|
|
'statuses {!r}/{!r} resolve differently depending on which source '
|
|
'reported them'.format(first, second))
|
|
|
|
|
|
def test_the_two_sources_are_paired_by_drive_letter_not_by_order():
|
|
"""The sources enumerate independently and need not agree on ordering."""
|
|
rows = _mapped_drives({
|
|
'netuse': [
|
|
_netuse('Q:', r'\\server\specdata', 'OK'),
|
|
_netuse('S:', r'\\server\shared', 'OK'),
|
|
],
|
|
'smbmapping': [
|
|
_smb('S:', r'\\server\shared', 'Disconnected'),
|
|
_smb('Q:', r'\\server\specdata', 'OK'),
|
|
],
|
|
})
|
|
|
|
assert rows == [
|
|
r'Q: \\server\specdata',
|
|
r'S: \\server\shared (Disconnected)',
|
|
]
|
|
|
|
|
|
def test_no_user_context_at_all_yields_no_rows():
|
|
"""Nobody signed in is a valid state, not a fault."""
|
|
assert _mapped_drives({}) == []
|
|
|
|
|
|
def test_malformed_entries_are_skipped_rather_than_raising():
|
|
"""The payload is agent-supplied; a bad row must not blank the whole card."""
|
|
rows = _mapped_drives({
|
|
'netuse': ['not-a-dict', None, {'status': 'OK'},
|
|
_netuse('Q:', r'\\server\specdata', 'Disconnected')],
|
|
'smbmapping': 'not-a-list',
|
|
})
|
|
|
|
assert rows == [r'Q: \\server\specdata (Disconnected)']
|