aiden
/
suricata
mirror of https://github.com/OISF/suricata
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ssh: minor cleanups in incomplete handling

Browse Source
pull/5000/head
Victor Julien 6 years ago
parent 3a2434ed4d
commit 9fd326b6c0
1 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File

24
rust/src/ssh/ssh.rs
Unescape Escape View File

@ -224,16 +224,12 @@ impl SSHState {
if hdr.flags == SSHConnectionState::SshStateBannerWaitEol { if hdr.flags == SSHConnectionState::SshStateBannerWaitEol {
match parser::ssh_parse_line(input) { match parser::ssh_parse_line(input) {
Ok((rem, _)) => { Ok((rem, _)) => {
let r = self.parse_record(rem, resp, pstate); let mut r = self.parse_record(rem, resp, pstate);
if r.status == 1 { if r.is_incomplete() {
//adds bytes consumed by banner to incomplete result //adds bytes consumed by banner to incomplete result
return AppLayerResult::incomplete( r.consumed += (input.len() - rem.len()) as u32;
r.consumed + (input.len() - rem.len()) as u32,
r.needed,
);
} else {
return r;
} }
return r;
} }
Err(nom::Err::Incomplete(_)) => { Err(nom::Err::Incomplete(_)) => {
return AppLayerResult::incomplete(0 as u32, (input.len() + 1) as u32); return AppLayerResult::incomplete(0 as u32, (input.len() + 1) as u32);
@ -266,16 +262,12 @@ impl SSHState {
); );
self.set_event(SSHEvent::LongBanner); self.set_event(SSHEvent::LongBanner);
} }
let r = self.parse_record(rem, resp, pstate); let mut r = self.parse_record(rem, resp, pstate);
if r.status == 1 { if r.is_incomplete() {
//adds bytes consumed by banner to incomplete result //adds bytes consumed by banner to incomplete result
return AppLayerResult::incomplete( r.consumed += (input.len() - rem.len()) as u32;
r.consumed + (input.len() - rem.len()) as u32,
r.needed,
);
} else {
return r;
} }
return r;
} }
Err(nom::Err::Incomplete(_)) => { Err(nom::Err::Incomplete(_)) => {
if input.len() < SSH_MAX_BANNER_LEN { if input.len() < SSH_MAX_BANNER_LEN {

Write Preview
Loading…
Cancel
Save