html encode psk to allow special characters

close #126
universam1 · Jan 21, 2018 · a86f0d2 · a86f0d2
1 parent f822d9d
commit a86f0d2
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -11,3 +11,4 @@ iSpindel/__vm/
 .piolibdeps
 .vscode
 .vscode/c_cpp_properties.json
+.vscode/launch.json
diff --git a/.travis.yml b/.travis.yml
@@ -13,7 +13,7 @@ script:
 - platformio run
 deploy:
   provider: releases
-  # prerelease: true
+  prerelease: true
   api_key:
     secure: bU4iotLTrslYAlXQmSoMaGfCsjpM96TrKKne/2gFTlg++EQwjD/Z/i6T59lO7YVwp1GTD3qp/E4vSXfgkEm559mFIKZkd1IT8Vx/hpjX5CU6/OinGNmj1hYJw5M9DI1kQtc0wFDpbyNDnjPpKqBpFmIpqFyJUC7b3vctk/BMPkiiI5ncuBGp2f35M4qN2FedpTWoZdSAVZms7hsKFP4qZcih6stSlncUNf/niLwf78B31r5Td3G1aYQtHkB0BzyGQSgCvVuZ+PBm6zD/EWqRUGo6OWBCgwykbIZlgu45J4q46yQ2uS1CvRf4DFzIWU79bPg26MmxpjFe3oZucITTUtvOSzHFn8b1nuJE8IajYdM1KHSREl8Piej3A446P+JDQPk6ki3jCRyQentaZofI2ePUuqrvsV3iL4qKXMWpX1cOGU2c6nx0vvl/oft4rEcccibGpGZr0RIL7Ebpp7D4DSQ+bM+2XkuFab3W3QdrqrB6A0DOJuJfu/MvxEgkLtlpypZ2Z3g/F/TDgJkLSNEvX9e6kGAAIiIgkKz/zuuy04eNX+jox22TldovjbNSMCDfeeD6ghfKm0Q1+mdZax2dhvldgKOiwcZFL+TozN3AdPkr5GG/9m+dVaUGdrMK/n6uEJ++FZeUmdT8Pa2u/m3w2A4zeqMUWLM4WZMaUDW4cnA=
   file: ".pioenvs/d1_mini_stage/firmware.bin"

diff --git a/pio/lib/Globals/Globals.h b/pio/lib/Globals/Globals.h
@@ -21,7 +21,7 @@
 extern Ticker flasher;
 
 // defines go here
-#define FIRMWAREVERSION "5.6.1"
+#define FIRMWAREVERSION "5.6.2"
 
 
 #define API_FHEM true

diff --git a/pio/src/iSpindel.cpp b/pio/src/iSpindel.cpp
@@ -271,6 +271,48 @@ void validateInput(const char *input, char *output)
   tmp.toCharArray(output, tmp.length() + 1);
 }
 
+String urlencode(String str)
+{
+  String encodedString = "";
+  char c;
+  char code0;
+  char code1;
+  char code2;
+  for (int i = 0; i < str.length(); i++)
+  {
+    c = str.charAt(i);
+    if (c == ' ')
+    {
+      encodedString += '+';
+    }
+    else if (isalnum(c))
+    {
+      encodedString += c;
+    }
+    else
+    {
+      code1 = (c & 0xf) + '0';
+      if ((c & 0xf) > 9)
+      {
+        code1 = (c & 0xf) - 10 + 'A';
+      }
+      c = (c >> 4) & 0xf;
+      code0 = c + '0';
+      if (c > 9)
+      {
+        code0 = c - 10 + 'A';
+      }
+      code2 = '\0';
+      encodedString += '%';
+      encodedString += code0;
+      encodedString += code1;
+      //encodedString+=code2;
+    }
+    yield();
+  }
+  return encodedString;
+}
+
 bool startConfiguration()
 {
 
@@ -319,7 +361,7 @@ bool startConfiguration()
   wifiManager.addParameter(&custom_polynom);
 
   wifiManager._ssid = my_ssid;
-  wifiManager._pass = my_psk;
+  wifiManager._pass = urlencode(my_psk);
 
   SerialOut(F("started Portal"));
   wifiManager.startConfigPortal("iSpindel");