Fix defects found in session review of GE-Enforce plugin
Consolidated fixes from a three-dimension adversarial review. Data-loss (HIGH): the manifest entry editor stripped fields the form did not expose, because PUT /entries is a full reset-then-apply. The form now captures everything - InUseCheck processes as structured name/ExePath/timeout rows (not just names), LogFile, and the three preinstall flags as checkboxes; the dead payload-source control (never wired) is removed. New regression test proves an edit preserves ExePath/timeout/LogFile/PreEnrollment/PCTypesStrict. Update-entry crash (found by that regression test): replacing an entry's one-to-one InUseCheck (unique entryid) collided with the old row mid-flush -> IntegrityError -> 400. update_entry now frees the old InUseCheck (delete+flush) before populate re-inserts it. Export truncation (MEDIUM): export_scope_to_share used a plain truncating open, so a failed/partial write left the live on-share manifest (every PC reads it) empty. Now writes a temp file in the same dir and os.replace() atomically. Report dedup case bug (MEDIUM, confirmed by scratch test): the iscurrent demote matched hostname case-sensitively while the read path uses ilike, so a PC reporting different casing left two iscurrent rows and double-counted. Demote is now case-insensitive; regression test added. Simulator fidelity (MEDIUM): PCTypesStrict was captured but ignored by the filter mirror, so the simulator wrongly matched a collections-only strict entry to a nocollections PC via the shared Standard alias group. matches_pctype now honors PCTypesStrict (disables alias expansion); test added. Hardening: removed the dead/unscoped GEENFORCE_API_KEY env fallback (never wired into config; tokens are the only path); create/update entry return 400 on a duplicate Name instead of 500; parity now asserts scope-level Version/Site; a new test guards real-manifest field lengths against column limits (the DB-free parity harness can't see truncation); error handling added to the previously unguarded editor + reports API calls. Full suite green; naming + frontend build green. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
@@ -80,6 +80,34 @@ def test_entry_crud_and_reorder(client, db, auth_headers):
|
||||
assert [e['Name'] for e in entries] == ['Alpha']
|
||||
|
||||
|
||||
def test_entry_edit_preserves_full_fidelity(client, db, auth_headers):
|
||||
"""Editing an entry with the complete payload keeps InUseCheck ExePath +
|
||||
timeout, LogFile, and preinstall flags (the UI now sends all of them)."""
|
||||
scopeid = _create_scope(client, auth_headers)
|
||||
rich = {
|
||||
'Name': 'PC-DMIS', 'Type': 'MSI', 'Installer': 'apps/pcdmis.msi',
|
||||
'LogFile': 'C:\\Logs\\pcdmis.log',
|
||||
'PreEnrollment': True, 'PCTypesStrict': True,
|
||||
'InUseCheck': {'Behavior': 'CloseAndReopen', 'Processes': [
|
||||
{'Name': 'PCDLRN', 'ExePath': 'C:\\PCDLRN.exe',
|
||||
'GracefulCloseTimeoutSec': 15}]},
|
||||
}
|
||||
entryid = _add_entry(client, auth_headers, scopeid, rich)
|
||||
|
||||
# Re-send the same full payload (what the editor now does) and confirm
|
||||
# nothing is stripped.
|
||||
upd = client.put(f'/api/geenforce/entries/{entryid}', json=rich,
|
||||
headers=auth_headers)
|
||||
assert upd.status_code == 200
|
||||
entry = upd.get_json()['data']
|
||||
assert entry['LogFile'] == 'C:\\Logs\\pcdmis.log'
|
||||
assert entry['PreEnrollment'] is True
|
||||
assert entry['PCTypesStrict'] is True
|
||||
proc = entry['InUseCheck']['Processes'][0]
|
||||
assert proc['ExePath'] == 'C:\\PCDLRN.exe'
|
||||
assert proc['GracefulCloseTimeoutSec'] == 15
|
||||
|
||||
|
||||
def test_invalid_entry_type_rejected(client, db, auth_headers):
|
||||
scopeid = _create_scope(client, auth_headers)
|
||||
resp = client.post(f'/api/geenforce/scopes/{scopeid}/entries',
|
||||
@@ -117,6 +145,34 @@ def test_simulate_cmm_version_gate(client, db, auth_headers):
|
||||
assert filtered['PC-DMIS 2016'] == ['_CmmVersion']
|
||||
|
||||
|
||||
def test_duplicate_entry_name_is_400_not_500(client, db, auth_headers):
|
||||
scopeid = _create_scope(client, auth_headers)
|
||||
_add_entry(client, auth_headers, scopeid, {'Name': 'Alpha', 'Type': 'MSI'})
|
||||
dup = client.post(f'/api/geenforce/scopes/{scopeid}/entries',
|
||||
json={'Name': 'Alpha', 'Type': 'PS1'}, headers=auth_headers)
|
||||
assert dup.status_code == 400
|
||||
|
||||
|
||||
def test_simulate_pctypesstrict_disables_alias(client, db, auth_headers):
|
||||
"""A collections-only strict entry must NOT match a nocollections PC via the
|
||||
shared Standard alias group (mirrors the preinstall UDC entry)."""
|
||||
scopeid = _create_scope(client, auth_headers, 'preinstall')
|
||||
_add_entry(client, auth_headers, scopeid,
|
||||
{'Name': 'UDC (strict)', 'Type': 'EXE', 'Installer': 'apps/udc.exe',
|
||||
'PCTypes': ['gea-shopfloor-collections'], 'PCTypesStrict': True})
|
||||
_add_entry(client, auth_headers, scopeid,
|
||||
{'Name': 'UDC (loose)', 'Type': 'EXE', 'Installer': 'apps/udc.exe',
|
||||
'PCTypes': ['gea-shopfloor-collections']})
|
||||
|
||||
sim = client.get(
|
||||
f'/api/geenforce/scopes/{scopeid}/simulate?pctype=gea-shopfloor-nocollections',
|
||||
headers=auth_headers).get_json()['data']
|
||||
# loose entry matches via the Standard alias group; strict entry does not.
|
||||
assert sim['applied'] == ['UDC (loose)']
|
||||
filtered = {f['name']: f['filteredby'] for f in sim['filtered']}
|
||||
assert filtered['UDC (strict)'] == ['PCTypes']
|
||||
|
||||
|
||||
def test_simulate_machine_number_gate(client, db, auth_headers):
|
||||
scopeid = _create_scope(client, auth_headers, 'gea-shopfloor-collections')
|
||||
_add_entry(client, auth_headers, scopeid,
|
||||
|
||||
Reference in New Issue
Block a user