Move handle_incorrect_comp_id to inbound module

Author: davidsteiner

crates/hotfix/src/session.rs

@@ -32,7 +32,7 @@ use crate::message::reject::Reject;
 use crate::message::resend_request::ResendRequest;
 use crate::message::sequence_reset::SequenceReset;
 use crate::message::test_request::TestRequest;
-use crate::message::verification_error::{CompIdType, MessageVerificationError};
+use crate::message::verification_error::MessageVerificationError;
 use crate::session::admin_request::AdminRequest;
 use crate::session::ctx::{SessionCtx, TransitionResult};
 use crate::session::error::SessionCreationError;
@@ -605,9 +605,9 @@ where
             }
             MessageVerificationError::IncorrectBeginString(begin_string) => {
                 if let Some(writer) = self.state.get_writer() {
-                    let result = inbound::handle_incorrect_begin_string(
-                        &mut self.ctx, writer, begin_string,
-                    ).await;
+                    let result =
+                        inbound::handle_incorrect_begin_string(&mut self.ctx, writer, begin_string)
+                            .await;
                     self.apply_transition(result);
                 }
             }
@@ -616,8 +616,17 @@ where
                 comp_id_type,
                 msg_seq_num,
             } => {
-                self.handle_incorrect_comp_id(comp_id, comp_id_type, msg_seq_num)
+                if let Some(writer) = self.state.get_writer() {
+                    let result = inbound::handle_incorrect_comp_id(
+                        &mut self.ctx,
+                        writer,
+                        comp_id,
+                        comp_id_type,
+                        msg_seq_num,
+                    )
                     .await;
+                    self.apply_transition(result);
+                }
             }
             MessageVerificationError::SendingTimeAccuracyIssue { msg_seq_num } => {
                 if let Some(writer) = self.state.get_writer() {
@@ -669,28 +678,6 @@ where
         Ok(())
     }
 
-
-    async fn handle_incorrect_comp_id(
-        &mut self,
-        received_comp_id: String,
-        comp_id_type: CompIdType,
-        msg_seq_num: u64,
-    ) {
-        error!(
-            "rejecting message with incorrect comp ID: {received_comp_id} (type: {comp_id_type:?})"
-        );
-        let reject = Reject::new(msg_seq_num)
-            .session_reject_reason(SessionRejectReason::ValueIsIncorrect)
-            .text(&format!("invalid comp ID {received_comp_id}"));
-        if let Err(err) = self.send_message(reject).await {
-            error!("failed to send reject message with invalid comp ID: {err}");
-        };
-
-        self.state
-            .logout_and_terminate(&mut self.ctx, "incorrect comp ID received")
-            .await;
-    }
-
     async fn handle_sequence_number_too_low(
         &mut self,
         expected: u64,

crates/hotfix/src/session/inbound.rs

@@ -1,17 +1,17 @@
 use crate::message::logout::Logout;
 use crate::message::reject::Reject;
 use crate::message::verification::verify_message;
-use crate::message::verification_error::MessageVerificationError;
+use crate::message::verification_error::{CompIdType, MessageVerificationError};
 use crate::session::ctx::{SessionCtx, TransitionResult};
 use crate::session::outbound;
 use crate::session::state::SessionState;
 use crate::transport::writer::WriterRef;
-use tracing::warn;
 use hotfix_message::Part;
 use hotfix_message::message::Message;
 use hotfix_message::session_fields::{MSG_SEQ_NUM, SessionRejectReason};
 use hotfix_store::MessageStore;
 use tracing::error;
+use tracing::warn;
 
 pub(crate) fn verify_message_with_ctx<A, S: MessageStore>(
     ctx: &SessionCtx<A, S>,
@@ -63,7 +63,33 @@ pub(crate) async fn handle_incorrect_begin_string<A, S: MessageStore>(
         Err(err) => warn!("failed to send logout for incorrect begin string: {err}"),
     }
     writer.disconnect().await;
-    TransitionResult::TransitionTo(SessionState::new_disconnected(true, "incorrect begin string"))
+    TransitionResult::TransitionTo(SessionState::new_disconnected(
+        true,
+        "incorrect begin string",
+    ))
+}
+
+pub(crate) async fn handle_incorrect_comp_id<A, S: MessageStore>(
+    ctx: &mut SessionCtx<A, S>,
+    writer: &WriterRef,
+    received_comp_id: String,
+    comp_id_type: CompIdType,
+    msg_seq_num: u64,
+) -> TransitionResult {
+    error!("rejecting message with incorrect comp ID: {received_comp_id} (type: {comp_id_type:?})");
+    let reject = Reject::new(msg_seq_num)
+        .session_reject_reason(SessionRejectReason::ValueIsIncorrect)
+        .text(&format!("invalid comp ID {received_comp_id}"));
+    if let Err(err) = outbound::send_message(ctx, writer, reject).await {
+        error!("failed to send reject message with invalid comp ID: {err}");
+    }
+    let logout = Logout::with_reason("incorrect comp ID received".to_string());
+    match ctx.prepare_message(logout).await {
+        Ok(prepared) => writer.send_raw_message(prepared.raw).await,
+        Err(err) => warn!("failed to send logout for incorrect comp ID: {err}"),
+    }
+    writer.disconnect().await;
+    TransitionResult::TransitionTo(SessionState::new_disconnected(true, "incorrect comp ID"))
 }
 
 pub(crate) async fn handle_invalid_msg_type<A, S: MessageStore>(