exthdr: doc: add support for matching IPv4 options
PATCH v2 1/1 exthdr: doc: add support for matching IPv4 options
This is the userspace change for the overall changes with this description:
Add capability to have rules matching IPv4 options. This is developed mainly to support dropping of IP packets with loose and/or strict source route route options.
v2: Removed options that aren't supported in the kernel (per Pablo Neira
Ayuso).
Signed-off-by Stephen Suryaputra <[email protected]>
--- doc/payload-expression.txt | 29 ++++- include/Makefile.am | 1 + include/exthdr.h | 1 + include/ipopt.h | 27 +++++ include/linux/netfilter/nf_tables.h | 2 + src/Makefile.am | 1 + src/evaluate.c | 17 +++ src/exthdr.c | 22 +++- src/ipopt.c | 159 ++++++++++++++++++++++++++++ src/parser_bison.y | 31 ++++++ src/payload.c | 4 + src/scanner.l | 8 ++ tests/py/ip/ipopt.t | 24 +++++ tests/py/ip/ipopt.t.payload | 150 ++++++++++++++++++++++++++ 14 files changed, 472 insertions(+), 4 deletions(-) create mode 100644 include/ipopt.h create mode 100644 src/ipopt.c create mode 100644 tests/py/ip/ipopt.t create mode 100644 tests/py/ip/ipopt.t.payload
doc/payload-expression.txt +27 -2
@@ -494,9 +494,9 @@ input meta iifname enp2s0 arp ptype 0x0800 arp htype 1 arp hlen 6 arp plen 4 @nh EXTENSION HEADER EXPRESSIONS ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Extension header expressions refer to data from variable-sized protocol headers, such as IPv6 extension headers and TCP options. +Extension header expressions refer to data from variable-sized protocol headers, such as IPv6 extension headers, TCP options and IPv4 options. -nftables currently supports matching (finding) a given ipv6 extension header or TCP option. +nftables currently supports matching (finding) a given ipv6 extension header, TCP option or IPv4 option. [verse] *hbh* {*nexthdr* | *hdrlength*} *frag* {*nexthdr* | *frag-off* | *more-fragments* | *id*}
@@ -505,11 +505,13 @@ nftables currently supports matching (finding) a given ipv6 extension header or *mh* {*nexthdr* | *hdrlength* | *checksum* | *type*} *srh* {*flags* | *tag* | *sid* | *seg-left*} *tcp option* {*eol* | *noop* | *maxseg* | *window* | *sack-permitted* | *sack* | *sack0* | *sack1* | *sack2* | *sack3* | *timestamp*} 'tcp_option_field' +*ip option* { lsrr | ra | rr | ssrr } 'ip_option_field' The following syntaxes are valid only in a relational expression with boolean type on right-hand side for checking header existence only: [verse] *exthdr* {*hbh* | *frag* | *rt* | *dst* | *mh*} *tcp option* {*eol* | *noop* | *maxseg* | *window* | *sack-permitted* | *sack* | *sack0* | *sack1* | *sack2* | *sack3* | *timestamp*} +*ip option* { lsrr | ra | rr | ssrr } .IPv6 extension headers [options="header"]
@@ -568,6 +570,24 @@ TCP Timestamps | kind, length, tsval, tsecr |============================ +.IP Options +[options="header"] +|================== +|Keyword| Description | IP option fields +|lsrr| +Loose Source Route | +type, length, ptr, addr +|ra| +Router Alert | +type, length, value +|rr| +Record Route | +type, length, ptr, addr +|ssrr| +Strict Source Route | +type, length, ptr, addr +|============================ + .finding TCP options -------------------- filter input tcp option sack-permitted kind 1 counter
@@ -578,6 +598,11 @@ filter input tcp option sack-permitted kind 1 counter ip6 filter input frag more-fragments 1 counter --------------------------------------- +.finding IP option +------------------ +filter input ip option lsrr exists counter +--------------------------------------- + CONNTRACK EXPRESSIONS ~~~~~~~~~~~~~~~~~~~~~ Conntrack expressions refer to meta data of the connection tracking entry associated with a packet. +
include/Makefile.am +1 -0
@@ -6,6 +6,7 @@ noinst_HEADERS = cli.h \ expression.h \ fib.h \ hash.h \ + ipopt.h \ json.h \ mini-gmp.h \ gmputil.h \
include/exthdr.h +1 -0
@@ -3,6 +3,7 @@#include <proto.h> #include <tcpopt.h> +#include <ipopt.h> /** * struct exthdr_desc - extension header description
include/ipopt.h new file +27 -0
@@ -0,0 +1,27 @@ +#ifndef NFTABLES_IPOPT_H +#define NFTABLES_IPOPT_H + +#include <proto.h> +#include <exthdr.h> +#include <statement.h> + +extern struct expr *ipopt_expr_alloc (const struct location *loc, +uint8_t type,uint8_t field,uint8_t ptr); + +extern void ipopt_init_raw (struct expr *expr,uint8_t type, +unsigned int offset,unsigned int len, +uint32_t flags,bool set_unknown); + +extern bool ipopt_find_template (struct expr *expr,unsigned int offset, +unsigned int len); + +enum ipopt_fields { +IPOPT_FIELD_INVALID , +IPOPT_FIELD_TYPE , +IPOPT_FIELD_LENGTH , +IPOPT_FIELD_VALUE , +IPOPT_FIELD_PTR , +IPOPT_FIELD_ADDR_0 , +}; + +#endif /* NFTABLES_IPOPT_H */
include/linux/netfilter/nf_tables.h +2 -0
@@ -730,10 +730,12 @@ enum nft_exthdr_flags {* * @NFT_EXTHDR_OP_IPV6: match against ipv6 extension headers * @NFT_EXTHDR_OP_TCP: match against tcp options +* @NFT_EXTHDR_OP_IPV4: match against ip options */ enum nft_exthdr_op {NFT_EXTHDR_OP_IPV6 ,NFT_EXTHDR_OP_TCPOPT , +NFT_EXTHDR_OP_IPV4 , __NFT_EXTHDR_OP_MAX };#define NFT_EXTHDR_OP_MAX (__NFT_EXTHDR_OP_MAX - 1)
src/Makefile.am +1 -0
@@ -61,6 +61,7 @@ libnftables_la_SOURCES = \ nfnl_osf.c \ tcpopt.c \ socket.c \ + ipopt.c \ libnftables.c # yacc and lex generate dirty code
src/evaluate.c +17 -0
@@ -518,6 +518,20 @@ static int __expr_evaluate_exthdr(struct eval_ctx *ctx, struct expr **exprp) totlen, max_tcpoptlen);break ; } +case NFT_EXTHDR_OP_IPV4 : { +static const unsigned int max_ipoptlen =40 *BITS_PER_BYTE ; +unsigned int totlen =0 ; + + totlen += expr->exthdr.tmpl->offset; + totlen += expr->exthdr.tmpl->len; + totlen += expr->exthdr.offset; + +if (totlen > max_ipoptlen) +return expr_error (ctx->msgs, expr, +"offset and size %u exceeds max ip option len (%u)" , + totlen, max_ipoptlen); +break ; + }default :break ; }
@@ -542,6 +556,9 @@ static int expr_evaluate_exthdr(struct eval_ctx *ctx, struct expr **exprp) dependency = &proto_tcp; pb =PROTO_BASE_TRANSPORT_HDR ;break ; +case NFT_EXTHDR_OP_IPV4 : + dependency = &proto_ip; +break ;case NFT_EXTHDR_OP_IPV6 :default : dependency = &proto_ip6;
src/exthdr.c +20 -2
@@ -38,6 +38,11 @@ static void exthdr_expr_print(const struct expr *expr, struct output_ctx *octx)if (offset)nft_print (octx,"%d" , offset);nft_print (octx," %s" , expr->exthdr.tmpl->token); + }else if (expr->exthdr.op ==NFT_EXTHDR_OP_IPV4 ) { +nft_print (octx,"ip option %s" , expr->exthdr.desc->name); +if (expr->exthdr.flags &NFT_EXTHDR_F_PRESENT ) +return ; +nft_print (octx," %s" , expr->exthdr.tmpl->token); }else {if (expr->exthdr.flags &NFT_EXTHDR_F_PRESENT )nft_print (octx,"exthdr %s" , expr->exthdr.desc->name);
@@ -172,6 +177,8 @@ void exthdr_init_raw(struct expr *expr, uint8_t type,assert (expr->etype ==EXPR_EXTHDR );if (op ==NFT_EXTHDR_OP_TCPOPT )return tcpopt_init_raw (expr, type, offset, len, flags); +if (op ==NFT_EXTHDR_OP_IPV4 ) +return ipopt_init_raw (expr, type, offset, len, flags, true); expr->len = len; expr->exthdr.flags = flags;
@@ -222,7 +229,8 @@ bool exthdr_find_template(struct expr *expr, const struct expr *mask, unsigned i {unsigned int off, mask_offset, mask_len; -if (expr->exthdr.tmpl != &exthdr_unknown_template) +if (expr->exthdr.op !=NFT_EXTHDR_OP_IPV4 && + expr->exthdr.tmpl != &exthdr_unknown_template)return false;/* In case we are handling tcp options instead of the default ipv6
@@ -237,8 +245,18 @@ bool exthdr_find_template(struct expr *expr, const struct expr *mask, unsigned i off = expr->exthdr.offset; off +=round_up (mask->len,BITS_PER_BYTE ) - mask_len; +/* Handle ip options after the offset and mask have been calculated. */ +if (expr->exthdr.op ==NFT_EXTHDR_OP_IPV4 ) { +if (ipopt_find_template (expr, off, mask_len - mask_offset)) { + *shift = mask_offset; +return true; + }else { +return false; + } + } +exthdr_init_raw (expr, expr->exthdr.desc->type, - off, mask_len - mask_offset,NFT_EXTHDR_OP_IPV6 ,0 ); + off, mask_len - mask_offset, expr->exthdr.op,0 );/* still failed to find a template... Bug. */ if (expr->exthdr.tmpl == &exthdr_unknown_template)
src/ipopt.c new file +159 -0
159 lines not on this page · raw message
src/parser_bison.y +31 -0
@@ -309,6 +309,14 @@ int nft_lex(void *, void *, void *); %token PROTOCOL "protocol" %token CHECKSUM "checksum" +%token PTR "ptr" +%token VALUE "value" + +%token LSRR "lsrr" +%token RR "rr" +%token SSRR "ssrr" +%token RA "ra" + %token ICMP "icmp" %token CODE "code" %token SEQUENCE "seq"
@@ -698,6 +706,7 @@ int nft_lex(void *, void *, void *); %type <expr> ip_hdr_expr icmp_hdr_expr igmp_hdr_expr numgen_expr hash_expr %destructor { expr_free($$); } ip_hdr_expr icmp_hdr_expr igmp_hdr_expr numgen_expr hash_expr %type <val> ip_hdr_field icmp_hdr_field igmp_hdr_field +%type <val> ip_option_type ip_option_field %type <expr> ip6_hdr_expr icmp6_hdr_expr %destructor { expr_free($$); } ip6_hdr_expr icmp6_hdr_expr %type <val> ip6_hdr_field icmp6_hdr_field
@@ -4249,6 +4258,15 @@ ip_hdr_expr : IP ip_hdr_field { $$ = payload_expr_alloc(&@$, &proto_ip, $2); } + | IP OPTION ip_option_type ip_option_field + { + $$ = ipopt_expr_alloc(&@$, $3, $4, 0); + } + | IP OPTION ip_option_type + { + $$ = ipopt_expr_alloc(&@$, $3, IPOPT_FIELD_TYPE, 0); + $$->exthdr.flags = NFT_EXTHDR_F_PRESENT; + } ; ip_hdr_field : HDRVERSION { $$ = IPHDR_VERSION; }
@@ -4265,6 +4283,19 @@ ip_hdr_field : HDRVERSION { $$ = IPHDR_VERSION; } | DADDR { $$ = IPHDR_DADDR; } ; +ip_option_type : LSRR { $$ = IPOPT_LSRR; } + | RR { $$ = IPOPT_RR; } + | SSRR { $$ = IPOPT_SSRR; } + | RA { $$ = IPOPT_RA; } + ; + +ip_option_field : TYPE { $$ = IPOPT_FIELD_TYPE; } + | LENGTH { $$ = IPOPT_FIELD_LENGTH; } + | VALUE { $$ = IPOPT_FIELD_VALUE; } + | PTR { $$ = IPOPT_FIELD_PTR; } + | ADDR { $$ = IPOPT_FIELD_ADDR_0; } + ; + icmp_hdr_expr : ICMP icmp_hdr_field { $$ = payload_expr_alloc(&@$, &proto_icmp, $2);
src/payload.c +4 -0
@@ -524,6 +524,10 @@ void exthdr_dependency_kill(struct payload_dep_ctx *ctx, struct expr *expr,if (payload_dependency_exists (ctx,PROTO_BASE_NETWORK_HDR ))payload_dependency_release (ctx);break ; +case NFT_EXTHDR_OP_IPV4 : +if (payload_dependency_exists (ctx,PROTO_BASE_NETWORK_HDR )) +payload_dependency_release (ctx); +break ;default :break ; }
src/scanner.l +8 -0
@@ -401,6 +401,14 @@ addrstring ({macaddr}|{ip4addr}|{ip6addr}) "protocol" { return PROTOCOL; } "checksum" { return CHECKSUM; } +"lsrr" { return LSRR; } +"rr" { return RR; } +"ssrr" { return SSRR; } +"ra" { return RA; } + +"value" { return VALUE; } +"ptr" { return PTR; } + "echo" { return ECHO; } "eol" { return EOL; } "maxseg" { return MAXSEG; }
tests/py/ip/ipopt.t new file +24 -0
@@ -0,0 +1,24 @@ +:input;type filter hook input priority 0 + +*ip;test-ipopt;input + +ip option lsrr type 1;ok +ip option lsrr length 1;ok +ip option lsrr ptr 1;ok +ip option lsrr addr 1;ok +ip option rr type 1;ok +ip option rr length 1;ok +ip option rr ptr 1;ok +ip option rr addr 1;ok +ip option ssrr type 1;ok +ip option ssrr length 1;ok +ip option ssrr ptr 1;ok +ip option ssrr addr 1;ok +ip option ra type 1;ok +ip option ra length 1;ok +ip option ra value 1;ok + +ip option foobar;fail +ip option foo bar;fail +ip option lsrr type;fail +ip option lsrr flag 1;fail
tests/py/ip/ipopt.t.payload new file +150 -0
150 lines not on this page · raw message
Signature · 1 line
2.17.1