Add SSH config storage support by brainstorm · Pull Request #44 · brainstorm/ssh-stamp

brainstorm · 2025-06-01T06:14:41Z

Will eventually fix #23 #20 #21, WIP.

Also involves changes upstream sunset dependency, commits happening on mkj/sunset#35.

…om sunset for ssh-stamp...

…/proc_macros...

mkj · 2025-06-17T11:29:42Z

I've pushed a sunset change that I think should fix that problem. mkj/sunset@1dcf2ec

Previously sshwire-derive assumed crate::sshwire would work, so needed use sunset::sshwire in the crate top lib.rs .
Now it should work fine as long as sunset is a dependency in Cargo.toml.

brainstorm · 2025-06-18T01:40:52Z

I've pushed a sunset change that I think should fix that problem. mkj/sunset@1dcf2ec

Previously sshwire-derive assumed crate::sshwire would work, so needed use sunset::sshwire in the crate top lib.rs . Now it should work fine as long as sunset is a dependency in Cargo.toml.

Thank you! Works a treat! ;)

…assumptions around mutexes and rename Fl/FlashCo fig struct names

…onfigure the UART's pins at runtime (possible?) and also pass the config object around (safely/mutex-ing) too

…t a CriticalSectionRawMutex for the SSHConfig. Next up: figure out non-unsafe() ways to steal() pins for the UART pins

…channel, needs more work/thought... also PeripheralRef is not present in 1.0.0-beta.1

Co-authored-by: Marko Malenic <mmalenic1@gmail.com>

@jubeormk1

… call is now required. The partition checking/handling functionalities might be relevant to @jubeormk1 too, btw

…with the UART operation, need to debug further

…X/TX/CTS/RTS... etc.. pin assignment and at-runtime validation et al Co-authored-by: Marko Malenic <mmalenic1@gmail.com>

…h into fix_passwd_auth

@mmalenic

…erialization/deserialization "on the wire" of SSHConfig, unfortunately /cc @mmalenic

Introduced custom Errors Introduced env vars and started refactoring accordingly. Config and peripherals are borrow checker challenges. Co-authored-by: Marko Malenic <mmalenic1@gmail.com>

src/main.rs

…nfig no longer needs a new() method but OTOH resolve_pin() requires a bit more rework (or remove it altogether?)

Co-authored-by: Marko Malenic <mmalenic1@gmail.com>

… PinConfig::new()... Also channel cannot send at the end of uart_task() because there's an infinite loop right before. Co-authored-by: Marko Malenic <mmalenic1@gmail.com>

@jubeormk1

…nfig persistence, added a couple of OTA partitions to help out @jubeormk1. Narrowed down flash write errors (erase works now) to sector size alignment issues /cc @mmalenic. [ci skip]

… nor flash writing offsets issue... hash payload on flash is 2 bytes off still and yields 'bad config hash' [ci skip]

Co-authored-by: Marko Malenic <mmalenic1@gmail.com>

…sh_read-ing config. Add IPV6-specific address to SSHStampConfig (renamed from SSHConfig since potentially we'll have to DIY-decode ourselves due to the extra fields we'll change/introduce) [ci skip]

…e SSHStampConfig members [ci skip]

…ect still though... I (334) boot: Disabling RNG early entropy source... Existing config bad, making new. Wrong config version [src/storage.rs:96] "New config being serialised: " = "New config being serialised: " [src/storage.rs:96] &c = SSHStampConfig { hostkey: SignKey::Ed25519, password_authentication: true, admin_pw: None, admin_keys: [ None, None, None, ], wifi_ssid: "ssh-stamp", wifi_pw: None, mac: [ 218, 85, 73, 185, 109, 144, ], ipv4_static: None, uart_pins: SerdePinConfig { tx: 10, rx: 11, rts: None, cts: None, }, } Flash size = 8388608 bytes NVS partition size = 8192 NVS partition offset = 0x9000 [src/storage.rs:150] CONFIG_OFFSET + FlashConfig::BUF_SIZE = 40996 [src/storage.rs:152] "Erasing flash" = "Erasing flash" flash save done Checking if link is up...

… now throws RanOut on wifi_ssid dec(s)?: config.rs:462-463 Co-authored-by: Julio Beltran Ortega <jubeormk1@gmail.com>

…rgets after almost a year... will it work?

…immaturity, increasing verbosity of hash-related bytes to determine bad hash errors... most probably related to read-ssh/write-ssh enc/dec SSHEncode/SSHDecode machinery

…env packets, we must not re-generate hostkey on each boot

…th tx/rx flipped... 🤦 Co-authored-by: Julio Beltran Ortega <jubeormk1@users.noreply.github.com>

…ations

…op, when receiving appropriate env vars (to be validated on device).

…arning: broken build, a few errors left for correction

This reverts commit 0f760f9.

@jubeormk1

…g with @jubeormk1 OTA PR/branch for updated esp_hal 1.0.0

…gs for now, wip

brainstorm and others added 5 commits June 1, 2025 16:12

Add SSH config storage support

4e769ad

Update references to sunset config system(s)

c01b70d

[ci skip] Continue adapting config/storage/flashstorage interfaces fr…

dd07731

…om sunset for ssh-stamp...

[ci skip] Stubborn 'unresolved import' for SSHEncode/SSHDecode traits…

359dede

…/proc_macros...

[ci skip] Same SSHDecode/SSHEncode 'unresolved import' issue /cc @mkj

717bed1

[ci skip] Apply @mkj's fix for sshwire derive, compiles now, thx :D

97f5338

brainstorm and others added 18 commits June 21, 2025 11:47

[ci skip] Init config/storage from main, will most probably refactor …

d46b3d5

…assumptions around mutexes and rename Fl/FlashCo fig struct names

[ci skip] Pass config through tasks

6bf0573

Merge branch 'main' into fix_passwd_auth

96c910a

[ci skip] AnyPin::steal is unsafe(), need to find a way to safely rec…

8077954

…onfigure the UART's pins at runtime (possible?) and also pass the config object around (safely/mutex-ing) too

[ci skip] Switch to multi-thread (feature flag) in sunset-async to ge…

c981001

…t a CriticalSectionRawMutex for the SSHConfig. Next up: figure out non-unsafe() ways to steal() pins for the UART pins

[ci skip] Experiment with suggestions given on esp-rs/esp-hal matrix …

e8b7cbe

…channel, needs more work/thought... also PeripheralRef is not present in 1.0.0-beta.1

[ci skip] This should be simpler, too much mutex/static cell/etc...

7f98af9

Use SunsetMutex() for the UART reconfiguration scheme.

30e2fe7

Co-authored-by: Marko Malenic <mmalenic1@gmail.com>

Change default SSID string (instead of using server id string)

d416aea

When updating espflash to 4.x, esp_bootloader_esp_idf::esp_app_desc()…

517eed8

… call is now required. The partition checking/handling functionalities might be relevant to @jubeormk1 too, btw

Disable custom partitions for now and SunsetMutex seems to interfere …

ff30894

…with the UART operation, need to debug further

Merge branch 'main' into fix_passwd_auth

90b4321

Fix mutex issues with uart_task and draft PinConfig struct/impl for R…

0d6ee1a

…X/TX/CTS/RTS... etc.. pin assignment and at-runtime validation et al Co-authored-by: Marko Malenic <mmalenic1@gmail.com>

Merge branch 'fix_passwd_auth' of github.com:brainstorm/esp_hosted_ss…

0419520

…h into fix_passwd_auth

Complex types such as Mutex<CriticalSectionRawMutex> complicate the s…

a0bebbd

…erialization/deserialization "on the wire" of SSHConfig, unfortunately /cc @mmalenic

Cargo.lock

24c009e

[ci skip] Working through PinConfig types issues, small cleanup

7f9f399

Serializable type on Pinconfig.

6be7ce2

Introduced custom Errors Introduced env vars and started refactoring accordingly. Config and peripherals are borrow checker challenges. Co-authored-by: Marko Malenic <mmalenic1@gmail.com>

mkj reviewed Jul 26, 2025

View reviewed changes

src/main.rs Outdated Show resolved Hide resolved

brainstorm and others added 3 commits July 28, 2025 20:43

[ci skip] Testing/refactoring idea proposed in #44 (comment)... PinCo…

6630c64

…nfig no longer needs a new() method but OTOH resolve_pin() requires a bit more rework (or remove it altogether?)

[ci skip] Big mess, ignore macro-heavy experiment :-S

c35a3c6

Co-authored-by: Marko Malenic <mmalenic1@gmail.com>

Adding channels and realising that unsafe is almost surely needed for…

becd503

… PinConfig::new()... Also channel cannot send at the end of uart_task() because there's an infinite loop right before. Co-authored-by: Marko Malenic <mmalenic1@gmail.com>

brainstorm and others added 30 commits September 9, 2025 21:54

Available gpios, not just gpios

d4f84cc

Event itself should trigger env/config/serialization

c19423a

Re-enabled partitions.csv since it's needed for NVS/SSHConfig/FlashCo…

bbcc09e

…nfig persistence, added a couple of OTA partitions to help out @jubeormk1. Narrowed down flash write errors (erase works now) to sector size alignment issues /cc @mmalenic. [ci skip]

Separate sunset and ssh-stamp errors, add ipv6 stub to determine some…

53f1923

… nor flash writing offsets issue... hash payload on flash is 2 bytes off still and yields 'bad config hash' [ci skip]

Merge channel_pins_nicer branch to fix_passwd_auth

3dbcf3b

Co-authored-by: Marko Malenic <mmalenic1@gmail.com>

Config hash still on ~2 bytes offset, now getting PacketWrong while s…

d461377

…sh_read-ing config. Add IPV6-specific address to SSHStampConfig (renamed from SSHConfig since potentially we'll have to DIY-decode ourselves due to the extra fields we'll change/introduce) [ci skip]

Feature-gate ipv6 for now, it was meant as an experiment to add/remov…

d9ccdd3

…e SSHStampConfig members [ci skip]

[ci skip] Back to shifted hash config error

fa70369

[ci skip] Fixed SSHEncode/Decode for SSHStampConfig, unfortunately it…

9a331fe

… now throws RanOut on wifi_ssid dec(s)?: config.rs:462-463 Co-authored-by: Julio Beltran Ortega <jubeormk1@gmail.com>

[ci skip] Try to experiment with probe-rs debugging support on ESP ta…

e2ee151

…rgets after almost a year... will it work?

Experiments with vscode/probe-rs debugging failed due to dev tooling …

df554ee

…immaturity, increasing verbosity of hash-related bytes to determine bad hash errors... most probably related to read-ssh/write-ssh enc/dec SSHEncode/SSHDecode machinery

Only one admin key, do not use option_env because we'll be using ssh …

7cf834a

…env packets, we must not re-generate hostkey on each boot

Turns out that calc_hash was failing because we had SerdePinConfig wi…

821126b

…th tx/rx flipped... 🤦 Co-authored-by: Julio Beltran Ortega <jubeormk1@users.noreply.github.com>

Thorough dbg cleanup...

7a6eb55

Refactor to accomodate SessionType and share channels between types.

aba0244

cargo fmt

e79b485

Separate 'regular' SSHConfig from Pins-related configuration and oper…

70177c2

…ations

Comment out SessionType(s) not needed for now

e741242

Fix up PinChannel logic so that pins are updated on the connection_lo…

8a8fe3d

…op, when receiving appropriate env vars (to be validated on device).

[ci skip] Bumping up esp-hal and many of the accompanying crates... w…

7028d0e

…arning: broken build, a few errors left for correction

Bump up edge-nal-embassy

4945450

[ci skip] Migrate from esp-wifi to esp-radio

178535a

Attempt at bumping edge-*, embassy-*, etc... locally

0f760f9

Revert "Attempt at bumping edge-*, embassy-*, etc... locally"

2b6d0dc

This reverts commit 0f760f9.

Walking back on heapless/embedded-async-io newer versions and sync-in…

39bb9df

…g with @jubeormk1 OTA PR/branch for updated esp_hal 1.0.0

[ci skip] Keep migrating to jubeormk1's workspace rework

13a24bd

[ci skip] Cargo.lock on separate commit to keep noise apart

31a6d69

Finished branch restoration, compiles

6d0488b

Eliminating pins.rs and re-doing uart pins as simple static u8 settin…

cf61e0a

…gs for now, wip

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add SSH config storage support#44

Add SSH config storage support#44
brainstorm wants to merge 63 commits intomainfrom
fix_passwd_auth

brainstorm commented Jun 1, 2025 •

edited

Loading

Uh oh!

mkj commented Jun 17, 2025

Uh oh!

brainstorm commented Jun 18, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

brainstorm commented Jun 1, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

mkj commented Jun 17, 2025

Uh oh!

brainstorm commented Jun 18, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

brainstorm commented Jun 1, 2025 •

edited

Loading