Commit graph

369 commits

Author SHA1 Message Date
Seth Hall
4df961aa60 Log specific event and debug log printing is working!
This is mostly a code checkpoint though.
2011-01-21 16:46:06 -05:00
Robin Sommer
9cea6c5b01 Some small tweaks to the HTTP analyzer.
From ticket #339.
2011-01-20 13:54:54 -08:00
Seth Hall
2be835c4e8 Merge branch 'master' into topic/logging-framework 2011-01-20 16:32:29 -05:00
Robin Sommer
fa7654ec75 Merge remote branch 'origin/topic/robin/entropy'
* origin/topic/robin/entropy:
  A few smaller tweaks.
  Applying Seth's patch from #265 adding entropy BiFs.
2011-01-19 17:38:29 -08:00
Robin Sommer
3bc2a26ea6 Merge remote branch 'origin/fastpath'
* origin/fastpath:
  Removing noisy output about doing incremental serialization. Addresses #292.
  Loading scan.bro in portmappter.bro, per #330.
  Connection compressor fix from #338.
  Working around not being able to do lookup_addr() for IPv6 addresses.
  IPv6 UDP checksum calculation was broken. (Matti Mantere)
  Fix for portmapper analyzer segfaulting when parsing portmap dump replies. (Gregor Maier)
  Keep buffering state across file rotation (Justin Azoff)
2011-01-19 17:05:04 -08:00
Robin Sommer
1e407b433c Merge branch 'fastpath' of ssh://envoy.icir.org/bro into fastpath 2011-01-19 16:48:25 -08:00
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
Robin Sommer
b67e4e5765 Loading scan.bro in portmappter.bro, per #330. 2011-01-19 11:53:31 -08:00
Seth Hall
7ffbac68a4 Merge branch 'master' into topic/seth/ssl-analyzer-work 2011-01-19 10:49:19 -05:00
Seth Hall
f3b148b019 Checkpoint for logging framework 2011-01-19 09:36:06 -05:00
Robin Sommer
dbca5be43c Applying Seth's patch from #265 adding entropy BiFs. 2011-01-06 17:16:10 -08: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
Robin Sommer
b0cb05de64 Merge with Subversion repository as of r7098. 2010-11-27 12:50:01 -08:00
Robin Sommer
3f0ce359a2 Cleanup of the Bro distribution.
* Deleting a lot of old stuff no longer maintained or needed.

* Updating some of the top-level instructions.
2010-11-26 13:45:54 -08:00
Robin Sommer
610d081c4b Merge with origin/topic/cmake-port.
Needed to readd the broctl/broccoli/binpac submodules manually, as
git seemed to get confused by the existing directories.
2010-11-24 21:02:08 -08:00
Seth Hall
06ca14ea45 Updated SSL analyzer and Bro script with lots of new ciphers. 2010-10-26 16:41:15 -04:00
Robin Sommer
61757ac78b Initial import of svn+ssh:://svn.icir.org/bro/trunk/bro as of r7088 2010-09-27 20:42:30 -07:00