Merge pull request #309 from mkinney/wifi_password_check

add wifi min length check

meshtastic/__main__.py

@@ -119,6 +119,10 @@ def setPref(attributes, name, valStr):
     val = meshtastic.util.fromStr(valStr)
     logging.debug(f'valStr:{valStr} val:{val}')
 
+    if snake_name == 'wifi_password' and len(valStr) < 8:
+        print(f"Warning: wifi_password must be 8 or more characters.")
+        return
+
     enumType = field.enum_type
     # pylint: disable=C0123
     if enumType and type(val) == str:

meshtastic/supported_device.py

@@ -40,7 +40,7 @@ tbeam_M8N_SX1262 = SupportedDevice(name="T-Beam", version="M8N_SX1262", for_firm
                                    usb_vendor_id_in_hex="1a86", usb_product_id_in_hex="55d4")
 tlora_v1 = SupportedDevice(name="T-Lora", version="1", for_firmware="tlora-v1",
                              baseport_on_linux="ttyUSB", baseport_on_mac="cu.usbserial",
-                             usb_vendor_id_in_hex="10c4", usb_product_id_in_hex="ea60")
+                             usb_vendor_id_in_hex="1a86", usb_product_id_in_hex="55d4")
 tlora_v1_3 = SupportedDevice(name="T-Lora", version="1.3", for_firmware="tlora-v1-3",
                              baseport_on_linux="ttyUSB", baseport_on_mac="cu.usbserial",
                              usb_vendor_id_in_hex="10c4", usb_product_id_in_hex="ea60")

meshtastic/tests/test_main.py

@@ -902,6 +902,27 @@ def test_main_set_valid_wifi_passwd(capsys):
         mo.assert_called()
 
 
+@pytest.mark.unit
+@pytest.mark.usefixtures("reset_globals")
+def test_main_set_invalid_wifi_passwd(capsys):
+    """Test --set with an invalid value (password must be 8 or more characters)"""
+    sys.argv = ['', '--set', 'wifi_password', '1234567']
+    Globals.getInstance().set_args(sys.argv)
+
+    mocked_node = MagicMock(autospec=Node)
+
+    iface = MagicMock(autospec=SerialInterface)
+    iface.getNode.return_value = mocked_node
+
+    with patch('meshtastic.serial_interface.SerialInterface', return_value=iface) as mo:
+        main()
+        out, err = capsys.readouterr()
+        assert re.search(r'Connected to radio', out, re.MULTILINE)
+        assert not re.search(r'Set wifi_password to 1234567', out, re.MULTILINE)
+        assert re.search(r'Warning: wifi_password must be 8 or more characters.', out, re.MULTILINE)
+        assert err == ''
+        mo.assert_called()
+
 @pytest.mark.unit
 @pytest.mark.usefixtures("reset_globals")
 def test_main_set_valid_camel_case(capsys):

setup.py

@@ -12,7 +12,7 @@ with open("README.md", "r") as fh:
 # This call to setup() does all the work
 setup(
     name="meshtastic",
-    version="1.2.90",
+    version="1.2.92",
     description="Python API & client shell for talking to Meshtastic devices",
     long_description=long_description,
     long_description_content_type="text/markdown",