Files
agessaman c1c55e4925 fix(provision): address field-test feedback on paste, fetch, and apply
- serial reader: fix buffer overflow crash on over-long lines (stomped NUL
  terminator + unbounded strlen); treat CR and LF both as line terminators
  so CRLF/LF pastes don't double-space or merge capture lines; report
  'command too long' instead of executing garbage; bump buffer to 256 so
  'provision fetch <long share url>' fits (PROVISION_MAX_LINE now 255)
- fetch: validate HTTPS against the embedded CA root bundle (pinned
  GTS/ISRG roots only as fallback) so DigiCert-chained hosts like Dropbox
  work; rewrite Dropbox share links to dl=1; hint at 'insecure' on TLS
  failures and at raw-file URLs on missing-header rejects
- wifi: 'set wifi.ssid/pwd' now starts or restarts the MQTT bridge so
  WiFi comes up immediately instead of on next reboot
- apply: summary names first failing line, serial console prints each
  failing line with its error, and manual apply reminds to reboot
- alert.hashtag: allow up to 31 chars (companion channel-name limit) via
  alert_hashtag_ext appended to MQTTPrefs; legacy field keeps truncated
  mirror for downgrade readback
- guard the ESP-only 'memory' CLI command so non-ESP targets compile
2026-07-11 22:55:38 -07:00

138 lines
3.4 KiB
C++

#include <Arduino.h> // needed for PlatformIO
#include <Mesh.h>
#include "MyMesh.h"
#ifdef DISPLAY_CLASS
#include "UITask.h"
static UITask ui_task(display);
#endif
StdRNG fast_rng;
SimpleMeshTables tables;
MyMesh the_mesh(board, radio_driver, *new ArduinoMillis(), fast_rng, rtc_clock, tables);
void halt() {
while (1) ;
}
// 256 bytes so a full 'provision fetch <long share url>' fits on one line.
static char command[256];
static bool command_too_long = false;
void setup() {
Serial.begin(115200);
delay(1000);
board.begin();
#ifdef DISPLAY_CLASS
if (display.begin()) {
display.startFrame();
display.setCursor(0, 0);
display.print("Please wait...");
display.endFrame();
}
#endif
if (!radio_init()) { halt(); }
fast_rng.begin(radio_driver.getRngSeed());
FILESYSTEM* fs;
#if defined(NRF52_PLATFORM)
InternalFS.begin();
fs = &InternalFS;
IdentityStore store(InternalFS, "");
#elif defined(RP2040_PLATFORM)
LittleFS.begin();
fs = &LittleFS;
IdentityStore store(LittleFS, "/identity");
store.begin();
#elif defined(ESP32)
SPIFFS.begin(true);
fs = &SPIFFS;
IdentityStore store(SPIFFS, "/identity");
#else
#error "need to define filesystem"
#endif
if (!store.load("_main", the_mesh.self_id)) {
the_mesh.self_id = radio_new_identity(); // create new random identity
int count = 0;
while (count < 10 && (the_mesh.self_id.pub_key[0] == 0x00 || the_mesh.self_id.pub_key[0] == 0xFF)) { // reserved id hashes
the_mesh.self_id = radio_new_identity(); count++;
}
store.save("_main", the_mesh.self_id);
}
Serial.print("Room ID: ");
mesh::Utils::printHex(Serial, the_mesh.self_id.pub_key, PUB_KEY_SIZE); Serial.println();
command[0] = 0;
sensors.begin();
the_mesh.begin(fs);
#ifdef DISPLAY_CLASS
ui_task.begin(the_mesh.getNodePrefs(), FIRMWARE_BUILD_DATE, FIRMWARE_VERSION);
#endif
// send out initial zero hop Advertisement to the mesh
#if ENABLE_ADVERT_ON_BOOT == 1
the_mesh.sendSelfAdvertisement(16000, false);
#endif
board.onBootComplete();
}
void loop() {
int len = strlen(command);
bool line_complete = false;
while (Serial.available()) {
char c = Serial.read();
if (c == '\r' || c == '\n') {
if (command_too_long) { // reached the end of an over-long line: report, don't execute
command_too_long = false;
Serial.println();
Serial.println(" -> Err - command too long");
len = 0;
command[0] = 0;
continue;
}
// Blank lines (and the LF of a CRLF pair, or doubled CRs some terminals
// send when pasting) are ignored rather than treated as empty commands —
// this keeps 'provision begin' paste capture from recording blank lines.
if (len == 0) continue;
line_complete = true;
break;
}
if (command_too_long) continue; // discard the rest of an over-long line
if (len < (int)sizeof(command) - 1) {
command[len++] = c;
command[len] = 0;
Serial.print(c);
} else {
command_too_long = true;
}
}
if (line_complete) { // received complete line
Serial.print('\n');
char reply[160];
the_mesh.handleCommand(0, command, reply); // NOTE: there is no sender_timestamp via serial!
if (reply[0]) {
Serial.print(" -> "); Serial.println(reply);
}
command[0] = 0; // reset command buffer
}
the_mesh.loop();
sensors.loop();
#ifdef DISPLAY_CLASS
ui_task.loop();
#endif
rtc_clock.tick();
}