chore(client): checkpoint deployed features and unfinished server management
User requested a checkpoint and stopped all agents. Deployed artifacts remain the last verified releases; unfinished settings/categories/forums are preserved as WIP. See TODO/roadmap for verification and remaining release/updater work.
This commit is contained in:
parent
15f03bf8df
commit
f04691c3cd
90 changed files with 9599 additions and 371 deletions
|
|
@ -8,8 +8,8 @@ use super::payloads::*;
|
|||
use super::trust::TransportError;
|
||||
use crate::identity::Identity;
|
||||
|
||||
const SERVER_HELLO_CONTEXT: &[u8] = b"VNOX-LNEx-v3-server-hello\0";
|
||||
const CLIENT_AUTH_CONTEXT: &[u8] = b"VNOX-LNEx-v3-client-auth\0";
|
||||
const SERVER_HELLO_CONTEXT: &[u8] = b"VNOX-LNEx-v4-server-hello\0";
|
||||
const CLIENT_AUTH_CONTEXT: &[u8] = b"VNOX-LNEx-v4-client-auth\0";
|
||||
|
||||
/// Bytes signed by the server identity: context, TLS exporter, HELLO without signature.
|
||||
pub fn server_hello_transcript(binding: &[u8], unsigned_hello: &[u8]) -> Vec<u8> {
|
||||
|
|
@ -40,6 +40,11 @@ pub struct Outcome {
|
|||
pub session_id: String,
|
||||
pub node_name: String,
|
||||
pub private_mode: bool,
|
||||
pub node_admin: bool,
|
||||
pub live_profiles: bool,
|
||||
pub node_settings: bool,
|
||||
pub channel_structure: bool,
|
||||
pub forums: bool,
|
||||
/// Lower-case hex Ed25519 identity of the server.
|
||||
pub server_identity: String,
|
||||
}
|
||||
|
|
@ -56,6 +61,27 @@ pub async fn run(
|
|||
binding: &[u8],
|
||||
trust_key: &str,
|
||||
expected_identity: Option<&str>,
|
||||
) -> Result<Outcome> {
|
||||
run_inner(
|
||||
stream,
|
||||
identity,
|
||||
seq,
|
||||
binding,
|
||||
trust_key,
|
||||
expected_identity,
|
||||
None,
|
||||
)
|
||||
.await
|
||||
}
|
||||
|
||||
async fn run_inner(
|
||||
stream: &mut (impl tokio::io::AsyncRead + tokio::io::AsyncWrite + Unpin),
|
||||
identity: &Identity,
|
||||
seq: &mut u32,
|
||||
binding: &[u8],
|
||||
trust_key: &str,
|
||||
expected_identity: Option<&str>,
|
||||
supplied_proof: Option<Vec<u8>>,
|
||||
) -> Result<Outcome> {
|
||||
// HELLO
|
||||
let pkt = framing::read(stream).await?;
|
||||
|
|
@ -117,11 +143,20 @@ pub async fn run(
|
|||
.ok_or_else(|| anyhow!("no signing key"))?;
|
||||
use ed25519_dalek::Signer;
|
||||
|
||||
let account_proof = match supplied_proof {
|
||||
Some(proof) => proof,
|
||||
None => crate::net::account::admission_proof(identity).await?,
|
||||
};
|
||||
anyhow::ensure!(
|
||||
!account_proof.is_empty(),
|
||||
"Central account sign-in required"
|
||||
);
|
||||
let mut auth = AuthPayload {
|
||||
client_pubkey: sk.verifying_key().to_bytes().to_vec(),
|
||||
nickname: identity.nickname.clone(),
|
||||
lnex_version: LNEX_VERSION.into(),
|
||||
signature: Vec::new(),
|
||||
account_proof,
|
||||
};
|
||||
let transcript = client_auth_transcript(binding, &signed_hello, &wire::encode(&auth)?);
|
||||
auth.signature = sk.sign(&transcript).to_bytes().to_vec();
|
||||
|
|
@ -154,6 +189,11 @@ pub async fn run(
|
|||
session_id: sess.session_id,
|
||||
node_name: hello.node_name,
|
||||
private_mode: hello.private_mode,
|
||||
node_admin: sess.node_admin,
|
||||
live_profiles: sess.live_profiles,
|
||||
node_settings: sess.node_settings,
|
||||
channel_structure: sess.channel_structure,
|
||||
forums: sess.forums,
|
||||
server_identity,
|
||||
})
|
||||
}
|
||||
|
|
@ -164,6 +204,26 @@ mod tests {
|
|||
use ed25519_dalek::{Signer, SigningKey};
|
||||
use tokio::io::AsyncWriteExt;
|
||||
|
||||
async fn run_for_test(
|
||||
stream: &mut (impl tokio::io::AsyncRead + tokio::io::AsyncWrite + Unpin),
|
||||
identity: &Identity,
|
||||
seq: &mut u32,
|
||||
binding: &[u8],
|
||||
trust_key: &str,
|
||||
expected_identity: Option<&str>,
|
||||
) -> Result<Outcome> {
|
||||
run_inner(
|
||||
stream,
|
||||
identity,
|
||||
seq,
|
||||
binding,
|
||||
trust_key,
|
||||
expected_identity,
|
||||
Some(b"test-account-proof".to_vec()),
|
||||
)
|
||||
.await
|
||||
}
|
||||
|
||||
/// Scripted gateway: sends a HELLO signed over `hello_binding` and returns the AUTH it gets.
|
||||
async fn fake_server(
|
||||
mut stream: tokio::io::DuplexStream,
|
||||
|
|
@ -199,6 +259,8 @@ mod tests {
|
|||
session_id: "session-1".into(),
|
||||
token: "token".into(),
|
||||
expires_at: 0,
|
||||
node_admin: false,
|
||||
live_profiles: false,
|
||||
};
|
||||
framing::write(
|
||||
&mut stream,
|
||||
|
|
@ -221,9 +283,9 @@ mod tests {
|
|||
async fn authenticated_handshake_returns_server_identity_and_binds_signature() {
|
||||
let server_key = SigningKey::generate(&mut rand::rng());
|
||||
let (mut client, server) = tokio::io::duplex(8192);
|
||||
let task = tokio::spawn(fake_server(server, server_key.clone(), [9; 32], "v3", true));
|
||||
let task = tokio::spawn(fake_server(server, server_key.clone(), [9; 32], "v4", true));
|
||||
let mut seq = 0;
|
||||
let outcome = run(&mut client, &identity(), &mut seq, &[9; 32], "h:7600", None)
|
||||
let outcome = run_for_test(&mut client, &identity(), &mut seq, &[9; 32], "h:7600", None)
|
||||
.await
|
||||
.unwrap();
|
||||
assert_eq!(outcome.session_id, "session-1");
|
||||
|
|
@ -233,6 +295,7 @@ mod tests {
|
|||
);
|
||||
// The AUTH signature is valid for this connection and invalid for any other one.
|
||||
let (auth, signed_hello) = task.await.unwrap();
|
||||
assert_eq!(auth.account_proof, b"test-account-proof");
|
||||
let client_public = ed25519_dalek::VerifyingKey::from_bytes(
|
||||
&auth.client_pubkey.clone().try_into().unwrap(),
|
||||
)
|
||||
|
|
@ -263,9 +326,9 @@ mod tests {
|
|||
let server_key = SigningKey::generate(&mut rand::rng());
|
||||
let (mut client, server) = tokio::io::duplex(8192);
|
||||
// The relay forwards a HELLO signed for a different TLS session.
|
||||
tokio::spawn(fake_server(server, server_key, [1; 32], "v3", false));
|
||||
tokio::spawn(fake_server(server, server_key, [1; 32], "v4", false));
|
||||
let mut seq = 0;
|
||||
let error = run(&mut client, &identity(), &mut seq, &[2; 32], "h:7600", None)
|
||||
let error = run_for_test(&mut client, &identity(), &mut seq, &[2; 32], "h:7600", None)
|
||||
.await
|
||||
.unwrap_err();
|
||||
assert!(error.to_string().contains("signature verification failed"));
|
||||
|
|
@ -276,9 +339,9 @@ mod tests {
|
|||
async fn changed_server_identity_is_blocked_before_auth() {
|
||||
let server_key = SigningKey::generate(&mut rand::rng());
|
||||
let (mut client, server) = tokio::io::duplex(8192);
|
||||
tokio::spawn(fake_server(server, server_key, [3; 32], "v3", false));
|
||||
tokio::spawn(fake_server(server, server_key, [3; 32], "v4", false));
|
||||
let mut seq = 0;
|
||||
let error = run(
|
||||
let error = run_for_test(
|
||||
&mut client,
|
||||
&identity(),
|
||||
&mut seq,
|
||||
|
|
@ -301,12 +364,59 @@ mod tests {
|
|||
let (mut client, server) = tokio::io::duplex(8192);
|
||||
tokio::spawn(fake_server(server, server_key, [4; 32], "v2", false));
|
||||
let mut seq = 0;
|
||||
let error = run(&mut client, &identity(), &mut seq, &[4; 32], "h:7600", None)
|
||||
let error = run_for_test(&mut client, &identity(), &mut seq, &[4; 32], "h:7600", None)
|
||||
.await
|
||||
.unwrap_err();
|
||||
assert!(matches!(
|
||||
error.downcast_ref::<TransportError>(),
|
||||
Some(TransportError::ProtocolMismatch(m)) if m.contains("v2") && m.contains("v3")
|
||||
Some(TransportError::ProtocolMismatch(m)) if m.contains("v2") && m.contains("v4")
|
||||
));
|
||||
}
|
||||
#[tokio::test]
|
||||
async fn empty_account_proof_is_rejected_before_auth() {
|
||||
let key = SigningKey::generate(&mut rand::rng());
|
||||
let (mut client, server) = tokio::io::duplex(8192);
|
||||
let task = tokio::spawn(fake_server(server, key, [9; 32], "v4", false));
|
||||
let mut seq = 0;
|
||||
let error = run_inner(
|
||||
&mut client,
|
||||
&identity(),
|
||||
&mut seq,
|
||||
&[9; 32],
|
||||
"h:7600",
|
||||
None,
|
||||
Some(Vec::new()),
|
||||
)
|
||||
.await
|
||||
.unwrap_err();
|
||||
assert!(
|
||||
error
|
||||
.to_string()
|
||||
.contains("Central account sign-in required")
|
||||
);
|
||||
assert_eq!(seq, 0);
|
||||
drop(client);
|
||||
task.await.unwrap();
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod capability_tests {
|
||||
use super::*;
|
||||
#[test]
|
||||
fn legacy_sessions_do_not_advertise_admin_and_new_flag_roundtrips() {
|
||||
let legacy: SessionPayload = wire::decode(&[10, 1, b's', 18, 1, b't']).unwrap();
|
||||
assert!(!legacy.node_admin);
|
||||
assert!(!legacy.live_profiles);
|
||||
let mut privileged = legacy;
|
||||
privileged.node_admin = true;
|
||||
privileged.live_profiles = true;
|
||||
let bytes = wire::encode(&privileged).unwrap();
|
||||
assert!(wire::decode::<SessionPayload>(&bytes).unwrap().node_admin);
|
||||
assert!(
|
||||
wire::decode::<SessionPayload>(&bytes)
|
||||
.unwrap()
|
||||
.live_profiles
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue