An operator could see that an endpoint was behind the published build but had no way to act on it. update_app resolves against Application rows, and the agent lives in the version store, so there was nothing to push. Bridge the two: the staged build is packaged and registered as a reserved Application row, and a managed PowerShell script is seeded to install it. The endpoint downloads that package over the existing collector-authenticated app-package route, so no parallel delivery path is introduced. The new route prepares the delivery and then DELEGATES to enqueue_endpoint_command as a digest-pinned run_script. It deliberately does not implement its own enqueue: a second path would duplicate, and eventually drift from, the endpoint lock, the Configuration Policy gate, stale-command reaping and the at-most-one-in-flight rule. A fleet-wide agent swap is the last action that should skip a quarantine check. Tests pin that delegation rather than only the happy path. Because it lands as run_script, the caller needs endpoints.runscript on top of endpoints.agentupdate. That is intended: this delivers arbitrary SYSTEM PowerShell by the same mechanism as any other script push. The audit event is written only on an actual 201, so a refused push does not record an upgrade that never happened. Replacing the agent is self-modifying the control plane - the process receiving the command is the one being swapped. The script therefore re-launches itself detached and exits immediately, because the agent runs run_script as a direct child and holds its stdout/stderr pipes while waiting on it. Expect the command to report queued rather than success: the process that would report completion is stopped mid-run. Judge the result by the version the endpoint reports afterward. Tray relaunch does not use the installer's `explorer.exe <path>` trick. That works in install-shopdbagent.ps1 only because the installer runs as the user - note its own `-ne "SYSTEM"` guard. This script always runs as SYSTEM in session 0, where the hand-off reaches no shell and exits 0, so Start-Process reported success for a relaunch that never happened. It also cannot descend into the session with a token-duplicating launch: UserContextSpool documents that WTSQueryUserToken is blocked by endpoint protection on these hosts. Instead a one-shot scheduled task targets the pinned ShopFloor account, matching how the user-context spool already resolves that user, and the tray must run as that account or the mapped-drive probe reports the wrong (empty) drive table. The relaunch is verified by polling for the process rather than assumed, and stays best-effort: the Run key still starts the tray at next logon, and a late tray is not worth rolling back a good agent upgrade. panel_status now carries agentbehind/agentversion/agentcurrent so the UI gates the action on a flag rather than parsing "(behind X)" out of a label. The button is confirmed by typing UPDATE, naming both versions and the service interruption, matching how run_script and system_restart are gated. Verified on live endpoints: upgraded 1.13.0.0 and 1.15.0.0 machines to 1.16.0.0. run_script delivery, digest fetch and system context all predate 1.13.0.0, so no minimum agent version is declared for this path.
119 lines
4.4 KiB
Python
119 lines
4.4 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
|
|
|
|
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.
|
|
temppath = path + '.tmp'
|
|
with open(temppath, 'wb') as handle:
|
|
handle.write(payload)
|
|
os.replace(temppath, path)
|
|
|
|
_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'],
|
|
}
|