Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

OCPBUGS-48740: Add missing CSP directives #2163

Merged
merged 1 commit into from
Jan 22, 2025

Conversation

jhadvig
Copy link
Member

@jhadvig jhadvig commented Jan 22, 2025

Adding two requested CSP directives:

  • ObjectSrc
  • ConnectSrc

This PR also need to be backported to 4.18

/assign @JoelSpeed @spadgett

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jan 22, 2025
@openshift-ci-robot openshift-ci-robot added the jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. label Jan 22, 2025
@openshift-ci-robot
Copy link

@jhadvig: This pull request references Jira Issue OCPBUGS-48740, which is valid.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.19.0) matches configured target version for branch (4.19.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @yapei

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

In response to this:

Adding two requested CSP directives:

  • ObjectSrc
  • ConnectSrc

This PR also need to be backported to 4.18

/assign @JoelSpeed @spadgett

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.

Copy link
Contributor

openshift-ci bot commented Jan 22, 2025

Hello @jhadvig! Some important instructions when contributing to openshift/api:
API design plays an important part in the user experience of OpenShift and as such API PRs are subject to a high level of scrutiny to ensure they follow our best practices. If you haven't already done so, please review the OpenShift API Conventions and ensure that your proposed changes are compliant. Following these conventions will help expedite the api review process for your PR.

@openshift-ci openshift-ci bot requested a review from yapei January 22, 2025 15:44
@openshift-ci openshift-ci bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jan 22, 2025
@openshift-ci openshift-ci bot requested review from knobunc and spadgett January 22, 2025 15:44
Copy link
Member

@spadgett spadgett left a comment

Choose a reason for hiding this comment

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

LGTM. We've identified these as additional CSP directives we need based on feedback from plugin teams. Deferring to @JoelSpeed for final review and approval.

Copy link
Contributor

openshift-ci bot commented Jan 22, 2025

@jhadvig: all tests passed!

Full PR test history. Your PR dashboard.

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.

@JoelSpeed
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jan 22, 2025
Copy link
Contributor

openshift-ci bot commented Jan 22, 2025

[APPROVALNOTIFIER] This PR is APPROVED

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

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

The pull request process is described here

Needs approval from an approver in each of these files:

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

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 22, 2025
@jhadvig
Copy link
Member Author

jhadvig commented Jan 22, 2025

/label acknowledge-critical-fixes-only
/cherry-pick release-4.18

@openshift-cherrypick-robot

@jhadvig: once the present PR merges, I will cherry-pick it on top of release-4.18 in a new PR and assign it to you.

In response to this:

/label acknowledge-critical-fixes-only
/cherry-pick release-4.18

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-ci openshift-ci bot added the acknowledge-critical-fixes-only Indicates if the issuer of the label is OK with the policy. label Jan 22, 2025
@openshift-merge-bot openshift-merge-bot bot merged commit f7ed4f5 into openshift:master Jan 22, 2025
11 checks passed
@openshift-ci-robot
Copy link

@jhadvig: Jira Issue OCPBUGS-48740: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-48740 has been moved to the MODIFIED state.

In response to this:

Adding two requested CSP directives:

  • ObjectSrc
  • ConnectSrc

This PR also need to be backported to 4.18

/assign @JoelSpeed @spadgett

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-cherrypick-robot

@jhadvig: #2163 failed to apply on top of branch "release-4.18":

Applying: OCPBUGS-48740: Add missing CSP directives
Using index info to reconstruct a base tree...
M	console/v1/types_console_plugin.go
M	console/v1/zz_generated.crd-manifests/90_consoleplugins-CustomNoUpgrade.crd.yaml
M	console/v1/zz_generated.crd-manifests/90_consoleplugins-DevPreviewNoUpgrade.crd.yaml
M	console/v1/zz_generated.crd-manifests/90_consoleplugins-TechPreviewNoUpgrade.crd.yaml
M	console/v1/zz_generated.featuregated-crd-manifests/consoleplugins.console.openshift.io/ConsolePluginContentSecurityPolicy.yaml
M	console/v1/zz_generated.swagger_doc_generated.go
M	openapi/generated_openapi/zz_generated.openapi.go
M	openapi/openapi.json
Falling back to patching base and 3-way merge...
Auto-merging openapi/openapi.json
Auto-merging openapi/generated_openapi/zz_generated.openapi.go
Auto-merging console/v1/zz_generated.swagger_doc_generated.go
Auto-merging console/v1/zz_generated.featuregated-crd-manifests/consoleplugins.console.openshift.io/ConsolePluginContentSecurityPolicy.yaml
Auto-merging console/v1/zz_generated.crd-manifests/90_consoleplugins-TechPreviewNoUpgrade.crd.yaml
Auto-merging console/v1/zz_generated.crd-manifests/90_consoleplugins-DevPreviewNoUpgrade.crd.yaml
Auto-merging console/v1/zz_generated.crd-manifests/90_consoleplugins-CustomNoUpgrade.crd.yaml
Auto-merging console/v1/types_console_plugin.go
CONFLICT (content): Merge conflict in console/v1/types_console_plugin.go
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 advice.mergeConflict false"
Patch failed at 0001 OCPBUGS-48740: Add missing CSP directives

In response to this:

/label acknowledge-critical-fixes-only
/cherry-pick release-4.18

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-bot
Copy link

[ART PR BUILD NOTIFIER]

Distgit: ose-cluster-config-api
This PR has been included in build ose-cluster-config-api-container-v4.19.0-202501222307.p0.gf7ed4f5.assembly.stream.el9.
All builds following this will include this PR.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
acknowledge-critical-fixes-only Indicates if the issuer of the label is OK with the policy. approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants