[Oisf-devel] [COMMIT] OISF branch, master, updated. suricata-2.1beta4-107-g9fa2f85

[OISF Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "OISF".

The branch, master has been updated
       via  9fa2f85cc7f951b144c35b01d39b8bbb42348a1d (commit)
       via  0bbc818b2d26d3c042f2af8fc43afd186b067dce (commit)
       via  320355570863dfa6376c9d2af875495ccc8a199f (commit)
       via  d837562441fae6f5b3a246f26b73654d687b71d3 (commit)
       via  be07620a6021b7bd448bca02a68961516ab4ef9a (commit)
       via  ae23144b67e62636b8955d28cc0b8f9c761a3334 (commit)
       via  d9fe95bc8a0b4809b77d12973b8b3ca0cfce029b (commit)
       via  0a4fd39f9c95588a4e9fe9d05dba2d1349bcc71a (commit)
      from  07efec550dd249f3c4a1a1fb926cbbe4298245cc (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 9fa2f85cc7f951b144c35b01d39b8bbb42348a1d
Author: Victor Julien <victor at inliniac.net>
Date:   Mon Jun 1 11:00:36 2015 +0200

    http: improve body pruning
    
    Take inspect window into account.

commit 0bbc818b2d26d3c042f2af8fc43afd186b067dce
Author: Victor Julien <victor at inliniac.net>
Date:   Sun May 31 10:52:05 2015 +0200

    http: fix body tracking
    
    In HTTP body tracking for response bodies, pruning body chunks was broken
    as the body parsing code wouldn't update HtpBody::body_parsed.

commit 320355570863dfa6376c9d2af875495ccc8a199f
Author: Victor Julien <victor at inliniac.net>
Date:   Fri May 29 12:15:18 2015 +0200

    http-client-body: create unittest util func

commit d837562441fae6f5b3a246f26b73654d687b71d3
Author: Eric Leblond <eric at regit.org>
Date:   Wed May 27 22:05:19 2015 +0200

    logging: fix modules ordering during logging
    
    With the previous code the order of the logging modules in the
    YAML were determining which module was run first. This was not
    wished and a consequences was that the EVE fileinfo module was
    not correctly displaying the key 'stored' because it was
    depending on a flag set alter by the filestore module.
    
    This patch adds a priority file to the TmModule structure. The
    higher the priority is set, the sooner the module is run in the
    logging process. The RunModeOutput structure has also been
    updated to contain the name of the original TmModule. Thus allowing
    to define a priority for a RunModeOutput.
    
    Currently only the filestore has a priority set. The rest of them is
    set to the default value of zero.

commit be07620a6021b7bd448bca02a68961516ab4ef9a
Author: Eric Leblond <eric at regit.org>
Date:   Thu May 28 07:02:12 2015 +0200

    output-lua: sync variable name with yaml
    
    'script-dir' was used in the code but we had 'scripts-dir' in the
    configuration file. This patch fixes it to 'scripts-dir'.

commit ae23144b67e62636b8955d28cc0b8f9c761a3334
Author: Jason Ish <ish at unx.ca>
Date:   Wed May 20 15:14:59 2015 -0600

    --set - handle spaces on either side of '='
    
    Discard spaces when provided as part of --set around the '='. For
    example, "val=key", "val = key", "val= key" and "val =key" are
    all equivalent now.

commit d9fe95bc8a0b4809b77d12973b8b3ca0cfce029b
Author: Jason Ish <ish at unx.ca>
Date:   Wed May 20 14:19:20 2015 -0600

    conf - function declaration style
    
    Use consistent style - function return type and declaration on
    same line.

commit 0a4fd39f9c95588a4e9fe9d05dba2d1349bcc71a
Author: DIALLO David <david.diallo at ssi.gouv.fr>
Date:   Wed May 27 17:00:35 2015 +0200

    modbus: fix heap-buffer-overflow in Modbus parser
    
    Modbus parser does not check length to extract/read data (read or write address,
    quantity of data, etc.) that should be present.
    
    In case of malformated data (invalid length in header), Modbus parser reads data
    over the input data length.
    
    Add check before extracting/reading data from input buffer to avoid head buffer
    overflow.

-----------------------------------------------------------------------

Summary of changes:
 src/app-layer-htp-body.c   |   13 +-
 src/app-layer-htp-body.h   |    2 +-
 src/app-layer-htp.c        |    5 +-
 src/app-layer-modbus.c     |  356 ++--
 src/conf.c                 |  248 ++-
 src/conf.h                 |    1 +
 src/detect-engine-hcbd.c   | 4241 +++++++-------------------------------------
 src/detect-engine-modbus.c |    2 +-
 src/log-filestore.c        |    1 +
 src/output-lua.c           |    2 +-
 src/runmodes.c             |   45 +-
 src/suricata.c             |    4 +-
 src/tm-modules.h           |    2 +
 13 files changed, 1102 insertions(+), 3820 deletions(-)


hooks/post-receive
-- 
OISF