Fix authentication for callback web handlers

me-no-dev · web-flow · commit 241aca38a0ab · 2020-11-05T20:54:31.000+02:00
diff --git a/src/WebHandlerImpl.h b/src/WebHandlerImpl.h
@@ -119,16 +119,22 @@ class AsyncCallbackWebHandler: public AsyncWebHandler {
     }
   
     virtual void handleRequest(AsyncWebServerRequest *request) override final {
+      if((_username != "" && _password != "") && !request->authenticate(_username.c_str(), _password.c_str()))
+        return request->requestAuthentication();
       if(_onRequest)
         _onRequest(request);
       else
         request->send(500);
     }
     virtual void handleUpload(AsyncWebServerRequest *request, const String& filename, size_t index, uint8_t *data, size_t len, bool final) override final {
+      if((_username != "" && _password != "") && !request->authenticate(_username.c_str(), _password.c_str()))
+        return request->requestAuthentication();
       if(_onUpload)
         _onUpload(request, filename, index, data, len, final);
     }
     virtual void handleBody(AsyncWebServerRequest *request, uint8_t *data, size_t len, size_t index, size_t total) override final {
+      if((_username != "" && _password != "") && !request->authenticate(_username.c_str(), _password.c_str()))
+        return request->requestAuthentication();
       if(_onBody)
         _onBody(request, data, len, index, total);
     }

Original file line number	Diff line number	Diff line change
`@@ -119,16 +119,22 @@ class AsyncCallbackWebHandler: public AsyncWebHandler {`
`119`	`119`	`}`
`120`	`120`
`121`	`121`	`virtual void handleRequest(AsyncWebServerRequest *request) override final {`
	`122`	`+ if((_username != "" && _password != "") && !request->authenticate(_username.c_str(), _password.c_str()))`
	`123`	`+ return request->requestAuthentication();`
`122`	`124`	`if(_onRequest)`
`123`	`125`	`_onRequest(request);`
`124`	`126`	`else`
`125`	`127`	`request->send(500);`
`126`	`128`	`}`
`127`	`129`	`virtual void handleUpload(AsyncWebServerRequest request, const String& filename, size_t index, uint8_t data, size_t len, bool final) override final {`
	`130`	`+ if((_username != "" && _password != "") && !request->authenticate(_username.c_str(), _password.c_str()))`
	`131`	`+ return request->requestAuthentication();`
`128`	`132`	`if(_onUpload)`
`129`	`133`	`_onUpload(request, filename, index, data, len, final);`
`130`	`134`	`}`
`131`	`135`	`virtual void handleBody(AsyncWebServerRequest request, uint8_t data, size_t len, size_t index, size_t total) override final {`
	`136`	`+ if((_username != "" && _password != "") && !request->authenticate(_username.c_str(), _password.c_str()))`
	`137`	`+ return request->requestAuthentication();`
`132`	`138`	`if(_onBody)`
`133`	`139`	`_onBody(request, data, len, index, total);`
`134`	`140`	`}`