added functionality to deauth and close client using ctx (#206)

* added functioanlity to deauth and close client using ctx

Signed-off-by: sachinvmurthy <[email protected]>

* addressed comments for deauthenticate_and_close_client

Signed-off-by: sachinvmurthy <[email protected]>

* added abstraction for config get calls via context

Signed-off-by: sachinvmurthy <[email protected]>

* addressed comments

Signed-off-by: sachinvmurthy <[email protected]>

---------

Signed-off-by: sachinvmurthy <[email protected]>

Author: sachinvmurthy

examples/client.rs

@@ -79,6 +79,33 @@ fn get_client_ip(ctx: &Context, _args: Vec<ValkeyString>) -> ValkeyResult {
     Ok(ctx.get_client_ip()?.into())
 }
 
+fn deauth_client_by_id(ctx: &Context, args: Vec<ValkeyString>) -> ValkeyResult {
+    if args.len() != 2 {
+        return Err(ValkeyError::WrongArity);
+    }
+    let mut args = args.into_iter().skip(1);
+    let client_id_str: ValkeyString = args.next_arg()?;
+    let client_id: u64 = client_id_str.parse_integer()?.try_into().unwrap();
+    let resp = ctx.deauthenticate_and_close_client_by_id(client_id);
+    match resp {
+        Ok(msg) => Ok(ValkeyValue::from(msg)),
+        Err(err) => Err(err),
+    }
+}
+
+fn config_get(ctx: &Context, args: Vec<ValkeyString>) -> ValkeyResult {
+    if args.len() != 2 {
+        return Err(ValkeyError::WrongArity);
+    }
+    let mut args = args.into_iter().skip(1);
+    let config_name: ValkeyString = args.next_arg()?;
+    let config_value = ctx.config_get(config_name.to_string());
+    match config_value {
+        Ok(value) => Ok(ValkeyValue::from(value.to_string())),
+        Err(err) => Err(err),
+    }
+}
+
 valkey_module! {
     name: "client",
     version: 1,
@@ -92,5 +119,7 @@ valkey_module! {
         ["client.cert", get_client_cert, "", 0, 0, 0],
         ["client.info", get_client_info, "", 0, 0, 0],
         ["client.ip", get_client_ip, "", 0, 0, 0],
+        ["client.deauth", deauth_client_by_id, "", 0, 0, 0],
+        ["client.config_get", config_get, "", 0, 0, 0],
     ]
 }

src/context/client.rs

@@ -1,8 +1,9 @@
 use crate::{
-    Context, RedisModuleClientInfo, RedisModule_GetClientCertificate, RedisModule_GetClientId,
-    RedisModule_GetClientInfoById, RedisModule_GetClientNameById,
-    RedisModule_GetClientUserNameById, RedisModule_SetClientNameById, Status, ValkeyError,
-    ValkeyResult, ValkeyString,
+    Context, RedisModuleClientInfo, RedisModule_DeauthenticateAndCloseClient,
+    RedisModule_GetClientCertificate, RedisModule_GetClientId, RedisModule_GetClientInfoById,
+    RedisModule_GetClientNameById, RedisModule_GetClientUserNameById,
+    RedisModule_SetClientNameById, Status, ValkeyError, ValkeyResult, ValkeyString, ValkeyValue,
+    VALKEYMODULE_OK,
 };
 use std::ffi::CStr;
 use std::os::raw::c_void;
@@ -120,4 +121,27 @@ impl Context {
     pub fn get_client_ip(&self) -> ValkeyResult<String> {
         self.get_client_ip_by_id(self.get_client_id())
     }
+    pub fn deauthenticate_and_close_client_by_id(&self, client_id: u64) -> ValkeyResult<ValkeyString> {
+        match unsafe { RedisModule_DeauthenticateAndCloseClient.unwrap()(self.ctx, client_id) } {
+            result if result as isize == VALKEYMODULE_OK => Ok(ValkeyString::create(None, "OK")),
+            _ => Err(ValkeyError::Str(
+                "Failed to deauthenticate and close client",
+            )),
+        }
+    }
+
+    pub fn deauthenticate_and_close_client(&self) -> ValkeyResult<String> {
+        self.deauthenticate_and_close_client_by_id(self.get_client_id())
+            .map(|valkey_str| valkey_str.to_string())
+    }
+
+    pub fn config_get(&self, config: String) -> ValkeyResult<ValkeyString> {
+        match self.call("CONFIG", &["GET", &config])? {
+            ValkeyValue::Array(array) if array.len() == 2 => match &array[1] {
+                ValkeyValue::SimpleString(val) => Ok(ValkeyString::create(None, val.clone())),
+                _ => Err(ValkeyError::Str("Config value is not a string")),
+            },
+            _ => Err(ValkeyError::Str("Unexpected CONFIG GET response")),
+        }
+    }
 }

tests/integration.rs

@@ -1213,6 +1213,17 @@ fn test_client() -> Result<()> {
         .query(&mut con)
         .with_context(|| "failed execute client.ip")?;
     assert_eq!(resp, "127.0.0.1");
+    // Test client.deauth
+    let resp: String = redis::cmd("client.deauth")
+        .arg(0)
+        .query(&mut con)
+        .with_context(|| "failed execute client.deauth")?;
+    assert_eq!(resp, "Failed to deauthenticate and close client");
+    let resp: String = redis::cmd("client.config_get")
+        .arg("maxmemory-policy")
+        .query(&mut con)
+        .with_context(|| "failed execute client.config_get")?;
+    assert_eq!(resp, "noeviction");
     Ok(())
 }