Commit graph

1750 commits

Author SHA1 Message Date
Robin Sommer
3220bbce55 Merge remote branch 'origin/topic/jsiwek/log-escaping'
* origin/topic/jsiwek/log-escaping:
  Add missing ascii writer options to log header.
  Escape the ASCII log's set separator (addresses #712)
  Rewrite ODesc character escaping functionality. (addresses #681)

Closes #712.
2011-12-19 06:37:54 -08:00
Robin Sommer
0a3e160a8d Merge remote branch 'origin/topic/seth/dns-updates'
* origin/topic/seth/dns-updates:
  Fixed some bugs with capturing data in the base DNS script.
  Some updates to the base DNS script.

Closes #702.
2011-12-18 15:20:00 -08:00
Robin Sommer
f3c2811e14 Merge remote branch 'origin/topic/seth/ssl-updates-for-2.0'
* origin/topic/seth/ssl-updates-for-2.0:
  Added is_orig fields to the SSL events and adapted script.

Closes #692.
2011-12-18 15:15:57 -08:00
Robin Sommer
719557a05b Merge remote branch 'origin/fastpath'
* origin/fastpath:
  Enable warnings for malformed Broxygen xref roles.
  Broxygen fix for function parameter recognition; better than 80b2451.
  Allow Broxygen markup "##<" for more general use.
2011-12-18 15:10:49 -08:00
Jon Siwek
23177aa081 Enable warnings for malformed Broxygen xref roles. 2011-12-16 14:36:15 -06:00
Jon Siwek
8394829fb1 Broxygen fix for function parameter recognition; better than 80b2451. 2011-12-16 11:59:55 -06:00
Jon Siwek
3b91df8cf5 Allow Broxygen markup "##<" for more general use. 2011-12-16 11:21:49 -06:00
Robin Sommer
41a68933eb Updating submodule(s). 2011-12-16 02:59:39 -08:00
Robin Sommer
84e6caed2c Merge remote branch 'origin/master'
* origin/master:
  Cleanup some misc Broxygen css/js stuff.
  Add search box to Broxygen docs (fixes #726).

Some markup for the tracker to close the recently addresses tickets:

Closes #726.
Closes #433.
Closes #311.
Closes #664.
2011-12-16 02:41:43 -08:00
Robin Sommer
8c53446292 Merge remote branch 'origin/fastpath'
* origin/fastpath:
  Fixed major bug with cluster synchronization (it was broken!)
2011-12-16 02:37:56 -08:00
Robin Sommer
4e17ef63f0 Merge remote branch 'origin/fastpath'
* origin/fastpath:
  Fix missing action in notice policy for looking up GeoIP data.
  Better persistent state config warning messages (fixes #433).
  A few updates for SQL injection detection.
  Fixed some DPD signatures for IRC.  Fixes ticket #311.
  Removing Off_Port_Protocol_Found notice.
  SSH::Interesting_Hostname_Login cleanup.  Fixes #664.
  Teach Broxygen to more generally reference attribute values by name.
  Fixed a really dumb bug that was causing the malware hash registry script to break.
  Fix Broxygen confusing scoped id at start of line as function parameter.
  Remove remnant of libmagic optionality
2011-12-16 02:36:43 -08:00
Seth Hall
0b8b14a0ed Fixed major bug with cluster synchronization (it was broken!) 2011-12-15 15:59:51 -05:00
Jon Siwek
fc9a38a796 Cleanup some misc Broxygen css/js stuff. 2011-12-15 13:01:23 -06:00
Jon Siwek
d04558dc45 Add search box to Broxygen docs (fixes #726). 2011-12-15 13:00:29 -06:00
Jon Siwek
86cba4c33f Fix missing action in notice policy for looking up GeoIP data. 2011-12-13 16:17:44 -06:00
Jon Siwek
ae57cbe5fc Better persistent state config warning messages (fixes #433). 2011-12-13 09:52:26 -06:00
Seth Hall
61aa592db5 A few updates for SQL injection detection.
- The biggest change is the change in notice names from
	HTTP::SQL_Injection_Attack_Against to
	HTTP::SQL_Injection_Victim

- A few new SQL injection attacks in the tests that we need to
  support at some point.
2011-12-12 14:26:54 -05:00
Seth Hall
76a0b9ad3c Fixed some DPD signatures for IRC. Fixes ticket #311.
- The larger issue from ticket 313 still stands.
2011-12-10 22:33:49 -05:00
Seth Hall
6478b4acaf Removing Off_Port_Protocol_Found notice.
- Other very small cleanup.
2011-12-10 00:18:10 -05:00
Seth Hall
b1c891f857 Merge branch 'fastpath' of ssh://git.bro-ids.org/bro into fastpath 2011-12-10 00:13:49 -05:00
Seth Hall
00fb187927 SSH::Interesting_Hostname_Login cleanup. Fixes #664. 2011-12-10 00:13:37 -05:00
Seth Hall
ec721dffec Added is_orig fields to the SSL events and adapted script.
- Added a field named $last_alert to the SSL log.  This doesn't even
  indicate the direction the alert was sent, but we need to start somewhere.

- The x509_certificate function has an is_orig field now instead of
  is_server and it's position in the argument list has moved.

- A bit of reorganization and cleanup in the core analyzer.
2011-12-09 16:56:12 -05:00
Jon Siwek
2cf7bb5788 Teach Broxygen to more generally reference attribute values by name. 2011-12-09 15:39:31 -06:00
Seth Hall
3391270527 Fixed a really dumb bug that was causing the malware hash registry script to break. 2011-12-08 14:25:52 -05:00
Seth Hall
04e2773d30 Fixed some bugs with capturing data in the base DNS script. 2011-12-08 13:06:45 -05:00
Jon Siwek
80b24513e7 Fix Broxygen confusing scoped id at start of line as function parameter. 2011-12-07 17:08:38 -06:00
Jon Siwek
ab315949d6 Remove remnant of libmagic optionality 2011-12-07 12:53:11 -06:00
Robin Sommer
f1e132cd1a Adding missing script. 2011-12-07 10:28:56 -08:00
Robin Sommer
3c2fa085d4 Adapting diff-all so that it expands globs in both current and
baseline directory.

This way, it now spots if a Baseline file isn't produced anymore.

Closes #677.
2011-12-07 10:03:44 -08:00
Robin Sommer
9d5f79a0fa Updating submodule(s).
[nomail]
2011-12-06 11:49:49 -08:00
Robin Sommer
8ecbfb6284 Merge remote-tracking branch 'origin/topic/jsiwek/local-node-order'
* origin/topic/jsiwek/local-node-order:
  Omit loading local-<node>.bro scripts from base cluster framework. The loading of these is better handled by BroControl and it seems odd to load them from a base/ script anyway since they'll contain site/policy specific code.
2011-12-06 11:44:37 -08:00
Jon Siwek
506a42638a Omit loading local-<node>.bro scripts from base cluster framework.
The loading of these is better handled by BroControl and it seems
odd to load them from a base/ script anyway since they'll contain
site/policy specific code.

Addresses #663
2011-12-05 13:02:39 -06:00
Robin Sommer
b449d5652d Merge remote-tracking branch 'remotes/origin/topic/robin/broccoli-connrec'
* remotes/origin/topic/robin/broccoli-connrec:
  Adapting attribute serialization when talking to Broccoli.
2011-12-03 15:57:39 -08:00
Robin Sommer
6943b3c4b1 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Changes to Broxygen master script package index
2011-12-03 15:56:32 -08:00
Robin Sommer
ab1ac72d4b Updating submodule(s).
[nomail]
2011-12-03 14:45:02 -08:00
Robin Sommer
5a58053ef1 Updating submodule(s).
[nomail]
2011-12-02 17:19:47 -08:00
Robin Sommer
89f4e44f6a Updating submodule(s).
[nomail]
2011-12-02 17:11:44 -08:00
Robin Sommer
f59c766858 Portability fix for new patch. 2011-12-02 17:00:08 -08:00
Robin Sommer
1e45910b25 Merge remote-tracking branch 'origin/topic/jsiwek/bro-log-suffix'
* origin/topic/jsiwek/bro-log-suffix:
  Teach LogWriterAscii to use BRO_LOG_SUFFIX env. var. (addresses #704)

Closes #704.
2011-12-02 16:52:18 -08:00
Jon Siwek
a43ed633a4 Changes to Broxygen master script package index
- Now only lists packages as those directories in the script hierarchy
  that contain an __load__.bro file.
- Script packages (dirs with a __load__.bro file), can now include a
  README (in reST format) that will automatically be appended under
  the link to a specific package in the master package index.
2011-12-02 13:59:33 -06:00
Robin Sommer
03b7ebfb5b Merge remote-tracking branch 'origin/topic/jsiwek/fix-dns-double-free'
* origin/topic/jsiwek/fix-dns-double-free:
  Fix double-free of DNS_Mgr_Request object (addresses #661)

Closes #661.
2011-12-01 16:40:07 -08:00
Robin Sommer
df3ae4b30d Merge remote-tracking branch 'origin/topic/jsiwek/remote-log-peer'
* origin/topic/jsiwek/remote-log-peer:
  Add a remote_log_peer event which contains an event_peer record param.

Closes #493.
2011-12-01 16:02:11 -08:00
Robin Sommer
220b161881 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Remove example redef of SMTP::entity_excerpt_len from local.bro.
  Add missing doc targets to top Makefile; remove old doc/Makefile. (fixes #705)
  Fix error emitted when loading local.bro in bare mode
  Small updates to address the "globals" ticket.
  Rearrange packet filter and dpd documentation.

Closes #705.
Closes #633.
2011-12-01 15:55:46 -08:00
Robin Sommer
e8a25ee68f Updating CHANGES and VERSION. 2011-12-01 15:49:10 -08:00
Jon Siwek
edc0a451f8 Teach LogWriterAscii to use BRO_LOG_SUFFIX env. var. (addresses #704) 2011-12-01 16:18:56 -06:00
Jon Siwek
0c8b5a712d Add a remote_log_peer event which contains an event_peer record param.
Addresses #493.
2011-12-01 14:07:08 -06:00
Robin Sommer
18d968adcd Adapting attribute serialization when talking to Broccoli.
Broccoli doesn't support expressions, and we now no longer send them
when serializing attributes. This is the Bro change mentioned in #606.
It's needs a correspondinly modified Broccoli identifying itself as
such, and it isn't tested yet ...

Addresses #606.
2011-12-01 11:52:01 -08:00
Jon Siwek
14c1d2ae1f Remove example redef of SMTP::entity_excerpt_len from local.bro. 2011-12-01 09:31:38 -06:00
Jon Siwek
f6494a09c9 Add missing doc targets to top Makefile; remove old doc/Makefile. (fixes #705) 2011-12-01 09:16:38 -06:00
Jon Siwek
2913a990c4 Merge branch 'master' into fastpath 2011-12-01 09:12:42 -06:00