Skip to content

firewall: add default-policy to policy config v3 #15950

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

Open
lukashino wants to merge 4 commits into
base: main
Choose a base branch
from
+347 −202
Open

firewall: add default-policy to policy config v3 #15950

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5391c44
detect/firewall: address HTTP/1 policies as http1
Jul 28, 2026
2b17b7e
detect/firewall: group policies under packet and app nodes
Jul 28, 2026
b5ced77
detect/firewall: add default-policy to policy config
Jul 28, 2026
04309fb
detect/firewall: validate action scope against the hook class
Jul 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion doc/userguide/firewall/firewall-design.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ Application layer tables
~~~~~~~~~~~~~~~~~~~~~~~~

If applayer is available, rules from the following tables apply. The tables for the
application layer are per app layer protocol and per protocol state. e.g. ``http:request_line``.
application layer are per app layer protocol and per protocol state. e.g. ``http1:request_line``.

@jufajardini jufajardini Jul 30, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

To be confirmed, but if we already have stuff backported where http is an alias to http1, should we keep it that way? (or do we change in 9, and document?)



.. table::
Expand Down
2 changes: 1 addition & 1 deletion doc/userguide/firewall/firewall-example.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ In the example below: the config auto accepts various hooks, leaving just ``http

firewall:
policies:
http:
http1:
request-started:
- "accept:hook"
request-line:
Expand Down
4 changes: 2 additions & 2 deletions src/detect-parse.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4178,7 +4178,7 @@ static int DoParseAppSubStatePolicy(const char *prefix, const AppProto app_proto
nname[i] = '-';
}

const char *app_name = AppProtoToString(app_proto);
const char *app_name = (app_proto == ALPROTO_HTTP1) ? "http1" : AppProtoToString(app_proto);

@catenacyber catenacyber Jul 31, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Maybe time to have another function than AppProtoToString that does this

And use it in DetectRegisterAppLayerHookLists and DetectEngineAppHookToSmlist where we already do this

int r = snprintf(policy_name, sizeof(policy_name), "%s.%s.%s.%s", prefix, app_name,
sub_state_name, nname);
SCLogDebug("policy_name %s", policy_name);
Expand Down Expand Up @@ -4247,7 +4247,7 @@ static int DoParseAppPolicy(const char *prefix, const AppProto app_proto, const
nname[i] = '-';
}

const char *app_name = AppProtoToString(app_proto);
const char *app_name = (app_proto == ALPROTO_HTTP1) ? "http1" : AppProtoToString(app_proto);
int r = snprintf(policy_name, sizeof(policy_name), "%s.%s.%s", prefix, app_name, nname);
SCFree(nname);
if (r < 0 || (size_t)r >= sizeof(policy_name)) {
Expand Down