Skip to content

Add support for re-enrollment#68

Draft
bernd wants to merge 11 commits into
mainfrom
add/re-enrollment
Draft

Add support for re-enrollment#68
bernd wants to merge 11 commits into
mainfrom
add/re-enrollment

Conversation

@bernd

@bernd bernd commented Jun 11, 2026

Copy link
Copy Markdown
Member

Requires the server changes in: Graylog2/graylog2-server#25783

  • Generate keys on startup, not during enrollment
  • Implement actual re-enrollment

bernd and others added 10 commits May 12, 2026 19:25
Signing and encryption keys, alongside the instance UID, are now
generated and persisted at startup by persistence.InitIdentity rather
than during the first enrollment. PrepareEnrollment loads them from
disk on every call, so re-enrollment reuses the existing keypair.

InitIdentity refuses to run when a certificate exists but the keys
are missing, preventing an actor from silently re-keying out from
under a valid cert.

The auth manager drops its pendingSigningKey/pendingEncryptionKey
fields and tracks pending enrollment via pendingEnrollmentJWT only.
LoadCredentials, CompleteEnrollment, and CompleteRenewal share a new
verifyKeyCertPair helper that rejects a certificate whose public key
does not match the on-disk signing key.
@bernd
bernd marked this pull request as ready for review June 17, 2026 12:10
@bernd
bernd marked this pull request as draft June 17, 2026 12:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant