Skip to content

add the ability to filter by http status code #18

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
mk-f wants to merge 1 commit into
base: master
Choose a base branch
from
Open

add the ability to filter by http status code #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 7 additions & 0 deletions relayd/parse.y
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1448,6 +1448,13 @@ ruleopts : METHOD STRING {
rule->rule_method = id;
free($2);
}
| CODE NUMBER {
if ($2 < 100 || $2 > 599) {
yyerror("invalid HTTP code: %lld", $2);
YYERROR;
}
rule->rule_status = $2;
}
| COOKIE key_option STRING value {
keytype = KEY_TYPE_COOKIE;
rule->rule_kv[keytype].kv_key = strdup($3);
Expand Down
4 changes: 4 additions & 0 deletions relayd/relay_http.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1816,6 +1816,8 @@ relay_test(struct protocol *proto, struct ctl_relay_event *cre)
(desc->http_method == HTTP_METHOD_RESPONSE ||
desc->http_method != r->rule_method))
RELAY_GET_SKIP_STEP(RULE_SKIP_METHOD);
else if (r->rule_status && desc->http_status != r->rule_status)
RELAY_GET_SKIP_STEP(RULE_SKIP_STATUS);
else if (r->rule_tagged && con->se_tag != r->rule_tagged)
RELAY_GET_NEXT_STEP;
else if (relay_httpheader_test(cre, r, &matches) != 0)
Expand Down Expand Up @@ -1917,6 +1919,8 @@ relay_calc_skip_steps(struct relay_rules *rules)
RELAY_SET_SKIP_STEPS(RULE_SKIP_DST);
else if (cur->rule_method != prev->rule_method)
RELAY_SET_SKIP_STEPS(RULE_SKIP_METHOD);
else if (cur->rule_status != prev->rule_status)
RELAY_SET_SKIP_STEPS(RULE_SKIP_STATUS);

prev = cur;
cur = TAILQ_NEXT(cur, rule_entry);
Expand Down
4 changes: 4 additions & 0 deletions relayd/relayd.conf.5
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1205,6 +1205,10 @@ and can be either
or
.Ic VERSION-CONTROL .
.It Xo
.It Ic code Ar number
Match the HTTP return code
.Ar number .
.It Xo
.Ar type Ar option
.Oo Oo Ic digest Oc
.Pq Ar key Ns | Ns Ic file Ar path
Expand Down
4 changes: 3 additions & 1 deletion relayd/relayd.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -647,7 +647,8 @@ struct relay_rule {
#define RULE_SKIP_SRC 3
#define RULE_SKIP_DST 4
#define RULE_SKIP_METHOD 5
#define RULE_SKIP_COUNT 6
#define RULE_SKIP_STATUS 6
#define RULE_SKIP_COUNT 7
struct relay_rule *rule_skip[RULE_SKIP_COUNT];

#define RULE_FLAG_QUICK 0x01
Expand All @@ -664,6 +665,7 @@ struct relay_rule {
struct relay_table *rule_table;

u_int rule_method;
u_int rule_status;
char rule_labelname[LABEL_NAME_SIZE];
char rule_tablename[TABLE_NAME_SIZE];
char rule_taggedname[TAG_NAME_SIZE];
Expand Down