Noratrieb/cluelessh
1
0
Fork 0
mirror of https://github.com/Noratrieb/cluelessh.git synced 2026-01-14 16:35:06 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

prepare for encrypt

Browse source
This commit is contained in:
nora 2024-08-11 00:18:22 +02:00
parent ed30d5b4dc
commit caf989de97
2 changed files with 20 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

22
ssh-transport/src/lib.rs
View file

@ -10,7 +10,7 @@ use packet::{
DhKeyExchangeInitPacket, DhKeyExchangeInitReplyPacket, KeyExchangeInitPacket, Packet, DhKeyExchangeInitPacket, DhKeyExchangeInitReplyPacket, KeyExchangeInitPacket, Packet,
PacketTransport, SshPublicKey, SshSignature, PacketTransport, SshPublicKey, SshSignature,
}; };
use parse::{MpInt, NameList, Parser}; use parse::{MpInt, NameList, Parser, Writer};
use rand::RngCore; use rand::RngCore;
use sha2::Digest; use sha2::Digest;
use tracing::{debug, info}; use tracing::{debug, info};
@ -61,7 +61,9 @@ enum ServerState {
h: [u8; 32], h: [u8; 32],
k: [u8; 32], k: [u8; 32],
}, },
ServiceRequest {}, ServiceRequest,
// At this point we transfer to <https://datatracker.ietf.org/doc/html/rfc4252>
UserAuthRequest,
} }
pub trait SshRng { pub trait SshRng {
@ -305,7 +307,7 @@ impl ServerConnection {
self.state = ServerState::ServiceRequest {}; self.state = ServerState::ServiceRequest {};
self.packet_transport.set_key(h, k); self.packet_transport.set_key(h, k);
} }
ServerState::ServiceRequest {} => { ServerState::ServiceRequest => {
if packet.payload.get(0) != Some(&Packet::SSH_MSG_SERVICE_REQUEST) { if packet.payload.get(0) != Some(&Packet::SSH_MSG_SERVICE_REQUEST) {
return Err(client_error!("did not send SSH_MSG_SERVICE_REQUEST")); return Err(client_error!("did not send SSH_MSG_SERVICE_REQUEST"));
} }
@ -316,6 +318,20 @@ impl ServerConnection {
if service != "ssh-userauth" { if service != "ssh-userauth" {
return Err(client_error!("only supports ssh-userauth")); return Err(client_error!("only supports ssh-userauth"));
} }
// TODO: encrypt this!
self.queue_msg(MsgKind::Packet(Packet {
payload: {
let mut writer = Writer::new();
writer.u8(Packet::SSH_MSG_SERVICE_ACCEPT);
writer.string(service.as_bytes());
writer.finish()
},
}));
self.state = ServerState::UserAuthRequest;
}
ServerState::UserAuthRequest => {
todo!()
} }
} }
} }

1
ssh-transport/src/packet.rs
View file

@ -64,6 +64,7 @@ pub(crate) struct Packet {
} }
impl Packet { impl Packet {
pub(crate) const SSH_MSG_SERVICE_REQUEST: u8 = 5; pub(crate) const SSH_MSG_SERVICE_REQUEST: u8 = 5;
pub(crate) const SSH_MSG_SERVICE_ACCEPT: u8 = 6;
pub(crate) const SSH_MSG_KEXINIT: u8 = 20; pub(crate) const SSH_MSG_KEXINIT: u8 = 20;
pub(crate) const SSH_MSG_NEWKEYS: u8 = 21; pub(crate) const SSH_MSG_NEWKEYS: u8 = 21;
pub(crate) const SSH_MSG_KEXDH_INIT: u8 = 30; pub(crate) const SSH_MSG_KEXDH_INIT: u8 = 30;