utf8: handle UTF-8 arrays.

BOLT 12 introduces this as a new fundamental type, which lets us easily validate them. Signed-off-by: Rusty Russell <[email protected]>
urza · Dec 9, 2020 · a11edeb · a11edeb
1 parent 2734fd2
commit a11edeb
Show file tree

Hide file tree

Showing 40 changed files with 56 additions and 38 deletions.
diff --git a/channeld/channeld_wiregen.c b/channeld/channeld_wiregen.c
diff --git a/channeld/channeld_wiregen.h b/channeld/channeld_wiregen.h
diff --git a/closingd/closingd_wiregen.c b/closingd/closingd_wiregen.c
diff --git a/closingd/closingd_wiregen.h b/closingd/closingd_wiregen.h
diff --git a/common/peer_status_wiregen.c b/common/peer_status_wiregen.c
diff --git a/common/peer_status_wiregen.h b/common/peer_status_wiregen.h
diff --git a/common/status_wiregen.c b/common/status_wiregen.c
diff --git a/common/status_wiregen.h b/common/status_wiregen.h
diff --git a/connectd/connectd_gossipd_wiregen.c b/connectd/connectd_gossipd_wiregen.c
diff --git a/connectd/connectd_gossipd_wiregen.h b/connectd/connectd_gossipd_wiregen.h
diff --git a/connectd/connectd_wiregen.c b/connectd/connectd_wiregen.c
diff --git a/connectd/connectd_wiregen.h b/connectd/connectd_wiregen.h
diff --git a/gossipd/gossip_store_wiregen.c b/gossipd/gossip_store_wiregen.c
diff --git a/gossipd/gossip_store_wiregen.h b/gossipd/gossip_store_wiregen.h
diff --git a/gossipd/gossipd_peerd_wiregen.c b/gossipd/gossipd_peerd_wiregen.c
diff --git a/gossipd/gossipd_peerd_wiregen.h b/gossipd/gossipd_peerd_wiregen.h
diff --git a/gossipd/gossipd_wiregen.c b/gossipd/gossipd_wiregen.c
diff --git a/gossipd/gossipd_wiregen.h b/gossipd/gossipd_wiregen.h
diff --git a/hsmd/hsmd_wiregen.c b/hsmd/hsmd_wiregen.c
diff --git a/hsmd/hsmd_wiregen.h b/hsmd/hsmd_wiregen.h
diff --git a/onchaind/onchaind_wiregen.c b/onchaind/onchaind_wiregen.c
diff --git a/onchaind/onchaind_wiregen.h b/onchaind/onchaind_wiregen.h
diff --git a/openingd/dualopend_wiregen.c b/openingd/dualopend_wiregen.c
diff --git a/openingd/dualopend_wiregen.h b/openingd/dualopend_wiregen.h
diff --git a/openingd/openingd_wiregen.c b/openingd/openingd_wiregen.c
diff --git a/openingd/openingd_wiregen.h b/openingd/openingd_wiregen.h
diff --git a/tools/generate-wire.py b/tools/generate-wire.py
@@ -204,6 +204,7 @@ class Type(FieldSet):
         'bool',
         'secp256k1_ecdsa_signature',
         'secp256k1_ecdsa_recoverable_signature',
+        'utf8',
         'wirestring',
         'errcode_t',
         'bigsize',
@@ -318,9 +319,10 @@ def type_name(self):
 
         return prefix + self.struct_name()
 
-    # We only accelerate the u8 case: it's common and trivial.
+    # We accelerate the u8 case: it's common and trivial.
+    # We handle the utf8 case so we can be sure it's actually a UTF-8 string.
     def has_array_helper(self):
-        return self.name in ['u8']
+        return self.name in ['u8', 'utf8']
 
     def struct_name(self):
         if self.is_tlv():

diff --git a/wire/common_wiregen.c b/wire/common_wiregen.c
diff --git a/wire/common_wiregen.h b/wire/common_wiregen.h
diff --git a/wire/fromwire.c b/wire/fromwire.c
@@ -207,6 +207,13 @@ void fromwire_u8_array(const u8 **cursor, size_t *max, u8 *arr, size_t num)
 	fromwire(cursor, max, arr, num);
 }
 
+void fromwire_utf8_array(const u8 **cursor, size_t *max, char *arr, size_t num)
+{
+	fromwire(cursor, max, arr, num);
+	if (!utf8_check(arr, num))
+		fromwire_fail(cursor, max);
+}
+
 u8 *fromwire_tal_arrn(const tal_t *ctx,
 		      const u8 **cursor, size_t *max, size_t num)
 {

diff --git a/wire/onion_printgen.c b/wire/onion_printgen.c
diff --git a/wire/onion_printgen.h b/wire/onion_printgen.h
diff --git a/wire/onion_wiregen.c b/wire/onion_wiregen.c
diff --git a/wire/onion_wiregen.h b/wire/onion_wiregen.h
diff --git a/wire/peer_printgen.c b/wire/peer_printgen.c
diff --git a/wire/peer_printgen.h b/wire/peer_printgen.h
diff --git a/wire/peer_wiregen.c b/wire/peer_wiregen.c
diff --git a/wire/peer_wiregen.h b/wire/peer_wiregen.h
diff --git a/wire/towire.c b/wire/towire.c
@@ -123,6 +123,12 @@ void towire_u8_array(u8 **pptr, const u8 *arr, size_t num)
 	towire(pptr, arr, num);
 }
 
+void towire_utf8_array(u8 **pptr, const char *arr, size_t num)
+{
+	assert(utf8_check(arr, num));
+	towire(pptr, arr, num);
+}
+
 void towire_pad(u8 **pptr, size_t num)
 {
 	/* Simply insert zeros. */

diff --git a/wire/wire.h b/wire/wire.h
@@ -14,6 +14,7 @@ struct siphash_seed;
 
 /* Makes generate-wire.py work */
 typedef char wirestring;
+typedef char utf8;
 
 /* Read the type; returns -1 if not long enough.  cursor is a tal ptr. */
 int fromwire_peektype(const u8 *cursor);
@@ -38,6 +39,7 @@ void towire_bool(u8 **pptr, bool v);
 void towire_errcode_t(u8 **pptr, errcode_t v);
 
 void towire_u8_array(u8 **pptr, const u8 *arr, size_t num);
+void towire_utf8_array(u8 **pptr, const char *arr, size_t num);
 
 void towire_wirestring(u8 **pptr, const char *str);
 void towire_siphash_seed(u8 **cursor, const struct siphash_seed *seed);
@@ -62,6 +64,7 @@ void fromwire_ripemd160(const u8 **cursor, size_t *max, struct ripemd160 *ripemd
 void fromwire_pad(const u8 **cursor, size_t *max, size_t num);
 
 void fromwire_u8_array(const u8 **cursor, size_t *max, u8 *arr, size_t num);
+void fromwire_utf8_array(const u8 **cursor, size_t *max, char *arr, size_t num);
 u8 *fromwire_tal_arrn(const tal_t *ctx,
 		       const u8 **cursor, size_t *max, size_t num);
 char *fromwire_wirestring(const tal_t *ctx, const u8 **cursor, size_t *max);