Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

pgsql: track 'progress' in tx per direction - v0 #11540

Closed
wants to merge 2 commits into from
Closed

pgsql: track 'progress' in tx per direction - v0 #11540

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c88bf75
pgsql: track transaction progress per direction
jufajardini Jul 16, 2024
7f03644
pgsql: trigger raw stream reassembly at tx completion
jufajardini Jul 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 48 additions & 22 deletions rust/src/pgsql/pgsql.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ static mut PGSQL_MAX_TX: usize = 1024;
pub enum PgsqlTransactionState {
Init = 0,
RequestReceived,
RequestDone,
ResponseReceived,
ResponseDone,
FlushedOut,
}
Expand Down Expand Up @@ -97,28 +99,30 @@ impl PgsqlTransaction {
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
pub enum PgsqlStateProgress {
IdleState,
// Related to Frontend-received messages //
SSLRequestReceived,
SSLRejectedReceived,
StartupMessageReceived,
SASLAuthenticationReceived,
SASLInitialResponseReceived,
// SSPIAuthenticationReceived, // TODO implement
SASLResponseReceived,
PasswordMessageReceived,
SimpleQueryReceived,
CancelRequestReceived,
ConnectionTerminated,
// Related to Backend-received messages //
SSLRejectedReceived,
// SSPIAuthenticationReceived, // TODO implement
SASLAuthenticationReceived,
SASLAuthenticationContinueReceived,
SASLAuthenticationFinalReceived,
SimpleAuthenticationReceived,
PasswordMessageReceived,
AuthenticationOkReceived,
ParameterSetup,
BackendKeyReceived,
ReadyForQueryReceived,
SimpleQueryReceived,
RowDescriptionReceived,
DataRowReceived,
CommandCompletedReceived,
ErrorMessageReceived,
CancelRequestReceived,
ConnectionTerminated,
#[cfg(test)]
UnknownState,
Finished,
Expand Down Expand Up @@ -244,16 +248,29 @@ impl PgsqlState {
///
/// As Pgsql transactions are bidirectional and may be comprised of several
/// responses, we must track State progress to decide on tx completion
fn is_tx_completed(&self) -> bool {
if let PgsqlStateProgress::ReadyForQueryReceived
| PgsqlStateProgress::SSLRejectedReceived
| PgsqlStateProgress::SimpleAuthenticationReceived
| PgsqlStateProgress::SASLAuthenticationReceived
| PgsqlStateProgress::SASLAuthenticationContinueReceived
| PgsqlStateProgress::SASLAuthenticationFinalReceived
| PgsqlStateProgress::ConnectionTerminated
| PgsqlStateProgress::Finished = self.state_progress
fn is_tx_completed(&self, direction: Direction) -> bool {
if direction == Direction::ToClient
{
if let PgsqlStateProgress::ReadyForQueryReceived
| PgsqlStateProgress::SSLRejectedReceived
| PgsqlStateProgress::SimpleAuthenticationReceived
| PgsqlStateProgress::SASLAuthenticationReceived
| PgsqlStateProgress::SASLAuthenticationContinueReceived
| PgsqlStateProgress::SASLAuthenticationFinalReceived
| PgsqlStateProgress::Finished = self.state_progress
{
true
} else {
false
}
} else if let PgsqlStateProgress::SSLRequestReceived
| PgsqlStateProgress::StartupMessageReceived
| PgsqlStateProgress::SimpleQueryReceived
| PgsqlStateProgress::PasswordMessageReceived
| PgsqlStateProgress::SASLInitialResponseReceived
| PgsqlStateProgress::SASLResponseReceived
| PgsqlStateProgress::CancelRequestReceived
| PgsqlStateProgress::ConnectionTerminated = self.state_progress {
true
} else {
false
Expand Down Expand Up @@ -341,16 +358,22 @@ impl PgsqlState {
);
match PgsqlState::state_based_req_parsing(self.state_progress, start) {
Ok((rem, request)) => {
sc_app_layer_parser_trigger_raw_stream_reassembly(flow, Direction::ToServer as i32);
start = rem;
let mut temp_state = PgsqlStateProgress::IdleState;
if let Some(state) = PgsqlState::request_next_state(&request) {
self.state_progress = state;
temp_state = state;
};
let tx_completed = self.is_tx_completed();
let tx_completed = self.is_tx_completed(Direction::ToServer);
if let Some(tx) = self.find_or_create_tx() {
tx.request = Some(request);
if tx_completed {
tx.tx_state = PgsqlTransactionState::ResponseDone;
if temp_state == PgsqlStateProgress::ConnectionTerminated || temp_state == PgsqlStateProgress::CancelRequestReceived {
tx.tx_state = PgsqlTransactionState::ResponseDone;
} else {
tx.tx_state = PgsqlTransactionState::RequestDone;
}
sc_app_layer_parser_trigger_raw_stream_reassembly(flow, Direction::ToServer as i32);
}
} else {
// If there isn't a new transaction, we'll consider Suri should move on
Expand Down Expand Up @@ -471,15 +494,17 @@ impl PgsqlState {
while !start.is_empty() {
match PgsqlState::state_based_resp_parsing(self.state_progress, start) {
Ok((rem, response)) => {
sc_app_layer_parser_trigger_raw_stream_reassembly(flow, Direction::ToClient as i32);
start = rem;
SCLogDebug!("Response is {:?}", &response);
if let Some(state) = self.response_process_next_state(&response, flow) {
self.state_progress = state;
};
let tx_completed = self.is_tx_completed();
let tx_completed = self.is_tx_completed(Direction::ToClient);
let curr_state = self.state_progress;
if let Some(tx) = self.find_or_create_tx() {
if tx.tx_state == PgsqlTransactionState::Init {
tx.tx_state = PgsqlTransactionState::ResponseReceived;
}
if curr_state == PgsqlStateProgress::DataRowReceived {
tx.incr_row_cnt();
} else if curr_state == PgsqlStateProgress::CommandCompletedReceived
Expand All @@ -498,6 +523,7 @@ impl PgsqlState {
tx.responses.push(response);
if tx_completed {
tx.tx_state = PgsqlTransactionState::ResponseDone;
sc_app_layer_parser_trigger_raw_stream_reassembly(flow, Direction::ToClient as i32);
}
}
} else {
Expand Down Expand Up @@ -746,7 +772,7 @@ pub unsafe extern "C" fn rs_pgsql_register_parser() {
parse_tc: rs_pgsql_parse_response,
get_tx_count: rs_pgsql_state_get_tx_count,
get_tx: rs_pgsql_state_get_tx,
tx_comp_st_ts: PgsqlTransactionState::RequestReceived as i32,
tx_comp_st_ts: PgsqlTransactionState::RequestDone as i32,
tx_comp_st_tc: PgsqlTransactionState::ResponseDone as i32,
tx_get_progress: rs_pgsql_tx_get_alstate_progress,
get_eventinfo: None,
Expand Down
Loading