add fake cbor protocol, only for testing. and add cbor tests

diff --git a/src/protocols/cbor/all.mk b/src/protocols/cbor/all.mk
new file mode 100644 (file)
index 0000000..171ea0a
--- /dev/null
+++ b/src/protocols/cbor/all.mk
@@ -0,0 +1,10 @@
+#
+# Makefile
+#
+# Version:      $Id$
+#
+TARGET         := libfreeradius-cbor$(L)
+
+SOURCES                := base.c
+
+TGT_PREREQS    := libfreeradius-util$(L)

diff --git a/src/protocols/cbor/base.c b/src/protocols/cbor/base.c
new file mode 100644 (file)
index 0000000..49a11aa
--- /dev/null
+++ b/src/protocols/cbor/base.c
@@ -0,0 +1,71 @@
+#include <freeradius-devel/util/cbor.h>
+#include <freeradius-devel/io/test_point.h>
+
+static ssize_t decode_pair(TALLOC_CTX *ctx, fr_pair_list_t *out, fr_dict_attr_t const *parent,
+                          uint8_t const *data, size_t data_len, UNUSED void *decode_ctx)
+{
+       fr_dbuff_t dbuff;
+       uint8_t field;
+       ssize_t slen;
+
+       fr_dbuff_init(&dbuff, data, data_len);
+
+       FR_DBUFF_OUT_RETURN(&field, &dbuff);
+       if (field != 0x9f) {
+               fr_strerror_printf("Invalid cbor header - expected indefinite array 9f, got %02x",
+                                  field);
+               return -1;
+       }
+
+       do {
+               if (fr_dbuff_extend_lowat(NULL, &dbuff, 1) == 0) {
+                       fr_strerror_printf("Invalid cbor header - unexpected end of data");
+                       return -fr_dbuff_used(&dbuff);
+               }
+
+               field = *fr_dbuff_current(&dbuff);
+               if (field == 0xff) {
+                       fr_dbuff_advance(&dbuff, 1);
+                       break;
+               }
+
+               slen = fr_cbor_decode_pair(ctx, out, &dbuff, parent, false);
+               if (slen <= 0) return slen - fr_dbuff_used(&dbuff);
+       } while (true);
+
+       return fr_dbuff_used(&dbuff);
+}
+
+static ssize_t encode_pair(fr_dbuff_t *dbuff, fr_dcursor_t *cursor, UNUSED void *encode_ctx)
+{
+       fr_dbuff_t work_dbuff = FR_DBUFF(dbuff);
+       fr_pair_t *vp;
+
+       FR_DBUFF_IN_BYTES_RETURN(&work_dbuff, (uint8_t) 0x9f); /* indefinite array */
+
+       for (vp = fr_dcursor_current(cursor);
+              vp != NULL;
+              vp = fr_dcursor_next(cursor)) {
+               ssize_t slen;
+
+               slen = fr_cbor_encode_pair(&work_dbuff, vp);
+               if (slen <= 0) return slen - fr_dbuff_used(&work_dbuff);
+       }
+
+       FR_DBUFF_IN_BYTES_RETURN(&work_dbuff, (uint8_t) 0xff); /* end of indefinite array */
+
+       return fr_dbuff_set(dbuff, &work_dbuff);
+}
+
+/*
+ *     Test points
+ */
+extern fr_test_point_pair_encode_t cbor_tp_encode_pair;
+fr_test_point_pair_encode_t cbor_tp_encode_pair = {
+       .func           = encode_pair,
+};
+
+extern fr_test_point_pair_decode_t cbor_tp_decode_pair;
+fr_test_point_pair_decode_t cbor_tp_decode_pair = {
+       .func           = decode_pair
+};

diff --git a/src/tests/unit/protocols/cbor/base.txt b/src/tests/unit/protocols/cbor/base.txt
new file mode 100644 (file)
index 0000000..57cc1c0
--- /dev/null
+++ b/src/tests/unit/protocols/cbor/base.txt
@@ -0,0 +1,43 @@
+#
+#  Tests for the cbor encoder / decoder
+#
+proto cbor
+
+# Use the RADIUS dictionary for now.  It doesn't really matter which one we use so long as it has
+# complex attributes.
+proto-dictionary radius
+
+#
+#  a1: map of 1 item
+#  01: integer of value 1
+#  43: string of length 3
+#
+encode-pair User-Name = "bob"
+match 9f a1 01 43 62 6f 62 ff
+
+decode-pair -
+match User-Name = "bob"
+
+encode-pair User-Name = "bob", Framed-IP-Address = 192.0.2.1
+match 9f a1 01 43 62 6f 62 a1 08 d8 34 64 c0 00 02 01 ff
+
+#
+#  tag decode isn't done
+#
+#decode-pair -
+#match User-Name = "bob", Framed-IP-Address = 192.0.2.1
+
+encode-pair User-Name = "bob", NAS-Port = 2112
+match 9f a1 01 43 62 6f 62 a1 05 19 08 40 ff
+
+decode-pair -
+match User-Name = "bob", NAS-Port = 2112
+
+encode-pair Vendor-Specific = { Cisco = { AVPair = "foo", Pre-Input-Packets = 6809 } }
+match 9f a1 18 1a 9f a1 09 9f a1 01 43 66 6f 6f a1 18 c0 19 1a 99 ff ff ff
+
+decode-pair -
+match Vendor-Specific = { Cisco = { AVPair = "foo", Pre-Input-Packets = 6809 } }
+
+count
+match 16