Allow the passage of a server certificate when downloading from URL

Author: aentinger

main/CommandHandler.cpp

@@ -1317,7 +1317,7 @@ int downloadFile(const uint8_t command[], uint8_t response[]) {
   memcpy(&filename[strlen("/fs/")], &command[5 + command[3]], command[4 + command[3]]);
 
   FILE* f = fopen(filename, "w");
-  downloadAndSaveFile(url, filename, f);
+  downloadAndSaveFile(url, f, 0);
   fclose(f);
 
   return 0;
@@ -1418,7 +1418,7 @@ int downloadOTA(const uint8_t command[], uint8_t response[])
     response[4] = ERR_OPEN;
     goto ota_cleanup;
   }
-  downloadAndSaveFile(url, 0, f);
+  downloadAndSaveFile(url, f, 0);
 
   /* Determine size of downloaded file. */
   ota_size = ftell(f) - sizeof(ota_header.buf);

main/CommandHandler.h

@@ -45,6 +45,6 @@ class CommandHandlerClass {
 
 extern CommandHandlerClass CommandHandler;
 
-extern "C" int downloadAndSaveFile(char* url, char* filename, FILE* f);
+extern "C" int downloadAndSaveFile(char * url, FILE * f, const char * cert_pem);
 
 #endif

main/http_client.c

@@ -8,46 +8,28 @@
 
 #define MAX_HTTP_RECV_BUFFER 	128
 
-static const char* TAG = "HTTP_HANDLER";
+static const char* TAG = "HTTP_CLIENT";
 
-static esp_err_t _http_event_handler(esp_http_client_event_t *evt)
+int downloadAndSaveFile(char * url, FILE * f, const char * cert_pem)
 {
-    switch(evt->event_id) {
-		case HTTP_EVENT_ERROR:
-        case HTTP_EVENT_ON_CONNECTED:
-        case HTTP_EVENT_HEADER_SENT:
-        case HTTP_EVENT_ON_FINISH:
-        case HTTP_EVENT_DISCONNECTED:
-        case HTTP_EVENT_ON_HEADER:
-            break;
-        case HTTP_EVENT_ON_DATA:
-            if (!esp_http_client_is_chunked_response(evt->client)) {
-                //fwrite((char*)evt->data, sizeof(uint8_t), evt->data_len, (FILE*)evt->user_data);
-            }
-            break;
-    }
-    return ESP_OK;
-}
-
-int downloadAndSaveFile(char* url, char* filename, FILE* f) {
-
   char *buffer = (char*)malloc(MAX_HTTP_RECV_BUFFER);
   if (buffer == NULL) {
     return -1;
   }
   esp_http_client_config_t config = {
     .url = url,
-    .event_handler = _http_event_handler,
-    .user_data = f,
+    .cert_pem = cert_pem,
+    .timeout_ms = 20000,
   };
 
   esp_http_client_handle_t client = esp_http_client_init(&config);
   esp_err_t err;
   if ((err = esp_http_client_open(client, 0)) != ESP_OK) {
+    ESP_LOGE(TAG, "esp_http_client_open failed: %d", err);
     free(buffer);
     return -1;
   }
-  int content_length =  esp_http_client_fetch_headers(client);
+  int content_length = esp_http_client_fetch_headers(client);
   int total_read_len = 0, read_len;
   while (total_read_len < content_length) {
     read_len = esp_http_client_read(client, buffer, MAX_HTTP_RECV_BUFFER);
@@ -56,7 +38,9 @@ int downloadAndSaveFile(char* url, char* filename, FILE* f) {
       break;
     }
     total_read_len += read_len;
+    ESP_LOGV(TAG, "esp_http_client_read data received: %d, total %d", read_len, total_read_len);
   }
+  ESP_LOGV(TAG, "connection closed, cleaning up, total %d bytes received", total_read_len);
   esp_http_client_close(client);
   esp_http_client_cleanup(client);
   free(buffer);