From b966380b45d66ae058c31fbcab67ccfcb8751005 Mon Sep 17 00:00:00 2001
From: Ben Pfaff <blp@nicira.com>
Date: Thu, 19 Nov 2009 16:48:12 -0800
Subject: [PATCH] ovsdb: Require database, table, column names to be valid
 identifiers.

Database, table, and column names have always been required by the OVSDB
specification to be identifiers (e.g. valid C identifiers), but this has
never been enforced.

This commit adds enforcement and fixes one instance of an invalid column
name in the vswitch schema.
---
 lib/ovsdb-parser.c         | 6 +++---
 lib/ovsdb-parser.h         | 2 ++
 ovsdb/ovsdb.c              | 2 ++
 ovsdb/table.c              | 2 ++
 vswitchd/vswitch.ovsschema | 2 +-
 5 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/lib/ovsdb-parser.c b/lib/ovsdb-parser.c
index 5419467c..2a4c3d99 100644
--- a/lib/ovsdb-parser.c
+++ b/lib/ovsdb-parser.c
@@ -41,8 +41,8 @@ ovsdb_parser_init(struct ovsdb_parser *parser, const struct json *json,
     }
 }
 
-static bool
-is_id(const char *string)
+bool
+ovsdb_parser_is_id(const char *string)
 {
     unsigned char c;
 
@@ -83,7 +83,7 @@ ovsdb_parser_member(struct ovsdb_parser *parser, const char *name,
     if ((value->type >= 0 && value->type < JSON_N_TYPES
          && types & (1u << value->type))
         || (types & OP_ID && value->type == JSON_STRING
-            && is_id(value->u.string)))
+            && ovsdb_parser_is_id(value->u.string)))
     {
         svec_add(&parser->used, name);
         return value;
diff --git a/lib/ovsdb-parser.h b/lib/ovsdb-parser.h
index 6a3e32df..6efa0a73 100644
--- a/lib/ovsdb-parser.h
+++ b/lib/ovsdb-parser.h
@@ -71,4 +71,6 @@ struct ovsdb_error *ovsdb_parser_get_error(const struct ovsdb_parser *);
 struct ovsdb_error *ovsdb_parser_finish(struct ovsdb_parser *)
     WARN_UNUSED_RESULT;
 
+bool ovsdb_parser_is_id(const char *string);
+
 #endif /* ovsdb-parser.h */
diff --git a/ovsdb/ovsdb.c b/ovsdb/ovsdb.c
index 4d5f1c5e..27254e63 100644
--- a/ovsdb/ovsdb.c
+++ b/ovsdb/ovsdb.c
@@ -107,6 +107,8 @@ ovsdb_schema_from_json(struct json *json, struct ovsdb_schema **schemap)
         if (node->name[0] == '_') {
             error = ovsdb_syntax_error(json, NULL, "names beginning with "
                                        "\"_\" are reserved");
+        } else if (!ovsdb_parser_is_id(node->name)) {
+            error = ovsdb_syntax_error(json, NULL, "name must be a valid id");
         } else {
             error = ovsdb_table_schema_from_json(node->data, node->name,
                                                  &table);
diff --git a/ovsdb/table.c b/ovsdb/table.c
index d017a6ba..b520580c 100644
--- a/ovsdb/table.c
+++ b/ovsdb/table.c
@@ -111,6 +111,8 @@ ovsdb_table_schema_from_json(const struct json *json, const char *name,
         if (node->name[0] == '_') {
             error = ovsdb_syntax_error(json, NULL, "names beginning with "
                                        "\"_\" are reserved");
+        } else if (!ovsdb_parser_is_id(node->name)) {
+            error = ovsdb_syntax_error(json, NULL, "name must be a valid id");
         } else {
             error = ovsdb_column_from_json(node->data, node->name, &column);
         }
diff --git a/vswitchd/vswitch.ovsschema b/vswitchd/vswitch.ovsschema
index f4c63fb3..3f32d7ae 100644
--- a/vswitchd/vswitch.ovsschema
+++ b/vswitchd/vswitch.ovsschema
@@ -160,6 +160,6 @@
             "certificate": {
                 "comment": "Name of a PEM file containing a certificate, signed by the certificate authority (CA) used by the controller and manager, that certifies the switch's private key, identifying a trustworthy switch.",
                 "type": "string"},
-            "ca-cert": {
+            "ca_cert": {
                 "comment": "Name of a PEM file containing the CA certificate used to verify that the switch is connected to a trustworthy controller.",
                 "type": "string"}}}}}
-- 
2.30.2