detect/uri: Move uri logic into a separate module

pull/7921/head
Jeff Lucovsky 3 years ago committed by Victor Julien
parent 484c34bc60
commit c957882d1c

@ -15,10 +15,9 @@
* 02110-1301, USA.
*/
use nom7::branch::alt;
use nom7::bytes::complete::{is_a, tag, take_while};
use nom7::bytes::complete::{is_a, take_while};
use nom7::character::complete::{alpha0, char, digit1};
use nom7::combinator::{all_consuming, map_opt, map_res, opt, value};
use nom7::combinator::{all_consuming, map_opt, map_res, opt};
use nom7::error::{make_error, ErrorKind};
use nom7::Err;
use nom7::IResult;
@ -100,59 +99,6 @@ pub unsafe extern "C" fn rs_detect_stream_size_free(ctx: &mut DetectStreamSizeDa
std::mem::drop(Box::from_raw(ctx));
}
#[derive(Debug)]
#[repr(C)]
pub struct DetectUrilenData {
pub du16: DetectUintData<u16>,
pub raw_buffer: bool,
}
pub fn detect_parse_urilen_raw(i: &str) -> IResult<&str, bool> {
let (i, _) = opt(is_a(" "))(i)?;
let (i, _) = char(',')(i)?;
let (i, _) = opt(is_a(" "))(i)?;
return alt((value(true, tag("raw")), value(false, tag("norm"))))(i);
}
pub fn detect_parse_urilen(i: &str) -> IResult<&str, DetectUrilenData> {
let (i, du16) = detect_parse_uint_notending::<u16>(i)?;
let (i, raw) = opt(detect_parse_urilen_raw)(i)?;
match raw {
Some(raw_buffer) => {
return Ok((i, DetectUrilenData { du16, raw_buffer }));
}
None => {
return Ok((
i,
DetectUrilenData {
du16,
raw_buffer: false,
},
));
}
}
}
#[no_mangle]
pub unsafe extern "C" fn rs_detect_urilen_parse(
ustr: *const std::os::raw::c_char,
) -> *mut DetectUrilenData {
let ft_name: &CStr = CStr::from_ptr(ustr); //unsafe
if let Ok(s) = ft_name.to_str() {
if let Ok((_, ctx)) = detect_parse_urilen(s) {
let boxed = Box::new(ctx);
return Box::into_raw(boxed) as *mut _;
}
}
return std::ptr::null_mut();
}
#[no_mangle]
pub unsafe extern "C" fn rs_detect_urilen_free(ctx: &mut DetectUrilenData) {
// Just unbox...
std::mem::drop(Box::from_raw(ctx));
}
#[repr(u8)]
#[derive(Clone, Copy, PartialEq, FromPrimitive, Debug)]
pub enum DetectIPRepDataCmd {

@ -17,6 +17,7 @@
pub mod byte_math;
pub mod uint;
pub mod uri;
pub mod detect;
pub mod error;
pub mod parser;

@ -0,0 +1,78 @@
/* Copyright (C) 2022 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 super::uint::*;
use nom7::branch::alt;
use nom7::bytes::complete::{is_a, tag};
use nom7::character::complete::char;
use nom7::combinator::{opt, value};
use nom7::IResult;
use std::ffi::CStr;
#[derive(Debug)]
#[repr(C)]
pub struct DetectUrilenData {
pub du16: DetectUintData<u16>,
pub raw_buffer: bool,
}
pub fn detect_parse_urilen_raw(i: &str) -> IResult<&str, bool> {
let (i, _) = opt(is_a(" "))(i)?;
let (i, _) = char(',')(i)?;
let (i, _) = opt(is_a(" "))(i)?;
return alt((value(true, tag("raw")), value(false, tag("norm"))))(i);
}
pub fn detect_parse_urilen(i: &str) -> IResult<&str, DetectUrilenData> {
let (i, du16) = detect_parse_uint_notending::<u16>(i)?;
let (i, raw) = opt(detect_parse_urilen_raw)(i)?;
match raw {
Some(raw_buffer) => {
return Ok((i, DetectUrilenData { du16, raw_buffer }));
}
None => {
return Ok((
i,
DetectUrilenData {
du16,
raw_buffer: false,
},
));
}
}
}
#[no_mangle]
pub unsafe extern "C" fn rs_detect_urilen_parse(
ustr: *const std::os::raw::c_char,
) -> *mut DetectUrilenData {
let ft_name: &CStr = CStr::from_ptr(ustr); //unsafe
if let Ok(s) = ft_name.to_str() {
if let Ok((_, ctx)) = detect_parse_urilen(s) {
let boxed = Box::new(ctx);
return Box::into_raw(boxed) as *mut _;
}
}
return std::ptr::null_mut();
}
#[no_mangle]
pub unsafe extern "C" fn rs_detect_urilen_free(ctx: &mut DetectUrilenData) {
// Just unbox...
std::mem::drop(Box::from_raw(ctx));
}
Loading…
Cancel
Save