Commit graph

19573 commits

Author SHA1 Message Date
Robin Sommer
eb72ca7771 Revert "Some small tweaks to the HTTP analyzer".
This reverts commit 763a446182.
2011-01-19 16:45:42 -08:00
Robin Sommer
127ed569a6 Merge commit 'b8ab0ebc22'
* commit 'b8ab0ebc22':
  Removing expire timer from http_sessions.
2011-01-19 16:38:34 -08:00
Jon Siwek
5247a64eaa Changed behavior of how binary packaging installs config files.
The pre/post install scripts for RPMs should not perform any logic
to backup config files, instead relying on the standard logic
that RPMs normally do.

For Mac packages, when an existing config file differs from the package's
version, the previous version is always kept and an alert is displayed to
the user explaining the situation.
2011-01-19 16:56:30 -06:00
Jon Siwek
6ea8def6f6 MacPorts & Fink paths now prepended to default search prefixes 2011-01-19 14:57:06 -06:00
Robin Sommer
fc5a143bbe Removing noisy output about doing incremental serialization.
Addresses #292.
2011-01-19 12:27:15 -08:00
Robin Sommer
b67e4e5765 Loading scan.bro in portmappter.bro, per #330. 2011-01-19 11:53:31 -08:00
Robin Sommer
a7df00eca7 Connection compressor fix from #338. This changes starting times of
quite a few connections in the test-suite, but that all seems
legitimate.
2011-01-19 11:28:27 -08:00
Robin Sommer
bbbe32e443 Working around not being able to do lookup_addr() for IPv6
addresses. Rather than crashing, we warn the user once and then
always time out the call. This addresses #291, and a #355 is new
ticket scheduling fixing the actual problem to later.
2011-01-19 11:12:41 -08:00
Robin Sommer
ffaa20602c IPv6 UDP checksum calculation was broken. (Matti Mantere) 2011-01-19 10:08:42 -08:00
Seth Hall
ceb1bc8ee0 Reworded BRO_DNS_FAKE message. 2011-01-19 12:10:34 -05:00
Seth Hall
c7a5bf071d Prepared the old analyzer for extracting SSL extensions. 2011-01-19 11:46:35 -05:00
Seth Hall
7ffbac68a4 Merge branch 'master' into topic/seth/ssl-analyzer-work 2011-01-19 10:49:19 -05:00
Seth Hall
3d9461eca1 Added a BRO_DNS_FAKE message to the help output. 2011-01-19 10:35:27 -05:00
Seth Hall
f3b148b019 Checkpoint for logging framework 2011-01-19 09:36:06 -05:00
Seth Hall
9cfef93522 Fixed bug in do_split implementation.
Test suite succeeds!
2011-01-18 14:40:37 -05:00
Robin Sommer
aa0691ba21 Updating submodule(s). 2011-01-15 16:45:18 -08:00
Robin Sommer
de06588f27 Merge remote branch 'origin/topic/jsiwek/packaging'
* origin/topic/jsiwek/packaging:
  Changes for packaging
  Changes to CMake logic for binary packaging
  Changes for CPack binary packaging
  Fix package configuration macro returning from sub-project too early
  Add warning when building and installing are done by different users
  Fix for PackageMaker not accepting non-numeric versions
  Fix for OS X 10.5 compile error wrt llabs()
  Prefer static libraries for some dependencies on OS X
  Added OS X configures options for SDK & minimum version
  Changes to allow source packaging via CPack
2011-01-15 14:17:54 -08:00
Jon Siwek
1d8ad8e946 Changes for packaging
- Added 'dist' target to top-level Makefile for doing source packages
- Added 'make-*-packages' scripts for generating binary packages
- Fixes for the ConfigurePackaging CMake script
  - No longer fails when package version doesn't include a patch-level
  - Now considers the case when a package doesn't install any
    config files and the INSTALLED_CONFIG_FILES var is empty
2011-01-14 22:25:10 -06:00
Jon Siwek
8d4f487add Changes to CMake logic for binary packaging
- pre/post install scripts now track configuration files that may
  be clobbered on package install/upgrade through the
  INSTALLED_CONFIG_FILES CMake variable and attempts to make backups
  when the distribution's file differs from the existing file.
2011-01-13 21:58:25 -06:00
Robin Sommer
cb64bb6874 Porting Matti's branch to git.
No changes.
2011-01-13 14:58:53 -08:00
Jon Siwek
7936782057 Changes for CPack binary packaging 2011-01-12 16:26:25 -06:00
Gregor Maier
a5632aff4e TCP Reassembler hotfix for conns > 2GB.
The TCP Reassembler does not deliver any data to analyzers after the
first 2GB due to signed integer overflow (Actually it will deliver again
between 4--6GB, etc.) This happens silently, i.e., without content_gap
events or Undelivered calls.

See Comments in TCP_Reassembler.cc for more details.

As a hotfix that seems to work I disabled the seq_to_skip features. It
wasn't used by any analyzer or policy script (Note, that seq_to_skip is
different from skip_deliveries).

See also ticket #348
2011-01-12 09:38:13 -08:00
Jon Siwek
5d1f1e9edb Fix package configuration macro returning from sub-project too early 2011-01-11 19:30:31 -06:00
Jon Siwek
911230b037 Add warning when building and installing are done by different users 2011-01-11 15:59:25 -06:00
Robin Sommer
06bd8baef6 Fix for portmapper analyzer segfaulting when parsing portmap dump
replies. (Gregor Maier)

Closes #332.
2011-01-10 12:19:13 -08:00
Robin Sommer
f228e32679 Keep buffering state across file rotation (Justin Azoff)
Closes #207. From there:

    When files are rotated they lose their buffered flag, this is
    because File::Open only does a SetBuf? when it opens the file
    itself, but Rotate calls rotate_file to open the file.
2011-01-10 11:59:12 -08:00
Jon Siwek
f5715e7c14 Fix for PackageMaker not accepting non-numeric versions 2011-01-10 12:58:40 -06:00
Robin Sommer
6345129eaf A few smaller tweaks. 2011-01-06 19:17:44 -08:00
Robin Sommer
dbca5be43c Applying Seth's patch from #265 adding entropy BiFs. 2011-01-06 17:16:10 -08:00
Jon Siwek
3f6aa735e9 Fix for OS X 10.5 compile error wrt llabs()
GCC < 4.1.0 possibly has a problem w/ choosing an llabs()
unambigiously from stdlib.h and cstdlib

See also http://gcc.gnu.org/bugzilla/show_bug.cgi?id=13943
2011-01-06 17:06:51 -06:00
Jon Siwek
e1ebf81f76 Prefer static libraries for some dependencies on OS X
This makes binary packaging easier because OS X doesn't ship with
all the shared libraries we may link against (libmagic and libGeoIP
in this case)
2011-01-06 16:59:48 -06:00
Jon Siwek
b496d63632 Added OS X configures options for SDK & minimum version 2011-01-06 16:57:25 -06:00
Jon Siwek
fa07bcd233 Changes to allow source packaging via CPack
- Refactored all packaging related stuff into a single CMake module
- Build should no longer fail when optional sources (e.g. broctl)
  do not exist in the source directory, instead a warning is issued
- Additional configure options to change packaging behavior
2011-01-05 12:05:39 -06:00
Robin Sommer
5d41794034 Merge commit 'd8aecb174a'
* commit 'd8aecb174a':
  Escape commands given to CMake's execute_process
2011-01-04 18:12:00 -08:00
Robin Sommer
edfdd9d436 Updating submodule 2010-12-20 12:03:58 -08:00
Robin Sommer
017367d362 Updating submodules 2010-12-20 12:01:26 -08:00
Jon Siwek
4b91c79c03 Merge branch 'fastpath' of git://git.icir.org/bro into fastpath 2010-12-15 11:45:51 -06:00
Jon Siwek
9880fd6281 Merge branch 'master' into fastpath 2010-12-15 11:41:56 -06:00
Jon Siwek
d8aecb174a Escape commands given to CMake's execute_process 2010-12-15 11:40:17 -06:00
Gregor Maier
763a446182 Some small tweaks to the HTTP analyzer
From ticket #339 http://tracker.icir.org/bro/ticket/339 :

* Fixing a couple of minor issues in the HTTP analyzer, that made the
  analyzer raise a ProtocolViolation() on strange but seemingly legal
  HTTP traffic. Well, the traffic might not necessarily be adhering the
  RFC, but the server has understood it.

* Also stops parsing when the message is interrupted to prevent further
  parsing and ProtocolViolation() generation.

* skip_http_entity_data: check return value of  FindAnalyzer, since it
  can be NULL

In addition:
* http-headers.bro now loads http.bro

Testsuite changes:
* Added a new weird (empty_http_request). This shows up once in the medium
  testsuite.
* no change when running short testsuite
2010-12-13 19:11:05 -08:00
Gregor Maier
b8ab0ebc22 Remvoing expire timer from http_sessions.
The expire timeout for the http_sessions table is unnecessary and it
actually breaks http session semantics for long-lived sessions. The
connection_state_remove() event can take care of cleaning up unanswered
sessions.

If a HTTP transfer exceeds the expire timer, then once the expire timer
fires we get an "unanswered" HTTP request in http.log and once the
reply is done (http_reply_done event), it fails to locate the associated
request (because it expired) and thus results in an "unsolicited" HTTP
reply being logged (althoug they should be one http session).

There was a comment in the expire_function mentioning that without the
expire timer some requests don't show up with the test-suite. However,
after checking back with Robin, I could not reproduce this behavior.
(Actually there's one fewer request in the output without the
expire-timer, but this can be explained by the above observation, so
this is not an error but the way it should be).

This patch results in changes to test-suite output:
  * Timestamps for unanswered HTTP replies differ for unanswered request
    in the "short" test.
  * Medium testcase (note: lines are sorted, they are not in the order)::

	-902189670.828700 <unknown request> (0 "" [40880 (interrupted)])
	-902189670.828700 GET /1998/b142.ps <no reply>
	-902189670.828700 start <<IP>>:<<port>> <<IP>>:80
	+902189670.828700 GET /1998/b142.ps (200 "OK" [40880 (interrupted)] <<a.host.name>>)
2010-12-11 10:51:37 -08:00
Gregor Maier
1ff864c234 Merge branch 'master' into fastpath 2010-12-11 08:46:32 -08:00
Robin Sommer
d24f7a6aad Update submodules 2010-12-10 01:44:25 -08:00
Seth Hall
266acde342 Removed an accidental debugging printf. 2010-12-09 16:01:19 -05:00
Seth Hall
61c99176ad Readded the other changes to remove CheckString calls from strings.bif. 2010-12-09 15:59:08 -05:00
Seth Hall
a598bdb555 Fixed the problem with do_split function which caused it to bail 1 separator early. 2010-12-09 15:23:54 -05:00
Robin Sommer
0ebcf2dff4 Setting executable bit for bro-dev-path.in. 2010-12-09 02:51:11 -08:00
Robin Sommer
3facb6a9ea Merge remote branch 'origin/topic/cmake-port' 2010-12-09 02:00:46 -08:00
Jon Siwek
51d561c156 Fix wrong variable names in bro-path-dev script 2010-12-08 09:51:20 -06:00
Jon Siwek
943b5edee0 Merge branch 'master' into topic/cmake-port 2010-12-08 09:48:21 -06:00