The new object will hold security context strings.
Note:
nftnl_obj_secmark_json_parse is not yet implemented;
I'd like to get some help how to implement json string parsing as it is not implemented in ct_helper or ct_timeout.
Based on v1.1.1
Signed-off-by: Christian Göttsche <cgzones@xxxxxxxxxxxxxx>
---
include/libnftnl/object.h | 4 +
include/linux/netfilter/nf_tables.h | 18 +++-
include/obj.h | 4 +
src/Makefile.am | 1 +
src/obj/secmark.c | 159 ++++++++++++++++++++++++++++
src/object.c | 1 +
6 files changed, 186 insertions(+), 1 deletion(-)
create mode 100644 src/obj/secmark.c
diff --git a/include/libnftnl/object.h b/include/libnftnl/object.h
index 93a40d0..f958971 100644
--- a/include/libnftnl/object.h
+++ b/include/libnftnl/object.h
@@ -49,6 +49,10 @@ enum {
NFTNL_OBJ_LIMIT_FLAGS,
};
+enum {
+ NFTNL_OBJ_SECMARK_TEXT = NFTNL_OBJ_BASE,
+};
+
struct nftnl_obj;
struct nftnl_obj *nftnl_obj_alloc(void);
diff --git a/include/linux/netfilter/nf_tables.h b/include/linux/netfilter/nf_tables.h
index 91449ef..e015311 100644
--- a/include/linux/netfilter/nf_tables.h
+++ b/include/linux/netfilter/nf_tables.h
@@ -1142,6 +1142,21 @@ enum nft_quota_attributes {
};
#define NFTA_QUOTA_MAX (__NFTA_QUOTA_MAX - 1)
+/**
+ * enum nft_secmark_attributes - nf_tables secmark expression netlink attributes
+ *
+ * @NFTA_SECMARK_CTX: security context (NLA_STRING)
+ */
+enum nft_secmark_attributes {
+ NFTA_SECMARK_UNSPEC,
+ NFTA_SECMARK_CTX,
+ __NFTA_SECMARK_MAX,
+};
+#define NFTA_SECMARK_MAX (__NFTA_SECMARK_MAX - 1)
+
+/* Max security context length */
+#define NFT_SECMARK_CTX_MAXLEN 256
+
/**
* enum nft_reject_types - nf_tables reject expression reject types
*
@@ -1371,7 +1386,8 @@ enum nft_ct_helper_attributes {
#define NFT_OBJECT_CT_HELPER 3
#define NFT_OBJECT_LIMIT 4
#define NFT_OBJECT_CONNLIMIT 5
-#define __NFT_OBJECT_MAX 6
+#define NFT_OBJECT_SECMARK 6
+#define __NFT_OBJECT_MAX 7
#define NFT_OBJECT_MAX (__NFT_OBJECT_MAX - 1)
/**
diff --git a/include/obj.h b/include/obj.h
index 4a728c8..31f851b 100644
--- a/include/obj.h
+++ b/include/obj.h
@@ -43,6 +43,9 @@ struct nftnl_obj {
uint32_t type;
uint32_t flags;
} limit;
+ struct nftnl_obj_secmark {
+ char ctx[NFT_SECMARK_CTX_MAXLEN];
+ } secmark;
} data;
};
@@ -64,6 +67,7 @@ extern struct obj_ops obj_ops_counter;
extern struct obj_ops obj_ops_quota;
extern struct obj_ops obj_ops_ct_helper;
extern struct obj_ops obj_ops_limit;
+extern struct obj_ops obj_ops_secmark;
#define nftnl_obj_data(obj) (void *)&obj->data
diff --git a/src/Makefile.am b/src/Makefile.am
index c66a257..fa7d948 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -60,4 +60,5 @@ libnftnl_la_SOURCES = utils.c \
obj/ct_helper.c \
obj/quota.c \
obj/limit.c \
+ obj/secmark.c \
libnftnl.map
diff --git a/src/obj/secmark.c b/src/obj/secmark.c
new file mode 100644
index 0000000..2414e85
--- /dev/null
+++ b/src/obj/secmark.c
@@ -0,0 +1,159 @@
+/*
+ * (C) 2012-2016 by Pablo Neira Ayuso <pablo@xxxxxxxxxxxxx>
+ *
+ * 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 <stdio.h>
+#include <stdint.h>
+#include <arpa/inet.h>
+#include <errno.h>
+#include <inttypes.h>
+
+#include <linux/netfilter/nf_tables.h>
+
+#include "internal.h"
+#include <libmnl/libmnl.h>
+#include <libnftnl/object.h>
+
+#include "obj.h"
+
+static int nftnl_obj_secmark_set(struct nftnl_obj *e, uint16_t type,
+ const void *data, uint32_t data_len)
+{
+ struct nftnl_obj_secmark *secmark = nftnl_obj_data(e);
+
+ switch (type) {
+ case NFTNL_OBJ_SECMARK_TEXT:
+ snprintf(secmark->ctx, sizeof(secmark->ctx), "%s", (const char *)data);
+ break;
+ default:
+ return -1;
+ }
+ return 0;
+}
+
+static const void *nftnl_obj_secmark_get(const struct nftnl_obj *e,
+ uint16_t type, uint32_t *data_len)
+{
+ struct nftnl_obj_secmark *secmark = nftnl_obj_data(e);
+
+ switch (type) {
+ case NFTNL_OBJ_SECMARK_TEXT:
+ *data_len = strlen(secmark->ctx);
+ return secmark->ctx;
+ }
+ return NULL;
+}
+
+static int nftnl_obj_secmark_cb(const struct nlattr *attr, void *data)
+{
+ const struct nftnl_obj_secmark *secmark = NULL;
+ int type = mnl_attr_get_type(attr);
+ const struct nlattr **tb = data;
+
+ if (mnl_attr_type_valid(attr, NFTA_SECMARK_MAX) < 0)
+ return MNL_CB_OK;
+
+ switch(type) {
+ case NFTA_SECMARK_CTX:
+ if (mnl_attr_validate(attr, MNL_TYPE_STRING) < 0)
+ abi_breakage();
+ if (mnl_attr_get_payload_len(attr) >= sizeof(secmark->ctx))
+ abi_breakage();
+ break;
+ }
+
+ tb[type] = attr;
+ return MNL_CB_OK;
+}
+
+static void
+nftnl_obj_secmark_build(struct nlmsghdr *nlh, const struct nftnl_obj *e)
+{
+ struct nftnl_obj_secmark *secmark = nftnl_obj_data(e);
+
+ if (e->flags & (1 << NFTNL_OBJ_SECMARK_TEXT))
+ mnl_attr_put_str(nlh, NFTA_SECMARK_CTX, secmark->ctx);
+}
+
+static int
+nftnl_obj_secmark_parse(struct nftnl_obj *e, struct nlattr *attr)
+{
+ struct nftnl_obj_secmark *secmark = nftnl_obj_data(e);
+ struct nlattr *tb[NFTA_SECMARK_MAX + 1] = {};
+
+ if (mnl_attr_parse_nested(attr, nftnl_obj_secmark_cb, tb) < 0)
+ return -1;
+
+ if (tb[NFTA_SECMARK_CTX]) {
+ snprintf(secmark->ctx, sizeof(secmark->ctx), "%s",
+ mnl_attr_get_str(tb[NFTA_SECMARK_CTX]));
+ e->flags |= (1 << NFTNL_OBJ_SECMARK_TEXT);
+ }
+
+ return 0;
+}
+
+static int
+nftnl_obj_secmark_json_parse(struct nftnl_obj *e, json_t *root,
+ struct nftnl_parse_err *err)
+{
+ errno = EOPNOTSUPP;
+ return -1;
+}
+
+static int nftnl_obj_secmark_export(char *buf, size_t size,
+ const struct nftnl_obj *e, int type)
+{
+ struct nftnl_obj_secmark *secmark = nftnl_obj_data(e);
+ NFTNL_BUF_INIT(b, buf, size);
+
+ if (e->flags & (1 << NFTNL_OBJ_SECMARK_TEXT))
+ nftnl_buf_str(&b, type, secmark->ctx, NAME);
+
+ return nftnl_buf_done(&b);
+}
+
+static int nftnl_obj_secmark_snprintf_default(char *buf, size_t len,
+ const struct nftnl_obj *e)
+{
+ struct nftnl_obj_secmark *secmark = nftnl_obj_data(e);
+
+ return snprintf(buf, len, "context %s ", secmark->ctx);
+}
+
+static int nftnl_obj_secmark_snprintf(char *buf, size_t len, uint32_t type,
+ uint32_t flags,
+ const struct nftnl_obj *e)
+{
+ if (len)
+ buf[0] = '\0';
+
+ switch (type) {
+ case NFTNL_OUTPUT_DEFAULT:
+ return nftnl_obj_secmark_snprintf_default(buf, len, e);
+ case NFTNL_OUTPUT_XML:
+ case NFTNL_OUTPUT_JSON:
+ return nftnl_obj_secmark_export(buf, len, e, type);
+ default:
+ break;
+ }
+ return -1;
+}
+
+struct obj_ops obj_ops_secmark = {
+ .name = "secmark",
+ .type = NFT_OBJECT_SECMARK,
+ .alloc_len = sizeof(struct nftnl_obj_secmark),
+ .max_attr = NFTA_SECMARK_MAX,
+ .set = nftnl_obj_secmark_set,
+ .get = nftnl_obj_secmark_get,
+ .parse = nftnl_obj_secmark_parse,
+ .build = nftnl_obj_secmark_build,
+ .snprintf = nftnl_obj_secmark_snprintf,
+ .json_parse = nftnl_obj_secmark_json_parse,
+};
diff --git a/src/object.c b/src/object.c
index d8278f3..21401e8 100644
--- a/src/object.c
+++ b/src/object.c
@@ -30,6 +30,7 @@ static struct obj_ops *obj_ops[] = {
[NFT_OBJECT_QUOTA] = &obj_ops_quota,
[NFT_OBJECT_CT_HELPER] = &obj_ops_ct_helper,
[NFT_OBJECT_LIMIT] = &obj_ops_limit,
+ [NFT_OBJECT_SECMARK] = &obj_ops_secmark,
};
static struct obj_ops *nftnl_obj_ops_lookup(uint32_t type)
--
2.19.0
