Restricted schema for interface names #24

Closes #24
openwisp · Nov 2, 2015 · 4261940 · 4261940
1 parent cd4b217
commit 4261940
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 4 deletions.
diff --git a/netjsonconfig/schema.py b/netjsonconfig/schema.py
@@ -19,7 +19,9 @@
             ],
             "properties": {
                 "name": {
-                    "type": "string"
+                    "type": "string",
+                    "maxLength": 15,
+                    "pattern": "^[^\s]*$"
                 },
                 "mac": {
                     "type": "string"

diff --git a/tests/openwrt/test_network.py b/tests/openwrt/test_network.py
@@ -606,13 +606,35 @@ def test_bridge_members_schema(self):
         with self.assertRaises(ValidationError):
             o.validate()
         # ensure fix works
+        o.config['interfaces'][0]['bridge_members'] = ['eth0', 'wlan0']
+        o.validate()
+
+    def test_ifname_length(self):
         o = OpenWrt({
             "interfaces": [
                 {
-                    "name": "lan",
-                    "type": "bridge",
-                    "bridge_members": ["eth0", "wlan0"]
+                    "name": "ifname0123456789",
+                    "type": "ethernet"
+                }
+            ]
+        })
+        with self.assertRaises(ValidationError):
+            o.validate()
+        # ensure fix works
+        o.config['interfaces'][0]['name'] = 'ifname0'
+        o.validate()
+
+    def test_ifname_pattern(self):
+        o = OpenWrt({
+            "interfaces": [
+                {
+                    "name": "eth 0",
+                    "type": "ethernet"
                 }
             ]
         })
+        with self.assertRaises(ValidationError):
+            o.validate()
+        # ensure fix works
+        o.config['interfaces'][0]['name'] = 'e-t_h@=0.1'
         o.validate()