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

rust/clippy: fix lint: needless_range_loop

Browse Source
pull/8251/head
Jason Ish 4 years ago committed by Victor Julien
parent 2ac52d0610
commit 3044565cf4
6 changed files with 60 additions and 64 deletions
Show Stats Download Patch File Download Diff File

34
rust/src/http2/detect.rs
Unescape Escape View File

@ -243,14 +243,14 @@ pub unsafe extern "C" fn rs_http2_detect_settingsctx_free(ctx: *mut std::os::raw
fn http2_detect_settings_match( fn http2_detect_settings_match(
set: &[parser::HTTP2FrameSettings], ctx: &parser::DetectHTTP2settingsSigCtx, set: &[parser::HTTP2FrameSettings], ctx: &parser::DetectHTTP2settingsSigCtx,
) -> std::os::raw::c_int { ) -> std::os::raw::c_int {
for i in 0..set.len() { for e in set {
if set[i].id == ctx.id { if e.id == ctx.id {
match &ctx.value { match &ctx.value {
None => { None => {
return 1; return 1;
} }
Some(x) => { Some(x) => {
if detect_match_uint(x, set[i].value) { if detect_match_uint(x, e.value) {
return 1; return 1;
} }
} }
@ -399,8 +399,8 @@ fn http2_frames_get_header_firstvalue<'a>(
} else { } else {
&tx.frames_tc &tx.frames_tc
}; };
for i in 0..frames.len() { for frame in frames {
if let Some(blocks) = http2_header_blocks(&frames[i]) { if let Some(blocks) = http2_header_blocks(frame) {
for block in blocks.iter() { for block in blocks.iter() {
if block.name == name.as_bytes() { if block.name == name.as_bytes() {
return Ok(&block.value); return Ok(&block.value);
@ -423,8 +423,8 @@ pub fn http2_frames_get_header_value_vec(
} else { } else {
&tx.frames_tc &tx.frames_tc
}; };
for i in 0..frames.len() { for frame in frames {
if let Some(blocks) = http2_header_blocks(&frames[i]) { if let Some(blocks) = http2_header_blocks(frame) {
for block in blocks.iter() { for block in blocks.iter() {
if block.name == name.as_bytes() { if block.name == name.as_bytes() {
if found == 0 { if found == 0 {
@ -460,8 +460,8 @@ fn http2_frames_get_header_value<'a>(
} else { } else {
&tx.frames_tc &tx.frames_tc
}; };
for i in 0..frames.len() { for frame in frames {
if let Some(blocks) = http2_header_blocks(&frames[i]) { if let Some(blocks) = http2_header_blocks(frame) {
for block in blocks.iter() { for block in blocks.iter() {
if block.name == name.as_bytes() { if block.name == name.as_bytes() {
if found == 0 { if found == 0 {
@ -536,8 +536,8 @@ fn http2_lower(value: &[u8]) -> Option<Vec<u8>> {
// we got at least one upper character, need to transform // we got at least one upper character, need to transform
let mut vec: Vec<u8> = Vec::with_capacity(value.len()); let mut vec: Vec<u8> = Vec::with_capacity(value.len());
vec.extend_from_slice(value); vec.extend_from_slice(value);
for j in i..vec.len() { for e in &mut vec {
vec[j].make_ascii_lowercase(); e.make_ascii_lowercase();
} }
return Some(vec); return Some(vec);
} }
@ -674,8 +674,8 @@ pub unsafe extern "C" fn rs_http2_tx_get_header_names(
} else { } else {
&tx.frames_tc &tx.frames_tc
}; };
for i in 0..frames.len() { for frame in frames {
if let Some(blocks) = http2_header_blocks(&frames[i]) { if let Some(blocks) = http2_header_blocks(frame) {
for block in blocks.iter() { for block in blocks.iter() {
// we do not escape linefeeds in headers names // we do not escape linefeeds in headers names
vec.extend_from_slice(&block.name); vec.extend_from_slice(&block.name);
@ -738,8 +738,8 @@ pub unsafe extern "C" fn rs_http2_tx_get_headers(
} else { } else {
&tx.frames_tc &tx.frames_tc
}; };
for i in 0..frames.len() { for frame in frames {
if let Some(blocks) = http2_header_blocks(&frames[i]) { if let Some(blocks) = http2_header_blocks(frame) {
for block in blocks.iter() { for block in blocks.iter() {
if !http2_header_iscookie(direction.into(), &block.name) { if !http2_header_iscookie(direction.into(), &block.name) {
// we do not escape linefeeds nor : in headers names // we do not escape linefeeds nor : in headers names
@ -772,8 +772,8 @@ pub unsafe extern "C" fn rs_http2_tx_get_headers_raw(
} else { } else {
&tx.frames_tc &tx.frames_tc
}; };
for i in 0..frames.len() { for frame in frames {
if let Some(blocks) = http2_header_blocks(&frames[i]) { if let Some(blocks) = http2_header_blocks(frame) {
for block in blocks.iter() { for block in blocks.iter() {
// we do not escape linefeeds nor : in headers names // we do not escape linefeeds nor : in headers names
vec.extend_from_slice(&block.name); vec.extend_from_slice(&block.name);

28
rust/src/http2/http2.rs
Unescape Escape View File

@ -195,10 +195,10 @@ impl HTTP2Transaction {
self.tx_data.set_event(event as u8); self.tx_data.set_event(event as u8);
} }
fn handle_headers(&mut self, blocks: &Vec<parser::HTTP2FrameHeaderBlock>, dir: Direction) { fn handle_headers(&mut self, blocks: &[parser::HTTP2FrameHeaderBlock], dir: Direction) {
for i in 0..blocks.len() { for block in blocks {
if blocks[i].name == b"content-encoding" { if block.name == b"content-encoding" {
self.decoder.http2_encoding_fromvec(&blocks[i].value, dir); self.decoder.http2_encoding_fromvec(&block.value, dir);
} }
} }
} }
@ -617,17 +617,17 @@ impl HTTP2State {
fn process_headers(&mut self, blocks: &Vec<parser::HTTP2FrameHeaderBlock>, dir: Direction) { fn process_headers(&mut self, blocks: &Vec<parser::HTTP2FrameHeaderBlock>, dir: Direction) {
let (mut update, mut sizeup) = (false, 0); let (mut update, mut sizeup) = (false, 0);
for i in 0..blocks.len() { for block in blocks {
if blocks[i].error >= parser::HTTP2HeaderDecodeStatus::HTTP2HeaderDecodeError { if block.error >= parser::HTTP2HeaderDecodeStatus::HTTP2HeaderDecodeError {
self.set_event(HTTP2Event::InvalidHeader); self.set_event(HTTP2Event::InvalidHeader);
} else if blocks[i].error } else if block.error
== parser::HTTP2HeaderDecodeStatus::HTTP2HeaderDecodeSizeUpdate == parser::HTTP2HeaderDecodeStatus::HTTP2HeaderDecodeSizeUpdate
{ {
update = true; update = true;
if blocks[i].sizeupdate > sizeup { if block.sizeupdate > sizeup {
sizeup = blocks[i].sizeupdate; sizeup = block.sizeupdate;
} }
} else if blocks[i].error } else if block.error
== parser::HTTP2HeaderDecodeStatus::HTTP2HeaderDecodeIntegerOverflow == parser::HTTP2HeaderDecodeStatus::HTTP2HeaderDecodeIntegerOverflow
{ {
self.set_event(HTTP2Event::HeaderIntegerOverflow); self.set_event(HTTP2Event::HeaderIntegerOverflow);
@ -670,16 +670,16 @@ impl HTTP2State {
Some(parser::HTTP2FrameType::SETTINGS) => { Some(parser::HTTP2FrameType::SETTINGS) => {
match parser::http2_parse_frame_settings(input) { match parser::http2_parse_frame_settings(input) {
Ok((_, set)) => { Ok((_, set)) => {
for i in 0..set.len() { for e in &set {
if set[i].id == parser::HTTP2SettingsId::SETTINGSHEADERTABLESIZE { if e.id == parser::HTTP2SettingsId::SETTINGSHEADERTABLESIZE {
//reverse order as this is what we accept from the other endpoint //reverse order as this is what we accept from the other endpoint
let dyn_headers = if dir == Direction::ToClient { let dyn_headers = if dir == Direction::ToClient {
&mut self.dynamic_headers_ts &mut self.dynamic_headers_ts
} else { } else {
&mut self.dynamic_headers_tc &mut self.dynamic_headers_tc
}; };
dyn_headers.max_size = set[i].value as usize; dyn_headers.max_size = e.value as usize;
if set[i].value > unsafe { HTTP2_MAX_TABLESIZE } { if e.value > unsafe { HTTP2_MAX_TABLESIZE } {
//mark potential overflow //mark potential overflow
dyn_headers.overflow = 1; dyn_headers.overflow = 1;
} else { } else {

44
rust/src/http2/logger.rs
Unescape Escape View File

@ -32,44 +32,44 @@ enum HeaderName {
} }
fn log_http2_headers<'a>( fn log_http2_headers<'a>(
blocks: &'a Vec<parser::HTTP2FrameHeaderBlock>, js: &mut JsonBuilder, blocks: &'a [parser::HTTP2FrameHeaderBlock], js: &mut JsonBuilder,
common: &mut HashMap<HeaderName, &'a Vec<u8>>, common: &mut HashMap<HeaderName, &'a Vec<u8>>,
) -> Result<(), JsonError> { ) -> Result<(), JsonError> {
for j in 0..blocks.len() { for block in blocks {
js.start_object()?; js.start_object()?;
match blocks[j].error { match block.error {
parser::HTTP2HeaderDecodeStatus::HTTP2HeaderDecodeSuccess => { parser::HTTP2HeaderDecodeStatus::HTTP2HeaderDecodeSuccess => {
js.set_string_from_bytes("name", &blocks[j].name)?; js.set_string_from_bytes("name", &block.name)?;
js.set_string_from_bytes("value", &blocks[j].value)?; js.set_string_from_bytes("value", &block.value)?;
if let Ok(name) = std::str::from_utf8(&blocks[j].name) { if let Ok(name) = std::str::from_utf8(&block.name) {
match name.to_lowercase().as_ref() { match name.to_lowercase().as_ref() {
":method" => { ":method" => {
common.insert(HeaderName::Method, &blocks[j].value); common.insert(HeaderName::Method, &block.value);
} }
":path" => { ":path" => {
common.insert(HeaderName::Path, &blocks[j].value); common.insert(HeaderName::Path, &block.value);
} }
":status" => { ":status" => {
common.insert(HeaderName::Status, &blocks[j].value); common.insert(HeaderName::Status, &block.value);
} }
"user-agent" => { "user-agent" => {
common.insert(HeaderName::UserAgent, &blocks[j].value); common.insert(HeaderName::UserAgent, &block.value);
} }
"host" => { "host" => {
common.insert(HeaderName::Host, &blocks[j].value); common.insert(HeaderName::Host, &block.value);
} }
"content-length" => { "content-length" => {
common.insert(HeaderName::ContentLength, &blocks[j].value); common.insert(HeaderName::ContentLength, &block.value);
} }
_ => {} _ => {}
} }
} }
} }
parser::HTTP2HeaderDecodeStatus::HTTP2HeaderDecodeSizeUpdate => { parser::HTTP2HeaderDecodeStatus::HTTP2HeaderDecodeSizeUpdate => {
js.set_uint("table_size_update", blocks[j].sizeupdate)?; js.set_uint("table_size_update", block.sizeupdate)?;
} }
_ => { _ => {
js.set_string("error", &blocks[j].error.to_string())?; js.set_string("error", &block.error.to_string())?;
} }
} }
js.close()?; js.close()?;
@ -102,18 +102,18 @@ fn log_headers<'a>(
Ok(has_headers) Ok(has_headers)
} }
fn log_http2_frames(frames: &Vec<HTTP2Frame>, js: &mut JsonBuilder) -> Result<bool, JsonError> { fn log_http2_frames(frames: &[HTTP2Frame], js: &mut JsonBuilder) -> Result<bool, JsonError> {
let mut has_settings = false; let mut has_settings = false;
for i in 0..frames.len() { for frame in frames {
if let HTTP2FrameTypeData::SETTINGS(set) = &frames[i].data { if let HTTP2FrameTypeData::SETTINGS(set) = &frame.data {
if !has_settings { if !has_settings {
js.open_array("settings")?; js.open_array("settings")?;
has_settings = true; has_settings = true;
} }
for j in 0..set.len() { for e in set {
js.start_object()?; js.start_object()?;
js.set_string("settings_id", &set[j].id.to_string())?; js.set_string("settings_id", &e.id.to_string())?;
js.set_uint("settings_value", set[j].value as u64)?; js.set_uint("settings_value", e.value as u64)?;
js.close()?; js.close()?;
} }
} }
@ -125,8 +125,8 @@ fn log_http2_frames(frames: &Vec<HTTP2Frame>, js: &mut JsonBuilder) -> Result<bo
let mut has_error_code = false; let mut has_error_code = false;
let mut has_priority = false; let mut has_priority = false;
let mut has_multiple = false; let mut has_multiple = false;
for i in 0..frames.len() { for frame in frames {
match &frames[i].data { match &frame.data {
HTTP2FrameTypeData::GOAWAY(goaway) => { HTTP2FrameTypeData::GOAWAY(goaway) => {
if !has_error_code { if !has_error_code {
let errcode: Option<parser::HTTP2ErrorCode> = let errcode: Option<parser::HTTP2ErrorCode> =

11
rust/src/http2/parser.rs
Unescape Escape View File

@ -512,8 +512,8 @@ fn http2_parse_var_uint(input: &[u8], value: u64, max: u64) -> IResult<&[u8], u6
return Ok((i3, 0)); return Ok((i3, 0));
} }
let mut varval = max; let mut varval = max;
for i in 0..varia.len() { for (i, e) in varia.iter().enumerate() {
varval += ((varia[i] & 0x7F) as u64) << (7 * i); varval += ((e & 0x7F) as u64) << (7 * i);
} }
match varval.checked_add((finalv as u64) << (7 * varia.len())) { match varval.checked_add((finalv as u64) << (7 * varia.len())) {
None => { None => {
@ -892,11 +892,8 @@ mod tests {
match r1 { match r1 {
Ok((rem, ctx)) => { Ok((rem, ctx)) => {
assert_eq!(ctx.id, HTTP2SettingsId::SETTINGSENABLEPUSH); assert_eq!(ctx.id, HTTP2SettingsId::SETTINGSENABLEPUSH);
match ctx.value { if ctx.value.is_some() {
Some(_) => { panic!("Unexpected value");
panic!("Unexpected value");
}
None => {}
} }
assert_eq!(rem.len(), 1); assert_eq!(rem.len(), 1);
} }

1
rust/src/lib.rs
Unescape Escape View File

@ -37,7 +37,6 @@
#![allow(clippy::manual_find)] #![allow(clippy::manual_find)]
#![allow(clippy::match_like_matches_macro)] #![allow(clippy::match_like_matches_macro)]
#![allow(clippy::module_inception)] #![allow(clippy::module_inception)]
#![allow(clippy::needless_range_loop)]
#![allow(clippy::never_loop)] #![allow(clippy::never_loop)]
#![allow(clippy::new_without_default)] #![allow(clippy::new_without_default)]
#![allow(clippy::nonminimal_bool)] #![allow(clippy::nonminimal_bool)]

6
rust/src/pgsql/parser.rs
Unescape Escape View File

@ -557,9 +557,9 @@ pub fn pgsql_parse_startup_parameters(i: &[u8]) -> IResult<&[u8], PgsqlStartupPa
if let Some(ref mut params) = optional { if let Some(ref mut params) = optional {
let mut user = PgsqlParameter{name: PgsqlParameters::User, value: Vec::new() }; let mut user = PgsqlParameter{name: PgsqlParameters::User, value: Vec::new() };
let mut index: usize = 0; let mut index: usize = 0;
for j in 0..params.len() { for (j, p) in params.iter().enumerate() {
if params[j].name == PgsqlParameters::User { if p.name == PgsqlParameters::User {
user.value.extend_from_slice(&params[j].value); user.value.extend_from_slice(&p.value);
index = j; index = j;
} }
} }

Write Preview
Loading…
Cancel
Save