Skip to content

Add missing handling for recording encryption configs and keys#57279

Merged
eriktate merged 2 commits intomasterfrom
eriktate/add-tags-to-encryption-keys
Aug 13, 2025
Merged

Add missing handling for recording encryption configs and keys#57279
eriktate merged 2 commits intomasterfrom
eriktate/add-tags-to-encryption-keys

Conversation

@eriktate
Copy link
Copy Markdown
Contributor

This PR adds a few missing pieces to recording encryption:

  • Use alternate labels/tags for encryption keys so they aren't automatically removed while still in use
  • Prevent cloud tenants from using manual_key_management
  • Prevent recording encryption in FIPS mode

@github-actions github-actions Bot requested review from gzdunek and nklaassen July 29, 2025 19:56
@eriktate eriktate force-pushed the eriktate/refactor-encrypted-recording-protos branch from 3c160d0 to e99bcc2 Compare July 29, 2025 21:03
@eriktate eriktate force-pushed the eriktate/add-tags-to-encryption-keys branch 2 times, most recently from 8101eed to 28c2293 Compare July 30, 2025 19:54
@public-teleport-github-review-bot
Copy link
Copy Markdown

@eriktate - this PR will require admin approval to merge due to its size. Consider breaking it up into a series smaller changes.

@eriktate eriktate force-pushed the eriktate/refactor-encrypted-recording-protos branch from 71ad8e4 to 850c067 Compare August 7, 2025 23:24
@eriktate eriktate force-pushed the eriktate/add-tags-to-encryption-keys branch from adc5214 to 53cf180 Compare August 7, 2025 23:24
@eriktate eriktate force-pushed the eriktate/refactor-encrypted-recording-protos branch from 850c067 to b5a7837 Compare August 8, 2025 20:23
@eriktate eriktate force-pushed the eriktate/add-tags-to-encryption-keys branch from cf216c2 to 6954ed8 Compare August 8, 2025 20:31
@eriktate eriktate force-pushed the eriktate/refactor-encrypted-recording-protos branch from b5a7837 to c82d3de Compare August 11, 2025 18:17
@eriktate eriktate force-pushed the eriktate/add-tags-to-encryption-keys branch from 6954ed8 to 9756e5d Compare August 11, 2025 19:16
Comment thread lib/auth/keystore/aws_kms.go Outdated
@eriktate eriktate added the no-changelog Indicates that a PR does not require a changelog entry label Aug 12, 2025
@eriktate
Copy link
Copy Markdown
Contributor Author

@nklaassen @gzdunek friendly bump!

@eriktate eriktate requested a review from rosstimothy August 12, 2025 20:10
Comment thread lib/auth/keystore/keystore_test.go Outdated
…usting pkcs11 host UUID check to allow for key sharing of encryption keys, preventing cloud tenants from enabling manual key management, preventing use of recording encryption in FIPS mode
@eriktate eriktate force-pushed the eriktate/add-tags-to-encryption-keys branch from 82748f6 to b9fbaad Compare August 12, 2025 20:45
Base automatically changed from eriktate/refactor-encrypted-recording-protos to master August 13, 2025 14:06
@eriktate eriktate added this pull request to the merge queue Aug 13, 2025
Merged via the queue into master with commit fd58609 Aug 13, 2025
42 checks passed
@eriktate eriktate deleted the eriktate/add-tags-to-encryption-keys branch August 13, 2025 15:35
eriktate added a commit that referenced this pull request Aug 15, 2025
* updating protos for recording encryption

* changing labels for encryption keys to prevent automatic cleanup, adjusting pkcs11 host UUID check to allow for key sharing of encryption keys, preventing cloud tenants from enabling manual key management, preventing use of recording encryption in FIPS mode
eriktate added a commit that referenced this pull request Aug 27, 2025
* updating protos for recording encryption

* changing labels for encryption keys to prevent automatic cleanup, adjusting pkcs11 host UUID check to allow for key sharing of encryption keys, preventing cloud tenants from enabling manual key management, preventing use of recording encryption in FIPS mode
eriktate added a commit that referenced this pull request Sep 2, 2025
* updating protos for recording encryption

* changing labels for encryption keys to prevent automatic cleanup, adjusting pkcs11 host UUID check to allow for key sharing of encryption keys, preventing cloud tenants from enabling manual key management, preventing use of recording encryption in FIPS mode
eriktate added a commit that referenced this pull request Sep 2, 2025
* updating protos for recording encryption

* changing labels for encryption keys to prevent automatic cleanup, adjusting pkcs11 host UUID check to allow for key sharing of encryption keys, preventing cloud tenants from enabling manual key management, preventing use of recording encryption in FIPS mode
eriktate added a commit that referenced this pull request Sep 2, 2025
* updating protos for recording encryption

* changing labels for encryption keys to prevent automatic cleanup, adjusting pkcs11 host UUID check to allow for key sharing of encryption keys, preventing cloud tenants from enabling manual key management, preventing use of recording encryption in FIPS mode
eriktate added a commit that referenced this pull request Sep 3, 2025
* updating protos for recording encryption

* changing labels for encryption keys to prevent automatic cleanup, adjusting pkcs11 host UUID check to allow for key sharing of encryption keys, preventing cloud tenants from enabling manual key management, preventing use of recording encryption in FIPS mode
github-merge-queue Bot pushed a commit that referenced this pull request Sep 3, 2025
* adding support for encryption/decryption keys to keystore manager (#54428, #55652)

* adds new protos for resources related to encrypted session recordings and updates the existing SessionRecordingConfig protos to include a Status (#54780)

* adding local service implementation for recording encryption resources (#54816)

* adding Manager for RecordingEncryption resources that handles shared ops more complex than CRUD (#55078)

* Adding session recording plugin for `age` (#55120)

* adding Manager for RecordingEncryption resources that handles shared ops more complex than CRUD

* adding age plugin wrapping default X25519 Identity/Recipient implementation with hooks to more efficiently lookup private keys given their respective public key

* Adding recording encryption and playback for `sync` modes (#54901)

* adding cache for RecordingEncryption (#55857)

* adding recording_encryption service protos (#55121)

* adding async recording encryption with gRPC multipart uploader (#55859)

* adding file configuration for encrypted session recording (#56200)

* Switching recording encryption to unwrap keys using direct keystore RSA decryption (#56776)

* adding manual key management config (#56920)

* updating protos for recording encryption (#57055)

* Add missing handling for recording encryption configs and keys (#57279)

* updating protos for recording encryption

* changing labels for encryption keys to prevent automatic cleanup, adjusting pkcs11 host UUID check to allow for key sharing of encryption keys, preventing cloud tenants from enabling manual key management, preventing use of recording encryption in FIPS mode

* adding new protos for rotated keys and the local service for interacting (#57576)

with them

* Switching encryption keys from PEM to ASN.1 DER encoding (#58137)

* using pregenerated RSA4096 key for keystore tests because generation is too slow (#58138)

* extending precomputed RSA keys to support 4096-bit keys (#58251)

* adding rotation process to Manager and exposing with new RPCs and (#57577)

* adding rotation sub commands for recording encryption keys and fixing (#57780)

broken session_recording_config when using fileconf

* using more reliable method of validating key bit length
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

no-changelog Indicates that a PR does not require a changelog entry size/sm

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants