jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-28 13:16:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added BASIC AUTH for mjpeg stream

Browse Source
This commit is contained in:
Nemobi 2022-05-24 21:06:41 +00:00
parent 8e4dcd7b62
commit 301540f3ac
1 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
tasmota/xdrv_81_esp32_webcam.ino
View File

@ -729,6 +729,34 @@ pcopy:
return _jpg_buf_len; return _jpg_buf_len;
} }
//////////////// Handle authentication /////////////////
bool WebcamAuthenticate(void)
{
if (strlen(SettingsText(SET_WEBPWD)) && (HTTP_MANAGER_RESET_ONLY != Web.state)) {
return Wc.CamServer->authenticate(WEB_USERNAME, SettingsText(SET_WEBPWD));
} else {
return true;
}
}
bool WebcamCheckPriviledgedAccess(bool autorequestauth = true)
{
if(Settings->webcam_config2.auth == 0){
return true;
}
if (autorequestauth && !WebcamAuthenticate()) {
Wc.CamServer->requestAuthentication();
return false;
}
return true;
}
///////////////////////////////////////////////////
void HandleImage(void) { void HandleImage(void) {
if (!HttpCheckPriviledgedAccess()) { return; } if (!HttpCheckPriviledgedAccess()) { return; }
@ -818,6 +846,10 @@ void HandleImageBasic(void) {
} }
void HandleWebcamMjpeg(void) { void HandleWebcamMjpeg(void) {
if(!WebcamCheckPriviledgedAccess()){
Wc.CamServer->send(403,"","");
return;
}
AddLog(LOG_LEVEL_DEBUG, PSTR("CAM: Handle camserver")); AddLog(LOG_LEVEL_DEBUG, PSTR("CAM: Handle camserver"));
// if (!Wc.stream_active) { // if (!Wc.stream_active) {
// always restart stream // always restart stream
@ -910,6 +942,10 @@ void HandleWebcamMjpegTask(void) {
} }
void HandleWebcamRoot(void) { void HandleWebcamRoot(void) {
if(!WebcamCheckPriviledgedAccess()){
Wc.CamServer->send(403,"","");
return;
}
//CamServer->redirect("http://" + String(ip) + ":81/cam.mjpeg"); //CamServer->redirect("http://" + String(ip) + ":81/cam.mjpeg");
Wc.CamServer->sendHeader("Location", "/cam.mjpeg"); Wc.CamServer->sendHeader("Location", "/cam.mjpeg");
Wc.CamServer->send(302, "", ""); Wc.CamServer->send(302, "", "");
@ -1341,7 +1377,6 @@ void CmndWebcamFeature(void) {
void CmndWebcamAuth(void){ void CmndWebcamAuth(void){
if((XdrvMailbox.payload >=0) && (XdrvMailbox.payload <= 1)){ if((XdrvMailbox.payload >=0) && (XdrvMailbox.payload <= 1)){
Settings->webcam_config2.auth = XdrvMailbox.payload; Settings->webcam_config2.auth = XdrvMailbox.payload;
WcSetOptions(24, Settings->webcam_config2.auth);
} }
ResponseCmndNumber(Settings->webcam_config2.auth); ResponseCmndNumber(Settings->webcam_config2.auth);
} }