Skip to content

Commit

Permalink
detect/analyzer: add more details for tcp_mss
Browse files Browse the repository at this point in the history
Add more details to the tcp.mss keyword engine analysis output
Issue: OISF#6355
  • Loading branch information
0xEniola authored and catenacyber committed Apr 12, 2024
1 parent 172b55c commit 37b72f9
Show file tree
Hide file tree
Showing 3 changed files with 88 additions and 1 deletion.
1 change: 1 addition & 0 deletions rust/src/detect/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ pub mod stream_size;
pub mod uint;
pub mod uri;
pub mod requires;
pub mod tojson;

/// EnumString trait that will be implemented on enums that
/// derive StringEnum.
Expand Down
79 changes: 79 additions & 0 deletions rust/src/detect/tojson/mod.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
/* Copyright (C) 2024 Open Information Security Foundation
*
* You can copy, redistribute or modify this Program under the terms of
* the GNU General Public License version 2 as published by the Free
* Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* version 2 along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301, USA.
*/

use crate::detect::uint::{DetectIntType, DetectUintData, DetectUintMode};
use crate::jsonbuilder::{JsonBuilder, JsonError};

pub fn detect_uint_to_json<T: DetectIntType>(
js: &mut JsonBuilder, du: &DetectUintData<T>,
) -> Result<(), JsonError>
where
u64: From<T>,
{
match du.mode {
DetectUintMode::DetectUintModeEqual => {
js.set_uint("equal", du.arg1.into())?;
}
DetectUintMode::DetectUintModeNe => {
js.set_uint("diff", du.arg1.into())?;
}
DetectUintMode::DetectUintModeLt => {
js.set_uint("lt", du.arg1.into())?;
}
DetectUintMode::DetectUintModeLte => {
js.set_uint("lte", du.arg1.into())?;
}
DetectUintMode::DetectUintModeGt => {
js.set_uint("gt", du.arg1.into())?;
}
DetectUintMode::DetectUintModeGte => {
js.set_uint("gte", du.arg1.into())?;
}
DetectUintMode::DetectUintModeRange => {
js.open_object("range")?;
js.set_uint("min", du.arg1.into())?;
js.set_uint("max", du.arg2.into())?;
js.close()?;
}
DetectUintMode::DetectUintModeNegRg => {
js.open_object("negated_range")?;
js.set_uint("min", du.arg1.into())?;
js.set_uint("max", du.arg2.into())?;
js.close()?;
}
DetectUintMode::DetectUintModeBitmask => {
js.open_object("bitmask")?;
js.set_uint("mask", du.arg1.into())?;
js.set_uint("value", du.arg2.into())?;
js.close()?;
}
DetectUintMode::DetectUintModeNegBitmask => {
js.open_object("negated_bitmask")?;
js.set_uint("mask", du.arg1.into())?;
js.set_uint("value", du.arg2.into())?;
js.close()?;
}
}
Ok(())
}

#[no_mangle]
pub unsafe extern "C" fn rs_detect_u16_to_json(
js: &mut JsonBuilder, du: &DetectUintData<u16>,
) -> bool {
return detect_uint_to_json(js, du).is_ok();
}
9 changes: 8 additions & 1 deletion src/detect-engine-analyzer.c
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
#include "detect-engine.h"
#include "detect-engine-analyzer.h"
#include "detect-engine-mpm.h"
#include "detect-engine-uint.h"
#include "conf.h"
#include "detect-content.h"
#include "detect-pcre.h"
Expand Down Expand Up @@ -915,12 +916,18 @@ static void DumpMatches(RuleAnalyzer *ctx, JsonBuilder *js, const SigMatchData *
}
case DETECT_SEQ: {
const DetectSeqData *cd = (const DetectSeqData *)smd->ctx;

jb_open_object(js, "seq");
jb_set_uint(js, "number", cd->seq);
jb_close(js);
break;
}
case DETECT_TCPMSS: {
const DetectU16Data *cd = (const DetectU16Data *)smd->ctx;
jb_open_object(js, "tcp_mss");
rs_detect_u16_to_json(js, cd);
jb_close(js);
break;
}
}
jb_close(js);

Expand Down

0 comments on commit 37b72f9

Please sign in to comment.