tfaour
683e3881b1
The frame-claiming pipeline, end to end. Firmware: every request now carries ?id=<12-hex STA MAC> via build_url (mirrored in build_ota_url), and the captive portal's success page became a redirect that hands the user's browser to <server>/claim?device_id=... after ~7s -- enough time for the phone to drop the provisioning AP while the device reboots. The server pushes a per-frame device token through /frame/config during a one-time handshake; the firmware persists it to NVS (a dedicated single-key write that deliberately doesn't reset the connected-once flag or WiFi cache) and prefers it over the provisioned shared token from the next request on. Config response buffer grows 256->512. Both board variants compile clean; new firmware also works against an old server (which ignores ?id=) and old firmware against this server (the phase A legacy mapping), so either deploy order survives. Server: /claim lands the captive-portal redirect -- claim-gated signup (a valid unclaimed/unregistered device id IS the enrollment invitation), pending claims for the user-beats-the-frame race (auto-attached at self-registration, 24h expiry), and a waiting page that refreshes until the frame checks in. Unclaimed/unconfigured frames get a rendered instruction placeholder with a QR from /frame/image (200, never an error loop) -- new qrcode dep, placeholder shares the exact quantize/pack path photos use. The on-frame manage QR now resolves to a limited no-login page: scans of / carrying device credentials (new ?id&token or the legacy shared token) 303 to /m/<manage_token>, which allows exactly view queue, show-next, advance, back, and scoped thumbnails -- no settings, no removal, no other frames. Full control means logging in. One real protocol hole found by simulating full wake cycles: after self-registration the device could never authenticate again (the wake cycle fetches the image BEFORE /frame/config delivers its token). require_device now treats the id itself as the credential until the first authenticated request flips device_token_ack -- the same trust level as open registration, closing permanently once the handshake completes.
83 lines
2.8 KiB
C
83 lines
2.8 KiB
C
#include <string.h>
|
|
|
|
#include "esp_app_desc.h"
|
|
#include "esp_crt_bundle.h"
|
|
#include "esp_http_client.h"
|
|
#include "esp_https_ota.h"
|
|
#include "esp_log.h"
|
|
#include "esp_system.h"
|
|
|
|
#include "ota_update.h"
|
|
|
|
static const char *TAG = "ota_update";
|
|
|
|
/* Generous: the image is ~1.2MB and may stream over a WAN reverse
|
|
* proxy; esp_https_ota resets this per-read, so it's an inactivity
|
|
* timeout, not a total-transfer cap. */
|
|
#define OTA_HTTP_TIMEOUT_MS 30000
|
|
|
|
/* Built the same way as every other tools-server URL -- scheme/cert/
|
|
* id/token handling all come from build_url()'s conventions. Duplicated
|
|
* tiny helper rather than exporting frame_client.c's static build_url();
|
|
* kept byte-identical in behavior (see frame_client.c). */
|
|
static void build_ota_url(char *out, size_t out_size, const frame_config_t *cfg)
|
|
{
|
|
const char *toolsserver = cfg->toolsserver;
|
|
size_t len;
|
|
if (strncmp(toolsserver, "http://", 7) == 0 || strncmp(toolsserver, "https://", 8) == 0) {
|
|
len = (size_t)snprintf(out, out_size, "%s/frame/firmware", toolsserver);
|
|
} else {
|
|
len = (size_t)snprintf(out, out_size, "http://%s/frame/firmware", toolsserver);
|
|
}
|
|
|
|
char device_id[FRAME_DEVICE_ID_LEN + 1];
|
|
frame_device_id_get(device_id, sizeof(device_id));
|
|
if (len < out_size) {
|
|
len += (size_t)snprintf(out + len, out_size - len, "?id=%s", device_id);
|
|
}
|
|
|
|
const char *token = cfg->device_token[0] != '\0' ? cfg->device_token : cfg->access_token;
|
|
if (token[0] != '\0' && len < out_size) {
|
|
snprintf(out + len, out_size - len, "&token=%s", token);
|
|
}
|
|
}
|
|
|
|
void ota_update_if_available(const frame_config_t *cfg, const char *server_version)
|
|
{
|
|
if (server_version == NULL || server_version[0] == '\0') {
|
|
return; /* server has no uploaded firmware */
|
|
}
|
|
|
|
const char *running = esp_app_get_description()->version;
|
|
if (strcmp(server_version, running) == 0) {
|
|
return; /* already running what the server has */
|
|
}
|
|
|
|
ESP_LOGI(TAG, "Firmware update available: running '%s', server has '%s' -- starting OTA", running,
|
|
server_version);
|
|
|
|
char url[256];
|
|
build_ota_url(url, sizeof(url), cfg);
|
|
|
|
esp_http_client_config_t http_config = {
|
|
.url = url,
|
|
.timeout_ms = OTA_HTTP_TIMEOUT_MS,
|
|
.crt_bundle_attach = esp_crt_bundle_attach,
|
|
.keep_alive_enable = true,
|
|
};
|
|
esp_https_ota_config_t ota_config = {
|
|
.http_config = &http_config,
|
|
};
|
|
|
|
esp_err_t err = esp_https_ota(&ota_config);
|
|
if (err != ESP_OK) {
|
|
/* Not fatal -- the photo already displayed this cycle; we just
|
|
* try again on a future wake. */
|
|
ESP_LOGW(TAG, "OTA failed (%s), will retry on a later wake", esp_err_to_name(err));
|
|
return;
|
|
}
|
|
|
|
ESP_LOGI(TAG, "OTA complete, restarting into '%s'", server_version);
|
|
esp_restart();
|
|
}
|