aiden
/
suricata
mirror of https://github.com/OISF/suricata
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

detect: rename LdapIndex to something generic

Browse Source 
to be able to use it outside of ldap

Ticket: 7480

No behavior change, just code restyling
pull/13878/head
Philippe Antoine 1 year ago committed by Victor Julien
parent 2ed7a85356
commit ef6ce7d701
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File

24
rust/src/ldap/detect.rs
Unescape Escape View File

@ -37,7 +37,7 @@ use std::os::raw::{c_int, c_void};
use std::str::FromStr; use std::str::FromStr;
#[derive(Debug, PartialEq)] #[derive(Debug, PartialEq)]
enum LdapIndex { enum DetectUintIndex {
Any, Any,
All, All,
Index(i32), Index(i32),
@ -50,7 +50,7 @@ struct DetectLdapRespOpData {
/// Index can be Any to match with any responses index, /// Index can be Any to match with any responses index,
/// All to match if all indices, or an i32 integer /// All to match if all indices, or an i32 integer
/// Negative values represent back to front indexing. /// Negative values represent back to front indexing.
pub index: LdapIndex, pub index: DetectUintIndex,
} }
struct DetectLdapRespResultData { struct DetectLdapRespResultData {
@ -59,7 +59,7 @@ struct DetectLdapRespResultData {
/// Index can be Any to match with any responses index, /// Index can be Any to match with any responses index,
/// All to match if all indices, or an i32 integer /// All to match if all indices, or an i32 integer
/// Negative values represent back to front indexing. /// Negative values represent back to front indexing.
pub index: LdapIndex, pub index: DetectUintIndex,
} }
static mut G_LDAP_REQUEST_OPERATION_KW_ID: u16 = 0; static mut G_LDAP_REQUEST_OPERATION_KW_ID: u16 = 0;
@ -133,18 +133,18 @@ unsafe extern "C" fn ldap_detect_request_free(_de: *mut DetectEngineCtx, ctx: *m
SCDetectU8Free(ctx); SCDetectU8Free(ctx);
} }
fn parse_ldap_index(parts: &[&str]) -> Option<LdapIndex> { fn parse_ldap_index(parts: &[&str]) -> Option<DetectUintIndex> {
let index = if parts.len() == 2 { let index = if parts.len() == 2 {
match parts[1] { match parts[1] {
"all" => LdapIndex::All, "all" => DetectUintIndex::All,
"any" => LdapIndex::Any, "any" => DetectUintIndex::Any,
_ => { _ => {
let i32_index = i32::from_str(parts[1]).ok()?; let i32_index = i32::from_str(parts[1]).ok()?;
LdapIndex::Index(i32_index) DetectUintIndex::Index(i32_index)
} }
} }
} else { } else {
LdapIndex::Any DetectUintIndex::Any
}; };
return Some(index); return Some(index);
} }
@ -201,10 +201,10 @@ unsafe extern "C" fn ldap_detect_responses_operation_setup(
fn match_at_index<T, U>( fn match_at_index<T, U>(
array: &VecDeque<T>, ctx_value: &DetectUintData<U>, get_value: impl Fn(&T) -> Option<U>, array: &VecDeque<T>, ctx_value: &DetectUintData<U>, get_value: impl Fn(&T) -> Option<U>,
detect_match: impl Fn(U, &DetectUintData<U>) -> c_int, index: &LdapIndex, detect_match: impl Fn(U, &DetectUintData<U>) -> c_int, index: &DetectUintIndex,
) -> c_int { ) -> c_int {
match index { match index {
LdapIndex::Any => { DetectUintIndex::Any => {
for response in array { for response in array {
if let Some(code) = get_value(response) { if let Some(code) = get_value(response) {
if detect_match(code, ctx_value) == 1 { if detect_match(code, ctx_value) == 1 {
@ -214,7 +214,7 @@ fn match_at_index<T, U>(
} }
return 0; return 0;
} }
LdapIndex::All => { DetectUintIndex::All => {
for response in array { for response in array {
if let Some(code) = get_value(response) { if let Some(code) = get_value(response) {
if detect_match(code, ctx_value) == 0 { if detect_match(code, ctx_value) == 0 {
@ -224,7 +224,7 @@ fn match_at_index<T, U>(
} }
return 1; return 1;
} }
LdapIndex::Index(idx) => { DetectUintIndex::Index(idx) => {
let index = if *idx < 0 { let index = if *idx < 0 {
// negative values for backward indexing. // negative values for backward indexing.
((array.len() as i32) + idx) as usize ((array.len() as i32) + idx) as usize

Write Preview
Loading…
Cancel
Save