Per-PC credentials (replaces the 09-14 client-certificate attempt): - POST /api/endpoints/enroll issues a credential to a PC that matches exactly one computer by hostname and BIOS serial and has none yet. Anything else (unknown or duplicate hostname, serial mismatch, already enrolled) waits as a request an admin approves or rejects. The agent's persisted nonce binds an approved request to the PC that asked. - One auth helper serves every agent route. With X-Endpoint-Credential the asset comes from the credential and a request naming another PC gets 403 ASSET_MISMATCH. The shared key still works for PCs that have not enrolled, is refused (401 SHARED_KEY_REFUSED) for any PC that has, and can be switched off. A revoked credential gets 401 CREDENTIAL_INVALID so the agent re-enrolls. - The core collector accepts the credential for the computers, printers and endpoints collectors through two new plugin hooks exposed on shopdb.api (contract 0.33.0), and refuses the shared key for enrolled PCs. - Admin API: enrollment list, approve, reject, revoke (un-enroll), settings. Migration API: per-PC readiness with blockers, and upgrade waves that package the agent once and queue the existing agent upgrade per PC. - Migration 0023 creates endpointcredentials, endpointenrollrequests and endpointmigrationwaves, drops the certificate columns from assets where test databases have them, and renames app_fingerprint to appfingerprint. 0021 and 0022 keep their ids but no longer alter the core assets table. - Removed: client_cert.py, certificate renewal, the unauthenticated /test/client-cert route, nginx client certificate forwarding and the agent certificate script. The client-cert header could be forged on IIS, the key was readable by users, and the shared key remained a fallback. - GET /settings/server-cert returns the SPKI SHA-256 pin for GE-Enforce. Review fixes: - report_command_result used g without importing it; every result was a 500. - collect_log refuses setup answer files, appsettings, agent directories and key files at enqueue. - Fleet alerts: alerttimeout and alertfleet agree with the migration, the scope is validated and a malformed scope no longer reaches the whole fleet, and the ack race no longer raises NameError. - A refused break-glass override leaves no hold and no audit row. - Agent upgrade checks locks and permissions before repackaging, and writes the package atomically. - Server certificate upload validates the pair before replacing files; generation no longer builds an openssl config from user input; audit rows are actually written. - Health evaluation runs in a savepoint so a caught error cannot lose the check-in. - Required-app policies are found by appid, survive renames, and deleting an app deactivates policies that still name it. The UI and API now say such a policy only takes effect inside a business policy. - Backfill handles duplicate fingerprints and rolls back a failed batch. - Plugin settings routes skip a plugin whose hook raises. - The setup token is no longer printed to the log. - The naming gate checks top-level files again and handles odd file names. - Removed root scratch scripts, one of which carried a token. - Rewrote the fleet alert scheduling and app delta tests on real fixtures.
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'],
|
|
}
|