Commit graph

6849 commits

Author SHA1 Message Date
Robin Sommer
ba823efea2 Merge remote-tracking branch 'origin/topic/johanna/BIT-1459'
* origin/topic/johanna/BIT-1459:
  Get way more permissive on what characters we accept as an unquoted multipart boundary.

BIT-1459 #merged
2015-08-28 17:30:52 -07:00
Johanna Amann
68f1d25edd Get way more permissive on what characters we accept as an unquoted
multipart boundary.

Addresses BIT-1459
2015-08-28 13:09:32 -07:00
Johanna Amann
d054158713 Make asn.1 date/time parsing more robust.
These changes should be safe -- testing the failure cases proves a bit
difficult at the moment due to the fact that OpenSSL seems to fix the
values that are present in the original ASN.1 before passing them on to
us. It is thus not directly easily possible to trigger the error cases
from scriptland.

This also means that a lot of the new error cases we try to catch here
can probably never happen.
2015-08-27 21:44:37 -07:00
Robin Sommer
99e104b49c Updating submodule(s).
[nomail]
2015-08-25 15:45:57 -07:00
Robin Sommer
7c98497444 Merge remote-tracking branch 'origin/topic/vladg/bit-1466'
BIT-1466 #merged

* origin/topic/vladg/bit-1466:
  Add Q and update I documentation for conn history
2015-08-25 07:45:36 -07:00
Kris Nielander
ba4c816b0e Refactored patch (removed options, less ambiguous name) 2015-08-24 23:45:21 +02:00
Vlad Grigorescu
9cd4071cb3 Add Q and update I documentation for conn history
- Q (MULTI_FLAG_PKT) was not in the documentation for the history field.

- I (FIN_RST_PKT) was documented incorrectly. It was documented as a
SYN+RST, when it actually represents a FIN+RST.

The new documentation was derived from:
d3f513f/src/analyzer/protocol/tcp/TCP.cc (L493)

Addresses BIT-1466
2015-08-24 12:10:35 -05:00
Daniel Thayer
4788e4e715 Fix some test canonifiers in scripts/policy/protocols/ssl 2015-08-22 21:56:55 -05:00
Robin Sommer
d3f513fc80 Merge branch 'patch-1' of https://github.com/balintm/bro
* 'patch-1' of https://github.com/balintm/bro:
  Update to SIP protocol
2015-08-21 17:39:28 -07:00
dmfreemon@users.noreply.github.com
b14b189d12 add support for MIME type video/MP2T
BIT-1457 #merged
2015-08-21 17:32:19 -07:00
Robin Sommer
cf4ab1d381 Updating submodule(s). 2015-08-21 17:24:01 -07:00
Robin Sommer
fe1bbb3e70 Updating submodule(s).
[nomail]
2015-08-21 17:22:40 -07:00
Robin Sommer
7f5f2822dc Updating submodule(s).
[nomail]
2015-08-21 17:07:02 -07:00
Robin Sommer
918bf665bf Updating submodule(s).
[nomail]
2015-08-21 16:43:45 -07:00
Daniel Thayer
ab8a8d3ef3 Split long lines in input framework docs 2015-08-21 16:30:51 -05:00
Daniel Thayer
ac9552a0cf Update documentation of Conn::Info history field 2015-08-20 10:45:22 -05:00
Daniel Thayer
7ce0cefcba Minor clarifications and typo fixes in broker doc 2015-08-19 13:28:35 -05:00
balintm
5d12a56e0f Update to SIP protocol
- Change SIP header - according to RFC3261, space on both sides of ':' should be expected.

- Change to SIP_request and SIP_Reply - We encountered packets that do not contain newline and msg part of request/reply. Bro parser was segfaulting with:
0x0000000001227de2 in binpac::SIP::SIP_Headers::Parse (this=0x1c709120,
    t_begin_of_data=0x2aaaadd56348 <Address 0x2aaaadd56348 out of bounds>,
    t_end_of_data=0x2aaaadd56346 <Address 0x2aaaadd56346 out of bounds>, t_context=0x1c6f9a90)
    at src/analyzer/protocol/sip/sip_pac.cc:586
This small change should have it fixed.
2015-08-19 16:11:33 +01:00
Daniel Thayer
92c5885f06 Remove unnecessary blank lines from some broker doc files 2015-08-18 15:50:58 -05:00
Daniel Thayer
f56b3ebd93 Fix some doc build warnings 2015-08-18 14:23:48 -05:00
Robin Sommer
930603fc4a Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Fix diff-canonifier-external to use basename of input file
2015-08-18 07:53:52 -07:00
Daniel Thayer
c6dec18e2b Improve documentation of table and set types
Add a list of the types that are not allowed to be the index type
of a table or set.
2015-08-17 16:24:02 -05:00
Daniel Thayer
7b6ab180b6 Fix typo in documentation of a field in connection record 2015-08-17 14:58:22 -05:00
Daniel Thayer
0687b4f601 Merge remote-tracking branch 'origin/master' into topic/dnthayer/doc-fixes 2015-08-17 14:53:06 -05:00
Daniel Thayer
f3fb2b2f52 Fix diff-canonifier-external to use basename of input file
Use basename of the input filename because sometimes it will have
directory components, such as for the baseline files.
2015-08-15 21:05:40 -05:00
Robin Sommer
ac5c4f117f Removing the yielding_teredo_decapsulation option.
With the more precise Teredo option, it seems no longer needed, and it
was a bit of a fragile mechanism to begin with.
2015-08-14 08:36:16 -07:00
Robin Sommer
a9867c706d Make Teredo DPD signature more precise.
Contributed by Martina Balint in https://github.com/bro/bro/pull/39.

(I didn't merge the github branch, as that has some more stuff in its
history. Instead I applied the single-line change directly.)
2015-08-12 17:16:09 -07:00
Robin Sommer
7d71f0047f Updating submodule(s).
[nomail]
2015-08-10 15:16:16 -07:00
Robin Sommer
c91792b762 Merge branch 'topic/jswaro/feature/HookAddToAnalyzer-tcprs-support' of https://github.com/jswaro/bro
Making two changes here:

    - Renaming the hook to SetupAnalyzerTree.

    - Reverting the reversal of the script load order. Instead, I'm
      adding an additional script that Bro looks for to load first,
      "__preload__.bro". Also extending the plugin docs to cover this.

    - Increasing plugin API version, as I suppose adding a new virtual
      function may invalidate binary compatibility.

* 'topic/jswaro/feature/HookAddToAnalyzer-tcprs-support' of https://github.com/jswaro/bro:
  Add hook 'HookAddToAnalyzerTree' to support TCPRS plugin
2015-08-10 15:05:48 -07:00
Robin Sommer
8c235d91a7 Updating submodule(s).
[nomail]
2015-08-10 13:00:36 -07:00
Kris Nielander
54437c128f Merge branch 'master' of https://github.com/knielander/bro 2015-08-09 22:46:35 +02:00
Kris Nielander
d8c9b7255e Allow Bro to run in fanout mode. 2015-08-09 22:45:23 +02:00
Kris Nielander
f5429ee794 Allow libpcap buffer size to be set manually. 2015-08-09 22:45:09 +02:00
Kris Nielander
54078407d4 Allow Bro to run in fanout mode. 2015-08-09 22:41:28 +02:00
Kris Nielander
28c467df4e Allowed libpcap buffer size to be set via configuration. 2015-08-09 22:08:46 +02:00
Robin Sommer
9a7fc7c9ee Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Fix a test that is failing very frequently
2015-08-08 07:38:56 -07:00
Robin Sommer
a6704db3ba Updating submodule(s).
[nomail]
2015-08-07 14:15:04 -07:00
Robin Sommer
0beed71328 Updating submodule. 2015-08-07 14:06:32 -07:00
Robin Sommer
9efd54a08a Merge remote-tracking branch 'origin/topic/dnthayer/ticket1440'
* origin/topic/dnthayer/ticket1440:
  Remove build dependency on perl
2015-08-07 13:10:08 -07:00
Robin Sommer
67d529585c CID 1314754: Fixing unreachable code in RSH analyzer. 2015-08-07 13:10:08 -07:00
Robin Sommer
068b7d1f8b CID 1312752: Add comment to mark 'case' fallthrough as ok. 2015-08-07 13:10:08 -07:00
Robin Sommer
8fc44e7e86 CID 1312751: Removing redundant assignment. 2015-08-07 13:10:08 -07:00
Jan Grashoefer
55dc982a33 Update calls of Base64 functions.
Base64 encoding-errors during authentication in POP3 analyzer,
authentication in FTP analyzer (using GSI) and basic
authentication on HTTP will be logged to Weird.
2015-08-05 11:33:57 +02:00
Daniel Thayer
6d031c41f1 Significant improvements to the GeoLocation doc
Updated the install section for FreeBSD and OS X.
Added a section to explain how to quickly test that everything is
setup correctly.
Improved the usage section by removing the misleading record definition
(a link to the reference doc is provided), and explaining that some
fields will be uninitialized.
Corrected the example so that it doesn't try to access uninitialized
fields.
2015-08-04 22:00:54 -05:00
Jan Grashoefer
8f3ded5e2d Refactoring of Base64 functions.
Base64Converter now uses a connection directly, instead of an analyzer
redirecting to the underlying connection for reporting to Weird. The new
built-in functions en-/decode_base64_intern make use of this to send
encoding-errors to Weird instead of Reporter.

According to the documentation, using the empty string as alphabet in
the built-in functions, will use the default alphabet. Therefore the
built-in functions can now use default arguments and
en-/decode_base64_custom is deprecated.

The tests have been updated accordingly.
2015-08-04 15:46:24 +02:00
Daniel Thayer
33cebe1150 Fix a test that is failing very frequently 2015-08-03 15:10:06 -05:00
Robin Sommer
4c2aa804e1 Merge branch 'master' of https://github.com/albertzaharovits/bro
* 'master' of https://github.com/albertzaharovits/bro:
  Appended smtp.trace with CC: header baseline test
  SMTP logs include CC: addresses [BIT-1429]
2015-07-31 08:56:39 -07:00
Robin Sommer
d3bb0f4901 Updating submodule(s).
[nomail]
2015-07-30 07:23:54 -07:00
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