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

Author: Viscous106

netjsonconfig/backends/openwisp/templates/openwrt.jinja2

@@ -9,9 +9,15 @@
                     {% for list_value in value %}
                         list '{{ key }}' '{{ list_value }}'
                     {% endfor %}
+                {% else %}
+                {% if value is sameas true %}
+                    option '{{ key }}' '1'
+                {% elif value is sameas false %}
+                    option '{{ key }}' '0'
                 {% else %}
                     option '{{ key }}' '{{ value }}'
                 {% endif %}
+                {% endif %}
             {% endif %}
         {% endfor %}
 

netjsonconfig/backends/openwrt/renderer.py

@@ -16,8 +16,6 @@ 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")
         # max 2 consecutive \n delimiters
         output = output.replace("\n\n\n", "\n\n")
         # if output is present

netjsonconfig/backends/openwrt/templates/openwrt.jinja2

@@ -9,9 +9,15 @@
                     {% for list_value in value %}
                         list {{ key }} '{{ list_value }}'
                     {% endfor %}
+                {% else %}
+                {% if value is sameas true %}
+                    option {{ key }} '1'
+                {% elif value is sameas false %}
+                    option {{ key }} '0'
                 {% else %}
                     option {{ key }} '{{ value }}'
                 {% endif %}
+                {% endif %}
             {% endif %}
         {% endfor %}
 

tests/openwisp/test_backend.py

@@ -194,6 +194,22 @@ def test_wireless_radio_disabled_0(self):
         output = o.render()
         self.assertIn("option 'disabled' '0'", output)
 
+    def test_render_wifi_issue_250_ssid_variants(self):
+        ssid_values = [
+            "TrueGait Living Guest",
+            "FalseGait Living Guest",
+            "MyTrueNetwork",
+            "True",
+            "False",
+        ]
+        for ssid in ssid_values:
+            with self.subTest(ssid=ssid):
+                config = deepcopy(self.config)
+                config["interfaces"][2]["wireless"]["ssid"] = ssid
+                o = OpenWisp(config)
+                output = o.render()
+                self.assertIn(f"option 'ssid' '{ssid}'", output)
+
     def test_tc_script(self):
         config = deepcopy(self.config)
         o = OpenWisp(config)

tests/openwrt/test_wireless.py

@@ -63,6 +63,22 @@ def test_render_wifi_interface(self):
         expected = self._tabs(self._wifi_uci)
         self.assertEqual(o.render(), expected)
 
+    def test_render_wifi_issue_250_ssid_variants(self):
+        ssid_values = [
+            "TrueGait Living Guest",
+            "FalseGait Living Guest",
+            "MyTrueNetwork",
+            "True",
+            "False",
+        ]
+        for ssid in ssid_values:
+            with self.subTest(ssid=ssid):
+                netjson = deepcopy(self._wifi_netjson)
+                netjson["interfaces"][0]["wireless"]["ssid"] = ssid
+                o = OpenWrt(netjson)
+                expected_uci = self._wifi_uci.replace("'MyWifiAP'", f"'{ssid}'")
+                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)