Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-09 18:18:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
6202 commits 387 branches 195 tags 267 MiB
Commit graph

6202 commits

This branch
This branch
All branches
Author SHA1 Message Date
Robin Sommer
46e584daa2 Adding tests for Flash version parsing and plugin detection. 
(The plugin detection isn't testing the Chrome behaviour actually,
don't have a trace for that.)
 2015-07-30 07:23:14 -07:00
Johanna Amann
5a8eac521c StartTLS support for IRC 2015-07-29 11:47:59 -07:00
Robin Sommer
11aa119c5b Merge branch 'master' of git.bro.org:bro into topic/jgras/flash-detection-merge 2015-07-29 08:21:46 -07:00
Robin Sommer
907b58dc38 Adding missing file. 2015-07-28 15:02:19 -07:00
Robin Sommer
026148ca97 Merge remote-tracking branch 'origin/master' into topic/jgras/flash-detection-merge 2015-07-28 12:32:31 -07:00
Robin Sommer
e4da8c49c2 Updating submodule(s). 
[nomail]
 2015-07-28 12:26:50 -07:00
Robin Sommer
4663240d70 Updating submodule(s). 
[nomail]
 2015-07-28 12:25:25 -07:00
Robin Sommer
0172557dee Updating submodule(s). 
[nomail]
 2015-07-28 12:14:44 -07:00
Robin Sommer
f14b926b64 Updating submodule(s). 
[nomail]
 2015-07-28 11:57:53 -07:00
Robin Sommer
3957091e1b Renaming config.h to bro-config.h. 
A couple times now I had this conflicting with files of the same name
in other projects.
 2015-07-28 11:57:04 -07:00
Robin Sommer
ba10115181 Merge branch 'topic/jgras/flash-detection' of https://github.com/J-Gras/bro 
Switching from using the http_all_headers() event to
http_message_done(). That delays it a bit, but is the less expensive
event.

* 'topic/jgras/flash-detection' of https://github.com/J-Gras/bro:
  Updated detection of Flash and AdobeAIR.
 2015-07-27 11:05:49 -07:00
Albert Zaharovits
7fa96fa040 Appended smtp.trace with CC: header baseline test 2015-07-26 22:48:31 +03:00
Albert Zaharovits
b4e8a44630 SMTP logs include CC: addresses [BIT-1429] 2015-07-26 22:08:43 +03:00
James Swaro
85fd1c9fa7 Add hook 'HookAddToAnalyzerTree' to support TCPRS plugin 
This commit introduces a new hook, HookAddToAnalyzerTree, which
allows plugins to add a new analyzer to the analyzer tree during
analyzer tree creation. This hook is necessary to support the
TCPRS plugin.

Additionally, the order in which the scripts were loaded has been
changed to address a problem with undefined variable errors due
to load order issues.

Signed-off-by: James Swaro <james.swaro@gmail.com>
 2015-07-26 13:32:24 -05:00
Robin Sommer
30bb17ea8d Baseline update. 2015-07-24 15:07:03 -07:00
Robin Sommer
632ac4bc88 Merge branch 'master' of git.bro.org:bro 2015-07-24 15:05:22 -07:00
Robin Sommer
93738df98e Updating submodule(s). 
[nomail]
 2015-07-24 15:03:06 -07:00
Robin Sommer
2de425c870 Updating submodule(s). 
[nomail]
 2015-07-24 08:11:37 -07:00
Jan Grashoefer
b765c95d6e Updated detection of Flash and AdobeAIR. 2015-07-24 14:33:53 +02:00
Johanna Amann
5ffe76f336 Slightly earlier protocol confirmation for pop3. 
This allows, e.g. pop3 sessions that are upgraded via STLS to be
properly marked as such.
 2015-07-23 16:55:02 -07:00
Robin Sommer
fb848f795d Merge branch 'master' of https://github.com/aaronmbr/bro 
* 'master' of https://github.com/aaronmbr/bro:
  Copy-paste issue
  Allow for logging of the VLAN data about a connection in conn.log
  Save the inner vlan in the Packet object for Q-in-Q setups
 2015-07-23 13:05:28 -07:00
Robin Sommer
a8f1ebf429 Merge branch 'master' of git.bro.org:bro 2015-07-23 11:43:55 -07:00
Jon Siwek
0d60da7ae6 Updating submodule(s). 
[nomail]
 2015-07-22 13:22:56 -05:00
Aaron Brown
ba1facb6c3 Copy-paste issue 2015-07-22 14:19:36 -04:00
Aaron Brown
f29dbb90a5 Allow for logging of the VLAN data about a connection in conn.log 2015-07-22 14:13:17 -04:00
Aaron Brown
d76c7a2657 Save the inner vlan in the Packet object for Q-in-Q setups 2015-07-22 12:52:10 -04:00
Jon Siwek
871b340ade Fix broker python bindings install location to track --prefix. 2015-07-22 10:58:09 -05:00
Robin Sommer
10b61b1d16 Increasing plugin API version. 
The layer 2 updates introduced some API changes.
 2015-07-22 06:53:20 -07:00
Robin Sommer
8ad504ad4f Enabling Broker by default. 
This means CAF is now a required dependency. For now, I'm keeping a
switch --disable-broker to turn it off, but I'm thinking that
eventually we should remove that as well.
 2015-07-21 18:20:34 -07:00
Robin Sommer
93846d428f Requiring a C++11 compiler, and turning on C++11 support. 2015-07-21 13:19:18 -07:00
Robin Sommer
748450c61f Updating submodule(s). 
[nomail]
 2015-07-21 12:07:40 -07:00
Robin Sommer
ff21fa42d3 Updating submodule(s). 
[nomail]
 2015-07-21 09:39:36 -07:00
Robin Sommer
e4c6779a67 Fixing compiler warning. 2015-07-21 08:36:23 -07:00
Robin Sommer
358f3bfe84 Merge branch 'topic/robin/rework-packets-merge' 2015-07-21 08:32:08 -07:00
Robin Sommer
f97b2b180c Moving the remaining code from Layer2.* into Packet.* and documenting 
the Packet API.

Plus, some more cleanup, including removing a legacy option
time_machine_profiling.
 2015-07-21 08:30:23 -07:00
Robin Sommer
f69edd1437 Adding missing files. 2015-07-20 16:49:03 -07:00
Robin Sommer
fcf8cef949 Updating submodule(s). 
[nomail]
 2015-07-20 16:23:10 -07:00
Robin Sommer
c72d191ab5 Refactoring L2 parsing code to reside in the Packet class. 
That way it can be reused more easily. This also avoid having to
change the serialization structure for packets, which is a problem as
external sources of packets (via Broccoli) wouldn't have the new
attributes available to send.

Also moving Packet.{h,cc} and Layer2.{h,cc} into iosource/, and
removing header size from properties that packet sources have to
provide, as we can now compute that easily from the link type.

Plus some more cleanup.
 2015-07-20 16:21:34 -07:00
Robin Sommer
64a478dbd5 Determining final L3 layer protocol right inside PktSrc. 2015-07-17 21:44:42 -07:00
Robin Sommer
86440e44fc Adding more cross-checks for IP. 
This prevents a few more packets from reaching raw_events(), see
baseline update for the corresponding test.
 2015-07-17 13:59:12 -07:00
Robin Sommer
fe3579f1b4 Merge branch 'topic/rework-packets' of https://github.com/jsbarber/bro 
* 'topic/rework-packets' of https://github.com/jsbarber/bro:
  One more tinker to Packet -- ensure no uninitialized values
  Packet::IP()-created IP_Hdr should not free
  Make enums work for non-C++11 config
  Refactor to make bro use a common Packet object. Do a better job of parsing layer 2 and keeping track of layer 3 proto. Add support for raw packet event, including Layer2 headers.

Conflicts:
	aux/plugins
 2015-07-17 12:56:04 -07:00
Johanna Amann
5f07268805 Small changes to iana tls registry. 2015-07-16 16:40:35 -07:00
Robin Sommer
924549bd4d Updating submodule(s). 
[nomail]
 2015-07-15 13:32:17 -07:00
Robin Sommer
4d6efa4e02 Merge remote-tracking branch 'origin/fastpath' 
* origin/fastpath:
  (Hopefully) fix race condition between trace and intel file.
 2015-07-15 13:31:43 -07:00
Johanna Amann
0d9869a2aa (Hopefully) fix race condition between trace and intel file. 2015-07-15 09:14:36 -07:00
Robin Sommer
70d222135b Merge remote-tracking branch 'origin/fastpath' 
* origin/fastpath:
  Correct perl package name on freebsd
 2015-07-14 08:05:03 -07:00
Robin Sommer
8fb708b9b2 Adding an environemtn variable to btest.cfg for external scripts. 2015-07-13 22:13:10 -07:00
Robin Sommer
31dda41169 Updating submodule(s). 
[nomail]
 2015-07-10 07:15:40 -07:00
Justin Azoff
8d8dc890dd Correct perl package name on freebsd 
Based on feedback on IRC, the correct package name is 'perl5', not 'perl'
 2015-07-10 08:35:18 -04:00
Robin Sommer
85b433b13f Adding a weird for when truncated packets lead TCP reassembly to 
ignore content.

(Private test suite has a bunch of test cases.)
 2015-07-03 11:06:05 -07:00