Seich
/
HomeSpan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

created struct Configure

This commit is contained in:
Gregg 2020-09-03 21:24:27 -05:00
parent fd3b00ecd5
commit b957b540c0
4 changed files with 101 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
src/Configure.cpp Normal file
View File

@ -0,0 +1,84 @@
#include "Configure.h"
///////////////////////////////
void Configure::processRequest(WiFiClient &client, char *body, char *formData){
if(!strncmp(body,"POST /configure ",16) && // POST CONFIGURE
strstr(body,"Content-Type: application/x-www-form-urlencoded")){ // check that content is from a form
LOG2(formData); // print form data
LOG2("\n------------ END DATA! ------------\n");
LOG1("In Post Configure...\n");
String s="HTTP/1.1 200 OK\r\nContent-type: text/html\r\n\r\n";
s+="<html><head><title>Initiating</title><meta http-equiv = \"refresh\" content = \"2; url = /wifi-status\" /></head><body style=\"background-color:lightyellow;\">";
s+="<p style=\"font-size:300%;\">Initiating WiFi Connection...</p></body></html>";
} else
if(!strncmp(body,"GET /wifi-status ",17)){ // GET WIFI-STATUS
LOG1("In Get WiFi Status...\n");
String s="HTTP/1.1 200 OK\r\nContent-type: text/html\r\nRefresh: 5\r\n\r\n";
s+="<html><head><title>Connection Status</title></head><body style=\"background-color:lightyellow;\">";
s+="<p style=\"font-size:300%;\">Trying to Connect (";
s+=String(millis()/1000) + "sec)...</p></body></html>";
} else { // LOGIN PAGE
LOG1("In Captive Access...\n");
int n=WiFi.scanNetworks();
String s="HTTP/1.1 200 OK\r\nContent-type: text/html\r\n\r\n";
s+="<html><head><title>HomeSpan Configuration</title><style>p{font-size:300%; margin:25px}label{font-size:300%; margin:25px}input{font-size:250%; margin:25px}</style></head>";
s+="<body style=\"background-color:lightyellow;\"><center><p><b>HomeSpan_12_54_DD_E4_23_F5</b></p></center>";
s+="<p>Welcome to HomeSpan! This page allows you to configure the above HomeSpan device to connect to your WiFi network, and (if needed) to create a Setup Code for pairing this device to HomeKit.</p>";
s+="<p>The LED on this device should be <em>double-blinking</em> during this configuration.<p>";
s+="<form action=\"/configure\" method=\"post\">";
s+="<label for=\"ssid\">WiFi Network:</label>";
s+="<input list=\"network\" name=\"network\" placeholder=\"Choose or Type\" required>";
s+="<datalist id=\"network\">";
for(int i=0;i<n;i++){
if(s.indexOf(WiFi.SSID(i))==-1) // first time this SSID founx
s+="<option value=\"" + WiFi.SSID(i) + "\">" + WiFi.SSID(i) + "</option>";
}
s+="</datalist><br><br>";
s+="<label for=\"pwd\">WiFi Password:</label>";
s+="<input type=\"password\" id=\"pwd\" name=\"pwd\">";
s+="<br><br>";
s+="<label for=\"code\">Setup Code:</label>";
s+="<input type=\"tel\" id=\"code\" name=\"code\" placeholder=\"12345678\" pattern=\"[0-9]{8}\">";
/*
apClient.print("<p><em>");
apClient.print("This device already has a Setup Code. You may leave Setup Code blank to retain the current one, or type a new Setup Code to change.");
apClient.print("This device does not yet have a Setup Code. You must create one above.");
apClient.print("</p>");
*/
s+="<center><input style=\"font-size:300%\" type=\"submit\" value=\"SUBMIT\"></center>";
s+="</form></body></html>";
}
LOG2("\n>>>>>>>>>> ");
LOG2(client.remoteIP());
LOG2(" >>>>>>>>>>\n");
LOG2(s);
LOG2("\n");
client.print(s);
LOG2("------------ SENT! --------------\n");
} // processRequest
//////////////////////////////////////

9
src/Configure.h Normal file
View File

@ -0,0 +1,9 @@
#include <HAP.h>
///////////////////////////////
struct Configure {
void processRequest(WiFiClient &client, char *body, char *formData);
};

27
src/HAP.cpp
View File

@ -163,28 +163,11 @@ void HAPClient::processRequest(){
LOG2(body);
LOG2("\n------------ END BODY! ------------\n");
if(homeSpan.needsConfiguration){ // device not yet configured - only allow certain URLs
if(!strncmp(body,"POST /configure ",16) && // POST CONFIGURE
strstr(body,"Content-Type: application/x-www-form-urlencoded")){ // check that content is from a form
content[cLen]='\0'; // add a trailing null on end of POST data
LOG2((char *)content); // print data
LOG2("\n------------ END DATA! ------------\n");
postConfigureURL((char *)content); // process URL
return;
}
if(!strncmp(body,"GET /wifi-status ",17)){ // GET WIFI-STATUS
getWiFiStatusURL();
return;
}
captiveAccessURL(); // default action for all other URLs when in captive Access Point mode
if(homeSpan.needsConfiguration){ // device not yet configured
content[cLen]='\0'; // add a trailing null on end of any contents, which should always be text-based
configure.processRequest(client, body, (char *)content); // process request
return;
} // captive access point URLs only - everything below is for normal HAP requests
}
if(!strncmp(body,"POST ",5)){ // this is a POST request
@ -1684,5 +1667,5 @@ Accessory HAPClient::accessory;
Controller HAPClient::controllers[MAX_CONTROLLERS];
SRP6A HAPClient::srp;
int HAPClient::conNum;
Configure HAPClient::configure;

2
src/HAP.h
View File

@ -7,6 +7,7 @@
#include "HKDF.h"
#include "SRP.h"
#include "HomeSpan.h"
#include "Configure.h"
/////////////////////////////////////////////////
// NONCE Structure (HAP used last 64 of 96 bits)
@ -58,6 +59,7 @@ struct HAPClient {
static Accessory accessory; // Accessory ID and Ed25519 public and secret keys- permanently stored
static Controller controllers[MAX_CONTROLLERS]; // Paired Controller IDs and ED25519 long-term public keys - permanently stored
static int conNum; // connection number - used to keep track of per-connection EV notifications
static Configure configure; // initial configuration of WiFi credentials and Setup Code
// individual structures and data defined for each Hap Client connection