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

Fix definition order of modsecurity directives #5315

Merged
merged 1 commit into from
Apr 3, 2020

Conversation

aledbf
Copy link
Member

@aledbf aledbf commented Apr 2, 2020

What this PR does / why we need it:

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)

Which issue/s this PR fixes

fixes #5099
fixes #4640

How Has This Been Tested?

Checklist:

  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I've read the CONTRIBUTION guide
  • I have added tests to cover my changes.
  • All new and existing tests passed.

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Apr 2, 2020
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: aledbf

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 2, 2020
@codecov-io
Copy link

Codecov Report

Merging #5315 into master will increase coverage by 0.07%.
The diff coverage is 66.66%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #5315      +/-   ##
==========================================
+ Coverage   58.64%   58.72%   +0.07%     
==========================================
  Files          88       88              
  Lines        6901     6919      +18     
==========================================
+ Hits         4047     4063      +16     
- Misses       2410     2412       +2     
  Partials      444      444              
Impacted Files Coverage Δ
cmd/nginx/main.go 6.41% <0.00%> (-0.09%) ⬇️
internal/k8s/main.go 69.23% <25.00%> (+3.77%) ⬆️
internal/ingress/status/status.go 70.98% <71.42%> (ø)
internal/ingress/controller/store/store.go 60.08% <77.77%> (+0.43%) ⬆️
internal/ingress/annotations/class/main.go 88.88% <85.71%> (+17.46%) ⬆️
cmd/nginx/flags.go 83.08% <100.00%> (ø)
internal/ingress/controller/controller.go 49.40% <100.00%> (ø)
internal/ingress/controller/template/template.go 80.16% <100.00%> (+0.05%) ⬆️
... and 2 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 680d801...291d9fb. Read the comment docs.

@aledbf
Copy link
Member Author

aledbf commented Apr 2, 2020

/hold

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 2, 2020
@aledbf
Copy link
Member Author

aledbf commented Apr 2, 2020

/retest

1 similar comment
@aledbf
Copy link
Member Author

aledbf commented Apr 2, 2020

/retest

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. 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.

Modsecurity can never be enabled in enforced mode Nginx with modsecurity enabled stop to process request
3 participants