ge-aerospace/shopdb-flask
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

geenforce: display scope is self-sufficient, no common inheritance

Browse Source 
Per decision: displays need none of the fleet-wide common scope's software, so
the gea-shopfloor-display scope carries everything it enforces and does not
inherit common. This avoids repackaging common's SMB-backed payloads for a
share-less display.

- Invert the client common-merge switch: -NoCommon (default-on) becomes
  -IncludeCommon (default OFF). A scope now enforces alone unless opted in.
  The capability stays for a future share-less non-display PC; displays omit it.
- Drop the common SMB-payload audit + inheritance sections from the display
  seed comments and docs (GE-ENFORCE-DISPLAY.md); document self-sufficiency.
- GE-ENFORCE-CLIENT.md: common-scope inheritance is now opt-in.
This commit is contained in:
cproudlock
2026-07-23 08:22:23 -04:00
parent 9d65ef103d
commit d0bf37ced7
5 changed files with 56 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
docs/GE-ENFORCE-DISPLAY.md
View File

@@ -5,7 +5,8 @@ credential-less kiosk PCs that pull their manifest over HTTPS on port 443 and
authenticate with a read-only service PAT scoped `geenforce.fetch`, sent as
`X-API-Key`. They have no SMB share mount. The kiosk engine and the kiosk
browser are baked into the display image, not shipped over HTTPS, so the display
manifest heals POLICY / CONFIG drift and inherited common entries, never EXEs.
manifest heals POLICY / CONFIG drift only, never EXEs. It is self-sufficient and
does not inherit the fleet-wide `common` scope (see below).
There are three display subtypes, selected by `C:\Enrollment\display-type.txt`:
`Dashboard`, `Lobby`, and `3DPrintRoom`.
@@ -53,58 +54,18 @@ creates a new version).
| `Lobby` | `/tv` | slides plugin TV dashboard (surface `lobby`) |
| `3DPrintRoom` | `/parts-kiosk` | **PLACEHOLDER, TODO-confirm** printedparts parts kiosk route; confirm the real 3D-print-room target with the floor team before publishing to production displays |
## Inheritance: the client merges common
## Self-sufficient: displays do NOT inherit common
The manifest model has no inheritance column. The display scope is a plain
(non-common) runtime scope carrying only display-specific entries. The CLIENT
merges the fleet-wide `common` scope underneath the display scope at fetch time.
So `common` is where the fleet-wide policy/config/self-update entries live, and
`gea-shopfloor-display` adds the kiosk-only entries on top.
The `gea-shopfloor-display` scope carries everything a display enforces. It does
NOT inherit the fleet-wide `common` scope. Displays run the enforcer with
common-merge off (the client default; common-merge is opt-in via
`Invoke-ShopdbEnforce.ps1 -IncludeCommon`), so `common`'s SMB-backed fleet
entries (Adobe, Oracle, OpenText, Defect Tracker, EventSaver, printer map,
self-update, asset-reporting, ...) never reach a share-less display.
## Blocker: common carries SMB payloads that break on share-less displays
Before a share-less display can safely inherit `common`, every `common` entry
that pulls a payload file from the SMB share must first be given an `http` or
`inline` payload (with a `payloadsha256`). A display has no share mount, so any
inherited entry whose `Installer` / `Source` / `Script` resolves to a
share-relative path will fail its fetch.
Registry entries in `common` carry no payload (they write inline reg values) and
are safe to inherit as-is. The entries below reference a share file and must be
converted first. This audit is the authoritative to-convert list; the payload
bytes themselves are not converted here (that needs the real payload files).
Common entries that reference an SMB/share payload (as of the on-share
`common/manifest.json`, 22 entries, Version 2.0):
| # | Common entry | Type | Share payload | Field |
| --- | --- | --- | --- | --- |
| 1 | Adobe Acrobat Reader DC | CMD | `scripts/Install-AcroReader.cmd` | Installer |
| 2 | Migrate pc-type.txt to gea-shopfloor-* taxonomy | PS1 | `scripts/Migrate-PCType.ps1` | Script |
| 3 | WJF Defect Tracker | MSI | `apps/WJF_Defect_Tracker.msi` | Installer |
| 4 | 3OF9 barcode font | File | `configs/3OF9.ttf` | Source |
| 5 | Edge IE-Mode site list | File | `configs/enterprise-mode-site-list.xml` | Source |
| 6 | Ensure VNC firewall rule | PS1 | `scripts/ensure-vnc-firewall.ps1` | Script |
| 7 | FMS hosts pin (WJFMS3.AE.GE.COM) | PS1 | `scripts/Set-FmsHostsEntry.ps1` | Script |
| 8 | Oracle Client 11.2 | CMD | `scripts/Install-Oracle11r2.cmd` | Installer |
| 9 | PrinterInstallerMap (site-map printer installer) | File | `apps/PrinterInstallerMap.exe` | Source |
| 10 | OpenText HostExplorer ShopFloor | CMD | `scripts/Setup-OpenText.cmd` | Installer |
| 11 | GE-Enforce dispatcher (self-update) | File | `GE-Enforce.ps1` | Source |
| 12 | Install-FromManifest lib (self-update) | File | `lib/Install-FromManifest.ps1` | Source |
| 13 | Report asset (host + IP + machine number) to ShopDB | PS1 | `apps/Report-AssetToShopDB.ps1` | Script |
| 14 | EventSaver screensaver (binary) | File | `apps/EventSaver.scr` | Source |
| 15 | EventSaver screensaver (config) | File | `configs/EventSaver.ini` | Source |
| 16 | EventSaver enable (per-user screensaver) | PS1 | `scripts/Set-EventSaverScreensaver.ps1` | Script |
| 17 | EventSaver power (keep monitor awake) | PS1 | `scripts/Set-EventSaverPower.ps1` | Script |
| 18 | EventSaver disable (measuring-tool bays) | PS1 | `scripts/Set-EventSaverDisable.ps1` | Script |
| 19 | EventSaver disable (specific hostnames) | PS1 | `scripts/Set-EventSaverDisable.ps1` | Script |
Safe to inherit as-is (Registry entries, no share payload): `3OF9 barcode font
registry entry`, `Edge IE-Mode policy level`, `Edge IE-Mode policy site list
pointer`.
Not every entry above is relevant to a display (a display needs no Oracle
client, OpenText, or Defect Tracker), so a follow-up decision is which common
entries a display should actually run (via `PCTypes` targeting) versus which
must be repackaged as `http`/`inline`. But any that survive targeting must have
a non-SMB payload before displays inherit common.
This was a deliberate decision: a display needs none of common's software, and
inheriting common would have forced repackaging every SMB `common` payload as
`http`/`inline` for a share-less box. Keeping the display scope self-sufficient
avoids all of that. If a future non-display share-less PC genuinely needs the
fleet-wide entries, that is what `-IncludeCommon` plus a per-entry SMB->http
payload conversion would be for -- but displays do not use it.