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.
128 lines
4.7 KiB
Python
128 lines
4.7 KiB
Python
"""Register staged endpoint agent builds as installable Applications.
|
|
|
|
The endpoint update_app push resolves an install source from the applications
|
|
table alone - it has no knowledge of the agent version store. Without a row
|
|
there, a build can be staged and current in agentstore and still be impossible
|
|
to push, which is exactly the gap found in the fleet: no application row existed
|
|
for the agent at all.
|
|
|
|
This module bridges the two by making the UPLOAD the single source of truth.
|
|
Staging a build repackages the current agent (plus tray) and rewrites the
|
|
application row's installpath and installersha256 in the same request, so the
|
|
row cannot describe a build that is no longer current. Nothing here is
|
|
hand-maintained; an operator never edits these rows.
|
|
"""
|
|
|
|
import os
|
|
import uuid
|
|
|
|
from shopdb.api import Application, application_package_location, db
|
|
|
|
from . import agentstore
|
|
|
|
# Reserved appname for the managed agent bundle. appname is unique, which is
|
|
# what makes the upsert idempotent: repeated uploads update one row rather than
|
|
# accumulating a row per build. Changing this string strands the existing row,
|
|
# so it is a constant rather than anything configurable.
|
|
AGENT_APPNAME = 'ShopDB Endpoint Agent'
|
|
|
|
AGENT_PACKAGE_FILENAME = 'shopdb-endpoint-agent.zip'
|
|
|
|
_AGENT_DESCRIPTION = (
|
|
'Managed ShopDB endpoint agent bundle. Created and kept current '
|
|
'automatically when an agent build is staged - do not edit by hand.'
|
|
)
|
|
|
|
|
|
def _package_path(appid):
|
|
directory, _prefix = application_package_location()
|
|
return os.path.join(directory, str(appid), AGENT_PACKAGE_FILENAME)
|
|
|
|
|
|
def get_agent_application():
|
|
"""The reserved agent Application row, or None when nothing is registered.
|
|
|
|
Read-only lookup for callers that need the appid to build a delivery URL
|
|
without causing a row to spring into existence as a side effect.
|
|
"""
|
|
return Application.query.filter_by(appname=AGENT_APPNAME).first()
|
|
|
|
|
|
def _get_or_create_app():
|
|
"""Return the reserved agent Application row, creating it when absent.
|
|
|
|
Does not commit: the caller commits once, after the package is written, so
|
|
a failed write cannot leave a row advertising an installer that is not
|
|
there.
|
|
"""
|
|
app = Application.query.filter_by(appname=AGENT_APPNAME).first()
|
|
if app:
|
|
return app, False
|
|
|
|
app = Application(
|
|
appname=AGENT_APPNAME,
|
|
appdescription=_AGENT_DESCRIPTION,
|
|
# Installable so it can be pushed; hidden so a machine-managed row does
|
|
# not surface in the software catalogue alongside real licensed apps.
|
|
isinstallable=True,
|
|
ishidden=True,
|
|
)
|
|
db.session.add(app)
|
|
# Flush rather than commit: the row needs its appid to build the package
|
|
# path, but the transaction stays open so the whole registration is atomic.
|
|
db.session.flush()
|
|
return app, True
|
|
|
|
|
|
def register_current_agent_package():
|
|
"""Repackage the current agent build and point the agent app row at it.
|
|
|
|
Returns a dict describing what was registered, or None when there is no
|
|
current agent build to package. Safe to call on every upload: it is an
|
|
upsert keyed on the reserved appname, and it rewrites the package file in
|
|
place.
|
|
"""
|
|
payload, manifest = agentstore.build_current_package()
|
|
if payload is None:
|
|
return None
|
|
|
|
app, created = _get_or_create_app()
|
|
|
|
path = _package_path(app.appid)
|
|
os.makedirs(os.path.dirname(path), exist_ok=True)
|
|
# Write to a temp name and replace, so an interrupted write cannot leave a
|
|
# truncated archive at the path the row already advertises. os.replace is
|
|
# atomic within a filesystem. The temp name is unique per call so two
|
|
# concurrent pushes (a batch wave) cannot interleave writes into one file.
|
|
temppath = '{}.{}.tmp'.format(path, uuid.uuid4().hex)
|
|
try:
|
|
with open(temppath, 'wb') as handle:
|
|
handle.write(payload)
|
|
os.replace(temppath, path)
|
|
except BaseException:
|
|
try:
|
|
os.remove(temppath)
|
|
except OSError:
|
|
pass
|
|
raise
|
|
|
|
_directory, urlprefix = application_package_location()
|
|
app.installpath = '{}{}/{}'.format(
|
|
urlprefix, app.appid, AGENT_PACKAGE_FILENAME)
|
|
# The digest of the ARCHIVE, which is what the agent downloads and verifies.
|
|
# The per-binary digests inside the manifest are for the install script to
|
|
# check its unpacked contents, and are not interchangeable with this one.
|
|
app.installersha256 = manifest['sha256']
|
|
db.session.commit()
|
|
|
|
return {
|
|
'appid': app.appid,
|
|
'appname': app.appname,
|
|
'created': created,
|
|
'installpath': app.installpath,
|
|
'sha256': manifest['sha256'],
|
|
'size': manifest['size'],
|
|
'agentversion': manifest['agentversion'],
|
|
'contents': manifest['contents'],
|
|
}
|