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.
140 lines
5.5 KiB
Python
140 lines
5.5 KiB
Python
"""Migration 0023: per-PC credential tables, and the client certificate cleanup.
|
|
|
|
Two starting points matter. A database that ran the 2026-09-14 builds of
|
|
0020-0022 carries app_fingerprint and five certificate columns on assets; a
|
|
fresh one carries neither. Both must reach the same schema, twice over.
|
|
"""
|
|
|
|
import importlib.util
|
|
from pathlib import Path
|
|
|
|
from alembic.migration import MigrationContext
|
|
from alembic.operations import Operations
|
|
from sqlalchemy import create_engine, inspect, text
|
|
|
|
|
|
_VERSIONS = (Path(__file__).resolve().parent.parent.parent
|
|
/ 'plugins' / 'endpoints' / 'migrations' / 'versions')
|
|
_CHAIN = ('0020_app_delta_fingerprints.py', '0021_client_certificates.py',
|
|
'0022_client_cert_revocation.py', '0023_endpoint_credentials.py')
|
|
_CERT_COLUMNS = {'client_cert_fingerprint', 'cert_issued_at', 'cert_expires_at',
|
|
'cert_revoked_at', 'cert_revocation_reason'}
|
|
|
|
|
|
def _load(filename):
|
|
path = _VERSIONS / filename
|
|
spec = importlib.util.spec_from_file_location('endpoints_mig_' + path.stem,
|
|
str(path))
|
|
module = importlib.util.module_from_spec(spec)
|
|
spec.loader.exec_module(module)
|
|
return module
|
|
|
|
|
|
def _run(connection, step='upgrade', files=_CHAIN):
|
|
operations = Operations(MigrationContext.configure(connection))
|
|
operations._install_proxy()
|
|
try:
|
|
for filename in files:
|
|
getattr(_load(filename), step)()
|
|
finally:
|
|
operations._remove_proxy()
|
|
connection.commit()
|
|
|
|
|
|
def _base_schema(connection, legacy):
|
|
certcolumns = ''
|
|
if legacy:
|
|
certcolumns = (', client_cert_fingerprint VARCHAR(64), '
|
|
'cert_issued_at DATETIME, cert_expires_at DATETIME, '
|
|
'cert_revoked_at DATETIME, '
|
|
'cert_revocation_reason VARCHAR(255)')
|
|
connection.execute(text(
|
|
'CREATE TABLE assets (assetid INTEGER PRIMARY KEY, '
|
|
'assetnumber VARCHAR(50)' + certcolumns + ')'))
|
|
fingerprint = ', app_fingerprint VARCHAR(64)' if legacy else ''
|
|
connection.execute(text(
|
|
'CREATE TABLE endpointapplications (endpointapplicationid INTEGER '
|
|
'PRIMARY KEY, assetid INTEGER, displayname VARCHAR(255)'
|
|
+ fingerprint + ')'))
|
|
if legacy:
|
|
connection.execute(text(
|
|
'CREATE INDEX idx_assets_cert_fingerprint ON assets '
|
|
'(client_cert_fingerprint)'))
|
|
connection.execute(text(
|
|
'CREATE UNIQUE INDEX idx_endpointapplications_fingerprint ON '
|
|
'endpointapplications (assetid, app_fingerprint)'))
|
|
connection.execute(text(
|
|
"INSERT INTO endpointapplications VALUES (1, 7, 'App', '"
|
|
+ 'a' * 64 + "')"))
|
|
connection.commit()
|
|
|
|
|
|
def _assert_head_schema(connection):
|
|
inspector = inspect(connection)
|
|
assetcolumns = {c['name'] for c in inspector.get_columns('assets')}
|
|
assert not assetcolumns & _CERT_COLUMNS
|
|
appcolumns = {c['name'] for c in inspector.get_columns('endpointapplications')}
|
|
assert 'appfingerprint' in appcolumns
|
|
assert 'app_fingerprint' not in appcolumns
|
|
indexed = {tuple(ix['column_names']): ix['unique'] for ix in
|
|
inspector.get_indexes('endpointapplications')}
|
|
assert indexed.get(('assetid', 'appfingerprint')) in (True, 1)
|
|
|
|
for table in ('endpointcredentials', 'endpointenrollrequests',
|
|
'endpointmigrationwaves'):
|
|
assert inspector.has_table(table), table
|
|
credentialcolumns = {c['name'] for c in inspector.get_columns('endpointcredentials')}
|
|
assert credentialcolumns == {
|
|
'credentialid', 'assetid', 'credentialhash', 'credentialprefix',
|
|
'enrolledvia', 'issuedat', 'lastusedat', 'revokedat', 'revokedby'}
|
|
requestindexes = [tuple(ix['column_names']) for ix in
|
|
inspector.get_indexes('endpointenrollrequests')]
|
|
assert requestindexes.count(('hostname', 'serialnumber')) == 1
|
|
|
|
|
|
def test_upgrade_from_the_client_certificate_builds():
|
|
engine = create_engine('sqlite://')
|
|
with engine.connect() as connection:
|
|
_base_schema(connection, legacy=True)
|
|
_run(connection)
|
|
_assert_head_schema(connection)
|
|
# Data survives the rename.
|
|
assert connection.execute(text(
|
|
'SELECT appfingerprint FROM endpointapplications')).scalar() == 'a' * 64
|
|
|
|
_run(connection)
|
|
_assert_head_schema(connection)
|
|
|
|
|
|
def test_upgrade_on_a_fresh_database():
|
|
engine = create_engine('sqlite://')
|
|
with engine.connect() as connection:
|
|
_base_schema(connection, legacy=False)
|
|
_run(connection)
|
|
_assert_head_schema(connection)
|
|
_run(connection)
|
|
_assert_head_schema(connection)
|
|
|
|
|
|
def test_retired_certificate_revisions_are_no_ops():
|
|
engine = create_engine('sqlite://')
|
|
with engine.connect() as connection:
|
|
_base_schema(connection, legacy=False)
|
|
_run(connection, files=_CHAIN[1:3])
|
|
columns = {c['name'] for c in inspect(connection).get_columns('assets')}
|
|
assert not columns & _CERT_COLUMNS
|
|
|
|
|
|
def test_downgrade_drops_the_credential_tables():
|
|
engine = create_engine('sqlite://')
|
|
with engine.connect() as connection:
|
|
_base_schema(connection, legacy=False)
|
|
_run(connection)
|
|
_run(connection, step='downgrade', files=_CHAIN[3:])
|
|
inspector = inspect(connection)
|
|
for table in ('endpointcredentials', 'endpointenrollrequests',
|
|
'endpointmigrationwaves'):
|
|
assert not inspector.has_table(table), table
|
|
_run(connection, files=_CHAIN[3:])
|
|
_assert_head_schema(connection)
|