[fix] Fixed UCI name escaping in uci-autoname script

The openwisp-uci-autoname script did not always escape
renamed UCI sections, therefore in some cases the new
name was invalid, which caused the section to be removed
entirely.

Author: nemesifier

openwisp-config/files/sbin/openwisp-uci-autoname.lua

@@ -80,21 +80,22 @@ for file in lfs.dir(standard_path) do
           new_name = 'led_' .. string.lower(section['name'])
         elseif file == 'wireless' and section['.type'] == 'wifi-iface' then
           if section['ifname'] == nil then
-            new_name = 'wifi_' .. getUCIName(
+            new_name = 'wifi_' .. (
               standard:get('network', section['network'], 'ifname')
             )
           else
-            new_name = 'wifi_' .. getUCIName(section['ifname'])
+            new_name = 'wifi_' .. section['ifname']
           end
         else
-          new_name = nextAvailableName(getUCIName(section['.type']))
+          new_name = nextAvailableName(section['.type'])
         end
         -- make sure the new name is unique
         if all_names[new_name] then
             new_name = nextAvailableName(new_name .. '_')
         end
         all_names[new_name] = true
-        section['.name'] = new_name
+        -- make sure name is valid
+        section['.name'] = getUCIName(new_name)
         section['.anonymous'] = false
         utils.write_uci_section(output, file, section)
         output:reorder(file, section['.name'], index)

openwisp-config/tests/config/network

@@ -14,8 +14,12 @@ config interface 'lan'
 	option ip6assign '60'
 	option force_link '0'
 
+config device
+	option name 'eth0.2'
+	option macaddr '00:00:00:00:00:11'
+
 config interface 'wan'
-	option ifname 'eth0.2'
+	option device 'eth0.2'
 	option proto 'none'
 	option test_restore '1'
 

openwisp-config/tests/test_uci_autoname.lua

@@ -42,6 +42,9 @@ function TestUciAutoname.test_default_behaviour()
   -- ensure rest of config options are present
   luaunit.assertNotNil(string.find(networkContents, "config interface 'loopback'"))
   luaunit.assertNotNil(string.find(networkContents, "config interface 'lan'"))
+  -- ensure device eth0.2 is renamed
+  luaunit.assertNotNil(string.find(networkContents, "config device 'device_eth0_2'"))
+  luaunit.assertNotNil(string.find(networkContents, "option macaddr '00:00:00:00:00:11'"))
   -- check wireless
   local wirelessFile = io.open(write_dir .. 'wireless')
   luaunit.assertNotNil(wirelessFile)