[release-4.21] OCPBUGS-85674: Prevent binary secret data corruption when editing by TheRealJon · Pull Request #16448 · openshift/console

TheRealJon · 2026-05-14T19:36:05Z

Manual backport of #16435

coderabbitai · 2026-05-14T19:36:12Z

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository: openshift/coderabbit/.coderabbit.yaml

Review profile: CHILL

Plan: Enterprise

Run ID: 1e8ca133-f7f2-4308-ae69-4add5f0f01d7

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

🔍 Trigger review

✨ Finishing Touches

🧪 Generate unit tests (beta)

Create PR with unit tests

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

openshift-ci-robot · 2026-05-14T19:36:12Z

@TheRealJon: This pull request references Jira Issue OCPBUGS-70273, which is invalid:

expected the bug to target either version "4.21." or "openshift-4.21.", but it targets "5.0.0" instead
expected the bug to be in one of the following states: NEW, ASSIGNED, POST, but it is Verified instead
expected Jira Issue OCPBUGS-70273 to depend on a bug targeting a version in 4.22.0 and in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but no dependents were found

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

Manual backport of #16435

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

openshift-ci-robot · 2026-05-14T19:37:26Z

@TheRealJon: This pull request references Jira Issue OCPBUGS-85674, which is invalid:

expected dependent Jira Issue OCPBUGS-85494 to target a version in 4.22.0, but it targets "4.22" instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

Manual backport of #16435

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

jhadvig · 2026-05-18T11:07:48Z

/jira refresh

openshift-ci-robot · 2026-05-18T11:07:56Z

@jhadvig: This pull request references Jira Issue OCPBUGS-85674, which is valid. The bug has been moved to the POST state.

7 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target version (4.21.z) matches configured target version for branch (4.21.z)
bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
release note text is set and does not match the template
dependent bug Jira Issue OCPBUGS-85494 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
dependent Jira Issue OCPBUGS-85494 targets the "4.22.0" version, which is one of the valid target versions: 4.22.0
bug has dependents

No GitHub users were found matching the public email listed for the QA contact in Jira (yapei@redhat.com), skipping review request.

Details

In response to this:

/jira refresh

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

jhadvig · 2026-05-18T11:20:18Z

/retest

When editing secrets containing binary data (JAR, JCEKS, etc), the binary values were being corrupted by decoding base64 as UTF-8 text, which inserts replacement characters for non-printable bytes. Fixed by: - Pass base64 data directly to DroppableFileInput for binary entries - Add isBase64Input prop to properly handle base64-encoded input - Preserve original binary values when form updates to prevent corruption - Use useMemo instead of useState for derived binaryData value - Use immutable reducer pattern to merge binary data Added Cypress test to verify editing text fields doesn't corrupt binary data in the same secret. Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>

TheRealJon · 2026-05-28T13:19:45Z

/retest

jhadvig · 2026-06-01T13:51:56Z

/lgtm
/label backport-risk-assessed
/verified by CI

openshift-ci-robot · 2026-06-01T13:52:14Z

@jhadvig: This PR has been marked as verified by CI.

Details

In response to this:

/lgtm
/label backport-risk-assessed
/verified by CI

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

openshift-ci · 2026-06-01T13:52:30Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jhadvig, TheRealJon

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details

Needs approval from an approver in each of these files:

~~frontend/OWNERS~~ [TheRealJon,jhadvig]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

openshift-merge-bot · 2026-06-01T15:04:45Z

/retest-required

Remaining retests: 0 against base HEAD 765e305 and 2 for PR HEAD 6d2c7ae in total

openshift-merge-bot · 2026-06-02T20:08:04Z

/retest-required

Remaining retests: 0 against base HEAD d1a3cd3 and 1 for PR HEAD 6d2c7ae in total

openshift-ci · 2026-06-03T02:33:09Z

@TheRealJon: all tests passed!

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

openshift-ci-robot · 2026-06-03T02:37:54Z

@TheRealJon: Jira Issue Verification Checks: Jira Issue OCPBUGS-85674
✔️ This pull request was pre-merge verified.
✔️ All associated pull requests have merged.
✔️ All associated, merged pull requests were pre-merge verified.

Jira Issue OCPBUGS-85674 has been moved to the MODIFIED state and will move to the VERIFIED state when the change is available in an accepted nightly payload. 🕓

Details

In response to this:

Manual backport of #16435

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

TheRealJon · 2026-06-03T13:01:05Z

/cherry-pick release-4.20

openshift-cherrypick-robot · 2026-06-03T13:02:16Z

@TheRealJon: #16448 failed to apply on top of branch "release-4.20":

Applying: OCPBUGS-70273: Prevent binary secret data corruption when editing
Using index info to reconstruct a base tree...
M	frontend/packages/console-shared/src/components/formik-fields/field-types.ts
M	frontend/packages/integration-tests-cypress/tests/crud/secrets/key-value.cy.ts
M	frontend/packages/integration-tests-cypress/tests/crud/secrets/source.cy.ts
M	frontend/packages/integration-tests-cypress/views/secret.ts
M	frontend/public/components/cluster-settings/__tests__/test-utils.ts
M	frontend/public/components/cluster-settings/basicauth-idp-form.tsx
M	frontend/public/components/cluster-settings/htpasswd-idp-form.tsx
M	frontend/public/components/cluster-settings/idp-cafile-input.tsx
M	frontend/public/components/cluster-settings/keystone-idp-form.tsx
M	frontend/public/components/secrets/create-secret/OpaqueSecretFormEntry.tsx
M	frontend/public/components/secrets/create-secret/PullSecretUploadForm.tsx
M	frontend/public/components/secrets/create-secret/SSHAuthSubform.tsx
M	frontend/public/components/secrets/create-secret/SecretFormWrapper.tsx
M	frontend/public/components/utils/file-input.tsx
M	frontend/public/locales/en/public.json
Falling back to patching base and 3-way merge...
Auto-merging frontend/public/locales/en/public.json
Auto-merging frontend/public/components/utils/file-input.tsx
CONFLICT (content): Merge conflict in frontend/public/components/utils/file-input.tsx
Auto-merging frontend/public/components/secrets/create-secret/SecretFormWrapper.tsx
CONFLICT (content): Merge conflict in frontend/public/components/secrets/create-secret/SecretFormWrapper.tsx
Auto-merging frontend/public/components/secrets/create-secret/SSHAuthSubform.tsx
Auto-merging frontend/public/components/secrets/create-secret/PullSecretUploadForm.tsx
Auto-merging frontend/public/components/secrets/create-secret/OpaqueSecretFormEntry.tsx
CONFLICT (content): Merge conflict in frontend/public/components/secrets/create-secret/OpaqueSecretFormEntry.tsx
Auto-merging frontend/public/components/cluster-settings/keystone-idp-form.tsx
Auto-merging frontend/public/components/cluster-settings/idp-cafile-input.tsx
Auto-merging frontend/public/components/cluster-settings/htpasswd-idp-form.tsx
Auto-merging frontend/public/components/cluster-settings/basicauth-idp-form.tsx
Auto-merging frontend/public/components/cluster-settings/__tests__/test-utils.ts
Auto-merging frontend/packages/integration-tests-cypress/views/secret.ts
Auto-merging frontend/packages/integration-tests-cypress/tests/crud/secrets/source.cy.ts
Auto-merging frontend/packages/integration-tests-cypress/tests/crud/secrets/key-value.cy.ts
Auto-merging frontend/packages/console-shared/src/components/formik-fields/field-types.ts
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 OCPBUGS-70273: Prevent binary secret data corruption when editing

Details

In response to this:

/cherry-pick release-4.20

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

openshift-merge-robot · 2026-06-03T19:58:12Z

Fix included in release 4.21.0-0.nightly-2026-06-03-102204

openshift-ci-robot added jira/severity-important Referenced Jira bug's severity is important for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. labels May 14, 2026

openshift-ci-robot added the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label May 14, 2026

openshift-ci Bot requested review from jhadvig and rhamilto May 14, 2026 19:36

openshift-ci Bot added component/core Related to console core functionality component/shared Related to console-shared approved Indicates a PR has been approved by an approver from all required OWNERS files. kind/cypress Related to Cypress e2e integration testing labels May 14, 2026

TheRealJon changed the title ~~OCPBUGS-70273: Prevent binary secret data corruption when editing~~ [release-4.21] OCPBUGS-70273: Prevent binary secret data corruption when editing May 14, 2026

TheRealJon changed the title ~~[release-4.21] OCPBUGS-70273: Prevent binary secret data corruption when editing~~ [release-4.21] OCPBUGS-85674: Prevent binary secret data corruption when editing May 14, 2026

TheRealJon force-pushed the OCPBUGS-85674 branch from 02936b3 to 0b0bf17 Compare May 15, 2026 12:59

openshift-ci Bot added the kind/i18n Indicates issue or PR relates to internationalization or has content that needs to be translated label May 15, 2026

openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels May 18, 2026

TheRealJon force-pushed the OCPBUGS-85674 branch 2 times, most recently from 22efbbf to 8c9539a Compare May 21, 2026 20:42

TheRealJon force-pushed the OCPBUGS-85674 branch from 8c9539a to 6d2c7ae Compare May 27, 2026 14:54

openshift-ci Bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Jun 1, 2026

openshift-ci Bot assigned sanketpathak Jun 1, 2026

openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Jun 1, 2026

openshift-ci Bot assigned jhadvig Jun 1, 2026

openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Jun 1, 2026

openshift-merge-bot Bot merged commit 4028827 into openshift:release-4.21 Jun 3, 2026
8 checks passed

TheRealJon deleted the OCPBUGS-85674 branch June 3, 2026 13:01

TheRealJon mentioned this pull request Jun 8, 2026

[release-4.20] OCPBUGS-87835: Prevent binary secret data corruption when editing #16571

Open

Conversation

TheRealJon commented May 14, 2026

Uh oh!

coderabbitai Bot commented May 14, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Review skipped

Uh oh!

openshift-ci-robot commented May 14, 2026

Uh oh!

openshift-ci-robot commented May 14, 2026

Uh oh!

jhadvig commented May 18, 2026

Uh oh!

openshift-ci-robot commented May 18, 2026

Uh oh!

jhadvig commented May 18, 2026

Uh oh!

TheRealJon commented May 28, 2026

Uh oh!

jhadvig commented Jun 1, 2026

Uh oh!

openshift-ci-robot commented Jun 1, 2026

Uh oh!

openshift-ci Bot commented Jun 1, 2026

Uh oh!

openshift-merge-bot Bot commented Jun 1, 2026

Uh oh!

openshift-merge-bot Bot commented Jun 2, 2026

Uh oh!

openshift-ci Bot commented Jun 3, 2026

Uh oh!

Uh oh!

openshift-ci-robot commented Jun 3, 2026

Uh oh!

TheRealJon commented Jun 3, 2026

Uh oh!

openshift-cherrypick-robot commented Jun 3, 2026

Uh oh!

openshift-merge-robot commented Jun 3, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

coderabbitai Bot commented May 14, 2026 •

edited

Loading