chore(deps): update all non-major dependencies in docker-bake.hcl#421
Conversation
|
@copilot fix the build ci. ModSecurity v2 changed the libinjection build to use git submodules. |
…ion submodule Agent-Logs-Url: https://github.com/coreruleset/modsecurity-crs-docker/sessions/0b78dbc1-9b74-4d63-9f80-182f69b184d9 Co-authored-by: fzipi <3012076+fzipi@users.noreply.github.com>
Fixed in 6dbb1ef. Both |
|
Note Reviews pausedIt looks like this branch is under active development. To avoid overwhelming you with review comments due to an influx of new commits, CodeRabbit has automatically paused this review. You can configure this behavior by changing the Use the following commands to manage reviews:
Use the checkboxes below for quick actions:
📝 WalkthroughWalkthroughSwaps ModSecurity source retrieval from release archives to shallow git clones for Apache builds, removes an OWASP patch and related package install from the NGINX Alpine build, bumps default ModSecurity/nginx versions, and updates a CI workflow environment variable plus a test expectation override. ChangesBuilds: ModSecurity source and version bumps
CI: verifyimage workflow change
Estimated code review effort🎯 3 (Moderate) | ⏱️ ~20 minutes Poem
🚥 Pre-merge checks | ✅ 4 | ❌ 1❌ Failed checks (1 warning)
✅ Passed checks (4 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches🧪 Generate unit tests (beta)
Comment |
|
@copilot Looks like patch https://patch-diff.githubusercontent.com/raw/owasp-modsecurity/ModSecurity/pull/3473.patch is already applied also, so remove. |
…Security 3.0.15 Agent-Logs-Url: https://github.com/coreruleset/modsecurity-crs-docker/sessions/04664656-9018-4bf8-9e9f-820d669bd5cc Co-authored-by: fzipi <3012076+fzipi@users.noreply.github.com>
Done in 7ea4758. Removed the |
|
@copilot nginx tests are failing. This is probably due to nginx 1.30.0 changed the response to test 920100-4 to have a status code of 405. Patch the file |
… on nginx 1.30.0 Agent-Logs-Url: https://github.com/coreruleset/modsecurity-crs-docker/sessions/1e9998d8-2e24-4f73-b609-408973146140 Co-authored-by: fzipi <3012076+fzipi@users.noreply.github.com>
Done in 09a9b2c. Added a workflow step after the CRS checkout that uses Python to update the existing |
There was a problem hiding this comment.
Actionable comments posted: 1
🧹 Nitpick comments (1)
.github/workflows/verifyimage.yml (1)
205-206: Scope this patch step to nginx targets.This override is nginx-specific but currently runs for all matrix entries. Adding a target guard makes the workflow intent clearer and avoids unnecessary file mutation in apache jobs.
Suggested guard
- name: Patch nginx overrides for nginx 1.30.0 (920100-4 now returns 405) + if: ${{ contains(matrix.target, 'nginx') }} run: |🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed. In @.github/workflows/verifyimage.yml around lines 205 - 206, The "Patch nginx overrides for nginx 1.30.0 (920100-4 now returns 405)" step is running for all matrix entries; restrict it to only nginx targets by adding a GitHub Actions conditional to the step (e.g., add an if: condition such as if: matrix.target == 'nginx' or if: contains(matrix.image, 'nginx') depending on your matrix keys) so the file mutation only runs for nginx jobs.
🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.
Inline comments:
In @.github/workflows/verifyimage.yml:
- Around line 207-215: The current fragile string replace in the Python snippet
should be replaced with a context-aware edit that locates the specific test by
rule_id/test_id and updates only its status, using a regex or structured match
(e.g., find the test block for the nginx override by its rule_id/test_id in
crs/tests/regression/nginx-overrides.yaml), perform the substitution with a
method that returns the number of replacements (e.g., re.subn), and assert that
exactly one replacement occurred; if not, print a clear error and exit non-zero
so CI fails rather than silently no-op.
---
Nitpick comments:
In @.github/workflows/verifyimage.yml:
- Around line 205-206: The "Patch nginx overrides for nginx 1.30.0 (920100-4 now
returns 405)" step is running for all matrix entries; restrict it to only nginx
targets by adding a GitHub Actions conditional to the step (e.g., add an if:
condition such as if: matrix.target == 'nginx' or if: contains(matrix.image,
'nginx') depending on your matrix keys) so the file mutation only runs for nginx
jobs.
🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
- Push a commit to this branch (recommended)
- Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: defaults
Review profile: CHILL
Plan: Pro Plus
Run ID: b563152c-fdaf-482d-a5d2-29d67e8251f2
📒 Files selected for processing (1)
.github/workflows/verifyimage.yml
|
@copilot Well, my bad. I should have written this better. Remove that python stuff you added and just use a line like |
Agent-Logs-Url: https://github.com/coreruleset/modsecurity-crs-docker/sessions/59cecc1a-8d6a-4484-8f91-b06992b79e97 Co-authored-by: fzipi <3012076+fzipi@users.noreply.github.com>
Edited/Blocked NotificationRenovate will not automatically rebase this PR, because it does not recognize the last commit author and assumes somebody else may have edited the PR. You can manually request rebase by checking the rebase/retry box above. |
|
This is currently blocking renovate updates, especially Apache httpd 2.4.67 with fixes for CVE-2026-34059. |
Signed-off-by: Felipe Zipitria <felipe.zipitria@owasp.org>
|
Thanks @jankohlmann. You can even help fixing if you want. |
Signed-off-by: Felipe Zipitria <felipe.zipitria@owasp.org>
This PR contains the following updates:
2.9.12→2.9.133.0.14→3.0.151.28.2→1.30.0Release Notes
owasp-modsecurity/ModSecurity (ModSecurity2)
v2.9.13Compare Source
Full list of changes:
[Issue #3545 - @fumfel,@airween]
[Issue #3542 - @fumfel,@airween]
[Issue #3535 - @airween]
[Issue #3530 - @airween]
[Issue #3527 - @fzipi,@airween]
[Issue #3502 - @sanjib2006]
[Issue #3493 - @umprayz]
[Issue #3488 - @umprayz]
[Issue #3480 - @hnakamur]
[Issue #3458 - @weida]
[Issue #3456 - @airween]
[Issue #3454 - @airween]
[Issue #3452 - @A13501350]
[Issue #3443 - @A13501350]
[Issue #3438 - @A13501350]
nginx/docker-nginx-unprivileged (nginxinc/nginx-unprivileged)
v1.29.4Compare Source
NGINX 1.29.4 (mainline)
v1.29.3Compare Source
NGINX 1.29.3 (mainline)
v1.29.2Compare Source
NGINX 1.29.2 (mainline)
v1.29.1Compare Source
NGINX 1.29.1 (mainline)
v1.29.0NGINX 1.29.0 (mainline)
Configuration
📅 Schedule: (UTC)
* 0-3 * * *)🚦 Automerge: Enabled.
♻ Rebasing: Whenever PR is behind base branch, or you tick the rebase/retry checkbox.
👻 Immortal: This PR will be recreated if closed unmerged. Get config help if that's undesired.
This PR was generated by Mend Renovate. View the repository job log.
Summary by CodeRabbit
Documentation
Chores
Tests / CI