Victor Julien
9324ed7b90
Fix icmpv6 ip-only rule not firing. #363 .
14 years ago
Anoop Saldanha
517040c4af
indentation fix
14 years ago
Anoop Saldanha
37b223645a
fix detection engine for alert stability. Fix cases where we have multiple rules having same pattern. We should see good perf increase(~5%) with this change, now that we avoid unnecessary inspection"
14 years ago
Anoop Saldanha
42bc22cfa5
indendation fix
14 years ago
Anoop Saldanha
ecc7a769a7
reclaim mpm contexts if no patterns are added to it, even in non-full mode
14 years ago
Anoop Saldanha
1389cf6913
update cuda mpm to support per proto mpm contexts. Fix faulty stream mpm usage of cuda
14 years ago
Anoop Saldanha
92643f6110
introduce separate mpm ctxs for tcp/udp/other_protos
14 years ago
Anoop Saldanha
a5dec3cb2e
refactor all http mpm engine code
14 years ago
Anoop Saldanha
34cf557abf
fix indentation
14 years ago
Anoop Saldanha
5b91cec4ae
remove unnecessary if/else checks
14 years ago
Victor Julien
ada4066238
Add counters for SYN, SYN/ACK and RST TCP packets. Issue #251 .
14 years ago
Victor Julien
298289f43f
Let flow:only_stream and flow:no_stream set the require packet and require stream flags. Toss out sigs with conflicting settings. Rename flow:stream_only to flow:only_stream. Fixes #261 .
14 years ago
Victor Julien
c04f45ccb9
Add tcp-pkt and tcp-stream 'protocols' to force a signature to inspect only packet or stream data.
14 years ago
Victor Julien
2c62b50ed5
Fix 2 compiler warnings.
14 years ago
Mike Pomraning
cfced01641
Use strlcpy
14 years ago
Mike Pomraning
914b10a8e6
Touch up Makefile for SCConfLogOpenGeneric.
14 years ago
Mike Pomraning
dfec9c0f6a
Switch 'fast', 'http-log', 'drop' and 'alert-debug' to SCConfLogOpenGeneric.
14 years ago
Mike Pomraning
dec34afa40
SCConfLogOpenGeneric() abstraction for regular and AF_UNIX logs.
...
util-logopenfile.[ch] implements the abstraction; util-error.[ch]
modified to include a socket-specific error code; output.h adds a
default filetype for logs ("regular").
14 years ago
Victor Julien
a1cb769205
Switch log-file module to use new absolute path detection code.
14 years ago
Victor Julien
4cbaeb408c
Add functions to determine whether a path is absolute or relative.
14 years ago
Victor Julien
a397599fbb
file extraction: add waldo option to file log module. This will store the last used file_id so extracted files won't get overwritten is Suricata is restarted.
14 years ago
Victor Julien
effe01ae7b
Add Init and DeInit calls to the thread module API.
14 years ago
Eric Leblond
7fb78a0ff6
Fix compilation warning.
14 years ago
Victor Julien
08f3ef7685
Reshuffle version printing so -V prints it only once.
14 years ago
Eric Leblond
1bebb9831d
logging: don't display debug message before setting params.
14 years ago
Eric Leblond
05f562fdc3
logging: use SCLogDebug instead of printf
...
This patch uses SCLogDebug instead of printf to enable filtering
of the log message by the log filtering option.
14 years ago
Eric Leblond
9545a56426
ipfw: suppress poll before sendto
...
Calling poll before using sendto seems a bit overkill.
14 years ago
Eric Leblond
6f1b40dd4b
ipfw: don't use socket lock in 'worker' mode
...
This patch is the IPFW version of NFQ latest patch.
14 years ago
Eric Leblond
58855494c1
nfq: do not use mutex in 'worker' mode
...
Using a mutex on the queue handle is not necessary in 'worker' mode
as there is no concurrent access to it.
14 years ago
Eric Leblond
ef3951d914
runmode: export running mode
...
This will permit to put some optimisation in different components.
This is done via the RunmodeGetActive() function.
14 years ago
Victor Julien
c908574545
Use strtoul instead of strtol for sid parsing. Fixes parsing of really large sid numbers. Fixes #393 .
14 years ago
Victor Julien
c1a40447c1
IP Only cleanup: make most functions static. Add error message on address parsing issues.
14 years ago
Victor Julien
e0cf2ccb91
Fix invalid direction error message.
14 years ago
Eric Leblond
db19680794
pcap: fix auto runmode
...
This patch fixes initialization of a pointer. The lack of it was
causing an invalid interface value to be given to suricata (in
the case no interface was given on the command line).
Reported-by: Delta Yeh <delta.yeh@gmail.com>
14 years ago
Victor Julien
5a769c02ee
Stream engine: handling packets with ACK|CWR.
14 years ago
Anoop Saldanha
999c34111e
bug #341 - support for urilen check on both norm and raw buffers
14 years ago
Victor Julien
158d72e7f3
file-inspection: inspect new files in same tx but opposite direction as well.
14 years ago
Victor Julien
a6e75aff21
file-extraction: improve handling of complex multipart bodies.
14 years ago
Victor Julien
4eda31df4d
file inspection: unset new file available flag when appropriate, prevents duplicate alerts.
14 years ago
Anoop Saldanha
6e2c921037
indentation fixes for ac-gfbs
14 years ago
Anoop Saldanha
2eb3aff0af
Further improve compression for ac-gfbs. Character codes shifted to 8 bits from 16/32 bits
14 years ago
Victor Julien
0712300a1c
Remove stream BUG_ON's that could fire on TCP session reuse.
14 years ago
Anoop Saldanha
0cde8072f4
fix ffr shutdown segv. We need to supply stream TV the the stream engine
14 years ago
Anoop Saldanha
5620844f7d
ac-gfbs fix output presence combination with mod table
14 years ago
Anoop Saldanha
153f2ad3eb
ac-gfbs update. Minor improvement of compression for state 0. Improves performance
14 years ago
Anoop Saldanha
c6cd59bda4
Update ac-gfbs with some rearrangement. Increased performance from 4-10%
14 years ago
Anoop Saldanha
e18cf72c13
fix bug in size parsing API. Pass the string returned by pcre_get_substring and not the passed arg. Also use strtod. Solves usage issues on windows
14 years ago
Victor Julien
842b01cc9c
Remove duplicate sys/prctl.h configure check. Wrap another include in HAVE_SYS_PRCTL_H.
14 years ago
Eileen Donlon
aaa5a78dfe
Moved prctl.h check to configure
14 years ago
deltay
37dc83d411
ignore signal SIGPIPE and SIGSYS
14 years ago
Victor Julien
c2c539942b
Rework the way the http parser can tell the de_state to reset it's file section on arrival of new files in the same tx. Fixes a dead lock in the auto runmode.
14 years ago
Victor Julien
679b8ec1ba
Fix filestore match code not expecting NULL file ptr.
14 years ago
Victor Julien
18d79c4215
file store: respect flowbits and other keywords
...
The filestore keyword until now flagged a file, tx or ssn for storage as soon
as the keyword was inspected. This happens before flowbits and some other
keywords, so files were stored that weren't supposed to.
This patch makes the filestore keyword fill an array in the detect engine
thread ctx. Then if the full signature matches, a post-match filestore
function makes the store final.
14 years ago
Victor Julien
7173256754
Fix compiler warnings in a couple of unittests.
14 years ago
Victor Julien
6d8aa6829d
Remove unused variable.
14 years ago
Anoop Saldanha
b164247fb8
Changed my email address to anoopsaldanha@gmail.com from my current one - Should have been an amend over my previous commit, but that commit's pushed out
14 years ago
Anoop Saldanha
f514b141ce
fix ipv6 header setup in pseudo pkt creation
14 years ago
Victor Julien
416b463c51
file-data: add more unittests
14 years ago
Victor Julien
296ce8b5f9
file-data: make bytejump, bytetest, byteextract and isdataat work better with file_data.
14 years ago
Victor Julien
077970051e
file-data: implement relative pcre support.
14 years ago
Victor Julien
07e560b137
file-data: initial file_data support
...
Support file_data for: content, pcre (relative), byte_test, byte_jump,
byte_extract, isdataat.
File_data support is handled at signature parsing time, all matches
occurring after the file_data in the rule are converted to http_server_body
matches.
Content matches relative to the file_data are converted. Within to depth,
distance to offset. Relative to the start of the body buffer.
14 years ago
Victor Julien
7adac3048d
file-data: create initial keyword registration.
14 years ago
Anoop Saldanha
420befb180
Changed my email address to anoopsaldanha at gmail dot com from my current one
14 years ago
Victor Julien
fa0152fa80
Shrink signature flags field to 32 bits.
14 years ago
Victor Julien
dd9da1a56f
Merge all http mpm related signature flags into a single set: SIG_FLAG_MPM_HTTP and SIG_FLAG_MPM_HTTP_NEG.
14 years ago
Victor Julien
d5ed28b065
Remove SIG_FLAG_MPM flag.
14 years ago
Victor Julien
fe48920514
Remove per sgh mpm_streamcontent_maxlen variable. It was checked but never set.
14 years ago
Victor Julien
4992f7c417
Remove SIG_FLAG_MPM_URI flag. It was checked but never set.
14 years ago
Victor Julien
2650551192
Rename signature init flags to indicate they are init flags.
14 years ago
Victor Julien
6ebd71545b
Fix signature flag definitions on 32 bit.
14 years ago
Victor Julien
291ddd95f2
Detection engine -- mpm
...
Each signature is in one mpm ctx at max, but there were 3 separate
id's in use: packet, stream, http. Merged them all into one.
Could shrink the SignatureHeader structure with 8 bytes because of this,
should lead to better caching performance.
14 years ago
Victor Julien
7db72bce75
Optimize detection engine prefiltering logic.
14 years ago
Victor Julien
89f83e714c
Introduce http_server_body keyword.
...
The http_server_body content modifier modifies the previous content to inspect
the normalized (dechunked, unzipped) http_server_body. The workings are similar
to http_client_body. Additionally, a new pcre flag was introduced "/S".
To facilitate this change the signature flags field was changed to be 64 bit.
14 years ago
Eric Leblond
6e7a8f38bf
ipfw: Add support for autofp and worker runmode
...
This patch convert ipfw code to the PcktAcqLoop API and
rework the running mode to use the running mode wrapper
already used by NFQ.
14 years ago
Eric Leblond
c1ad64b333
ips: update copyright date and author list.
14 years ago
Eric Leblond
d4cbc7c38c
ipfw: funnier to manage capability in running code.
14 years ago
Eric Leblond
f1cb4da442
ipfw: fix indentation of the file.
...
I will have to work a lot on this one. It will be easier with a
correct indentation.
14 years ago
Eric Leblond
acc9634106
nfq: add some comments about possible evolution
14 years ago
Eric Leblond
9ca7257279
nfq: suppress unused functions.
14 years ago
Eric Leblond
58b20359a7
nfq: add worker runmode support.
14 years ago
Eric Leblond
aee2e3ddd6
nfq: Add autofp mode support
14 years ago
Eric Leblond
115c3499d2
nfq: factorize auto mode
14 years ago
Eric Leblond
70c574fb63
runmode: Add support for IPS running mode
...
This patch adds the 'auto', 'autofp' and 'worker' runmode for
IPS. It provides a set of ready-to-use functions that can be
used by NFQ and IPFW to implement this running mode.
14 years ago
Eric Leblond
5cfdd7594f
util-device: Modify function name.
...
This patch modifies LiveBuildQueueList name to LiveBuildDeviceList
to have a consistent naming accross function. It also adds a
doxygen comment to add author and description of util-device.c
file.
14 years ago
Eric Leblond
7096e11ab5
af-packet: simplify code.
14 years ago
Eric Leblond
5cec22ac37
threads: Add sanity check.
14 years ago
Eileen Donlon
327fd048a0
Fixed coredump windows compile issue
14 years ago
Eric Leblond
6c55af847b
'auto' running mode does not support 'threads' var.
...
This patch modifies the RunModeSetLiveCaptureAuto() prototype to
be able to detect that a 'threads' variable (telling how much
threads must listen to one socket in IDS mode) has been used
in the configuration file. It then print a warning message
if this is the case.
14 years ago
Victor Julien
6f0ca120d1
Make sure existing log-pcap and unified2-alert 'limit' settings don't break.
14 years ago
Victor Julien
678213c9f4
Fix ParseSizeString return code and a compiler warning.
14 years ago
Anoop Saldanha
4b8ebb5c53
set default response body limit for specific http server conf
14 years ago
Anoop Saldanha
6240131a4e
updates to accomodate master rebase
14 years ago
Anoop Saldanha
7c9d1b80fd
Update size parsing API with new calls for returing u8, u16, u32 and u64 values. Make updates in the codebase to use these new calls
14 years ago
Anoop Saldanha
e0c13434ef
bug 333 - support new Size Parsing API. Update various conf params inside the engine to use this API to parse sizes in the format xxx <-just the no represents bytes, xxxkb <- kilobytes, xxxmb <- megabytes, xxxgb <- gigabytes, where xxx is a \d+
14 years ago
Eileen Donlon
79e0299643
Fixed coredump compile problems on bsd, windows
14 years ago
Anoop Saldanha
b970273163
fix broken unittest
14 years ago
Anoop Saldanha
651f91e4de
fix setting pseudo packet from this commit:
...
commit 259e022f721a7c3a70c26447b1cf730bb8a1f6cd
Author: Anoop Saldanha <poonaatsoc@gmail.com>
Date: Sun Dec 4 13:20:43 2011 +0530
fix setting ipv4 header in pseudo packet
14 years ago
Anoop Saldanha
d40fb5b933
Remove unnecessary flow NULL check
14 years ago
Anoop Saldanha
8533cd2cdf
fix mapping of tcp states to flow_established and flow_closed. Improves accuracy
14 years ago
Anoop Saldanha
cc7db6315c
Move setting packet iponly flags from decode section to stream section
14 years ago
Anoop Saldanha
eaf15911e7
fix setting ipv4 header in pseudo packet
14 years ago
Victor Julien
322779fb23
flow engine: release flow lock earlier in flow kill/prune process. Minor cleanups.
14 years ago
Victor Julien
5401764697
flow engine: minor cleanup.
14 years ago
Victor Julien
bfa872b9b7
flow engine: no longer allow FlowRequeue to be called with the same src and dst queue.
14 years ago
Victor Julien
84c7480c06
flow engine: convert flow hash code FlowRequeue call to FlowEnqueue.
14 years ago
Victor Julien
ad4e016288
flow engine: make FlowEnqueue lock the queue. Adapt callers.
14 years ago
Victor Julien
fbbdbb251f
flow engine: remove unneeded 'need_srclock' argument for FlowRequeue
14 years ago
Victor Julien
0331da9773
flow engine: introduce FlowRequeueMoveToSpare
...
As part of a clean up of how FlowRequeue is used, introduce
FlowRequeueMoveToSpare for moving a flow from a locked queue to the
spare queue.
14 years ago
Victor Julien
7fa3df33f2
flow engine: introduce FlowRequeueMoveToBot
...
As part of a clean up of how FlowRequeue is used, introduce
FlowRequeueMoveToBot for moving a flow to the bottom of it's queue.
14 years ago
Victor Julien
ae1e4c1d7d
Add missing hash row unlock.
14 years ago
Victor Julien
f47f601f09
Fix unified2 setting the wrong eth_type.
14 years ago
Eric Leblond
9422a36851
unified2: avoid to log RAW packet
...
If the packet datalink is ethernet, we add a fake ethernet
header to stream logging to avoid that barnyard2 create
different files.
14 years ago
Eric Leblond
fc56abfcd0
unified2: log an ethernet header for stream alert.
...
If packet is a of type ethernet, we log the alert reconstructed
payload as an ethernet packet and not a raw packet. This will avoid
to confuse barnyard2 pcap output.
14 years ago
Victor Julien
49d6885ec7
Improve debug validation code for packet, add new macro for flow.
14 years ago
Victor Julien
3009429e3c
HTTP transaction handling improvement
...
In some cases AppLayerTransactionGetInspectId can return -1, which is
now handled by all it's callers.
Improve logic of selecting which transactions are inspected by the various
HTTP keywords.
14 years ago
Eileen Donlon
dbdf2d888f
Enable/disable core dump in config (feature 319)
14 years ago
Victor Julien
7b0f261fdc
Add some debug statements for debugging a smtp issue.
14 years ago
Victor Julien
004b5dde88
Support libhtp's different handling of CONNECT requests.
14 years ago
Victor Julien
117d51c965
Fix a compile warning when debug is enabled.
14 years ago
Victor Julien
1df3304655
Clean up for unittests code: only compile unittest api code when unittests are enabled. Fix unittest code that wasn't wrapped in the proper UNITTESTS ifdefs.
14 years ago
Victor Julien
a138b32533
flow manager: timing change
...
Set default timeout for the flow manager to wake up to 1 second. The 0.4 sec
performed best on a Xeon, but in kvm vm's it was horrible:
32 bit vm: 60% cpu for flowmgr when idle.
64 bit vm: 30% cpu for flowmgr when idle.
With the 1 second timeout both are at 0.3% cpu.
14 years ago
Victor Julien
786148319c
Lower flow manager wake up timer to 0.4 seconds as that performs 2% better in my tests.
14 years ago
Anoop Saldanha
776bf633e3
flow manager code cleanup. Remove unused code + fix indentation. Remove unused vars
14 years ago
Anoop Saldanha
5133098bd6
Accomodate pcap-file mode to signal flow mgr to wakeup when it exceeds a certain time interval. This let's the flow mgr keep in sync with pcap timestamp changes
14 years ago
Anoop Saldanha
9917744707
separate timers for flow mgr thread for normal and emerg mode. Signal flow mgr thread when in emerg mode
14 years ago
Eric Leblond
5a63662766
Flow: use condition system instead of short sleep
...
Short sleep can lead to some really annoying performance issue in
some environnement like virtual systems. This technic was used in
the flow manager. This patch uses an alternate approach based on
a timed condition which is triggered each time a new flow has to
be created. This avoid to run out of flow. A counter is also done
to be able not to run the cleaning code at each new flow.
14 years ago
Victor Julien
34450b9b57
Don't parse layers / ext headers above ipv6 frag header. This is taken care of by defrag.
14 years ago
Victor Julien
938e9b3db0
Fix filestore related segv.
14 years ago
Victor Julien
e6d8d0443c
Unify output functions for alert-debug for IPv4 and IPv6.
14 years ago
Victor Julien
3c7f09d1ea
Add debug output to engine event.
14 years ago
Victor Julien
e6af837b25
Convert StreamTcpSetEvent function into macro. Eases debug.
14 years ago
Victor Julien
58011554b0
Don't consider payload len in ACK value validation check.
14 years ago
Victor Julien
9878eca086
file handling: expand filestore keyword
...
Filestore keyword by default (... filestore; ... ) marks only the file in the
same direction as the rule match for storing. This makes sense when inspecting
individual files (filemagic, filename, etc) but not so much when looking at
suspicious file requests, where the actual file is in the response.
The filestore keyword now takes 2 optional options:
filestore:<direction>,<scope>;
By default the direction is "same as rule match", and scope is "currently
inspected file".
For direction the following values are possible: "request" and "to_server",
"response" and "to_client", "both".
For scope the following values are possible: "tx" for all files in the current
HTTP/1.1 transation, "ssn" and "flow" for all files in the session/flow.
For the above case, where a suspious request should lead to a response file
download, this would work:
alert http ... content:"/suspicious/"; http_uri; filestore:response; ...
14 years ago
Victor Julien
ddfa5c49c6
Stream engine: gap handling
...
Set a stream event for stream gaps.
Add a (disabled by default) signature to the stream-event.rules.
14 years ago
Victor Julien
45d86ff58a
Stream reassembly / app layer: disable gap errors
...
Gap errors on the app layer are now silently handled. No longer printed
to the screen.
14 years ago
Victor Julien
425294f912
stream reassembly: account stream gaps
...
Add counter to the stream reassembly engine to count stream gaps. Stream gaps
are the result of missing packets (usually due to packet loss). This missing
data stops the reassembly for the app layer.
14 years ago
Victor Julien
d8d8fdd9f5
Improve handling of packets when stream is in the fin_wait1 or fin_wait2 state.
14 years ago
Victor Julien
b74c73309b
file handling: improve filestore keyword handling
...
In stateful detection only inspect the file portion of the rule after all
other conditions matched. This to prevent "filestore" from tagging files
for storage during a partial match.
Add a couple of unittests to test the behaviour change.
14 years ago
Victor Julien
4cbe7519fa
Add missing file util code.
14 years ago
Victor Julien
56b96363b8
Fix merge artefact.
14 years ago
Victor Julien
63c9a3ab85
Remove duplicate include.
14 years ago
Victor Julien
042fd850fc
Make sure we check the sgh for no magic and no store once per flow direction.
14 years ago
Victor Julien
f3fbc1a44c
file handling: filemagic matching improvement
...
Magic buffer is a null terminated string. Allow matching on the final
\0 using filemagic:"somevalue|00|"; so we can anchor to the end of the
buffer.
14 years ago
Victor Julien
2ccd35c6e4
Fix code after rebase.
14 years ago
Victor Julien
33848124d1
Fix a multipart body parsing issue.
14 years ago
Victor Julien
96d20098b0
file inspect: stateful inspection split
...
Split stateful detection of the files in a HTTP state between toserver
and toclient inspection.
14 years ago
Victor Julien
d59ca75e46
file extract: split toserver and toclient tracking
...
Split toserver and toclient file tracking for the http state.
14 years ago
Victor Julien
04ea70ccf7
file extract: pruning
...
Add pruning of files in memory so we keep only memory what we really need.
Fix magic logic.
Reset file part of the de_state on receiving another file in the same tx.
14 years ago
Victor Julien
1c934acc85
Don't store fd per file (too many fd's). Enable IPv6 storing. Close file on receiving stream end flag.
14 years ago
Victor Julien
b402d97179
File carving -- enable reponse file extraction
...
- Enable response body tracking
- Enable file extraction for responses
- File store meta file includes magic, close reason.
- Option to force magic lookup for all stored files.
- Fix libmagic calls thead safety.
14 years ago