Skip to content

Fix duplicate upload creation for plaintext recordings after encryption has been enabled#60889

Merged
eriktate merged 1 commit intomasterfrom
eriktate/fix-recording-24h-reset
Nov 1, 2025
Merged

Fix duplicate upload creation for plaintext recordings after encryption has been enabled#60889
eriktate merged 1 commit intomasterfrom
eriktate/fix-recording-24h-reset

Conversation

@eriktate
Copy link
Copy Markdown
Contributor

@eriktate eriktate commented Oct 31, 2025

This PR partially addresses #60860. It reads the first part of an async upload to confirm whether or not it's encrypted before starting the encrypted upload flow. Without this check an upload will be created for an encrypted recording using the same session ID before we encounter the skip encrypted upload error. The recording will then proceed to the plaintext upload flow which will create another upload that proceeds through the entire lifecycle.

The upload created by the encrypted flow remains empty until the completer completes it and overwrites the original session data.

changelog: Fixed a bug causing unencrypted session recordings to be deleted 24 hours after being created while using node and proxy recording modes.

@github-actions github-actions bot added audit-log Issues related to Teleports Audit Log size/sm labels Oct 31, 2025
Copy link
Copy Markdown
Contributor

@tigrato tigrato left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we add a test?

@eriktate eriktate force-pushed the eriktate/fix-recording-24h-reset branch from 0612631 to ff8bdd2 Compare October 31, 2025 21:19
Base automatically changed from joerger/pad-encrypted-recordings-s3 to master October 31, 2025 22:03
@eriktate eriktate force-pushed the eriktate/fix-recording-24h-reset branch from ff8bdd2 to f281f6a Compare November 1, 2025 00:13
@eriktate eriktate enabled auto-merge November 1, 2025 00:13
@eriktate eriktate added this pull request to the merge queue Nov 1, 2025
Merged via the queue into master with commit df7907b Nov 1, 2025
41 checks passed
@eriktate eriktate deleted the eriktate/fix-recording-24h-reset branch November 1, 2025 00:56
@backport-bot-workflows
Copy link
Copy Markdown
Contributor

@eriktate See the table below for backport results.

Branch Result
branch/v18 Failed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

audit-log Issues related to Teleports Audit Log backport/branch/v18 size/sm

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants