From d2a13436aa3029333d4352e7bcddf956735ec0a8 Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Thu, 18 Aug 2016 18:51:28 +0200 Subject: expr: add quota expression This patch adds support for the new quota expression. Signed-off-by: Pablo Neira Ayuso --- include/libnftnl/expr.h | 5 + include/linux/netfilter/nf_tables.h | 19 ++++ src/Makefile.am | 1 + src/expr/quota.c | 210 ++++++++++++++++++++++++++++++++++++ src/expr_ops.c | 2 + tests/Makefile.am | 4 + tests/nft-expr_quota-test.c | 92 ++++++++++++++++ tests/test-script.sh | 1 + 8 files changed, 334 insertions(+) create mode 100644 src/expr/quota.c create mode 100644 tests/nft-expr_quota-test.c diff --git a/include/libnftnl/expr.h b/include/libnftnl/expr.h index 5dd5e10..663cbf3 100644 --- a/include/libnftnl/expr.h +++ b/include/libnftnl/expr.h @@ -172,6 +172,11 @@ enum { NFTNL_EXPR_QUEUE_FLAGS, }; +enum { + NFTNL_EXPR_QUOTA_BYTES = NFTNL_EXPR_BASE, + NFTNL_EXPR_QUOTA_FLAGS, +}; + enum { NFTNL_EXPR_MASQ_FLAGS = NFTNL_EXPR_BASE, NFTNL_EXPR_MASQ_REG_PROTO_MIN, diff --git a/include/linux/netfilter/nf_tables.h b/include/linux/netfilter/nf_tables.h index fcf9a39..6390d6e 100644 --- a/include/linux/netfilter/nf_tables.h +++ b/include/linux/netfilter/nf_tables.h @@ -880,6 +880,25 @@ enum nft_queue_attributes { #define NFT_QUEUE_FLAG_CPU_FANOUT 0x02 /* use current CPU (no hashing) */ #define NFT_QUEUE_FLAG_MASK 0x03 +enum nft_quota_flags { + NFT_QUOTA_F_INV = (1 << 0), +}; + +/** + * enum nft_quota_attributes - nf_tables quota expression netlink attributes + * + * @NFTA_QUOTA_BYTES: quota in bytes (NLA_U16) + * @NFTA_QUOTA_FLAGS: flags (NLA_U32) + */ +enum nft_quota_attributes { + NFTA_QUOTA_UNSPEC, + NFTA_QUOTA_BYTES, + NFTA_QUOTA_FLAGS, + NFTA_QUOTA_PAD, + __NFTA_QUOTA_MAX +}; +#define NFTA_QUOTA_MAX (__NFTA_QUOTA_MAX - 1) + /** * enum nft_reject_types - nf_tables reject expression reject types * diff --git a/src/Makefile.am b/src/Makefile.am index 7725c79..3d710c5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -41,6 +41,7 @@ libnftnl_la_SOURCES = utils.c \ expr/nat.c \ expr/payload.c \ expr/queue.c \ + expr/quota.c \ expr/reject.c \ expr/target.c \ expr/masq.c \ diff --git a/src/expr/quota.c b/src/expr/quota.c new file mode 100644 index 0000000..47db62f --- /dev/null +++ b/src/expr/quota.c @@ -0,0 +1,210 @@ +/* + * (C) 2016 by Pablo Neira Ayuso + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published + * by the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + */ + +#include +#include +#include +#include +#include + +#include + +#include "internal.h" +#include +#include +#include + +struct nftnl_expr_quota { + uint64_t bytes; + uint32_t flags; +}; + +static int nftnl_expr_quota_set(struct nftnl_expr *e, uint16_t type, + const void *data, uint32_t data_len) +{ + struct nftnl_expr_quota *quota = nftnl_expr_data(e); + + switch (type) { + case NFTNL_EXPR_QUOTA_BYTES: + quota->bytes = *((uint64_t *)data); + break; + case NFTNL_EXPR_QUOTA_FLAGS: + quota->flags = *((uint32_t *)data); + break; + default: + return -1; + } + return 0; +} + +static const void *nftnl_expr_quota_get(const struct nftnl_expr *e, + uint16_t type, uint32_t *data_len) +{ + struct nftnl_expr_quota *quota = nftnl_expr_data(e); + + switch (type) { + case NFTNL_EXPR_QUOTA_BYTES: + *data_len = sizeof(quota->bytes); + return "a->bytes; + case NFTNL_EXPR_QUOTA_FLAGS: + *data_len = sizeof(quota->flags); + return "a->flags; + } + return NULL; +} + +static int nftnl_expr_quota_cb(const struct nlattr *attr, void *data) +{ + int type = mnl_attr_get_type(attr); + const struct nlattr **tb = data; + + if (mnl_attr_type_valid(attr, NFTA_QUOTA_MAX) < 0) + return MNL_CB_OK; + + switch(type) { + case NFTA_QUOTA_BYTES: + if (mnl_attr_validate(attr, MNL_TYPE_U64) < 0) + abi_breakage(); + break; + case NFTA_QUOTA_FLAGS: + if (mnl_attr_validate(attr, MNL_TYPE_U32) < 0) + abi_breakage(); + break; + } + + tb[type] = attr; + return MNL_CB_OK; +} + +static void +nftnl_expr_quota_build(struct nlmsghdr *nlh, const struct nftnl_expr *e) +{ + struct nftnl_expr_quota *quota = nftnl_expr_data(e); + + if (e->flags & (1 << NFTNL_EXPR_QUOTA_BYTES)) + mnl_attr_put_u64(nlh, NFTA_QUOTA_BYTES, htobe64(quota->bytes)); + if (e->flags & (1 << NFTNL_EXPR_QUOTA_FLAGS)) + mnl_attr_put_u32(nlh, NFTA_QUOTA_FLAGS, htonl(quota->flags)); +} + +static int +nftnl_expr_quota_parse(struct nftnl_expr *e, struct nlattr *attr) +{ + struct nftnl_expr_quota *quota = nftnl_expr_data(e); + struct nlattr *tb[NFTA_QUOTA_MAX + 1] = {}; + + if (mnl_attr_parse_nested(attr, nftnl_expr_quota_cb, tb) < 0) + return -1; + + if (tb[NFTA_QUOTA_BYTES]) { + quota->bytes = be64toh(mnl_attr_get_u64(tb[NFTA_QUOTA_BYTES])); + e->flags |= (1 << NFTNL_EXPR_QUOTA_BYTES); + } + if (tb[NFTA_QUOTA_FLAGS]) { + quota->flags = ntohl(mnl_attr_get_u32(tb[NFTA_QUOTA_FLAGS])); + e->flags |= (1 << NFTNL_EXPR_QUOTA_FLAGS); + } + + return 0; +} + +static int +nftnl_expr_quota_json_parse(struct nftnl_expr *e, json_t *root, + struct nftnl_parse_err *err) +{ +#ifdef JSON_PARSING + uint64_t bytes; + uint32_t flags; + + if (nftnl_jansson_parse_val(root, "bytes", NFTNL_TYPE_U64, &bytes, + err) == 0) + nftnl_expr_set_u64(e, NFTNL_EXPR_QUOTA_BYTES, bytes); + if (nftnl_jansson_parse_val(root, "flags", NFTNL_TYPE_U32, &flags, + err) == 0) + nftnl_expr_set_u32(e, NFTNL_EXPR_QUOTA_FLAGS, flags); + + return 0; +#else + errno = EOPNOTSUPP; + return -1; +#endif +} + +static int nftnl_expr_quota_xml_parse(struct nftnl_expr *e, mxml_node_t *tree, + struct nftnl_parse_err *err) +{ +#ifdef XML_PARSING + uint64_t bytes; + uint32_t flags; + + if (nftnl_mxml_num_parse(tree, "bytes", MXML_DESCEND_FIRST, BASE_DEC, + &bytes, NFTNL_TYPE_U64, NFTNL_XML_MAND, err) == 0) + nftnl_expr_set_u64(e, NFTNL_EXPR_QUOTA_BYTES, bytes); + if (nftnl_mxml_num_parse(tree, "flags", MXML_DESCEND_FIRST, BASE_DEC, + &flags, NFTNL_TYPE_U32, NFTNL_XML_MAND, err) == 0) + nftnl_expr_set_u32(e, NFTNL_EXPR_QUOTA_FLAGS, flags); + + return 0; +#else + errno = EOPNOTSUPP; + return -1; +#endif +} + +static int nftnl_expr_quota_export(char *buf, size_t size, + const struct nftnl_expr *e, int type) +{ + struct nftnl_expr_quota *quota = nftnl_expr_data(e); + NFTNL_BUF_INIT(b, buf, size); + + if (e->flags & (1 << NFTNL_EXPR_QUOTA_BYTES)) + nftnl_buf_u64(&b, type, quota->bytes, BYTES); + if (e->flags & (1 << NFTNL_EXPR_QUOTA_FLAGS)) + nftnl_buf_u32(&b, type, quota->flags, FLAGS); + + return nftnl_buf_done(&b); +} + +static int nftnl_expr_quota_snprintf_default(char *buf, size_t len, + const struct nftnl_expr *e) +{ + struct nftnl_expr_quota *quota = nftnl_expr_data(e); + + return snprintf(buf, len, "bytes %"PRIu64" flags %u ", + quota->bytes, quota->flags); +} + +static int nftnl_expr_quota_snprintf(char *buf, size_t len, uint32_t type, + uint32_t flags, + const struct nftnl_expr *e) +{ + switch (type) { + case NFTNL_OUTPUT_DEFAULT: + return nftnl_expr_quota_snprintf_default(buf, len, e); + case NFTNL_OUTPUT_XML: + case NFTNL_OUTPUT_JSON: + return nftnl_expr_quota_export(buf, len, e, type); + default: + break; + } + return -1; +} + +struct expr_ops expr_ops_quota = { + .name = "quota", + .alloc_len = sizeof(struct nftnl_expr_quota), + .max_attr = NFTA_QUOTA_MAX, + .set = nftnl_expr_quota_set, + .get = nftnl_expr_quota_get, + .parse = nftnl_expr_quota_parse, + .build = nftnl_expr_quota_build, + .snprintf = nftnl_expr_quota_snprintf, + .xml_parse = nftnl_expr_quota_xml_parse, + .json_parse = nftnl_expr_quota_json_parse, +}; diff --git a/src/expr_ops.c b/src/expr_ops.c index 9b10029..876d7ad 100644 --- a/src/expr_ops.c +++ b/src/expr_ops.c @@ -24,6 +24,7 @@ extern struct expr_ops expr_ops_payload; extern struct expr_ops expr_ops_redir; extern struct expr_ops expr_ops_reject; extern struct expr_ops expr_ops_queue; +extern struct expr_ops expr_ops_quota; extern struct expr_ops expr_ops_target; extern struct expr_ops expr_ops_dynset; extern struct expr_ops expr_ops_hash; @@ -49,6 +50,7 @@ static struct expr_ops *expr_ops[] = { &expr_ops_redir, &expr_ops_reject, &expr_ops_queue, + &expr_ops_quota, &expr_ops_target, &expr_ops_dynset, &expr_ops_hash, diff --git a/tests/Makefile.am b/tests/Makefile.am index 86766f3..4b421eb 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -27,6 +27,7 @@ check_PROGRAMS = nft-parsing-test \ nft-expr_nat-test \ nft-expr_payload-test \ nft-expr_queue-test \ + nft-expr_quota-test \ nft-expr_redir-test \ nft-expr_reject-test \ nft-expr_target-test \ @@ -101,6 +102,9 @@ nft_expr_payload_test_LDADD = ../src/libnftnl.la ${LIBMNL_LIBS} nft_expr_queue_test_SOURCES = nft-expr_queue-test.c nft_expr_queue_test_LDADD = ../src/libnftnl.la ${LIBMNL_LIBS} +nft_expr_quota_test_SOURCES = nft-expr_quota-test.c +nft_expr_quota_test_LDADD = ../src/libnftnl.la ${LIBMNL_LIBS} + nft_expr_reject_test_SOURCES = nft-expr_reject-test.c nft_expr_reject_test_LDADD = ../src/libnftnl.la ${LIBMNL_LIBS} diff --git a/tests/nft-expr_quota-test.c b/tests/nft-expr_quota-test.c new file mode 100644 index 0000000..2320551 --- /dev/null +++ b/tests/nft-expr_quota-test.c @@ -0,0 +1,92 @@ +/* + * (C) 2016 by Pablo Neira Ayuso + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + */ + +#include +#include +#include + +#include +#include +#include +#include +#include +#include + +static int test_ok = 1; + +static void print_err(const char *msg) +{ + test_ok = 0; + printf("\033[31mERROR:\e[0m %s\n", msg); +} + +static void cmp_nftnl_expr(struct nftnl_expr *rule_a, struct nftnl_expr *rule_b) +{ + if (nftnl_expr_get_u64(rule_a, NFTNL_EXPR_QUOTA_BYTES) != + nftnl_expr_get_u64(rule_b, NFTNL_EXPR_QUOTA_BYTES)) + print_err("Expr NFTNL_EXPR_QUOTA_BYTES mismatches"); + if (nftnl_expr_get_u64(rule_a, NFTNL_EXPR_QUOTA_FLAGS) != + nftnl_expr_get_u64(rule_b, NFTNL_EXPR_QUOTA_FLAGS)) + print_err("Expr NFTNL_EXPR_QUOTA_FLAGS mismatches"); +} + +int main(int argc, char *argv[]) +{ + struct nftnl_expr_iter *iter_a, *iter_b; + struct nftnl_expr *rule_a, *rule_b; + struct nftnl_rule *a, *b; + struct nftnl_expr *ex; + struct nlmsghdr *nlh; + char buf[4096]; + + a = nftnl_rule_alloc(); + b = nftnl_rule_alloc(); + if (a == NULL || b == NULL) + print_err("OOM"); + + ex = nftnl_expr_alloc("counter"); + if (ex == NULL) + print_err("OOM"); + + nftnl_expr_set_u64(ex, NFTNL_EXPR_QUOTA_BYTES, 0x123456789abcdef0); + nftnl_expr_set_u32(ex, NFTNL_EXPR_QUOTA_FLAGS, 0x12345678); + nftnl_rule_add_expr(a, ex); + + nlh = nftnl_rule_nlmsg_build_hdr(buf, NFT_MSG_NEWRULE, AF_INET, 0, 1234); + nftnl_rule_nlmsg_build_payload(nlh, a); + + if (nftnl_rule_nlmsg_parse(nlh, b) < 0) + print_err("parsing problems"); + + iter_a = nftnl_expr_iter_create(a); + iter_b = nftnl_expr_iter_create(b); + if (iter_a == NULL || iter_b == NULL) + print_err("OOM"); + rule_a = nftnl_expr_iter_next(iter_a); + rule_b = nftnl_expr_iter_next(iter_b); + if (rule_a == NULL || rule_b == NULL) + print_err("OOM"); + + cmp_nftnl_expr(rule_a, rule_b); + + if (nftnl_expr_iter_next(iter_a) != NULL || + nftnl_expr_iter_next(iter_b) != NULL) + print_err("More 1 expr."); + + nftnl_expr_iter_destroy(iter_a); + nftnl_expr_iter_destroy(iter_b); + nftnl_rule_free(a); + nftnl_rule_free(b); + + if (!test_ok) + exit(EXIT_FAILURE); + printf("%s: \033[32mOK\e[0m\n", argv[0]); + return EXIT_SUCCESS; +} diff --git a/tests/test-script.sh b/tests/test-script.sh index 48f002f..0c89e7c 100755 --- a/tests/test-script.sh +++ b/tests/test-script.sh @@ -18,6 +18,7 @@ ./nft-expr_redir-test ./nft-expr_nat-test ./nft-expr_payload-test +./nft-expr_quota-test ./nft-expr_reject-test ./nft-expr_target-test ./nft-expr_hash-test -- cgit v1.2.3