Skip to content

nginx: update repository of maintained naxsi module#26029

Open
JKSTAFF wants to merge 1 commit into
openwrt:masterfrom
JKSTAFF:update-naxsi
Open

nginx: update repository of maintained naxsi module#26029
JKSTAFF wants to merge 1 commit into
openwrt:masterfrom
JKSTAFF:update-naxsi

Conversation

@JKSTAFF

@JKSTAFF JKSTAFF commented Feb 21, 2025

Copy link
Copy Markdown

nginx: update repository of maintained naxsi moduleMaintainer: @mhusaam @Ansuel
Compile tested:
mediatek/filogic / Bananapi BPI-R3 / openwrt/openwrt@1fad1b4 (v24.10.0)

Run tested:
mediatek/filogic / Bananapi BPI-R3 / openwrt/openwrt@1fad1b4 (v24.10.0)

Description:
This improvement switches the naxsi-module repository to an actively maintained fork recomanded by nbs-system due to the original project is officially abandoned (archived in 2023.11.08). The current version causes syntax error when reading the default naxsi_core.rules and other blocking and whitelist rules file as below:

Naxsi-Config : Incorrect line MainRule rx:select|union|update|delete|insert|table|from|ascii|hex|unhex|drop|load_file|substr|group_concat|dumpfile (nginx-1.26.1/nginx-mod-naxsi/naxsi_src/naxsi_skeleton.c/973)... in /etc/nginx/naxsi_core.rules:23

@Neustradamus

This comment was marked as spam.

@Ansuel

Ansuel commented Nov 25, 2025

Copy link
Copy Markdown
Member

@JKSTAFF can you rebase this so I we can merge? changes are ok to me!

@GeorgeSapkin GeorgeSapkin force-pushed the update-naxsi branch 2 times, most recently from 9a022aa to b50b7fc Compare May 4, 2026 08:09
@JKSTAFF JKSTAFF force-pushed the update-naxsi branch 2 times, most recently from 8fec578 to 5c46a77 Compare May 5, 2026 07:10
@JKSTAFF

JKSTAFF commented May 5, 2026

Copy link
Copy Markdown
Author

@Ansuel Done rebased to the latest master. If any other steps are required or there are any mistakes in my merge, please let me know.

@Neustradamus

This comment was marked as low quality.

@Ansuel

Ansuel commented May 5, 2026

Copy link
Copy Markdown
Member

@JKSTAFF the pkg hash needs to be fixed. The suggested value is 2b8bf06f8e4cee95e287158c193c4930deab097bf1491c03a95dd8b0c2682d4c

@JKSTAFF JKSTAFF force-pushed the update-naxsi branch 2 times, most recently from 354cb90 to 571af55 Compare May 5, 2026 14:38
@GeorgeSapkin

Copy link
Copy Markdown
Member

@JKSTAFF you need to squash your commits.

@JKSTAFF JKSTAFF force-pushed the update-naxsi branch 2 times, most recently from 5e0568a to 0b697ba Compare May 6, 2026 01:06
@JKSTAFF

JKSTAFF commented May 6, 2026

Copy link
Copy Markdown
Author

@GeorgeSapkin Commits have been squashed. Thank you.

@JKSTAFF JKSTAFF force-pushed the update-naxsi branch 2 times, most recently from 537fd9f to 765b08e Compare May 12, 2026 01:28
@openwrt

openwrt Bot commented Jul 5, 2026

Copy link
Copy Markdown

Formality Check: Failed

We completed the verification flow. Please review the formatting overview logs below.

🛑 CRITICAL ERRORS

Commit 9e841d1 - nginx: update repository of maintained naxsi module:

  • Author name format is invalid ('JKSTAFF')
  • Committer name format is invalid ('JKSTAFF')

⚠️ STYLISTIC WARNINGS & SUGGESTIONS

Package Release Audit:

  • ⚠️ Package net/nginx content changed without a PKG_RELEASE or version bump

Tip

Do not close this pull request to make corrections. Instead, modify your existing commits (e.g. git commit --amend) and update the branch using git push --force-with-lease --force-if-includes. The checks will re-run automatically.


Something broken? Consider reporting an issue.
Running version 026bbbc deployed on 2026-07-09 08:15:56 CEST

@JKSTAFF

JKSTAFF commented Jul 8, 2026

Copy link
Copy Markdown
Author

Is it necessary to define the conffiles path for this nginx module?

@openwrt-ai openwrt-ai left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Reviewed the single new commit (68f089c).

Commit checks

  • Stray fix pkg hash line in the commit message. After squashing, the message ends with a dangling fix pkg hash line below the Signed-off-by: trailer. This is leftover fixup noise and breaks the trailer block — please remove it (fold it into the body or drop it) so the message is just the subject, description, and the sign-off.
  • Invalid author / Signed-off-by name (JK觸發器). The FormalityCheck "Git & Commits" run fails on this. OpenWrt requires a real name for the commit author and matching Signed-off-by:; the CJK handle is rejected. Please set git config user.name to your real name and re-sign the commit.
  • Minor: recomanded in the body is a typo for recommended.

The two inline comments cover the remaining CI blockers (missing conffiles) and the missing PKG_RELEASE bump. I did not verify the naxsi_config/naxsi_rules/ path against the wargio/naxsi tree, but the directory rename matches the fork's restructuring and co-maintainer @Ansuel has confirmed the change is acceptable.


Generated by Claude Code

Comment thread net/nginx/Makefile
SOURCE_VERSION:=d714f1636ea49a9a9f4f06dba14aee003e970834
URL:=https://github.com/nbs-system/naxsi.git
MIRROR_HASH:=b0cef5fbf842f283eb5f0686ddd1afcd07d83abd7027c8cfb3e84a2223a34797
SOURCE_DATE:=2025-01-05

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

The naxsi module's source repo, revision and hash all change here, so the built nginx-mod-naxsi package content changes — but PKG_RELEASE is still 1. OpenWrt convention is to bump PKG_RELEASE whenever a package's built output changes, so users receive the rebuilt package on opkg upgrade. This is also the "Package net/nginx content changed without a PKG_RELEASE or version bump" warning from the FormalityCheck bot. Please bump PKG_RELEASE to 2.


Generated by Claude Code

Comment thread net/nginx/Makefile
$(INSTALL_DIR) $(1)/etc/nginx
$(INSTALL_CONF) $(PKG_BUILD_DIR)/nginx-mod-naxsi/naxsi_config/naxsi_core.rules $(1)/etc/nginx
$(INSTALL_CONF) $(PKG_BUILD_DIR)/nginx-mod-naxsi/naxsi_rules/naxsi_core.rules $(1)/etc/nginx
endef

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Regarding your standing question and the FormalityCheck "missing conffiles" critical error: because naxsi_core.rules is installed with $(INSTALL_CONF) into /etc/nginx, it is a user-editable config file, and without a conffiles block it would be silently overwritten on every sysupgrade/opkg upgrade. Adding a conffiles definition to the nginx-mod-naxsi package clears the CI error and preserves user edits, e.g.:

define Package/nginx-mod-naxsi/conffiles
/etc/nginx/naxsi_core.rules
endef

Note this pre-dates your change (the old line also used INSTALL_CONF), so it is not something you introduced — but since it currently blocks the merge, worth fixing here.


Generated by Claude Code

Switch the naxsi-module repository to an actively maintained fork
recommended by nbs-system due to the original project is officially
abandoned (archived in 2023.11.08).

Signed-off-by: JKSTAFF <ionsuite@gmail.com>
@JKSTAFF

JKSTAFF commented Jul 9, 2026

Copy link
Copy Markdown
Author

Fixed invalid formats and added suggested values for conffiles

@openwrt-ai openwrt-ai left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Reviewed 1 new commit (9e841d1); the PR was squashed and rebased onto current master since my last review. Two items from that review are now resolved: the missing conffiles block has been added correctly (and FormalityCheck / OpenWrt Makefiles is green), and the commit message no longer has the stray fix pkg hash line or the recomanded typo.

Commit checks

  • Author/committer name is still rejected by CI. FormalityCheck / Git & Commits fails with Author name format is invalid ('JKSTAFF') and Committer name format is invalid ('JKSTAFF'). The previous CJK handle was replaced, but OpenWrt requires a real personal name (given + family name); the single all-caps token JKSTAFF is still rejected. Set git config user.name "Your Real Name", then git commit --amend --reset-author -s (or re-sign) so the author, committer, and Signed-off-by: line all carry your real name.

For continuity: the previously flagged PKG_RELEASE bump is still outstanding — PKG_RELEASE remains 1 while the naxsi module's built content changes. That thread is still current, so I'm not duplicating it inline.


Generated by Claude Code

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants