This patch adds capabilities for parsing a XML table/chain/rule Some points to note: * the XML data is case sensitive (so <chain>asd</chain> != <chain>ASD</chain> != <CHAIN>asd</CHAIN>) * all exported functions will receive a XML and return an object (aka table|chain|rule) * XML parsing is done with libmxml (http://minixml.org) NOTE: expr/target and expr/match binary data are ignored. Some code examples/test cases will be added to libnftables in a future patch. Signed-off-by: Arturo Borrero González <arturo.borrero.glez@xxxxxxxxx> --- Make_global.am | 2 configure.ac | 1 include/libnftables/chain.h | 1 include/libnftables/rule.h | 1 include/libnftables/table.h | 1 src/chain.c | 178 ++++++++++++++++++++++++++++++ src/expr/bitwise.c | 115 +++++++++++++++++++ src/expr/cmp.c | 99 +++++++++++++++++ src/expr/counter.c | 63 +++++++++++ src/expr/data_reg.c | 255 ++++++++++++++++++++++++++++++++++++++++++- src/expr/immediate.c | 98 +++++++++++++++++ src/expr/lookup.c | 75 +++++++++++++ src/expr/match.c | 57 ++++++++++ src/expr/meta.c | 64 +++++++++++ src/expr/nat.c | 130 ++++++++++++++++++++++ src/expr/payload.c | 89 +++++++++++++++ src/expr/target.c | 59 ++++++++++ src/expr_ops.h | 1 src/libnftables.map | 3 + src/rule.c | 169 ++++++++++++++++++++++++++++ src/table.c | 78 +++++++++++++ 21 files changed, 1535 insertions(+), 4 deletions(-) diff --git a/Make_global.am b/Make_global.am index 1654f10..8205938 100644 --- a/Make_global.am +++ b/Make_global.am @@ -20,5 +20,5 @@ # LIBVERSION=0:0:0 -AM_CPPFLAGS = ${regular_CPPFLAGS} -I${top_srcdir}/include ${LIBMNL_CFLAGS} +AM_CPPFLAGS = ${regular_CPPFLAGS} -I${top_srcdir}/include ${LIBMNL_CFLAGS} ${LIBMXML_CFLAGS} AM_CFLAGS = ${regular_CFLAGS} ${GCC_FVISIBILITY_HIDDEN} diff --git a/configure.ac b/configure.ac index 01c170a..523133f 100644 --- a/configure.ac +++ b/configure.ac @@ -14,6 +14,7 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) dnl Dependencies PKG_CHECK_MODULES([LIBMNL], [libmnl >= 1.0.0]) +PKG_CHECK_MODULES([LIBMXML], [mxml >= 2.6]) AC_PROG_CC AM_PROG_CC_C_O diff --git a/include/libnftables/chain.h b/include/libnftables/chain.h index a7f6a50..af51191 100644 --- a/include/libnftables/chain.h +++ b/include/libnftables/chain.h @@ -44,6 +44,7 @@ enum { NFT_CHAIN_O_XML, }; +int nft_chain_xml_parse(struct nft_chain *c, char *xml); int nft_chain_snprintf(char *buf, size_t size, struct nft_chain *t, uint32_t type, uint32_t flags); struct nlmsghdr *nft_chain_nlmsg_build_hdr(char *buf, uint16_t cmd, uint16_t family, uint16_t type, uint32_t seq); diff --git a/include/libnftables/rule.h b/include/libnftables/rule.h index 50944cd..66143c7 100644 --- a/include/libnftables/rule.h +++ b/include/libnftables/rule.h @@ -43,6 +43,7 @@ enum { NFT_RULE_O_XML, }; +int nft_rule_xml_parse(struct nft_rule *r, char *xml); int nft_rule_snprintf(char *buf, size_t size, struct nft_rule *t, uint32_t type, uint32_t flags); struct nlmsghdr *nft_rule_nlmsg_build_hdr(char *buf, uint16_t cmd, uint16_t family, uint16_t type, uint32_t seq); diff --git a/include/libnftables/table.h b/include/libnftables/table.h index c50650f..94c236c 100644 --- a/include/libnftables/table.h +++ b/include/libnftables/table.h @@ -31,6 +31,7 @@ enum { NFT_TABLE_O_XML, }; +int nft_table_xml_parse(struct nft_table *t, char *xml); int nft_table_snprintf(char *buf, size_t size, struct nft_table *t, uint32_t type, uint32_t flags); struct nlmsghdr *nft_table_nlmsg_build_hdr(char *buf, uint16_t cmd, uint16_t family, uint16_t type, uint32_t seq); diff --git a/src/chain.c b/src/chain.c index 44a0e66..97eaacd 100644 --- a/src/chain.c +++ b/src/chain.c @@ -20,6 +20,7 @@ #include <libmnl/libmnl.h> #include <linux/netfilter/nfnetlink.h> #include <linux/netfilter/nf_tables.h> +#include <mxml.h> #include <libnftables/chain.h> @@ -446,6 +447,183 @@ int nft_chain_nlmsg_parse(const struct nlmsghdr *nlh, struct nft_chain *c) } EXPORT_SYMBOL(nft_chain_nlmsg_parse); +int nft_chain_xml_parse(struct nft_chain *c, char *xml) +{ + mxml_node_t *tree = NULL; + mxml_node_t *node = NULL; + char *endptr = NULL; + unsigned long long int utmp; + long int tmp; + + /* NOTE: all XML nodes are mandatory */ + + /* Load the tree */ + tree = mxmlLoadString(NULL, xml, MXML_OPAQUE_CALLBACK); + if (tree == NULL) + return -1; + + /* Get and set <chain name="xxx" ... >*/ + if (mxmlElementGetAttr(tree, "name") == NULL) { + mxmlDelete(tree); + return -1; + } + strncpy(c->name, mxmlElementGetAttr(tree, "name"), + NFT_CHAIN_MAXNAMELEN); + c->flags |= (1 << NFT_CHAIN_ATTR_NAME); + + /* Get and set <chain handle="x" ... >*/ + if (mxmlElementGetAttr(tree, "handle") == NULL) { + mxmlDelete(tree); + return -1; + } + + /* + * checking here (and followings): + * dest type overflow, + * strtoul overflow, + * bad string + */ + errno = 0; + utmp = strtoull(mxmlElementGetAttr(tree, "handle"), &endptr, 10); + if (utmp > UINT64_MAX || utmp < 0 || errno != 0 + || strlen(endptr) > 0) { + mxmlDelete(tree); + return -1; + } + + c->handle = (uint64_t)utmp; + c->flags |= (1 << NFT_CHAIN_ATTR_HANDLE); + + /* Get and set <chain bytes="x" ... >*/ + if (mxmlElementGetAttr(tree, "bytes") == NULL) { + mxmlDelete(tree); + return -1; + } + utmp = strtoull(mxmlElementGetAttr(tree, "bytes"), &endptr, 10); + if (utmp > UINT64_MAX || utmp < 0 || errno != 0 + || strlen(endptr) > 0) { + mxmlDelete(tree); + return -1; + } + c->bytes = (uint64_t)utmp; + c->flags |= (1 << NFT_CHAIN_ATTR_BYTES); + + /* Get and set <chain packets="x" ... > */ + if (mxmlElementGetAttr(tree, "packets") == NULL) { + mxmlDelete(tree); + return -1; + } + utmp = strtoull(mxmlElementGetAttr(tree, "packets"), &endptr, 10); + if (utmp > UINT64_MAX || utmp < 0 || errno != 0 + || strlen(endptr) > 0) { + mxmlDelete(tree); + return -1; + } + c->packets = (uint64_t)utmp; + c->flags |= (1 << NFT_CHAIN_ATTR_PACKETS); + + /* Ignore <properties> node */ + node = mxmlFindElement(tree, tree, "properties", NULL, NULL, + MXML_DESCEND_FIRST); + + /* Get and set <type> */ + node = mxmlFindElement(tree, tree, "type", NULL, NULL, MXML_DESCEND); + if (node == NULL) { + mxmlDelete(tree); + return -1; + } + + if (c->type) + free(c->type); + + c->type = strdup(node->child->value.opaque); + c->flags |= (1 << NFT_CHAIN_ATTR_TYPE); + + /* Get and set <table> */ + node = mxmlFindElement(tree, tree, "table", NULL, NULL, MXML_DESCEND); + if (node == NULL) { + mxmlDelete(tree); + return -1; + } + if (c->table) + free(c->table); + + c->table = strdup(node->child->value.opaque); + c->flags |= (1 << NFT_CHAIN_ATTR_TABLE); + + /* Get and set <prio> */ + node = mxmlFindElement(tree, tree, "prio", NULL, NULL, MXML_DESCEND); + if (node == NULL) { + mxmlDelete(tree); + return -1; + } + tmp = strtol(node->child->value.opaque, &endptr, 10); + if (tmp > INT32_MAX || tmp < INT32_MIN || errno != 0 + || strlen(endptr) > 0) { + mxmlDelete(tree); + return -1; + } + + memcpy(&c->prio, &tmp, sizeof(c->prio)); + c->flags |= (1 << NFT_CHAIN_ATTR_PRIO); + + /* Ignore <use> (cannot be set)*/ + node = mxmlFindElement(tree, tree, "use", NULL, NULL, MXML_DESCEND); + + /* Get and set <hooknum> */ + node = mxmlFindElement(tree, tree, "hooknum", NULL, NULL, + MXML_DESCEND); + if (node == NULL) { + mxmlDelete(tree); + return -1; + } + utmp = strtoul(node->child->value.opaque, &endptr, 10); + if (utmp > UINT32_MAX || utmp < 0 || errno != 0 + || strlen(endptr) > 0) { + mxmlDelete(tree); + return -1; + } + + memcpy(&c->hooknum, &utmp, sizeof(c->hooknum)); + c->flags |= (1 << NFT_CHAIN_ATTR_HOOKNUM); + + /* Get and set <policy> */ + node = mxmlFindElement(tree, tree, "policy", NULL, NULL, MXML_DESCEND); + if (node == NULL) { + mxmlDelete(tree); + return -1; + } + utmp = strtoul(node->child->value.opaque, &endptr, 10); + if (utmp > UINT32_MAX || utmp < 0 || errno != 0 + || strlen(endptr) > 0) { + mxmlDelete(tree); + return -1; + } + + c->policy = (uint32_t)utmp; + c->flags |= (1 << NFT_CHAIN_ATTR_POLICY); + + /* Get and set <family> */ + node = mxmlFindElement(tree, tree, "family", NULL, NULL, MXML_DESCEND); + if (node == NULL) { + mxmlDelete(tree); + return -1; + } + utmp = strtoul(node->child->value.opaque, &endptr, 10); + if (utmp > UINT8_MAX || utmp < 0 || errno != 0 + || strlen(endptr) > 0) { + mxmlDelete(tree); + return -1; + } + + c->family = (uint32_t)utmp; + c->flags |= (1 << NFT_CHAIN_ATTR_FAMILY); + + mxmlDelete(tree); + return 0; +} +EXPORT_SYMBOL(nft_chain_xml_parse); + static int nft_chain_snprintf_xml(char *buf, size_t size, struct nft_chain *c) { return snprintf(buf, size, diff --git a/src/expr/bitwise.c b/src/expr/bitwise.c index ddcf6a7..9edb682 100644 --- a/src/expr/bitwise.c +++ b/src/expr/bitwise.c @@ -22,6 +22,8 @@ #include "data_reg.h" #include "expr_ops.h" +#include <mxml.h> + struct nft_expr_bitwise { enum nft_registers sreg; enum nft_registers dreg; @@ -196,6 +198,118 @@ nft_rule_expr_bitwise_parse(struct nft_rule_expr *e, struct nlattr *attr) } static int +nft_rule_expr_bitwise_xml_parse(struct nft_rule_expr *e, char *xml) +{ + struct nft_expr_bitwise *bitwise = (struct nft_expr_bitwise *)e; + mxml_node_t *tree = NULL; + mxml_node_t *node = NULL; + mxml_node_t *save = NULL; + unsigned long int tmp; + union nft_data_reg data_regtmp; + char *endptr; + + tree = mxmlLoadString(NULL, xml, MXML_OPAQUE_CALLBACK); + if (tree == NULL) + return -1; + + if (mxmlElementGetAttr(tree, "type") == NULL) { + mxmlDelete(tree); + return -1; + } + + if (strcmp("bitwise", mxmlElementGetAttr(tree, "type")) != 0) { + mxmlDelete(tree); + return -1; + } + + + /* get and set <sreg> */ + node = mxmlFindElement(tree, tree, "sreg", NULL, NULL, + MXML_DESCEND_FIRST); + if (node == NULL) { + mxmlDelete(tree); + return -1; + } + + /* + * Checking here (and followins) + * dst type overflow + * strtol overflow + * bad number string + */ + errno = 0; + tmp = strtoul(node->child->value.opaque, &endptr, 10); + if (tmp > UINT32_MAX || tmp < 0 || errno != 0 || strlen(endptr) > 0) { + mxmlDelete(tree); + return -1; + } + + bitwise->sreg = (uint32_t)tmp; + e->flags |= (1 << NFT_EXPR_BITWISE_SREG); + + /* get and set <dreg> */ + node = mxmlFindElement(tree, tree, "dreg", NULL, NULL, MXML_DESCEND); + if (node == NULL) { + mxmlDelete(tree); + return -1; + } + tmp = strtoul(node->child->value.opaque, &endptr, 10); + if (tmp > UINT32_MAX || tmp < 0 || errno != 0 || strlen(endptr) > 0) { + mxmlDelete(tree); + return -1; + } + + bitwise->dreg = (uint32_t)tmp; + e->flags |= (1 << NFT_EXPR_BITWISE_DREG); + + /* Get and set <mask> */ + node = mxmlFindElement(tree, tree, "mask", NULL, NULL, + MXML_DESCEND); + if (node == NULL) { + mxmlDelete(tree); + return -1; + } + + /* hack for mxmSaveAllocString to print just the current node */ + save = node->next; + node->next = NULL; + if (nft_data_reg_xml_parse(&data_regtmp, + mxmlSaveAllocString(node, MXML_NO_CALLBACK)) < 0) { + mxmlDelete(tree); + return -1; + } + node->next = save; + + memcpy(&bitwise->mask.val, data_regtmp.val, data_regtmp.len); + bitwise->mask.len = data_regtmp.len; + e->flags |= (1 << NFT_EXPR_BITWISE_MASK); + + /* Get and set <xor> */ + node = mxmlFindElement(tree, tree, "xor", NULL, NULL, + MXML_DESCEND); + if (node == NULL) { + mxmlDelete(tree); + return -1; + } + + /* hack for mxmSaveAllocString to print just the current node */ + save = node->next; + node->next = NULL; + if (nft_data_reg_xml_parse(&data_regtmp, + mxmlSaveAllocString(node, MXML_NO_CALLBACK)) < 0) { + mxmlDelete(tree); + return -1; + } + + memcpy(&bitwise->xor.val, data_regtmp.val, data_regtmp.len); + bitwise->xor.len = data_regtmp.len; + e->flags |= (1 << NFT_EXPR_BITWISE_XOR); + + mxmlDelete(tree); + return 0; +} + +static int nft_rule_expr_bitwise_snprintf_xml(char *buf, size_t size, struct nft_expr_bitwise *bitwise) { @@ -280,4 +394,5 @@ struct expr_ops expr_ops_bitwise = { .parse = nft_rule_expr_bitwise_parse, .build = nft_rule_expr_bitwise_build, .snprintf = nft_rule_expr_bitwise_snprintf, + .xml_parse = nft_rule_expr_bitwise_xml_parse, }; diff --git a/src/expr/cmp.c b/src/expr/cmp.c index 3de849a..455489c 100644 --- a/src/expr/cmp.c +++ b/src/expr/cmp.c @@ -23,6 +23,8 @@ #include "expr_ops.h" #include "data_reg.h" +#include <mxml.h> + struct nft_expr_cmp { union nft_data_reg data; uint8_t sreg; /* enum nft_registers */ @@ -166,6 +168,102 @@ static char *expr_cmp_str[] = { [NFT_CMP_GTE] = "gte", }; +static int nft_rule_expr_cmp_xml_parse(struct nft_rule_expr *e, char *xml) +{ + struct nft_expr_cmp *cmp = (struct nft_expr_cmp *)e->data; + mxml_node_t *tree = NULL; + mxml_node_t *node = NULL; + mxml_node_t *save = NULL; + union nft_data_reg data_regtmp; + unsigned int tmp; + char *endptr; + + tree = mxmlLoadString(NULL, xml, MXML_OPAQUE_CALLBACK); + if (tree == NULL) + return -1; + + if (mxmlElementGetAttr(tree, "type") == NULL) { + mxmlDelete(tree); + return -1; + } + + if (strcmp("cmp", mxmlElementGetAttr(tree, "type")) != 0) { + mxmlDelete(tree); + return -1; + } + + /* Get and set <sreg>. Is not mandatory */ + node = mxmlFindElement(tree, tree, "sreg", NULL, NULL, + MXML_DESCEND_FIRST); + if (node != NULL) { + /* + * Checking here (and followings) + * dst data type overflow + * strtol overflow + * bad number string + */ + + errno = 0; + tmp = strtoul(node->child->value.opaque, &endptr, 10); + if (tmp > UINT8_MAX || tmp < 0 || errno != 0 + || strlen(endptr) > 0) { + mxmlDelete(tree); + return -1; + } + + cmp->sreg = (uint8_t)tmp; + e->flags |= (1 << NFT_EXPR_CMP_SREG); + } + + /* Get and set <op>. Is not mandatory*/ + node = mxmlFindElement(tree, tree, "op", NULL, NULL, MXML_DESCEND); + if (node != NULL) { + if (strcmp(node->child->value.opaque, "eq") == 0) { + cmp->op = NFT_CMP_EQ; + } else if (strcmp(node->child->value.opaque, "neq") == 0) { + cmp->op = NFT_CMP_NEQ; + } else if (strcmp(node->child->value.opaque, "lt") == 0) { + cmp->op = NFT_CMP_LT; + } else if (strcmp(node->child->value.opaque, "lte") == 0) { + cmp->op = NFT_CMP_LTE; + } else if (strcmp(node->child->value.opaque, "gt") == 0) { + cmp->op = NFT_CMP_GT; + } else if (strcmp(node->child->value.opaque, "gte") == 0) { + cmp->op = NFT_CMP_GTE; + } else { + /* If <op> is present, a valid value is mandatory */ + mxmlDelete(tree); + return -1; + } + e->flags |= (1 << NFT_EXPR_CMP_OP); + } + + /* Get and set <cmpdata>. Is not mandatory */ + node = mxmlFindElement(tree, tree, "cmpdata", NULL, NULL, + MXML_DESCEND); + if (node != NULL) { + /* hack for mxmSaveAllocString to print just the current node */ + save = node->next; + node->next = NULL; + + if (nft_data_reg_xml_parse(&data_regtmp, + mxmlSaveAllocString(node, MXML_NO_CALLBACK)) < 0) { + mxmlDelete(tree); + return -1; + } + + node->next = save; + + memcpy(&cmp->data.val, data_regtmp.val, data_regtmp.len); + cmp->data.len = data_regtmp.len; + e->flags |= (1 << NFT_EXPR_CMP_DATA); + } + + mxmlDelete(tree); + return 0; +} + + static int nft_rule_expr_cmp_snprintf_xml(char *buf, size_t size, struct nft_expr_cmp *cmp) { @@ -227,4 +325,5 @@ struct expr_ops expr_ops_cmp = { .parse = nft_rule_expr_cmp_parse, .build = nft_rule_expr_cmp_build, .snprintf = nft_rule_expr_cmp_snprintf, + .xml_parse = nft_rule_expr_cmp_xml_parse, }; diff --git a/src/expr/counter.c b/src/expr/counter.c index 550d56d..b82d722 100644 --- a/src/expr/counter.c +++ b/src/expr/counter.c @@ -21,6 +21,8 @@ #include <libnftables/rule.h> #include "expr_ops.h" +#include <mxml.h> + struct nft_expr_counter { uint64_t pkts; uint64_t bytes; @@ -125,6 +127,66 @@ nft_rule_expr_counter_parse(struct nft_rule_expr *e, struct nlattr *attr) return 0; } + +static int +nft_rule_expr_counter_xml_parse(struct nft_rule_expr *e, char *xml) +{ + struct nft_expr_counter *ctr = (struct nft_expr_counter *)e->data; + mxml_node_t *tree = NULL; + mxml_node_t *node = NULL; + char *endptr; + unsigned long long int tmp; + + tree = mxmlLoadString(NULL, xml, MXML_OPAQUE_CALLBACK); + if (tree == NULL) + return -1; + + if (mxmlElementGetAttr(tree, "type") == NULL) { + mxmlDelete(tree); + return -1; + } + + if (strcmp("counter", mxmlElementGetAttr(tree, "type")) != 0) { + mxmlDelete(tree); + return -1; + } + + /* get and set <pkts>. Is not mandatory*/ + node = mxmlFindElement(tree, tree, "pkts", NULL, NULL, + MXML_DESCEND_FIRST); + if (node != NULL) { + errno = 0; + tmp = strtoull(node->child->value.opaque, &endptr, 10); + if (tmp > UINT64_MAX || tmp < 0 || errno != 0 + || strlen(endptr) > 0) { + mxmlDelete(tree); + return -1; + } + + ctr->pkts = (uint64_t)tmp; + e->flags |= (1 << NFT_EXPR_CTR_PACKETS); + } + + /* get and set <bytes> */ + node = mxmlFindElement(tree, tree, "bytes", NULL, NULL, + MXML_DESCEND); + if (node != NULL) { + tmp = strtoull(node->child->value.opaque, &endptr, 10); + if (tmp > UINT64_MAX || tmp < 0 || errno != 0 + || strlen(endptr) > 0) { + mxmlDelete(tree); + return -1; + } + + ctr->bytes = (uint64_t)tmp; + e->flags |= (1 << NFT_EXPR_CTR_BYTES); + } + + mxmlDelete(tree); + return 0; +} + + static int nft_rule_expr_counter_snprintf(char *buf, size_t len, uint32_t type, uint32_t flags, struct nft_rule_expr *e) @@ -153,4 +215,5 @@ struct expr_ops expr_ops_counter = { .parse = nft_rule_expr_counter_parse, .build = nft_rule_expr_counter_build, .snprintf = nft_rule_expr_counter_snprintf, + .xml_parse = nft_rule_expr_counter_xml_parse, }; diff --git a/src/expr/data_reg.c b/src/expr/data_reg.c index 78c7d49..3f66452 100644 --- a/src/expr/data_reg.c +++ b/src/expr/data_reg.c @@ -12,6 +12,7 @@ #include <stdio.h> #include <stdint.h> #include <string.h> +#include <limits.h> #include <arpa/inet.h> #include <libmnl/libmnl.h> @@ -23,9 +24,256 @@ #include "data_reg.h" #include "internal.h" -static int nft_data_reg_value_snprintf_xml(char *buf, size_t size, - union nft_data_reg *reg, - uint32_t flags) +#include <mxml.h> + +static int nft_data_reg_verdict_xml_parse(union nft_data_reg *reg, char *xml) +{ + mxml_node_t *tree = NULL; + mxml_node_t *node = NULL; + char *endptr; + long int tmp; + + /* + * <data_reg type="verdict" > + <verdict>int</verdict> + * </data_reg> + */ + + tree = mxmlLoadString(NULL, xml, MXML_OPAQUE_CALLBACK); + if (tree == NULL) + return -1; + + node = mxmlFindElement(tree, tree, "data_reg", NULL, NULL, + MXML_DESCEND_FIRST); + + if (node == NULL) { + mxmlDelete(tree); + return -1; + } + + /* Get and validate <data_reg type="verdict" >*/ + if (mxmlElementGetAttr(tree, "type") == NULL) { + mxmlDelete(tree); + return -1; + } + + if (strcmp(mxmlElementGetAttr(tree, "type"), "verdict") != 0) { + mxmlDelete(tree); + return -1; + } + + /* Get and set <verdict> */ + node = mxmlFindElement(tree, tree, "verdict", NULL, NULL, + MXML_DESCEND_FIRST); + if (node == NULL) { + mxmlDelete(tree); + return -1; + } + + errno = 0; + tmp = strtol(node->child->value.opaque, &endptr, 10); + if (tmp > INT_MAX || tmp < INT_MIN || errno != 0 + || strlen(endptr) > 0) { + mxmlDelete(tree); + return -1; + } + + reg->verdict = tmp; + + mxmlDelete(tree); + return 0; +} + +static int nft_data_reg_chain_xml_parse(union nft_data_reg *reg, char *xml) +{ + mxml_node_t *tree = NULL; + mxml_node_t *node = NULL; + + /* + * <data_reg type="chain" > + <chain>string</chain> + * </data_reg> + */ + + tree = mxmlLoadString(NULL, xml, MXML_OPAQUE_CALLBACK); + if (tree == NULL) + return -1; + + node = mxmlFindElement(tree, tree, "data_reg", NULL, NULL, + MXML_DESCEND_FIRST); + + if (node == NULL) { + mxmlDelete(tree); + return -1; + } + + /* Get and validate <data_reg type="chain" >*/ + if (mxmlElementGetAttr(tree, "type") == NULL) { + mxmlDelete(tree); + return -1; + } + + if (strcmp(mxmlElementGetAttr(tree, "type"), "chain") != 0) { + mxmlDelete(tree); + return -1; + } + + /* Get and set <chain> */ + node = mxmlFindElement(tree, tree, "chain", NULL, NULL, MXML_DESCEND); + if (node == NULL) { + mxmlDelete(tree); + return -1; + } + + /* no max len value to validate? */ + if (strlen(node->child->value.opaque) < 1) { + mxmlDelete(tree); + return -1; + } + + if (reg->chain) + free(reg->chain); + + reg->chain = strdup(node->child->value.opaque); + + mxmlDelete(tree); + return 0; +} + +static int nft_data_reg_value_xml_parse(union nft_data_reg *reg, char *xml) +{ + mxml_node_t *tree = NULL; + mxml_node_t *node = NULL; + int i, len; + long int tmp; + unsigned long int utmp; + char *endptr; + char node_name[6]; + + tree = mxmlLoadString(NULL, xml, MXML_OPAQUE_CALLBACK); + if (tree == NULL) + return -1; + + node = mxmlFindElement(tree, tree, "data_reg", NULL, NULL, + MXML_DESCEND_FIRST); + + if (node == NULL) { + mxmlDelete(tree); + return -1; + } + + /* + * <data_reg type="value"> + * <len>4</len> + * <data0>0xc09a002a</data0> + * <data1>0x2700cac1</data1> + * <data2>0x00000000</data2> + * <data3>0x08000000</data3> + * </data_reg> + */ + + /* Get and validate <data_reg type="value" ... >*/ + if (mxmlElementGetAttr(node, "type") == NULL) { + mxmlDelete(tree); + return -1; + } + + if (strcmp(mxmlElementGetAttr(node, "type"), "value") != 0) { + mxmlDelete(tree); + return -1; + } + + /* Get <len> */ + node = mxmlFindElement(tree, tree, "len", NULL, NULL, MXML_DESCEND); + if (node == NULL) { + mxmlDelete(tree); + return -1; + } + + /* + * Checking here (and followings): + * dest type overflow + * strtol overflow + * bad string + */ + + errno = 0; + tmp = strtol(node->child->value.opaque, &endptr, 10); + if (tmp > INT_MAX || tmp < 0 || errno != 0 || strlen(endptr) > 0) { + mxmlDelete(tree); + return -1; + } + /* maybe also (len < 1 || len > 4) */ + len = tmp; + + /* Get and set <dataN> */ + for (i = 0; i < len; i++) { + sprintf(node_name, "data%d", i); + + node = mxmlFindElement(tree, tree, node_name, NULL, + NULL, MXML_DESCEND); + if (node == NULL) { + mxmlDelete(tree); + return -1; + } + + utmp = strtoul(node->child->value.opaque, &endptr, 16); + if (utmp > UINT32_MAX || utmp < 0 || errno != 0 + || strlen(endptr) > 0) { + mxmlDelete(tree); + return -1; + } + reg->val[i] = tmp; + } + + reg->len = sizeof(reg->val); + + mxmlDelete(tree); + return 0; +} + +int nft_data_reg_xml_parse(union nft_data_reg *reg, char *xml) +{ + mxml_node_t *node = NULL; + mxml_node_t *tree = mxmlLoadString(NULL, xml, MXML_OPAQUE_CALLBACK); + + if (tree == NULL) + return -1; + + node = mxmlFindElement(tree, tree, "data_reg", NULL, NULL, + MXML_DESCEND_FIRST); + if (node == NULL) { + mxmlDelete(tree); + return -1; + } + + /* Get <data_reg type="xxx" ... >*/ + if (mxmlElementGetAttr(node, "type") == NULL) { + mxmlDelete(tree); + return -1; + } + + /* Select what type of parsing is needed */ + if (strcmp(mxmlElementGetAttr(node, "type"), "value") == 0) { + mxmlDelete(tree); + return nft_data_reg_value_xml_parse(reg, xml); + } else if (strcmp(mxmlElementGetAttr(node, "type"), "verdict") == 0) { + mxmlDelete(tree); + return nft_data_reg_verdict_xml_parse(reg, xml); + } else if (strcmp(mxmlElementGetAttr(node, "type"), "chain") == 0) { + mxmlDelete(tree); + return nft_data_reg_chain_xml_parse(reg, xml); + } + + mxmlDelete(tree); + return -1; +} + + + +static +int nft_data_reg_value_snprintf_xml(char *buf, size_t size, + union nft_data_reg *reg, uint32_t flags) { int len = size, offset = 0, ret, i, j; uint8_t *tmp; @@ -251,3 +499,4 @@ int nft_parse_data(union nft_data_reg *data, struct nlattr *attr, int *type) return ret; } + diff --git a/src/expr/immediate.c b/src/expr/immediate.c index 10f7793..af09f07 100644 --- a/src/expr/immediate.c +++ b/src/expr/immediate.c @@ -22,6 +22,8 @@ #include "expr_ops.h" #include "data_reg.h" +#include <mxml.h> + struct nft_expr_immediate { union nft_data_reg data; enum nft_registers dreg; @@ -196,6 +198,101 @@ nft_rule_expr_immediate_parse(struct nft_rule_expr *e, struct nlattr *attr) } static int +nft_rule_expr_immediate_xml_parse(struct nft_rule_expr *e, char *xml) +{ + struct nft_expr_immediate *imm = (struct nft_expr_immediate *)e->data; + mxml_node_t *tree = NULL; + mxml_node_t *node = NULL; + mxml_node_t *save = NULL; + union nft_data_reg data_regtmp; + uint32_t tmp; + char *endptr; + + /* load the tree */ + tree = mxmlLoadString(NULL, xml, MXML_OPAQUE_CALLBACK); + if (tree == NULL) + return -1; + + if (mxmlElementGetAttr(tree, "type") == NULL) { + mxmlDelete(tree); + return -1; + } + + if (strcmp("immediate", mxmlElementGetAttr(tree, "type")) != 0) { + mxmlDelete(tree); + return -1; + } + + /* Get and set <dreg>. Is mandatory */ + node = mxmlFindElement(tree, tree, "dreg", NULL, NULL, + MXML_DESCEND_FIRST); + if (node == NULL) { + mxmlDelete(tree); + return -1; + } + + errno = 0; + tmp = strtoul(node->child->value.opaque, &endptr, 10); + if (tmp > UINT32_MAX || tmp < 0 || errno != 0 || strlen(endptr) > 0) { + mxmlDelete(tree); + return -1; + } + + imm->dreg = (uint32_t)tmp; + e->flags |= (1 << NFT_EXPR_IMM_DREG); + + /* Get and set <immdata>. Is mandatory */ + node = mxmlFindElement(tree, tree, "immdata", NULL, NULL, + MXML_DESCEND); + if (node == NULL) { + mxmlDelete(tree); + return -1; + } + + /* hack for mxmSaveAllocString to print just the current node */ + save = node->next; + node->next = NULL; + + if (nft_data_reg_xml_parse(&data_regtmp, + mxmlSaveAllocString(node, MXML_NO_CALLBACK)) < 0) { + mxmlDelete(tree); + return -1; + } + node->next = save; + + /* data_reg type switch */ + node = mxmlFindElement(tree, tree, "data_reg", NULL, NULL, + MXML_DESCEND); + if (node == NULL) { + mxmlDelete(tree); + return -1; + } + + if (mxmlElementGetAttr(node, "type") == NULL) { + mxmlDelete(tree); + return -1; + } + + if (strcmp(mxmlElementGetAttr(node, "type"), "value") == 0) { + memcpy(&imm->data.val, data_regtmp.val, data_regtmp.len); + imm->data.len = data_regtmp.len; + e->flags |= (1 << NFT_EXPR_IMM_DATA); + } else if (strcmp(mxmlElementGetAttr(node, "type"), "verdict") == 0) { + imm->data.verdict = data_regtmp.verdict; + e->flags |= (1 << NFT_EXPR_IMM_VERDICT); + } else if (strcmp(mxmlElementGetAttr(node, "type"), "chain") == 0) { + if (imm->data.chain) + free(imm->data.chain); + + imm->data.chain = strdup(data_regtmp.chain); + e->flags |= (1 << NFT_EXPR_IMM_CHAIN); + } + + mxmlDelete(tree); + return 0; +} + +static int nft_rule_expr_immediate_snprintf_xml(char *buf, size_t len, struct nft_rule_expr *e, uint32_t flags) { @@ -282,4 +379,5 @@ struct expr_ops expr_ops_immediate = { .parse = nft_rule_expr_immediate_parse, .build = nft_rule_expr_immediate_build, .snprintf = nft_rule_expr_immediate_snprintf, + .xml_parse = nft_rule_expr_immediate_xml_parse, }; diff --git a/src/expr/lookup.c b/src/expr/lookup.c index 1046615..78afd22 100644 --- a/src/expr/lookup.c +++ b/src/expr/lookup.c @@ -22,6 +22,8 @@ #include "data_reg.h" #include "expr_ops.h" +#include <mxml.h> + #ifndef IFNAMSIZ #define IFNAMSIZ 16 #endif @@ -151,6 +153,78 @@ nft_rule_expr_lookup_parse(struct nft_rule_expr *e, struct nlattr *attr) } static int +nft_rule_expr_lookup_xml_parse(struct nft_rule_expr *e, char *xml) +{ + struct nft_expr_lookup *lookup = (struct nft_expr_lookup *)e->data; + mxml_node_t *tree = NULL; + mxml_node_t *node = NULL; + unsigned long int tmp; + char *endptr; + + tree = mxmlLoadString(NULL, xml, MXML_OPAQUE_CALLBACK); + if (tree == NULL) + return -1; + + if (mxmlElementGetAttr(tree, "type") == NULL) { + mxmlDelete(tree); + return -1; + } + + if (strcmp("lookup", mxmlElementGetAttr(tree, "type")) != 0) { + mxmlDelete(tree); + return -1; + } + + /* get and set <set>. Is mandatory */ + node = mxmlFindElement(tree, tree, "set", NULL, NULL, + MXML_DESCEND_FIRST); + if (node == NULL) { + mxmlDelete(tree); + return -1; + } + + memcpy(lookup->set_name, node->child->value.opaque, IFNAMSIZ); + lookup->set_name[IFNAMSIZ-1] = '\0'; + e->flags |= (1 << NFT_EXPR_LOOKUP_SET); + + /* get and set <sreg>. Is mandatory */ + node = mxmlFindElement(tree, tree, "sreg", NULL, NULL, + MXML_DESCEND); + if (node == NULL) { + mxmlDelete(tree); + return -1; + } + + errno = 0; + + tmp = strtoul(node->child->value.opaque, &endptr, 10); + if (tmp > UINT32_MAX || tmp < 0 || errno != 0 || strlen(endptr) > 0) { + mxmlDelete(tree); + return -1; + } + + lookup->sreg = (uint32_t)tmp; + e->flags |= (1 << NFT_EXPR_LOOKUP_SREG); + + /* get and set <dreg>. Isn't mandatory */ + node = mxmlFindElement(tree, tree, "dreg", NULL, NULL, + MXML_DESCEND); + if (node != NULL) { + tmp = strtoul(node->child->value.opaque, &endptr, 10); + if (tmp > UINT32_MAX || tmp < 0 || errno != 0 + || strlen(endptr) > 0) { + mxmlDelete(tree); + return -1; + } + + lookup->dreg = (uint32_t)tmp; + e->flags |= (1 << NFT_EXPR_LOOKUP_DREG); + } + mxmlDelete(tree); + return 0; +} + +static int nft_rule_expr_lookup_snprintf_xml(char *buf, size_t size, struct nft_expr_lookup *l) { @@ -202,4 +276,5 @@ struct expr_ops expr_ops_lookup = { .parse = nft_rule_expr_lookup_parse, .build = nft_rule_expr_lookup_build, .snprintf = nft_rule_expr_lookup_snprintf, + .xml_parse = nft_rule_expr_lookup_xml_parse, }; diff --git a/src/expr/match.c b/src/expr/match.c index 57c5ab9..59d68fd 100644 --- a/src/expr/match.c +++ b/src/expr/match.c @@ -25,6 +25,8 @@ #include <libnftables/expr.h> #include <libnftables/rule.h> +#include <mxml.h> + #include "expr_ops.h" struct nft_expr_match { @@ -184,6 +186,60 @@ static int nft_rule_expr_match_parse(struct nft_rule_expr *e, struct nlattr *att return 0; } +static int nft_rule_expr_match_xml_parse(struct nft_rule_expr *e, char *xml) +{ + struct nft_expr_match *mt = (struct nft_expr_match *)e->data; + mxml_node_t *tree = NULL; + mxml_node_t *node = NULL; + unsigned long int tmp; + char *endptr; + + /* load the tree */ + tree = mxmlLoadString(NULL, xml, MXML_OPAQUE_CALLBACK); + if (tree == NULL) + return -1; + + if (mxmlElementGetAttr(tree, "type") == NULL) { + mxmlDelete(tree); + return -1; + } + + if (strcmp("match", mxmlElementGetAttr(tree, "type")) != 0) { + mxmlDelete(tree); + return -1; + } + + /* get and set <name>. Not mandatory */ + node = mxmlFindElement(tree, tree, "name", NULL, NULL, + MXML_DESCEND_FIRST); + if (node != NULL) { + memcpy(mt->name, node->child->value.opaque, + XT_EXTENSION_MAXNAMELEN); + mt->name[XT_EXTENSION_MAXNAMELEN-1] = '\0'; + e->flags |= (1 << NFT_EXPR_MT_NAME); + } + + /* get and set <rev>. Not mandatory */ + node = mxmlFindElement(tree, tree, "rev", NULL, NULL, MXML_DESCEND); + if (node != NULL) { + errno = 0; + tmp = strtoul(node->child->value.opaque, &endptr, 10); + if (tmp > UINT32_MAX || tmp < 0 || errno != 0 + || strlen(endptr) > 0) { + mxmlDelete(tree); + return -1; + } + + mt->rev = (uint32_t)tmp; + e->flags |= (1 << NFT_EXPR_MT_REV); + } + + /* mt->info is ignored until other solution is reached */ + + mxmlDelete(tree); + return 0; +} + static int nft_rule_expr_match_snprintf_xml(char *buf, size_t len, struct nft_expr_match *mt) { @@ -235,4 +291,5 @@ struct expr_ops expr_ops_match = { .parse = nft_rule_expr_match_parse, .build = nft_rule_expr_match_build, .snprintf = nft_rule_expr_match_snprintf, + .xml_parse = nft_rule_expr_match_xml_parse, }; diff --git a/src/expr/meta.c b/src/expr/meta.c index bfc1aa6..aa94948 100644 --- a/src/expr/meta.c +++ b/src/expr/meta.c @@ -21,6 +21,9 @@ #include <libnftables/rule.h> #include "expr_ops.h" +#include <mxml.h> + + struct nft_expr_meta { uint8_t key; /* enum nft_meta_keys */ uint8_t dreg; /* enum nft_registers */ @@ -125,6 +128,66 @@ nft_rule_expr_meta_parse(struct nft_rule_expr *e, struct nlattr *attr) return 0; } +static int nft_rule_expr_meta_xml_parse(struct nft_rule_expr *e, char *xml) +{ + struct nft_expr_meta *meta = (struct nft_expr_meta *)e->data; + mxml_node_t *tree = NULL; + mxml_node_t *node = NULL; + unsigned long int tmp; + char *endptr; + + tree = mxmlLoadString(NULL, xml, MXML_OPAQUE_CALLBACK); + if (tree == NULL) + return -1; + + if (mxmlElementGetAttr(tree, "type") == NULL) { + mxmlDelete(tree); + return -1; + } + + if (strcmp("meta", mxmlElementGetAttr(tree, "type")) != 0) { + mxmlDelete(tree); + return -1; + } + + /* Get and set <dreg>. Is mandatory */ + node = mxmlFindElement(tree, tree, "dreg", NULL, NULL, + MXML_DESCEND_FIRST); + if (node == NULL) { + mxmlDelete(tree); + return -1; + } + + errno = 0; + tmp = strtoul(node->child->value.opaque, &endptr, 10); + if (tmp > UINT8_MAX || tmp < 0 || errno != 0 || strlen(endptr) > 0) { + mxmlDelete(tree); + return -1; + } + + meta->dreg = (uint8_t)tmp; + e->flags |= (1 << NFT_EXPR_META_DREG); + + /* Get and set <key>. Is mandatory */ + node = mxmlFindElement(tree, tree, "key", NULL, NULL, MXML_DESCEND); + if (node == NULL) { + mxmlDelete(tree); + return -1; + } + + tmp = strtoul(node->child->value.opaque, &endptr, 10); + if (tmp > UINT8_MAX || tmp < 0 || errno != 0 || strlen(endptr) > 0) { + mxmlDelete(tree); + return -1; + } + + meta->key = (uint8_t)tmp; + e->flags |= (1 << NFT_EXPR_META_KEY); + + mxmlDelete(tree); + return 0; +} + static int nft_rule_expr_meta_snprintf(char *buf, size_t len, uint32_t type, uint32_t flags, struct nft_rule_expr *e) @@ -154,4 +217,5 @@ struct expr_ops expr_ops_meta = { .parse = nft_rule_expr_meta_parse, .build = nft_rule_expr_meta_build, .snprintf = nft_rule_expr_meta_snprintf, + .xml_parse = nft_rule_expr_meta_xml_parse, }; diff --git a/src/expr/nat.c b/src/expr/nat.c index 56212a7..8c402f5 100644 --- a/src/expr/nat.c +++ b/src/expr/nat.c @@ -14,6 +14,7 @@ #include <stdio.h> #include <stdint.h> +#include <limits.h> #include <arpa/inet.h> #include <libmnl/libmnl.h> #include <linux/netfilter/nf_tables.h> @@ -21,6 +22,8 @@ #include <libnftables/rule.h> #include "expr_ops.h" +#include <mxml.h> + struct nft_expr_nat { enum nft_registers sreg_addr_min; enum nft_registers sreg_addr_max; @@ -201,6 +204,132 @@ nft_rule_expr_nat_build(struct nlmsghdr *nlh, struct nft_rule_expr *e) htonl(nat->sreg_proto_max)); } + + +static int nft_rule_expr_nat_xml_parse(struct nft_rule_expr *e, char *xml) +{ + struct nft_expr_nat *nat = (struct nft_expr_nat *)e->data; + mxml_node_t *tree = NULL; + mxml_node_t *node = NULL; + unsigned long int tmp; + char *endptr; + + tree = mxmlLoadString(NULL, xml, MXML_OPAQUE_CALLBACK); + if (tree == NULL) + return -1; + + if (mxmlElementGetAttr(tree, "type") == NULL) { + mxmlDelete(tree); + return -1; + } + + if (strcmp("nat", mxmlElementGetAttr(tree, "type")) != 0) { + mxmlDelete(tree); + return -1; + } + + /* Get and set <type>. Mandatory */ + node = mxmlFindElement(tree, tree, "type", NULL, NULL, + MXML_DESCEND_FIRST); + if (node == NULL) { + mxmlDelete(tree); + return -1; + } + + if (strcmp(node->child->value.opaque, "NFT_NAT_SNAT") == 0) { + nat->type = NFT_NAT_SNAT; + } else if (strcmp(node->child->value.opaque, "NFT_NAT_DNAT") == 0) { + nat->type = NFT_NAT_DNAT; + } else { + mxmlDelete(tree); + return -1; + } + e->flags |= (1 << NFT_EXPR_NAT_TYPE); + + /* Get and set <family>. Mandatory */ + node = mxmlFindElement(tree, tree, "family", NULL, NULL, + MXML_DESCEND); + if (node == NULL) { + mxmlDelete(tree); + return -1; + } + + if (strcmp(node->child->value.opaque, "AF_INET") == 0) { + nat->family = AF_INET; + } else if (strcmp(node->child->value.opaque, "AF_INET6") == 0) { + nat->family = AF_INET6; + } else { + mxmlDelete(tree); + return -1; + } + + e->flags |= (1 << NFT_EXPR_NAT_FAMILY); + + /* Get and set <sreg_addr_min_v4>. Not mandatory */ + node = mxmlFindElement(tree, tree, "sreg_addr_min_v4", NULL, NULL, + MXML_DESCEND); + if (node == NULL) { + errno = 0; + tmp = strtoul(node->child->value.opaque, &endptr, 10); + if (tmp > UINT32_MAX || tmp < 0 || errno != 0 + || strlen(endptr) < 0) { + mxmlDelete(tree); + return -1; + } + + nat->sreg_addr_min = (uint32_t)tmp; + e->flags |= (1 << NFT_EXPR_NAT_REG_ADDR_MIN); + } + + /* Get and set <sreg_addr_max_v4>. Not mandatory */ + node = mxmlFindElement(tree, tree, "sreg_addr_max_v4", NULL, NULL, + MXML_DESCEND); + if (node == NULL) { + tmp = strtoul(node->child->value.opaque, &endptr, 10); + if (tmp > UINT32_MAX || tmp < 0 || errno != 0 + || strlen(endptr) < 0) { + mxmlDelete(tree); + return -1; + } + + nat->sreg_addr_max = (uint32_t)tmp; + e->flags |= (1 << NFT_EXPR_NAT_REG_ADDR_MAX); + } + + /* Get and set <sreg_proto_min>. Not mandatory */ + node = mxmlFindElement(tree, tree, "sreg_proto_min", NULL, NULL, + MXML_DESCEND); + if (node == NULL) { + tmp = strtoul(node->child->value.opaque, &endptr, 10); + if (tmp > UINT32_MAX || tmp < 0 || errno != 0 + || strlen(endptr) < 0) { + mxmlDelete(tree); + return -1; + } + + nat->sreg_proto_min = (uint32_t)tmp; + e->flags |= (1 << NFT_EXPR_NAT_REG_PROTO_MIN); + } + + /* Get and set <sreg_proto_max>. Not mandatory */ + node = mxmlFindElement(tree, tree, "sreg_proto_max", NULL, NULL, + MXML_DESCEND); + if (node == NULL) { + tmp = strtoul(node->child->value.opaque, &endptr, 10); + if (tmp > UINT32_MAX || tmp < 0 || errno != 0 + || strlen(endptr) < 0) { + mxmlDelete(tree); + return -1; + } + + nat->sreg_proto_max = (uint32_t)tmp; + e->flags |= (1 << NFT_EXPR_NAT_REG_PROTO_MAX); + } + mxmlDelete(tree); + return 0; +} + + static int nft_rule_expr_nat_snprintf_xml(char *buf, size_t size, struct nft_rule_expr *e) @@ -305,4 +434,5 @@ struct expr_ops expr_ops_nat = { .parse = nft_rule_expr_nat_parse, .build = nft_rule_expr_nat_build, .snprintf = nft_rule_expr_nat_snprintf, + .xml_parse = nft_rule_expr_nat_xml_parse, }; diff --git a/src/expr/payload.c b/src/expr/payload.c index 091078b..64be139 100644 --- a/src/expr/payload.c +++ b/src/expr/payload.c @@ -13,6 +13,7 @@ #include <stdio.h> #include <stdint.h> +#include <limits.h> #include <arpa/inet.h> #include <libmnl/libmnl.h> @@ -24,6 +25,8 @@ #include "expr_ops.h" +#include <mxml.h> + struct nft_expr_payload { enum nft_registers dreg; enum nft_payload_bases base; @@ -165,6 +168,91 @@ nft_rule_expr_payload_parse(struct nft_rule_expr *e, struct nlattr *attr) } static int +nft_rule_expr_payload_xml_parse(struct nft_rule_expr *e, char *xml) +{ + struct nft_expr_payload *payload = (struct nft_expr_payload *)e->data; + mxml_node_t *tree = NULL; + mxml_node_t *node = NULL; + unsigned long int tmp; + char *endptr; + + tree = mxmlLoadString(NULL, xml, MXML_OPAQUE_CALLBACK); + if (tree == NULL) + return -1; + + if (mxmlElementGetAttr(tree, "type") == NULL) { + mxmlDelete(tree); + return -1; + } + + if (strcmp("payload", mxmlElementGetAttr(tree, "type")) != 0) { + mxmlDelete(tree); + return -1; + } + + /* Get and set <dreg>. Not mandatory */ + node = mxmlFindElement(tree, tree, "dreg", NULL, NULL, + MXML_DESCEND_FIRST); + if (node != NULL) { + errno = 0; + tmp = strtoul(node->child->value.opaque, &endptr, 10); + if (tmp > UINT32_MAX || tmp < 0 || errno != 0 + || strlen(endptr) > 0) { + mxmlDelete(tree); + return -1; + } + + payload->dreg = (uint32_t)tmp; + e->flags |= (1 << NFT_EXPR_PAYLOAD_DREG); + } + + /* Get and set <base>. Not mandatory */ + node = mxmlFindElement(tree, tree, "base", NULL, NULL, MXML_DESCEND); + if (node != NULL) { + tmp = strtoul(node->child->value.opaque, &endptr, 10); + if (tmp > UINT32_MAX || tmp < 0 || errno != 0 + || strlen(endptr) > 0) { + mxmlDelete(tree); + return -1; + } + + payload->base = (uint32_t)tmp; + e->flags |= (1 << NFT_EXPR_PAYLOAD_BASE); + } + + /* Get and set <offset>. Not mandatory */ + node = mxmlFindElement(tree, tree, "offset", NULL, NULL, + MXML_DESCEND); + if (node != NULL) { + tmp = strtoul(node->child->value.opaque, &endptr, 10); + if (tmp > UINT_MAX || tmp < 0 || errno != 0 + || strlen(endptr) > 0) { + mxmlDelete(tree); + return -1; + } + + payload->offset = (unsigned int)tmp; + e->flags |= (1 << NFT_EXPR_PAYLOAD_OFFSET); + } + + /* Get and set <len>. Not mandatory */ + node = mxmlFindElement(tree, tree, "len", NULL, NULL, MXML_DESCEND); + if (node != NULL) { + tmp = strtoul(node->child->value.opaque, &endptr, 10); + if (tmp > UINT_MAX || tmp < 0 || errno != 0 + || strlen(endptr) > 0) { + mxmlDelete(tree); + return -1; + } + + payload->len = (unsigned int)tmp; + e->flags |= (1 << NFT_EXPR_PAYLOAD_LEN); + } + mxmlDelete(tree); + return 0; +} + +static int nft_rule_expr_payload_snprintf(char *buf, size_t len, uint32_t type, uint32_t flags, struct nft_rule_expr *e) { @@ -197,4 +285,5 @@ struct expr_ops expr_ops_payload = { .parse = nft_rule_expr_payload_parse, .build = nft_rule_expr_payload_build, .snprintf = nft_rule_expr_payload_snprintf, + .xml_parse = nft_rule_expr_payload_xml_parse, }; diff --git a/src/expr/target.c b/src/expr/target.c index d3de8e8..d2982de 100644 --- a/src/expr/target.c +++ b/src/expr/target.c @@ -27,6 +27,8 @@ #include "expr_ops.h" +#include <mxml.h> + struct nft_expr_target { char name[XT_EXTENSION_MAXNAMELEN]; uint32_t rev; @@ -184,6 +186,62 @@ static int nft_rule_expr_target_parse(struct nft_rule_expr *e, struct nlattr *at return 0; } +static int +nft_rule_expr_target_xml_parse(struct nft_rule_expr *e, char *xml) +{ + struct nft_expr_target *tg = (struct nft_expr_target *)e->data; + mxml_node_t *tree = NULL; + mxml_node_t *node = NULL; + unsigned long int tmp; + char *endptr; + + /* load the tree */ + tree = mxmlLoadString(NULL, xml, MXML_OPAQUE_CALLBACK); + if (tree == NULL) + return -1; + + if (mxmlElementGetAttr(tree, "type") == NULL) { + mxmlDelete(tree); + return -1; + } + + if (strcmp("target", mxmlElementGetAttr(tree, "type")) != 0) { + mxmlDelete(tree); + return -1; + } + + /* Get and set <name>. Optional */ + node = mxmlFindElement(tree, tree, "name", NULL, NULL, + MXML_DESCEND_FIRST); + if (node != NULL) { + memcpy(tg->name, node->child->value.opaque, + XT_EXTENSION_MAXNAMELEN); + tg->name[XT_EXTENSION_MAXNAMELEN-1] = '\0'; + e->flags |= (1 << NFT_EXPR_TG_NAME); + } + + /* Get and set <rev>. Optional */ + node = mxmlFindElement(tree, tree, "rev", NULL, NULL, + MXML_DESCEND); + if (node == NULL) { + errno = 0; + tmp = strtoul(node->child->value.opaque, &endptr, 10); + if (tmp > UINT32_MAX || tmp < 0 || errno != 0 + || strlen(endptr) > 0) { + mxmlDelete(tree); + return -1; + } + + tg->rev = (uint32_t)tmp; + e->flags |= (1 << NFT_EXPR_TG_REV); + } + + /* tg->info is ignored until other solution is reached */ + + mxmlDelete(tree); + return 0; +} + static int nft_rule_exp_target_snprintf_xml(char *buf, size_t len, struct nft_expr_target *tg) @@ -235,4 +293,5 @@ struct expr_ops expr_ops_target = { .parse = nft_rule_expr_target_parse, .build = nft_rule_expr_target_build, .snprintf = nft_rule_expr_target_snprintf, + .xml_parse = nft_rule_expr_target_xml_parse, }; diff --git a/src/expr_ops.h b/src/expr_ops.h index d6e4ec9..ff4c648 100644 --- a/src/expr_ops.h +++ b/src/expr_ops.h @@ -17,6 +17,7 @@ struct expr_ops { int (*parse)(struct nft_rule_expr *e, struct nlattr *attr); void (*build)(struct nlmsghdr *nlh, struct nft_rule_expr *e); int (*snprintf)(char *buf, size_t len, uint32_t type, uint32_t flags, struct nft_rule_expr *e); + int (*xml_parse)(struct nft_rule_expr *e, char *xml); }; struct expr_ops *nft_expr_ops_lookup(const char *name); diff --git a/src/libnftables.map b/src/libnftables.map index 957e3b6..5913976 100644 --- a/src/libnftables.map +++ b/src/libnftables.map @@ -6,6 +6,7 @@ global: nft_table_attr_get; nft_table_attr_set_u32; nft_table_attr_get_u32; + nft_table_xml_parse; nft_table_snprintf; nft_table_nlmsg_build_hdr; nft_table_nlmsg_build_payload; @@ -28,6 +29,7 @@ global: nft_chain_attr_get_s32; nft_chain_attr_get_u64; nft_chain_attr_get_str; + nft_chain_xml_parse; nft_chain_snprintf; nft_chain_nlmsg_build_hdr; nft_chain_nlmsg_build_payload; @@ -51,6 +53,7 @@ global: nft_rule_attr_get_u32; nft_rule_attr_get_u64; nft_rule_attr_get_str; + nft_rule_xml_parse; nft_rule_snprintf; nft_rule_nlmsg_build_hdr; nft_rule_nlmsg_build_payload; diff --git a/src/rule.c b/src/rule.c index 3945676..4a4847d 100644 --- a/src/rule.c +++ b/src/rule.c @@ -27,6 +27,8 @@ #include "linux_list.h" #include "expr_ops.h" +#include "mxml.h" + struct nft_rule { struct list_head head; @@ -437,6 +439,173 @@ int nft_rule_nlmsg_parse(const struct nlmsghdr *nlh, struct nft_rule *r) } EXPORT_SYMBOL(nft_rule_nlmsg_parse); +int nft_rule_xml_parse(struct nft_rule *r, char *xml) +{ + mxml_node_t *tree = NULL; + mxml_node_t *node = NULL; + mxml_node_t *save = NULL; + struct nft_rule_expr *e; + struct expr_ops *ops; + char *endptr; + unsigned long long int tmp; + + /* Load the tree */ + tree = mxmlLoadString(NULL, xml, MXML_OPAQUE_CALLBACK); + if (tree == NULL) + return -1; + + /* get and set <rule ... family=X ... > */ + if (mxmlElementGetAttr(tree, "family") == NULL) { + mxmlDelete(tree); + return -1; + } + + /* + * Checking here (and followings): + * dest type overflow + * strtol overflow + * badformed number string + */ + errno = 0; + tmp = strtoull(mxmlElementGetAttr(tree, "family"), &endptr, 10); + if (tmp > UINT8_MAX || tmp < 0 || errno != 0 || strlen(endptr) > 0) { + mxmlDelete(tree); + return -1; + } + + r->family = (uint8_t)tmp; + r->flags |= (1 << NFT_RULE_ATTR_FAMILY); + + /* get and set <rule ... table=X ...> */ + if (mxmlElementGetAttr(tree, "table") == NULL) { + mxmlDelete(tree); + return -1; + } + + if (r->table) + free(r->table); + + r->table = strdup(mxmlElementGetAttr(tree, "table")); + + /* get and set <rule ... chain=X ...> */ + if (mxmlElementGetAttr(tree, "chain") == NULL) { + mxmlDelete(tree); + return -1; + } + + if (r->chain) + free(r->chain); + + r->chain = strdup(mxmlElementGetAttr(tree, "chain")); + r->flags |= (1 << NFT_RULE_ATTR_CHAIN); + + /* get and set <rule ... handle=X ...> */ + if (mxmlElementGetAttr(tree, "handle") == NULL) { + mxmlDelete(tree); + return -1; + } + tmp = strtoull(mxmlElementGetAttr(tree, "handle"), &endptr, 10); + if (tmp > UINT64_MAX || tmp < 0 || errno != 0 || strlen(endptr) > 0) { + mxmlDelete(tree); + return -1; + } + + r->handle = (uint64_t)tmp; + r->flags |= (1 << NFT_RULE_ATTR_HANDLE); + + /* get and set <rule_flags> */ + node = mxmlFindElement(tree, tree, "rule_flags", NULL, NULL, + MXML_DESCEND_FIRST); + if (node == NULL) { + mxmlDelete(tree); + return -1; + } + tmp = strtoull(node->child->value.opaque, &endptr, 10); + if (tmp > UINT32_MAX || tmp < 0 || errno != 0 || strlen(endptr) > 0) { + mxmlDelete(tree); + return -1; + } + + r->rule_flags = (uint32_t)tmp; + r->flags |= (1 << NFT_RULE_ATTR_FLAGS); + + /* get and set <compat_proto> */ + node = mxmlFindElement(tree, tree, "compat_proto", NULL, NULL, + MXML_DESCEND); + if (node == NULL) { + mxmlDelete(tree); + return -1; + } + tmp = strtoull(node->child->value.opaque, &endptr, 10); + if (tmp > UINT32_MAX || tmp < 0 || errno != 0 || strlen(endptr) > 0) { + mxmlDelete(tree); + return -1; + } + + r->compat.proto = (uint32_t)tmp; + r->flags |= (1 << NFT_RULE_ATTR_COMPAT_PROTO); + + /* get and set <compat_flags> */ + node = mxmlFindElement(tree, tree, "compat_flags", NULL, NULL, + MXML_DESCEND); + if (node == NULL) { + mxmlDelete(tree); + return -1; + } + tmp = strtoull(node->child->value.opaque, &endptr, 10); + if (tmp > UINT32_MAX || tmp < 0 || errno != 0 || strlen(endptr) > 0) { + mxmlDelete(tree); + return -1; + } + + r->compat.flags = (uint32_t)tmp; + r->flags |= (1 << NFT_RULE_ATTR_COMPAT_FLAGS); + + /* Iterating over <expr> */ + for (node = mxmlFindElement(tree, tree, "expr", "type", + NULL, MXML_DESCEND); + node != NULL; + node = mxmlFindElement(node, tree, "expr", "type", + NULL, MXML_DESCEND)) { + + if (mxmlElementGetAttr(node, "type") == NULL) { + mxmlDelete(tree); + return -1; + } + + ops = nft_expr_ops_lookup(mxmlElementGetAttr(node, "type")); + if (ops == NULL) { + mxmlDelete(tree); + return -1; + } + + e = nft_rule_expr_alloc(mxmlElementGetAttr(node, "type")); + if (e == NULL) { + mxmlDelete(tree); + return -1; + } + + /* This is a hack for mxml to print just the current node */ + save = node->next; + node->next = NULL; + + if (ops->xml_parse(e, mxmlSaveAllocString(node, + MXML_NO_CALLBACK)) != 0) { + mxmlDelete(tree); + return -1; + } + + nft_rule_add_expr(r, e); + + node->next = save; + save = NULL; + } + + mxmlDelete(tree); + return 0; +} +EXPORT_SYMBOL(nft_rule_xml_parse); + static int nft_rule_snprintf_xml(char *buf, size_t size, struct nft_rule *r, uint32_t type, uint32_t flags) { diff --git a/src/table.c b/src/table.c index 8adaba8..ad676dd 100644 --- a/src/table.c +++ b/src/table.c @@ -13,6 +13,7 @@ #include <time.h> #include <endian.h> #include <stdint.h> +#include <limits.h> #include <stdlib.h> #include <string.h> #include <netinet/in.h> @@ -21,6 +22,8 @@ #include <linux/netfilter/nfnetlink.h> #include <linux/netfilter/nf_tables.h> +#include <mxml.h> + #include <libnftables/table.h> struct nft_table { @@ -182,6 +185,81 @@ int nft_table_nlmsg_parse(const struct nlmsghdr *nlh, struct nft_table *t) } EXPORT_SYMBOL(nft_table_nlmsg_parse); +int nft_table_xml_parse(struct nft_table *t, char *xml) +{ + mxml_node_t *tree = NULL; + mxml_node_t *node = NULL; + char *endptr; + unsigned long int tmp; + + /* NOTE: all XML nodes are mandatory */ + + /* Load the tree */ + tree = mxmlLoadString(NULL, xml, MXML_OPAQUE_CALLBACK); + if (tree == NULL) + return -1; + + /* Get and set the name of the table */ + if (mxmlElementGetAttr(tree, "name") == NULL) { + mxmlDelete(tree); + return -1; + } + + if (t->name) + free(t->name); + + t->name = strdup(mxmlElementGetAttr(tree, "name")); + t->flags |= (1 << NFT_TABLE_ATTR_NAME); + + /* Ignore <properties> node */ + node = mxmlFindElement(tree, tree, "properties", NULL, NULL, + MXML_DESCEND_FIRST); + + /* Get the and set <family> node */ + node = mxmlFindElement(tree, tree, "family", NULL, NULL, MXML_DESCEND); + if (node == NULL) { + mxmlDelete(tree); + return -1; + } + + /* + * checking here (and followings): + * dest type overflow, + * strtoul overflow, + * bad string + */ + errno = 0; + tmp = strtoul(node->child->value.opaque, &endptr, 10); + if (tmp > UINT8_MAX || tmp < 0 || errno != 0 || strlen(endptr) > 0) { + mxmlDelete(tree); + return -1; + } + + t->family = (uint32_t)tmp; + t->flags |= (1 << NFT_TABLE_ATTR_FAMILY); + + /* Get and set <table_flags> */ + node = mxmlFindElement(tree, tree, "table_flags", NULL, NULL, + MXML_DESCEND); + if (node == NULL) { + mxmlDelete(tree); + return -1; + } + + tmp = strtoul(node->child->value.opaque, &endptr, 10); + if (tmp > UINT32_MAX || tmp < 0 || errno != 0 || strlen(endptr) > 0) { + mxmlDelete(tree); + return -1; + } + + t->table_flags = (uint32_t)tmp; + t->flags |= (1 << NFT_TABLE_ATTR_FLAGS); + + mxmlDelete(tree); + return 0; +} +EXPORT_SYMBOL(nft_table_xml_parse); + static int nft_table_snprintf_xml(char *buf, size_t size, struct nft_table *t) { return snprintf(buf, size, -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
