NVS

Store passwords in nvs

Author: rjsachse

README.md

@@ -3,6 +3,7 @@
 
 Application for ESP32 / ESP32S3 with OV2640 / OV5640 camera to record JPEGs to SD card as AVI files and playback to browser as an MJPEG stream. The AVI format allows recordings to replay at correct frame rate on media players. If a microphone is installed then a WAV file is also created and stored in the AVI file.  
 The application supports:
+* [RTSP Server](#rtsp) stream Video, Audio and Subtitles
 * [Motion detection by camera](#motion-detection-by-camera) or PIR / radar sensor
 * Time lapse recording
 * [Audio Recording](#audio-recording) from I2S or PDM microphones
@@ -29,7 +30,7 @@ To suggest an improvement or enhancement use Discussions.***
 
 Changes up to version 10.5.4:
 * Stream to [NVR](#stream-to-nvr) using integration to RTSPServer library contributed by [@rjsachse](https://github.com/rjsachse). 
-* RTSP server now has multiple client support as well as user/pass authentication
+* RTSP server now has multiple client support as well as user/pass authentication.
 * Frame resolution selection mismatch corrected due to [#10801](https://github.com/espressif/arduino-esp32/issues/10801) in arduino core v3.1.0
 * SD card 4 bit mode configurable (see `utilsFS.cpp`)
 * Shared I2C fixed following code changes in Arduino core v3.1.1
@@ -454,7 +455,7 @@ Streaming performance depends on quality of network connection, but can be incre
 
 #### RTSP
 
-This requires an additional library to be installed - see [RTSPServer](https://github.com/rjsachse/ESP32-RTSPServer) library for details. Must be version 1.3.0 or above
+This requires an additional library to be installed - see [RTSPServer](https://github.com/rjsachse/ESP32-RTSPServer) library for details. Must be version 1.3.1 or above
 
 To integrate library with this app, set `#define INCLUDE_RTSP` to `true`.
 

appGlobals.h

@@ -491,8 +491,8 @@ extern uint16_t rtpSubtitlesPort;
 extern char RTP_ip[];
 extern uint8_t rtspMaxClients;
 extern uint8_t rtpTTL;
-extern char rtspUser[];
-extern char rtspPassword[];
+extern char RTSP_Name[];
+extern char RTSP_Pass[];
 
 // task handling
 extern TaskHandle_t battHandle;

appSpecific.cpp

@@ -228,23 +228,6 @@ bool updateAppStatus(const char* variable, const char* value, bool fromUser) {
   else if (!strcmp(variable, "uartTxdPin")) uartTxdPin = intVal;
   else if (!strcmp(variable, "uartRxdPin")) uartRxdPin = intVal;
 #endif
-
-#if INCLUDE_RTSP
- 
-  else if (!strcmp(variable, "rtsp00User")) strncpy(rtspUser, value, MAX_IP_LEN-1);
-  else if (!strcmp(variable, "rtsp01Pass")) strncpy(rtspPassword, value, MAX_IP_LEN-1);
-  else if (!strcmp(variable, "rtsp02Video")) rtspVideo = streamVid = (bool)intVal;
-  else if (!strcmp(variable, "rtsp03Audio")) rtspAudio = streamAud = (bool)intVal;
-  else if (!strcmp(variable, "rtsp04Subtitles")) rtspSubtitles = streamSrt = (bool)intVal;
-  else if (!strcmp(variable, "rtsp05Port")) rtspPort = intVal;
-  else if (!strcmp(variable, "rtsp06VideoPort")) rtpVideoPort = intVal;
-  else if (!strcmp(variable, "rtsp07AudioPort")) rtpAudioPort = intVal;
-  else if (!strcmp(variable, "rtsp08SubtitlesPort")) rtpSubtitlesPort = intVal;
-  else if (!strcmp(variable, "rtsp09Ip")) strncpy(RTP_ip, value, MAX_IP_LEN-1);
-  else if (!strcmp(variable, "rtsp10MaxC")) rtspMaxClients = intVal;
-  else if (!strcmp(variable, "rtsp11TTL")) rtpTTL = intVal;
-#endif
-
 #ifndef AUXILIARY
   // camera settings
   else if (!strcmp(variable, "xclkMhz")) xclkMhz = intVal;
@@ -995,16 +978,16 @@ relayMode~0~3~S:Manual:Night~How relay activated
 relaySwitch~0~3~C~Switch relay off / on
 I2Csda~-1~3~N~I2C SDA pin if unshared
 I2Cscl~-1~3~N~I2C SCL pin if unshared
-rtsp00User~~8~T~RTSP Auth Username
-rtsp01Pass~~8~T~RTSP Auth Password
-rtsp02Video~1~8~C~Enable RTSP Video
-rtsp03Audio~0~8~C~Enable RTSP Audio
-rtsp04Subtitles~1~8~C~Enable RTSP Subtitles
-rtsp05Port~554~8~N~RTSP ServerPort
-rtsp06VideoPort~5430~8~N~RTSP Video Port
-rtsp07AudioPort~5432~8~N~RTSP Audio Port
-rtsp08SubtitlesPort~5434~8~N~RTSP Subtitles Port
-rtsp09Ip~239.255.0.1~8~T~RTSP Multicast IP
-rtsp10MaxC~3~8~N~RTSP Multicast Max Connections
-rtsp11TTL~1~8~N~RTSP Multicast Time-to-Live
+RTSP_Name~~8~T~RTSP Auth Username
+RTSP_Pass~~8~T~RTSP Auth Password
+rtsp00Video~1~8~C~Enable RTSP Video
+rtsp01Audio~0~8~C~Enable RTSP Audio
+rtsp02Subtitles~1~8~C~Enable RTSP Subtitles
+rtsp03Port~554~8~N~RTSP ServerPort
+rtsp04VideoPort~5430~8~N~RTSP Video Port
+rtsp05AudioPort~5432~8~N~RTSP Audio Port
+rtsp06SubtitlesPort~5434~8~N~RTSP Subtitles Port
+rtsp07Ip~239.255.0.1~8~T~RTSP Multicast IP
+rtsp08MaxC~3~8~N~RTSP Multicast Max Connections
+rtsp09TTL~1~8~N~RTSP Multicast Time-to-Live
 )~";

prefs.cpp

@@ -191,6 +191,9 @@ static bool savePrefs(bool retain = true) {
 #endif
 #if INCLUDE_MQTT
   prefs.putString("mqtt_user_Pass", mqtt_user_Pass);
+#endif
+#if INCLUDE_RTSP
+  prefs.putString("RTSP_Pass", RTSP_Pass);
 #endif
   prefs.end();
   LOG_INF("Saved preferences");
@@ -221,6 +224,9 @@ static bool loadPrefs() {
 #endif
 #if INCLUDE_MQTT
   prefs.getString("mqtt_user_Pass", mqtt_user_Pass, MAX_PWD_LEN);
+#endif
+#if INCLUDE_RTSP
+  prefs.getString("RTSP_Pass", RTSP_Pass, MAX_PWD_LEN);
 #endif
   prefs.end();
   return true;
@@ -314,7 +320,20 @@ void updateStatus(const char* variable, const char* _value, bool fromUser) {
   else if (!strcmp(variable, "mqtt_user_Pass") && value[0] != '*') strncpy(mqtt_user_Pass, value, MAX_PWD_LEN-1);
   else if (!strcmp(variable, "mqtt_topic_prefix")) strncpy(mqtt_topic_prefix, value, (FILE_NAME_LEN/2)-1);
 #endif
-
+#if INCLUDE_RTSP
+  else if (!strcmp(variable, "RTSP_Name")) strncpy(RTSP_Name, value, MAX_HOST_LEN-1);
+  else if (!strcmp(variable, "RTSP_Pass")  && value[0] != '*')strncpy(RTSP_Pass, value, MAX_PWD_LEN-1);
+  else if (!strcmp(variable, "rtsp00Video")) rtspVideo = streamVid = (bool)intVal;
+  else if (!strcmp(variable, "rtsp01Audio")) rtspAudio = streamAud = (bool)intVal;
+  else if (!strcmp(variable, "rtsp02Subtitles")) rtspSubtitles = streamSrt = (bool)intVal;
+  else if (!strcmp(variable, "rtsp03Port")) rtspPort = intVal;
+  else if (!strcmp(variable, "rtsp04VideoPort")) rtpVideoPort = intVal;
+  else if (!strcmp(variable, "rtsp05AudioPort")) rtpAudioPort = intVal;
+  else if (!strcmp(variable, "rtsp06SubtitlesPort")) rtpSubtitlesPort = intVal;
+  else if (!strcmp(variable, "rtsp07Ip")) strncpy(RTP_ip, value, MAX_IP_LEN-1);
+  else if (!strcmp(variable, "rtsp08MaxC")) rtspMaxClients = intVal;
+  else if (!strcmp(variable, "rtsp09TTL")) rtpTTL = intVal;
+#endif
   // Other settings
   else if (!strcmp(variable, "clockUTC")) syncToBrowser((uint32_t)intVal);      
   else if (!strcmp(variable, "timezone")) strncpy(timezone, value, FILE_NAME_LEN-1);
@@ -410,6 +429,9 @@ void buildJsonString(uint8_t filter) {
 #endif
 #if INCLUDE_MQTT
       p += sprintf(p, "\"mqtt_user_Pass\":\"%.*s\",", strlen(mqtt_user_Pass), FILLSTAR);
+#endif
+#if INCLUDE_RTSP
+      p += sprintf(p, "\"RTSP_Pass\":\"%.*s\",", strlen(RTSP_Pass), FILLSTAR);
 #endif
     }
   } else {

rtsp.cpp

@@ -41,8 +41,9 @@ uint16_t rtpSubtitlesPort;
 char RTP_ip[MAX_IP_LEN];
 uint8_t rtspMaxClients;
 uint8_t rtpTTL;
-char rtspUser[MAX_IP_LEN] = "";
-char rtspPassword[MAX_IP_LEN] = "";
+char RTSP_Name[MAX_HOST_LEN-1] = "";
+char RTSP_Pass[MAX_PWD_LEN-1] = "";
+bool useAuth;
 
 IPAddress rtpIp;
 char transportStr[30];  // Adjust the size as needed
@@ -129,7 +130,7 @@ static void startRTSPSubtitles(void* arg) {
 }
 
 void prepRTSP() {
-  rtspServer.setCredentials(rtspUser, rtspPassword); // Set RTSP authentication
+  useAuth = rtspServer.setCredentials(RTSP_Name, RTSP_Pass); // Set RTSP authentication
   RTSPServer::TransportType transport = determineTransportType();
   rtpIp.fromString(RTP_ip);
   rtspServer.transport = transport;
@@ -147,7 +148,7 @@ void prepRTSP() {
   if (transport != RTSPServer::NONE) {
     if (rtspServer.init()) { 
       LOG_INF("RTSP server started successfully with transport%s", transportStr);
-      strlen(rtspUser) ? 
+      useAuth ? 
           LOG_INF("Connect to: rtsp://<username>:<password>@%s:%d (credentials not shown for security reasons)", WiFi.localIP().toString().c_str(), rtspServer.rtspPort) :
           LOG_INF("Connect to: rtsp://%s:%d", WiFi.localIP().toString().c_str(), rtspServer.rtspPort);