f_errors: CqlAuthChallengeParseError

scylladb · Aug 22, 2024 · 6fcbe9a · 6fcbe9a
1 parent f1c92cc
commit 6fcbe9a
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/scylla-cql/src/frame/frame_errors.rs b/scylla-cql/src/frame/frame_errors.rs
@@ -35,6 +35,8 @@ pub enum FrameError {
 
 #[derive(Error, Debug)]
 pub enum ParseError {
+    #[error(transparent)]
+    CqlAuthChallengeParseError(#[from] CqlAuthChallengeParseError),
     #[error(transparent)]
     CqlAuthSuccessParseError(#[from] CqlAuthSuccessParseError),
     #[error(transparent)]
@@ -63,6 +65,14 @@ pub enum ParseError {
     CqlTypeError(#[from] CqlTypeError),
 }
 
+/// An error type returned when deserialization of AUTH_CHALLENGE response fails.
+#[non_exhaustive]
+#[derive(Error, Debug)]
+pub enum CqlAuthChallengeParseError {
+    #[error("Malformed authenticate message: {0}")]
+    AuthMessageParseError(LowLevelDeserializationError),
+}
+
 /// An error type returned when deserialization of AUTH_SUCCESS response fails.
 #[non_exhaustive]
 #[derive(Error, Debug)]

diff --git a/scylla-cql/src/frame/response/authenticate.rs b/scylla-cql/src/frame/response/authenticate.rs
@@ -1,4 +1,6 @@
-use crate::frame::frame_errors::{CqlAuthSuccessParseError, CqlAuthenticateParseError, ParseError};
+use crate::frame::frame_errors::{
+    CqlAuthChallengeParseError, CqlAuthSuccessParseError, CqlAuthenticateParseError,
+};
 use crate::frame::types;
 
 // Implements Authenticate message.
@@ -38,8 +40,10 @@ pub struct AuthChallenge {
 }
 
 impl AuthChallenge {
-    pub fn deserialize(buf: &mut &[u8]) -> Result<Self, ParseError> {
-        let authenticate_message = types::read_bytes_opt(buf)?.map(|b| b.to_owned());
+    pub fn deserialize(buf: &mut &[u8]) -> Result<Self, CqlAuthChallengeParseError> {
+        let authenticate_message = types::read_bytes_opt(buf)
+            .map_err(CqlAuthChallengeParseError::AuthMessageParseError)?
+            .map(|b| b.to_owned());
 
         Ok(AuthChallenge {
             authenticate_message,