authentication issue

vitotai · Feb 24, 2017 · 2941d37 · 2941d37
1 parent 3f39535
commit 2941d37
Show file tree

Hide file tree

Showing 118 changed files with 356 additions and 1 deletion.
diff --git a/BrewPiLess/Actuator.cpp b/BrewPiLess/Actuator.cpp
@@ -110,6 +110,9 @@
 
 
 
+
+
+
 
 
 

diff --git a/BrewPiLess/Actuator.h b/BrewPiLess/Actuator.h
@@ -157,6 +157,9 @@ class ValueActuator ACTUATOR_BASE_CLASS_DECL
 
 
 
+
+
+
 
 
 

diff --git a/BrewPiLess/ActuatorArduinoPin.cpp b/BrewPiLess/ActuatorArduinoPin.cpp
@@ -92,6 +92,9 @@
 
 
 
+
+
+
 
 
 

diff --git a/BrewPiLess/ActuatorArduinoPin.h b/BrewPiLess/ActuatorArduinoPin.h
@@ -142,6 +142,9 @@ class DigitalPinActuator ACTUATOR_BASE_CLASS_DECL
 
 
 
+
+
+
 
 
 

diff --git a/BrewPiLess/ActuatorAutoOff.h b/BrewPiLess/ActuatorAutoOff.h
@@ -144,6 +144,9 @@ class AutoOffActuator : public Actuator {
 
 
 
+
+
+
 
 
 

diff --git a/BrewPiLess/ArduinoEepromAccess.h b/BrewPiLess/ArduinoEepromAccess.h
@@ -138,6 +138,9 @@ class ArduinoEepromAccess
 
 
 
+
+
+
 
 
 

diff --git a/BrewPiLess/ArduinoFunctions.cpp b/BrewPiLess/ArduinoFunctions.cpp
@@ -162,6 +162,9 @@ extern "C"{
 
 
 
+
+
+
 
 
 

diff --git a/BrewPiLess/AsyncServerSideEvent.cpp b/BrewPiLess/AsyncServerSideEvent.cpp
@@ -364,6 +364,9 @@ size_t AsyncServerSideEventResponse::_ack(AsyncWebServerRequest *request, size_t
 
 
 
+
+
+
 
 
 

diff --git a/BrewPiLess/AsyncServerSideEvent.h b/BrewPiLess/AsyncServerSideEvent.h
@@ -201,6 +201,9 @@ class AsyncServerSideEventResponse: public AsyncWebServerResponse {
 
 
 
+
+
+
 
 
 

diff --git a/BrewPiLess/BrewKeeper.cpp b/BrewPiLess/BrewKeeper.cpp
@@ -361,6 +361,9 @@ void makeTime(time_t timeInput, struct tm &tm){
 
 
 
+
+
+
 
 
 

diff --git a/BrewPiLess/BrewKeeper.h b/BrewPiLess/BrewKeeper.h
@@ -133,6 +133,9 @@ class BrewKeeper
 
 
 
+
+
+
 
 
 

diff --git a/BrewPiLess/BrewLogger.h b/BrewPiLess/BrewLogger.h
@@ -798,6 +798,9 @@ extern BrewLogger brewLogger;
 
 
 
+
+
+
 
 
 

diff --git a/BrewPiLess/BrewPiLess.ino b/BrewPiLess/BrewPiLess.ino
@@ -116,7 +116,8 @@ R"END(
 #define DEFAULT_INDEX_FILE     "index.htm"
 
 const char *public_list[]={
-"/bwf.js"
+"/bwf.js",
+"/brewing.json"
 };
 
 const char *nocache_list[]={
@@ -300,6 +301,9 @@ public:
 	 		String data=request->getParam("data", true, false)->value();
 	 		//DBG_PRINTF("putline:%s\n",data.c_str());
 
+			if(data.startsWith("j") && !request->authenticate(username, password))
+		        return request->requestAuthentication();
+
 	 		brewPi.putLine(data.c_str());
 	 		request->send(200);
 	 	}else if(request->method() == HTTP_GET && request->url() == CONTROL_CC_PATH){
@@ -1128,6 +1132,9 @@ void loop(void){
 
 
 
+
+
+
 
 
 

diff --git a/BrewPiLess/BrewPiProxy.cpp b/BrewPiLess/BrewPiProxy.cpp
@@ -194,6 +194,9 @@ void BrewPiProxy::getAllStatus(uint8_t *pState,uint8_t *pMode,float *pBeerTemp,f
 
 
 
+
+
+
 
 
 

diff --git a/BrewPiLess/BrewPiProxy.h b/BrewPiLess/BrewPiProxy.h
@@ -130,6 +130,9 @@ class BrewPiProxy{
 
 
 
+
+
+
 
 
 

diff --git a/BrewPiLess/Brewpi.cpp b/BrewPiLess/Brewpi.cpp
@@ -240,6 +240,9 @@ void loop() {
 
 
 
+
+
+
 
 
 

diff --git a/BrewPiLess/Brewpi.h b/BrewPiLess/Brewpi.h
@@ -154,6 +154,9 @@ extern ValueActuator alarm;
 
 
 
+
+
+
 
 
 

diff --git a/BrewPiLess/BrewpiStrings.cpp b/BrewPiLess/BrewpiStrings.cpp
@@ -135,6 +135,9 @@ int8_t indexOf(const char* s, char c)
 
 
 
+
+
+
 
 
 

diff --git a/BrewPiLess/BrewpiStrings.h b/BrewPiLess/BrewpiStrings.h
@@ -133,6 +133,9 @@ int8_t indexOf(const char* s, char c);
 
 
 
+
+
+
 
 
 

diff --git a/BrewPiLess/Buzzer.cpp b/BrewPiLess/Buzzer.cpp
@@ -201,6 +201,9 @@ Buzzer buzzer;
 
 
 
+
+
+
 
 
 

diff --git a/BrewPiLess/Buzzer.h b/BrewPiLess/Buzzer.h
@@ -134,6 +134,9 @@ extern Buzzer buzzer;
 
 
 
+
+
+
 
 
 

diff --git a/BrewPiLess/Config.h b/BrewPiLess/Config.h
@@ -384,6 +384,9 @@
 
 
 
+
+
+
 
 
 

diff --git a/BrewPiLess/ConfigDefault.h b/BrewPiLess/ConfigDefault.h
@@ -291,6 +291,9 @@
 
 
 
+
+
+
 
 
 

diff --git a/BrewPiLess/DS2413.cpp b/BrewPiLess/DS2413.cpp
@@ -182,6 +182,9 @@ bool DS2413::accessWrite(uint8_t b, uint8_t maxTries)
 
 
 
+
+
+
 
 
 

diff --git a/BrewPiLess/DS2413.h b/BrewPiLess/DS2413.h
@@ -305,6 +305,9 @@ class DS2413
 
 
 
+
+
+
 
 
 

diff --git a/BrewPiLess/DallasTemperature.cpp b/BrewPiLess/DallasTemperature.cpp
@@ -972,6 +972,9 @@ void DallasTemperature::operator delete(void* p)
 
 
 
+
+
+
 
 
 

diff --git a/BrewPiLess/DallasTemperature.h b/BrewPiLess/DallasTemperature.h
@@ -474,6 +474,9 @@ class DallasTemperature
 
 
 
+
+
+
 
 
 

diff --git a/BrewPiLess/DataLogger.cpp b/BrewPiLess/DataLogger.cpp
@@ -444,6 +444,9 @@ void DataLogger::getSettings(AsyncWebServerRequest *request)
 
 
 
+
+
+
 
 
 

diff --git a/BrewPiLess/DataLogger.h b/BrewPiLess/DataLogger.h
@@ -132,6 +132,9 @@ class DataLogger
 
 
 
+
+
+
 
 
 

diff --git a/BrewPiLess/DeviceManager.cpp b/BrewPiLess/DeviceManager.cpp
@@ -1056,6 +1056,9 @@ DeviceManager deviceManager;
 
 
 
+
+
+
 
 
 

diff --git a/BrewPiLess/DeviceManager.h b/BrewPiLess/DeviceManager.h
@@ -373,6 +373,9 @@ extern DeviceManager deviceManager;
 
 
 
+
+
+
 
 
 

diff --git a/BrewPiLess/Display.cpp b/BrewPiLess/Display.cpp
@@ -117,6 +117,9 @@ Display::~Display() { }
 
 
 
+
+
+
 
 
 

diff --git a/BrewPiLess/Display.h b/BrewPiLess/Display.h
@@ -123,6 +123,9 @@ extern DisplayType DISPLAY_REF display;
 
 
 
+
+
+
 
 
 

diff --git a/BrewPiLess/DisplayBase.h b/BrewPiLess/DisplayBase.h
@@ -250,6 +250,9 @@ static const uint8_t LCD_FLAG_ALTERNATE_ROOM = 0x02;
 
 
 
+
+
+
 
 
 

diff --git a/BrewPiLess/DisplayLcd.cpp b/BrewPiLess/DisplayLcd.cpp
@@ -373,6 +373,9 @@ void LcdDisplay::printState(void){
 
 
 
+
+
+
 
 
 

diff --git a/BrewPiLess/DisplayLcd.h b/BrewPiLess/DisplayLcd.h
@@ -210,6 +210,9 @@ class LcdDisplay DISPLAY_SUPERCLASS
 
 
 
+
+
+
 
 
 

diff --git a/BrewPiLess/ESP8266mDNS.cpp b/BrewPiLess/ESP8266mDNS.cpp
@@ -1148,6 +1148,9 @@ MDNSResponder MDNS = MDNSResponder();
 
 
 
+
+
+
 
 
 

diff --git a/BrewPiLess/ESP8266mDNS.h b/BrewPiLess/ESP8266mDNS.h
@@ -224,6 +224,9 @@ extern MDNSResponder MDNS;
 
 
 
+
+
+
Original file line number	Diff line number	Diff line change
Expand Up		@@ -157,6 +157,9 @@ class ValueActuator ACTUATOR_BASE_CLASS_DECL









Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -142,6 +142,9 @@ class DigitalPinActuator ACTUATOR_BASE_CLASS_DECL









Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -144,6 +144,9 @@ class AutoOffActuator : public Actuator {









Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -138,6 +138,9 @@ class ArduinoEepromAccess









Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -364,6 +364,9 @@ size_t AsyncServerSideEventResponse::_ack(AsyncWebServerRequest *request, size_t









Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -201,6 +201,9 @@ class AsyncServerSideEventResponse: public AsyncWebServerResponse {









Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -361,6 +361,9 @@ void makeTime(time_t timeInput, struct tm &tm){









Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -798,6 +798,9 @@ extern BrewLogger brewLogger;









Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -194,6 +194,9 @@ void BrewPiProxy::getAllStatus(uint8_t pState,uint8_t pMode,float *pBeerTemp,f









Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -154,6 +154,9 @@ extern ValueActuator alarm;









Expand Down