main was 16 days and 259 commits behind the line the product is actually built on, at contract 0.30.0 against 0.35.0, with no per-PC credential code at all. It was neither current nor curated - just stale. This brings it forward and, at the same time, makes it mean something: main is what a receiving site installs, and nothing else. WHAT IT CARRIES. Twelve plugins - backups, computers, endpoints, guides, knowledgebase, machines, network, notifications, printers, slides, tools, warranty - plus applications, which is manifest-less core and always ships. The only manifest dependency inside that set is endpoints on computers, and both are in it, so the closure is self-contained. WHAT IT DOES NOT. employees, geenforce, measuringtools, printedparts and usb stay on the site line. So do the Windows installer tree, the VM rehearsal helpers, the agent tooling config, one site's data loader, the internal audit and findings records, and the planner spreadsheet. 1,135 tracked files against 1,438. A REMOVAL THAT BREAKS THE APP IS NOT A REMOVAL, and two nearly shipped: deploy/site-profile-universal.json still named all seventeen plugins. It is the file docs/DEPLOY.md tells a site to provision from, so a fresh install would have failed at `flask plugin apply-profile` with PluginError - the first thing a receiving site does, broken by the branch meant to serve them. It now names the twelve that exist, and its comment says the two must agree. agent/ was never refreshed. Whoever populated this branch copied shopdb/, plugins/, frontend/ and tests/ from the site line and left the agent tree at its September state: 22 C# and PowerShell sources missing, including AgentCredentials, EnrollmentService, AgentHttpFactory and the fleet-alert client, plus one file the site line had deleted still present. The old tree is internally consistent, so it compiles, and nothing in CI builds it - every gate was green over a server that speaks enrollment and per-PC credentials to a bundled agent source that cannot. Resynced whole. DECISIONS THIS ENCODES, rather than defers: - The plugin-authoring lab builds printedparts, whose manifest depends on employees, so it could not stay. The lab remains on the site line and main ships no build-along tutorial. That is a real loss for an adopting developer and is recorded here rather than discovered later. - Recognition, Training and Recertification notifications are no longer seeded. Each splits one notification into a card per employee and renders a photo, which needs a plugin this branch does not bundle. Seeding them would offer an author a type that cannot resolve anybody. A site that installs employees gets them from that plugin's own seed. - Windows/IIS is documented as the legacy path throughout, and the README leads with Docker, because that is what a receiving site gets. The API description is regenerated for THIS branch - 347 paths and 483 operations, down from 415 and 573 - so the published contract describes what is here rather than what the site line serves. docs/CONFIG.md lost the two measuring-tool label keys the code no longer declares, which two lanes had decided opposite ways. Suite: 3124 passed, 6 skipped. Naming and style gates pass. The docs gates run rather than skip, and every index line count is derived from the file it names.
113 lines
4.3 KiB
Python
113 lines
4.3 KiB
Python
"""Import-mode helpers: let admins replay legacy history through the API.
|
|
|
|
A migration script importing the classic ASP shopdb
|
|
needs two things the normal API withholds:
|
|
|
|
1. Preserve each row's original createddate/modifieddate instead of stamping
|
|
"now" on insert/update.
|
|
2. Backdate event history - a notification acknowledgement, an endpoint
|
|
event - to when it really happened rather than to the import run.
|
|
|
|
Both are gated. The caller must BOTH be an admin AND send the request header
|
|
`X-Import-Mode: true`. Outside import mode every helper here is a no-op, so
|
|
wiring a call into a normal create/update path never changes behavior for
|
|
regular users. See the IMPORT-API wiki page for the operator manual.
|
|
"""
|
|
|
|
from datetime import datetime, timezone
|
|
|
|
from flask import request
|
|
from flask_jwt_extended import verify_jwt_in_request, current_user, get_jwt
|
|
|
|
|
|
# Request header a migration client sets to opt a request into import mode.
|
|
IMPORT_MODE_HEADER = 'X-Import-Mode'
|
|
|
|
# strptime formats accepted for import timestamps, tried in order. Covers the
|
|
# ISO 'T' form and the legacy MySQL 'space' form, with and without fractions,
|
|
# plus a bare date.
|
|
_IMPORT_DATETIME_FORMATS = (
|
|
'%Y-%m-%dT%H:%M:%S.%f',
|
|
'%Y-%m-%dT%H:%M:%S',
|
|
'%Y-%m-%dT%H:%M',
|
|
'%Y-%m-%d %H:%M:%S.%f',
|
|
'%Y-%m-%d %H:%M:%S',
|
|
'%Y-%m-%d %H:%M',
|
|
'%Y-%m-%d',
|
|
)
|
|
|
|
|
|
def import_mode_active():
|
|
"""True when the request is an admin-authenticated import request.
|
|
|
|
Needs header `X-Import-Mode: true` AND an admin caller. Safe to call from
|
|
any request context: verify_jwt_in_request is optional here so a missing or
|
|
bad token yields False instead of raising, and it is idempotent when the
|
|
route already ran @jwt_required."""
|
|
header = (request.headers.get(IMPORT_MODE_HEADER) or '').strip().lower()
|
|
if header != 'true':
|
|
return False
|
|
verify_jwt_in_request(optional=True)
|
|
user = current_user
|
|
if user is None or not user.hasrole('admin'):
|
|
return False
|
|
# A scoped PAT never gets import mode: import mode is an admin-role
|
|
# capability and a scoped token suspends the admin bypass. get_jwt is safe
|
|
# here - an admin user means a valid JWT was decoded above.
|
|
if get_jwt().get('patscopes') is not None:
|
|
return False
|
|
return True
|
|
|
|
|
|
def parse_import_datetime(value):
|
|
"""Parse an import timestamp into naive UTC, or None.
|
|
|
|
Accepts ISO '2020-01-05T12:00:00', legacy 'YYYY-MM-DD HH:MM:SS', a bare
|
|
date, or an already-parsed datetime. A trailing 'Z' is treated as UTC.
|
|
Timezone-aware input is converted to UTC then stripped to naive, matching
|
|
the repo convention of storing naive-UTC in DB DateTime columns."""
|
|
if value is None:
|
|
return None
|
|
if isinstance(value, datetime):
|
|
parsed = value
|
|
else:
|
|
text = str(value).strip()
|
|
if not text:
|
|
return None
|
|
if text[-1] in ('Z', 'z'):
|
|
text = text[:-1]
|
|
parsed = None
|
|
for fmt in _IMPORT_DATETIME_FORMATS:
|
|
try:
|
|
parsed = datetime.strptime(text, fmt)
|
|
break
|
|
except ValueError:
|
|
continue
|
|
if parsed is None:
|
|
# last resort: let fromisoformat try (handles offsets like +00:00)
|
|
try:
|
|
parsed = datetime.fromisoformat(text)
|
|
except ValueError:
|
|
return None
|
|
if parsed.tzinfo is not None:
|
|
parsed = parsed.astimezone(timezone.utc).replace(tzinfo=None)
|
|
return parsed
|
|
|
|
|
|
def apply_import_timestamps(instance, data):
|
|
"""Stamp createddate/modifieddate on a row from the payload, in import mode.
|
|
|
|
Call this in a create/update path after building the instance and before
|
|
commit. It is a no-op unless ALL hold: import mode is active (admin +
|
|
header), the payload carries the field, and the model actually has the
|
|
column. Explicitly setting modifieddate also suppresses the column's
|
|
onupdate=now default on updates, so legacy history survives edits too."""
|
|
if not data or not import_mode_active():
|
|
return
|
|
created = parse_import_datetime(data.get('createddate'))
|
|
if created is not None and hasattr(instance, 'createddate'):
|
|
instance.createddate = created
|
|
modified = parse_import_datetime(data.get('modifieddate'))
|
|
if modified is not None and hasattr(instance, 'modifieddate'):
|
|
instance.modifieddate = modified
|