Give each endpoint its own credential and fix the review findings on the server
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.
This commit is contained in:
cproudlock
@@ -1,10 +1,10 @@
|
||||
"""Add fingerprint column for delta-based application updates
|
||||
|
||||
Revision ID: 0020
|
||||
Revises: 0019
|
||||
Revision ID: endpoints0020appfingerprints
|
||||
Revises: endpoints0019splitpolicies
|
||||
Create Date: 2026-09-14
|
||||
|
||||
Performance optimization: Add app_fingerprint column to endpointapplications
|
||||
Performance optimization: Add appfingerprint column to endpointapplications
|
||||
table to enable delta-based updates instead of delete-all-insert-all pattern.
|
||||
|
||||
Impact:
|
||||
@@ -35,6 +35,10 @@ SAFETY FEATURES:
|
||||
- Delete count verification detects silent failures
|
||||
- Memory limits prevent pathological cases (>5000 apps)
|
||||
- Metrics logged for monitoring
|
||||
|
||||
Idempotent: a database that already has the column (create_all built it from
|
||||
the model, or an earlier build of this revision added it as app_fingerprint)
|
||||
is left alone. 0023 renames the old spelling.
|
||||
"""
|
||||
|
||||
from alembic import op
|
||||
@@ -47,26 +51,40 @@ branch_labels = None
|
||||
depends_on = None
|
||||
plugin_name = 'endpoints'
|
||||
|
||||
TABLE = 'endpointapplications'
|
||||
INDEX = 'idx_endpointapplications_fingerprint'
|
||||
|
||||
|
||||
def _columns():
|
||||
from sqlalchemy import inspect
|
||||
|
||||
return {c['name'] for c in inspect(op.get_bind()).get_columns(TABLE)}
|
||||
|
||||
|
||||
def _indexes():
|
||||
from sqlalchemy import inspect
|
||||
|
||||
return {ix['name'] for ix in inspect(op.get_bind()).get_indexes(TABLE)}
|
||||
|
||||
|
||||
def upgrade():
|
||||
# Add app_fingerprint column - nullable for backward compatibility during rollout
|
||||
op.add_column('endpointapplications',
|
||||
sa.Column('app_fingerprint', sa.String(64), nullable=True))
|
||||
|
||||
# Add UNIQUE index for fast fingerprint lookups (assetid, app_fingerprint)
|
||||
# This index enables efficient delta detection: "which fingerprints exist for this asset?"
|
||||
# UNIQUE constraint ensures one fingerprint per asset (delta logic requirement)
|
||||
op.create_index(
|
||||
'idx_endpointapplications_fingerprint',
|
||||
'endpointapplications',
|
||||
['assetid', 'app_fingerprint'],
|
||||
unique=True
|
||||
)
|
||||
columns = _columns()
|
||||
# Old spelling present: leave it for 0023 to rename.
|
||||
if 'appfingerprint' in columns or 'app_fingerprint' in columns:
|
||||
return
|
||||
op.add_column(TABLE, sa.Column('appfingerprint', sa.String(64),
|
||||
nullable=True))
|
||||
if INDEX not in _indexes():
|
||||
# Unique per asset: the delta logic keys rows on it.
|
||||
op.create_index(INDEX, TABLE, ['assetid', 'appfingerprint'],
|
||||
unique=True)
|
||||
|
||||
|
||||
def downgrade():
|
||||
# Remove index first
|
||||
op.drop_index('idx_endpointapplications_fingerprint', 'endpointapplications')
|
||||
|
||||
# Remove column
|
||||
op.drop_column('endpointapplications', 'app_fingerprint')
|
||||
if INDEX in _indexes():
|
||||
op.drop_index(INDEX, table_name=TABLE)
|
||||
columns = _columns()
|
||||
for name in ('appfingerprint', 'app_fingerprint'):
|
||||
if name in columns:
|
||||
with op.batch_alter_table(TABLE) as batch:
|
||||
batch.drop_column(name)
|
||||
|
||||
@@ -1,42 +1,26 @@
|
||||
"""Add client certificate authentication columns
|
||||
"""Retired: client certificate columns on assets.
|
||||
|
||||
Revision ID: endpoints0021clientcerts
|
||||
Revises: endpoints0020appfingerprints
|
||||
Create Date: 2026-09-14
|
||||
|
||||
This revision once added client certificate columns to the core assets table.
|
||||
Client certificate authentication was replaced by per-PC endpoint credentials
|
||||
(0023), so the revision is kept only so databases already stamped with it
|
||||
still resolve. It does nothing; 0023 drops the columns wherever an earlier
|
||||
build of this revision created them.
|
||||
"""
|
||||
|
||||
from alembic import op
|
||||
import sqlalchemy as sa
|
||||
|
||||
revision = 'endpoints0021clientcerts'
|
||||
down_revision = 'endpoints0020appfingerprints' # Will resolve to actual revision ID
|
||||
down_revision = 'endpoints0020appfingerprints'
|
||||
branch_labels = None
|
||||
depends_on = None
|
||||
plugin_name = 'endpoints'
|
||||
|
||||
|
||||
def upgrade():
|
||||
# Add client cert columns to assets table
|
||||
op.add_column('assets',
|
||||
sa.Column('client_cert_fingerprint', sa.String(64), nullable=True))
|
||||
|
||||
op.add_column('assets',
|
||||
sa.Column('cert_issued_at', sa.DateTime, nullable=True))
|
||||
|
||||
op.add_column('assets',
|
||||
sa.Column('cert_expires_at', sa.DateTime, nullable=True))
|
||||
|
||||
# Add index for fast fingerprint lookup during authentication
|
||||
op.create_index(
|
||||
'idx_assets_cert_fingerprint',
|
||||
'assets',
|
||||
['client_cert_fingerprint'],
|
||||
unique=False
|
||||
)
|
||||
pass
|
||||
|
||||
|
||||
def downgrade():
|
||||
op.drop_index('idx_assets_cert_fingerprint', 'assets')
|
||||
op.drop_column('assets', 'cert_expires_at')
|
||||
op.drop_column('assets', 'cert_issued_at')
|
||||
op.drop_column('assets', 'client_cert_fingerprint')
|
||||
pass
|
||||
|
||||
@@ -1,12 +1,13 @@
|
||||
"""Add certificate revocation columns to assets
|
||||
"""Retired: client certificate revocation columns on assets.
|
||||
|
||||
Revision ID: endpoints0022certrevocation
|
||||
Revises: endpoints0021clientcerts
|
||||
Create Date: 2026-09-14
|
||||
"""
|
||||
|
||||
from alembic import op
|
||||
import sqlalchemy as sa
|
||||
Kept only so databases already stamped with this revision still resolve. It
|
||||
does nothing; 0023 drops the columns wherever an earlier build of this
|
||||
revision created them.
|
||||
"""
|
||||
|
||||
revision = 'endpoints0022certrevocation'
|
||||
down_revision = 'endpoints0021clientcerts'
|
||||
@@ -16,16 +17,8 @@ plugin_name = 'endpoints'
|
||||
|
||||
|
||||
def upgrade():
|
||||
# Add revocation tracking columns to assets table
|
||||
op.add_column('assets',
|
||||
sa.Column('cert_revoked_at', sa.DateTime, nullable=True,
|
||||
comment='When the certificate was revoked (null = not revoked)'))
|
||||
|
||||
op.add_column('assets',
|
||||
sa.Column('cert_revocation_reason', sa.String(255), nullable=True,
|
||||
comment='Why the certificate was revoked (admin note)'))
|
||||
pass
|
||||
|
||||
|
||||
def downgrade():
|
||||
op.drop_column('assets', 'cert_revocation_reason')
|
||||
op.drop_column('assets', 'cert_revoked_at')
|
||||
pass
|
||||
|
||||
@@ -0,0 +1,167 @@
|
||||
"""Per-PC endpoint credentials; remove the client certificate leftovers.
|
||||
|
||||
Revision ID: endpoints0023credentials
|
||||
Revises: endpoints0022certrevocation
|
||||
Create Date: 2026-09-15
|
||||
|
||||
Three things, each guarded against the live schema so the revision is safe on
|
||||
a database built by create_all, on one that ran the earlier client certificate
|
||||
builds of 0021/0022, and on a re-run:
|
||||
|
||||
1. Drop the client certificate columns (and their index) from the core assets
|
||||
table where an earlier build of 0021/0022 created them.
|
||||
2. Rename endpointapplications.app_fingerprint to appfingerprint where an
|
||||
earlier build of 0020 used the underscore spelling.
|
||||
3. Create endpointcredentials, endpointenrollrequests and
|
||||
endpointmigrationwaves.
|
||||
|
||||
MySQL 5.6 safe: no JSON columns, and the enroll request lookup index uses
|
||||
prefix lengths so the key stays under 767 bytes on utf8mb4.
|
||||
|
||||
Downgrade drops the three tables. The certificate columns are not restored:
|
||||
the code that read them is gone.
|
||||
"""
|
||||
from alembic import op
|
||||
|
||||
import sqlalchemy as sa
|
||||
|
||||
|
||||
revision = 'endpoints0023credentials'
|
||||
down_revision = 'endpoints0022certrevocation'
|
||||
branch_labels = None
|
||||
depends_on = None
|
||||
plugin_name = 'endpoints'
|
||||
|
||||
CREDENTIALS = 'endpointcredentials'
|
||||
REQUESTS = 'endpointenrollrequests'
|
||||
WAVES = 'endpointmigrationwaves'
|
||||
|
||||
_CERT_COLUMNS = ('client_cert_fingerprint', 'cert_issued_at', 'cert_expires_at',
|
||||
'cert_revoked_at', 'cert_revocation_reason')
|
||||
_APPS = 'endpointapplications'
|
||||
_FINGERPRINT_INDEX = 'idx_endpointapplications_fingerprint'
|
||||
|
||||
|
||||
def _inspector():
|
||||
from sqlalchemy import inspect
|
||||
|
||||
return inspect(op.get_bind())
|
||||
|
||||
|
||||
def _has_table(name):
|
||||
return _inspector().has_table(name)
|
||||
|
||||
|
||||
def _columns(table):
|
||||
return {c['name'] for c in _inspector().get_columns(table)}
|
||||
|
||||
|
||||
def _indexes(table):
|
||||
return _inspector().get_indexes(table)
|
||||
|
||||
|
||||
def _drop_certificate_columns():
|
||||
if not _has_table('assets'):
|
||||
return
|
||||
present = _columns('assets') & set(_CERT_COLUMNS)
|
||||
if not present:
|
||||
return
|
||||
# Any index over a certificate column goes first: 0021 named its own,
|
||||
# create_all names by convention, and SQLite refuses to drop an indexed column.
|
||||
for index in _indexes('assets'):
|
||||
if set(index.get('column_names') or ()) & present:
|
||||
op.drop_index(index['name'], table_name='assets')
|
||||
for column in _CERT_COLUMNS:
|
||||
if column in present:
|
||||
op.drop_column('assets', column)
|
||||
|
||||
|
||||
def _rename_fingerprint():
|
||||
if not _has_table(_APPS):
|
||||
return
|
||||
columns = _columns(_APPS)
|
||||
if 'app_fingerprint' not in columns:
|
||||
return
|
||||
if 'appfingerprint' in columns:
|
||||
return
|
||||
for index in _indexes(_APPS):
|
||||
if 'app_fingerprint' in (index.get('column_names') or ()):
|
||||
op.drop_index(index['name'], table_name=_APPS)
|
||||
op.alter_column(_APPS, 'app_fingerprint', new_column_name='appfingerprint',
|
||||
existing_type=sa.String(64), existing_nullable=True)
|
||||
op.create_index(_FINGERPRINT_INDEX, _APPS, ['assetid', 'appfingerprint'],
|
||||
unique=True)
|
||||
|
||||
|
||||
def upgrade():
|
||||
_drop_certificate_columns()
|
||||
_rename_fingerprint()
|
||||
|
||||
if not _has_table(CREDENTIALS):
|
||||
op.create_table(
|
||||
CREDENTIALS,
|
||||
sa.Column('credentialid', sa.Integer(), nullable=False),
|
||||
sa.Column('assetid', sa.Integer(), nullable=False),
|
||||
sa.Column('credentialhash', sa.CHAR(length=64), nullable=False),
|
||||
sa.Column('credentialprefix', sa.String(length=12), nullable=False),
|
||||
sa.Column('enrolledvia', sa.String(length=16), nullable=False),
|
||||
sa.Column('issuedat', sa.DateTime(), nullable=False),
|
||||
sa.Column('lastusedat', sa.DateTime(), nullable=True),
|
||||
sa.Column('revokedat', sa.DateTime(), nullable=True),
|
||||
sa.Column('revokedby', sa.String(length=64), nullable=True),
|
||||
sa.ForeignKeyConstraint(['assetid'], ['assets.assetid'],
|
||||
ondelete='CASCADE'),
|
||||
sa.PrimaryKeyConstraint('credentialid'),
|
||||
sa.UniqueConstraint('assetid'),
|
||||
sa.UniqueConstraint('credentialhash'),
|
||||
)
|
||||
|
||||
if not _has_table(REQUESTS):
|
||||
op.create_table(
|
||||
REQUESTS,
|
||||
sa.Column('requestid', sa.Integer(), nullable=False),
|
||||
sa.Column('hostname', sa.String(length=255), nullable=False),
|
||||
sa.Column('serialnumber', sa.String(length=128), nullable=False),
|
||||
sa.Column('deviceid', sa.String(length=64), nullable=True),
|
||||
sa.Column('enrollnonce', sa.String(length=128), nullable=False),
|
||||
sa.Column('agentversion', sa.String(length=32), nullable=True),
|
||||
sa.Column('status', sa.String(length=16), nullable=False),
|
||||
sa.Column('reason', sa.String(length=64), nullable=True),
|
||||
sa.Column('matchedassetid', sa.Integer(), nullable=True),
|
||||
sa.Column('sourceip', sa.String(length=45), nullable=True),
|
||||
sa.Column('requestedat', sa.DateTime(), nullable=False),
|
||||
sa.Column('lastseenat', sa.DateTime(), nullable=False),
|
||||
sa.Column('decidedat', sa.DateTime(), nullable=True),
|
||||
sa.Column('decidedby', sa.String(length=64), nullable=True),
|
||||
sa.ForeignKeyConstraint(['matchedassetid'], ['assets.assetid'],
|
||||
ondelete='SET NULL'),
|
||||
sa.PrimaryKeyConstraint('requestid'),
|
||||
)
|
||||
existing = {tuple(ix.get('column_names') or ()) for ix in _indexes(REQUESTS)}
|
||||
if ('hostname', 'serialnumber') not in existing:
|
||||
op.create_index('idx_endpointenrollrequests_hostserial', REQUESTS,
|
||||
['hostname', 'serialnumber'],
|
||||
mysql_length={'hostname': 128, 'serialnumber': 63})
|
||||
|
||||
if not _has_table(WAVES):
|
||||
op.create_table(
|
||||
WAVES,
|
||||
sa.Column('waveid', sa.Integer(), nullable=False),
|
||||
sa.Column('createdat', sa.DateTime(), nullable=False),
|
||||
sa.Column('createdby', sa.String(length=64), nullable=True),
|
||||
sa.Column('assetids', sa.Text(), nullable=False),
|
||||
sa.Column('notes', sa.String(length=255), nullable=True),
|
||||
sa.PrimaryKeyConstraint('waveid'),
|
||||
)
|
||||
|
||||
|
||||
def downgrade():
|
||||
if _has_table(WAVES):
|
||||
op.drop_table(WAVES)
|
||||
if _has_table(REQUESTS):
|
||||
for index in _indexes(REQUESTS):
|
||||
if index['name'] == 'idx_endpointenrollrequests_hostserial':
|
||||
op.drop_index(index['name'], table_name=REQUESTS)
|
||||
op.drop_table(REQUESTS)
|
||||
if _has_table(CREDENTIALS):
|
||||
op.drop_table(CREDENTIALS)
|
||||
Reference in New Issue
Block a user