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

cleanup

Browse source
This commit is contained in:
nora 2024-08-10 01:59:59 +02:00
parent be5b437548
commit aa96faa697
1 changed files with 23 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

61
src/lib.rs
View file

@ -107,35 +107,26 @@ impl ServerConnection {
} }
impl ServerConnection { impl ServerConnection {
pub fn recv_bytes(&mut self, mut bytes: &[u8]) -> Result<()> { pub fn recv_bytes(&mut self, bytes: &[u8]) -> Result<()> {
while let Some(consumed) = self.recv_bytes_step(bytes)? { if let ServerState::ProtoExchange { received } = &mut self.state {
bytes = &bytes[consumed..]; received.extend_from_slice(bytes);
if bytes.is_empty() { if received.windows(2).find(|win| win == b"\r\n").is_some() {
break; // TODO: care that its SSH 2.0 instead of anythin anything else
// The client will not send any more information than this until we respond, so discord the rest of the bytes.
let client_identification = received.to_owned();
self.queue_msg(MsgKind::ServerProtocolInfo);
self.state = ServerState::KeyExchangeInit {
client_identification,
};
} }
} // This means that we must be called at least twice, which is fine I think.
Ok(()) return Ok(());
}
fn recv_bytes_step(&mut self, bytes: &[u8]) -> Result<Option<usize>> {
if !matches!(self.state, ServerState::ProtoExchange { .. }) {
self.packet_transport.recv_bytes(bytes);
} }
let result = match &mut self.state { self.packet_transport.recv_bytes(bytes)?;
ServerState::ProtoExchange { received } => {
// TODO: get rid of this allocation :( match &mut self.state {
received.extend_from_slice(bytes); ServerState::ProtoExchange { .. } => unreachable!("handled above"),
if received.windows(2).find(|win| win == b"\r\n").is_some() {
// TODO: care that its SSH 2.0 instead of anythin anything else
// The client will not send any more information than this until we respond, so discord the rest of the bytes.
let client_identification = received.to_owned();
self.queue_msg(MsgKind::ServerProtocolInfo);
self.state = ServerState::KeyExchangeInit {
client_identification,
};
}
None
}
ServerState::KeyExchangeInit { ServerState::KeyExchangeInit {
client_identification, client_identification,
} => match self.packet_transport.next_packet() { } => match self.packet_transport.next_packet() {
@ -219,10 +210,8 @@ impl ServerConnection {
client_kexinit: data.payload, client_kexinit: data.payload,
server_kexinit: server_kexinit_payload, server_kexinit: server_kexinit_payload,
}; };
None
} }
None => None, None => {},
}, },
ServerState::DhKeyInit { ServerState::DhKeyInit {
client_identification, client_identification,
@ -313,10 +302,8 @@ impl ServerConnection {
})); }));
self.state = ServerState::NewKeys; self.state = ServerState::NewKeys;
// TODO: set keys for transport // TODO: set keys for transport
None
} }
None => None, None => {},
}, },
ServerState::NewKeys => match self.packet_transport.next_packet() { ServerState::NewKeys => match self.packet_transport.next_packet() {
Some(data) => { Some(data) => {
@ -328,14 +315,12 @@ impl ServerConnection {
payload: vec![Packet::SSH_MSG_NEWKEYS], payload: vec![Packet::SSH_MSG_NEWKEYS],
})); }));
self.state = ServerState::ServiceRequest {}; self.state = ServerState::ServiceRequest {};
None
} }
None => None, None => {},
}, },
ServerState::ServiceRequest {} => None, ServerState::ServiceRequest {} => {},
}; }
Ok(result) Ok(())
} }
pub fn next_message_to_send(&mut self) -> Option<Msg> { pub fn next_message_to_send(&mut self) -> Option<Msg> {