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.

Sign up for GitHub

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

Jump to bottom

OCPBUGS-9835: Add Content-Security-Policy headers to prometheus and alertmanager #2012

Merged
merged 8 commits into from Jul 7, 2023
Merged

OCPBUGS-9835: Add Content-Security-Policy headers to prometheus and alertmanager #2012

merged 8 commits into from Jul 7, 2023

Conversation

marioferh
Copy link
Contributor

@marioferh marioferh commented Jun 23, 2023 •
edited

Add http Content-Security-Policy headers
Add e2e test

  • I added CHANGELOG entry for this change.
  • No user facing changes, so no entry in CHANGELOG was needed.

@openshift-ci-robot openshift-ci-robot added the jira/severity-moderate Referenced Jira bug's severity is moderate for the branch this PR is targeting. label Jun 23, 2023
@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 23, 2023
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jun 23, 2023
@openshift-ci-robot
Copy link
Contributor

@marioferh: This pull request references Jira Issue OCPBUGS-9835, which is invalid:

  • expected the bug to target the "4.14.0" version, but no target version was set

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.

In response to this:

  • I added CHANGELOG entry for this change.
  • No user facing changes, so no entry in CHANGELOG was needed.

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/test-infra repository.

@openshift-ci-robot openshift-ci-robot added the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Jun 23, 2023
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 23, 2023
@marioferh marioferh force-pushed the http_headers branch 2 times, most recently from 75926da to 4ba7904 Compare June 23, 2023 13:32
@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 23, 2023
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 23, 2023
@openshift-ci-robot
Copy link
Contributor

@marioferh: This pull request references Jira Issue OCPBUGS-9835, which is invalid:

  • expected the bug to target the "4.14.0" version, but no target version was set

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.

In response to this:

Add http Content-Security-Policy headers

  • I added CHANGELOG entry for this change.
  • No user facing changes, so no entry in CHANGELOG was needed.

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/test-infra repository.

@marioferh marioferh changed the title WIP OCPBUGS-9835: Add Content-Security-Policy headers to prometheus and alertmanager OCPBUGS-9835: Add Content-Security-Policy headers to prometheus and alertmanager Jun 23, 2023
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 23, 2023
@marioferh
Copy link
Contributor Author

/test e2e-aws-ovn-single-node

2 similar comments
@marioferh
Copy link
Contributor Author

/test e2e-aws-ovn-single-node

@marioferh
Copy link
Contributor Author

/test e2e-aws-ovn-single-node

@marioferh
Copy link
Contributor Author

/jira refresh

@marioferh
Copy link
Contributor Author

/test e2e-aws-ovn-single-node

@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 29, 2023
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 29, 2023
@marioferh
add headers and test
2c697c8 
Signed-off-by: Mario Fernandez <mariofer@redhat.com>
@marioferh
Clean empty config in tests
dcc65cc 
Signed-off-by: Mario Fernandez <mariofer@redhat.com>
@marioferh marioferh force-pushed the http_headers branch 3 times, most recently from c64f30b to bd45617 Compare July 6, 2023 08:27
@marioferh
Move test to new security_headers_test
4e83185 
Signed-off-by: Mario Fernandez <mariofer@redhat.com>
@openshift-ci-robot 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 Jul 6, 2023
@openshift-ci-robot
Copy link
Contributor

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

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

Requesting review from QA contact:
/cc @juzhao

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

In response to this:

Add http Content-Security-Policy headers
Add e2e test

  • I added CHANGELOG entry for this change.
  • No user facing changes, so no entry in CHANGELOG was needed.

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/test-infra repository.

@openshift-ci openshift-ci bot requested a review from juzhao July 6, 2023 11:05
jan--f
jan--f reviewed Jul 6, 2023
View reviewed changes
Copy link
Contributor

@jan--f jan--f left a comment

Choose a reason for hiding this comment

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

Maybe add one more error bailout?

@marioferh @jan--f
Update test/e2e/security_headers_test.go
0334407 
Co-authored-by: Jan Fajerski <jan--f@users.noreply.github.com>
simonpasquier
simonpasquier reviewed Jul 6, 2023
View reviewed changes
Copy link
Contributor

@simonpasquier simonpasquier left a comment

Choose a reason for hiding this comment

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

/lgtm

@marioferh
Copy link
Contributor Author

Maybe add one more error bailout?

where?

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jul 6, 2023
@marioferh
Add go-fmt
a6ffc2c 
Signed-off-by: Mario Fernandez <mariofer@redhat.com>
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Jul 6, 2023
@simonpasquier
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jul 6, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jul 6, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: marioferh, simonpasquier

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:
  • OWNERS [marioferh,simonpasquier]

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

@openshift-ci-robot
Copy link
Contributor

/retest-required

Remaining retests: 0 against base HEAD 60f4899 and 2 for PR HEAD a6ffc2c in total

@openshift-ci-robot
Copy link
Contributor

/retest-required

Remaining retests: 0 against base HEAD 26622a6 and 1 for PR HEAD a6ffc2c in total

@openshift-ci-robot
Copy link
Contributor

/retest-required

Remaining retests: 0 against base HEAD f6ee2ed and 0 for PR HEAD a6ffc2c in total

@openshift-merge-robot openshift-merge-robot merged commit 26ca716 into openshift:master Jul 7, 2023
15 of 16 checks passed
@openshift-ci-robot
Copy link
Contributor

@marioferh: Jira Issue OCPBUGS-9835: All pull requests linked via external trackers have merged:

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

In response to this:

Add http Content-Security-Policy headers
Add e2e test

  • I added CHANGELOG entry for this change.
  • No user facing changes, so no entry in CHANGELOG was needed.

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/test-infra repository.

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

@jan--f jan--f jan--f left review comments

@simonpasquier simonpasquier simonpasquier left review comments

@raptorsun raptorsun raptorsun left review comments

@sthaha sthaha Awaiting requested review from sthaha

@juzhao juzhao Awaiting requested review from juzhao

Assignees

@simonpasquier simonpasquier

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/severity-moderate Referenced Jira bug's severity is moderate for the branch this PR is targeting. 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.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@marioferh @openshift-ci-robot @simonpasquier @jan--f @raptorsun @openshift-merge-robot