[fix] Avoid replacing True/False substrings in UCI string values

Author: Viscous106

netjsonconfig/backends/openwrt/renderer.py

@@ -16,8 +16,8 @@ def cleanup(self, output):
             .replace("\noption", "\n\toption")
             .replace("\nlist", "\n\tlist")
         )
-        # convert True to 1 and False to 0
-        output = output.replace("True", "1").replace("False", "0")
+        # convert True to 1 and False to 0 (exact match only, not substrings)
+        output = output.replace("'True'", "'1'").replace("'False'", "'0'")
         # max 2 consecutive \n delimiters
         output = output.replace("\n\n\n", "\n\n")
         # if output is present

tests/openwrt/test_wireless.py

@@ -63,6 +63,41 @@ def test_render_wifi_interface(self):
         expected = self._tabs(self._wifi_uci)
         self.assertEqual(o.render(), expected)
 
+    def test_render_wifi_issue_250_true_ssid(self):
+        netjson = deepcopy(self._wifi_netjson)
+        netjson["interfaces"][0]["wireless"]["ssid"] = "TrueGait Living Guest"
+        o = OpenWrt(netjson)
+        expected_uci = self._wifi_uci.replace("'MyWifiAP'", "'TrueGait Living Guest'")
+        self.assertEqual(o.render(), self._tabs(expected_uci))
+
+    def test_render_wifi_issue_250_false_ssid(self):
+        netjson = deepcopy(self._wifi_netjson)
+        netjson["interfaces"][0]["wireless"]["ssid"] = "FalseGait Living Guest"
+        o = OpenWrt(netjson)
+        expected_uci = self._wifi_uci.replace("'MyWifiAP'", "'FalseGait Living Guest'")
+        self.assertEqual(o.render(), self._tabs(expected_uci))
+
+    def test_render_wifi_issue_250_mid_word_true_ssid(self):
+        netjson = deepcopy(self._wifi_netjson)
+        netjson["interfaces"][0]["wireless"]["ssid"] = "MyTrueNetwork"
+        o = OpenWrt(netjson)
+        expected_uci = self._wifi_uci.replace("'MyWifiAP'", "'MyTrueNetwork'")
+        self.assertEqual(o.render(), self._tabs(expected_uci))
+
+    def test_render_wifi_issue_250_exact_true_ssid(self):
+        netjson = deepcopy(self._wifi_netjson)
+        netjson["interfaces"][0]["wireless"]["ssid"] = "True"
+        o = OpenWrt(netjson)
+        expected_uci = self._wifi_uci.replace("'MyWifiAP'", "'1'")
+        self.assertEqual(o.render(), self._tabs(expected_uci))
+
+    def test_render_wifi_issue_250_exact_false_ssid(self):
+        netjson = deepcopy(self._wifi_netjson)
+        netjson["interfaces"][0]["wireless"]["ssid"] = "False"
+        o = OpenWrt(netjson)
+        expected_uci = self._wifi_uci.replace("'MyWifiAP'", "'0'")
+        self.assertEqual(o.render(), self._tabs(expected_uci))
+
     def test_parse_wifi_interface(self):
         o = OpenWrt(native=self._wifi_uci)
         self.assertDictEqual(o.config, self._wifi_netjson)