fix: validate log level before setting logger configuration

Author: ganeshnj

datadog-log-ffi/src/lib.rs

@@ -5,18 +5,34 @@ use datadog_log::logger;
 use datadog_log::logger::{logger_configure, logger_set_log_level};
 use ddcommon_ffi::{CharSlice, Error};
 
+/// Validates that the log level is within the valid range (0 to 4).
+fn validate_log_level(level: logger::LogEventLevel) -> Result<(), Error> {
+    let level_value = level as i8;
+    if level_value >= 0 && level_value <= logger::LogEventLevel::Error as i8 {
+        Ok(())
+    } else {
+        Err(Error::from(format!(
+            "Invalid log level: {} (must be between 0 and 4)",
+            level_value
+        )))
+    }
+}
+
 /// Sets the global log level.
 ///
 /// # Arguments
 /// * `log_level` - The minimum level for events to be logged
 ///
 /// # Errors
-/// Returns an error if the log level cannot be set.
+/// Returns an error if the log level cannot be set or if the level is invalid.
 #[no_mangle]
 pub extern "C" fn ddog_logger_set_log_level(
     log_level: logger::LogEventLevel,
 ) -> Option<Box<Error>> {
-    logger_set_log_level(log_level).err().map(Box::new)
+    validate_log_level(log_level)
+        .and_then(|_| logger_set_log_level(log_level))
+        .err()
+        .map(Box::new)
 }
 
 /// Disables logging by configuring a no-op logger.
@@ -45,14 +61,19 @@ pub struct StdoutConfig {
 /// * `config` - Configuration for stdout logging including log level
 ///
 /// # Errors
-/// Returns an error if the logger cannot be configured.
+/// Returns an error if the logger cannot be configured or if the log level is invalid.
 #[no_mangle]
 pub extern "C" fn ddog_logger_configure_stdout(config: StdoutConfig) -> Option<Box<Error>> {
-    let logger_config = logger::LoggerConfig {
-        level: config.level,
-        writer: logger::WriterConfig::Stdout,
-    };
-    logger_configure(logger_config).err().map(Box::new)
+    validate_log_level(config.level)
+        .and_then(|_| {
+            let logger_config = logger::LoggerConfig {
+                level: config.level,
+                writer: logger::WriterConfig::Stdout,
+            };
+            logger_configure(logger_config)
+        })
+        .err()
+        .map(Box::new)
 }
 
 /// Configuration for file output.
@@ -70,14 +91,19 @@ pub struct FileConfig<'a> {
 /// * `config` - Configuration for file logging including path and log level
 ///
 /// # Errors
-/// Returns an error if the logger cannot be configured.
+/// Returns an error if the logger cannot be configured or if the log level is invalid.
 #[no_mangle]
 pub extern "C" fn ddog_logger_configure_file(config: FileConfig) -> Option<Box<Error>> {
-    let logger_config = logger::LoggerConfig {
-        level: config.level,
-        writer: logger::WriterConfig::File(logger::FileConfig {
-            path: config.path.to_string(),
-        }),
-    };
-    logger_configure(logger_config).err().map(Box::new)
+    validate_log_level(config.level)
+        .and_then(|_| {
+            let logger_config = logger::LoggerConfig {
+                level: config.level,
+                writer: logger::WriterConfig::File(logger::FileConfig {
+                    path: config.path.to_string(),
+                }),
+            };
+            logger_configure(logger_config)
+        })
+        .err()
+        .map(Box::new)
 }