Commit graph

75 commits

Author SHA1 Message Date
Robin Sommer
2892026201 Merge remote-tracking branch 'origin/topic/jsiwek/irc-orig'
* origin/topic/jsiwek/irc-orig:
  Shorten what's displayed in the IRC's log mime_type column for DCC transfers
  Add IRC unit tests.
  Small tweak to IRC event handlder priorities
  Fix IRC analyzer supplying wrong type to irc_dcc_message event.
  Changes to IRC analyzer and events (addresses #469).
2011-07-20 17:13:06 -07:00
Jon Siwek
beb44aee62 Shorten what's displayed in the IRC's log mime_type column for DCC transfers 2011-07-20 15:08:19 -05:00
Jon Siwek
ed1f1317e3 Small tweak to IRC event handlder priorities 2011-07-20 13:22:16 -05:00
Jon Siwek
063ad9a103 Fix IRC analyzer supplying wrong type to irc_dcc_message event.
And other IRC policy tweaks.
2011-07-20 13:19:44 -05:00
Jon Siwek
a73ef6f0e1 Changes to IRC analyzer and events (addresses #469).
- Removed irc_client and irc_server events.
- Added is_orig arguments to all other irc events.
- Fix analyzer not recognizing Turbo DCC extension message format.
- Fix analyzer not generating irc_dcc_message event when irc_privmsg_message
  event doesn't have a handler registered.
- Changes to IRC policy scripts to use the above changes.
2011-07-19 17:06:01 -05:00
Seth Hall
7ad0af666d Renamed utils/conn_ids.bro to utils/conn-ids.bro for consistency. 2011-07-19 12:00:27 -04:00
Seth Hall
cee3991822 Script updates.
- Fixing more vestiges from moving site.bro and removing functions.bro

- Updates comments on analysis-groups.bro

- Added the trim-trace-file script from broctl.
2011-07-19 10:41:54 -04:00
Seth Hall
7bf3e94628 Added a policy/site directory with a local.bro start up script. 2011-07-18 14:30:38 -04:00
Seth Hall
0332a06012 Fixed most of the tests after the script reorganization. 2011-07-12 14:12:25 -04:00
Seth Hall
b307cbbe64 Large reorganization.
- Scripts now use the full path for @load to remove the subpaths
  from the shipped BROPATH.
- Some script sets have been reorganized to make optional loads
  more obvious.
2011-07-08 00:04:01 -04:00
Seth Hall
46d0cf517b Start detecting Microsoft Sharepoint servers. 2011-07-06 09:18:22 -04:00
Seth Hall
ef96dc8d4d Spelling mistake caused known-services to not work quite right. 2011-07-05 15:55:33 -04:00
Robin Sommer
94be787261 Merge remote branch 'remotes/origin/topic/policy-scripts-new'
* remotes/origin/topic/policy-scripts-new:
  Fixed another SSL analyzer memory leak.
  Attempting to fix another SSL bug.
  Fixing a ref counting bug in the SSL analyzer that I just introduced.
  Fixing memory leaks in SSL analyzer.
  Fixed a parsing bug in the SSL analyzer thanks to tracefile from Aashish Sharma.
  Removing my fix from earlier.  This is indicating the script-land generated events priority problem.
  Updates to the DPD framework.
  Fixed a bug in the auth-addl DNS script.

Conflicts:
	src/bro.bif
2011-07-01 18:59:34 -07:00
Robin Sommer
bff8d39428 Fixing bug with even priorities potentially being ignored for the
handler.
2011-07-01 15:40:42 -07:00
Robin Sommer
9709b1d522 Merge remote branch 'origin/topic/robin/reporting'
* origin/topic/robin/reporting:
  Syslog BiF now goes through the reporter as well.
  Avoiding infinite loops when an error message handlers triggers errors itself.
  Renaming the Logger to Reporter.
  Overhauling the internal reporting of messages to the user.

Updating a bunch of tests/baselines as well.

Conflicts:
	aux/broccoli
	policy.old/alarm.bro
	policy/all.bro
	policy/bro.init
	policy/frameworks/notice/weird.bro
	policy/notice.bro
	src/SSL-binpac.cc
	src/bro.bif
	src/main.cc
2011-07-01 13:59:21 -07:00
Robin Sommer
80fcabdb47 Polishing the setup for external tests. 2011-06-30 22:54:25 -07:00
Seth Hall
26248fa243 Removing my fix from earlier. This is indicating the script-land generated events priority problem. 2011-06-30 22:09:16 -04:00
Seth Hall
e3f6909b93 Fixed a bug in the auth-addl DNS script. 2011-06-30 21:24:12 -04:00
Seth Hall
00065c88dd Moved the RPC script into the right place. 2011-06-30 16:47:11 -04:00
Seth Hall
556bc55068 More SSL script cleanup. 2011-06-30 16:45:13 -04:00
Seth Hall
24d570a94c Updates and fixes for the SSL analyzer.
- Fixed a pretty major eternal looping bug in the SSL analyzer and
  a few other parsing problems.
- New core scripts and log for SSL connection analysis.
- New known-certs script for logging certificate assets.
2011-06-30 13:23:31 -04:00
Seth Hall
de21409921 Renaming a poorly named notice. 2011-06-27 15:46:50 -04:00
Seth Hall
16b9a0e025 Fixed bug I just introduced to known-services. 2011-06-27 12:59:23 -04:00
Seth Hall
0337107a95 Known services now only logs for "normal" connections. 2011-06-27 12:46:05 -04:00
Seth Hall
04aa03e4ab New default notice actions for emailing network admins.
- When ACTION_EMAIL_ADMIN_ORIG or ACTION_EMAIL_ADMIN_RESP
  is applied to a notice,
  the email addresses associated with the address
  are collected from the new local_admins table
  and the email is sent to all discovered email addresses.
- The site.bro script is now in the Site module.
- Some other small cleanup.
2011-06-25 01:17:09 -04:00
Seth Hall
77948482b6 Finishing the inactivity script. 2011-06-24 16:13:45 -04:00
Seth Hall
da635c0c2c Bringing the inactivity script back. 2011-06-24 13:17:17 -04:00
Seth Hall
4a31399953 Changing FTP tags to strings instead of enum values.
- This makes FTP command/response tags more similar
  to tags used in other scripts.
2011-06-19 22:59:50 -04:00
Seth Hall
856fd37759 Fixed a bug in the HTTP:build_url_http function. 2011-06-19 03:02:15 -04:00
Seth Hall
93f1b53165 Fixing a bug where a nearly empty MIME record could be logged. 2011-06-19 02:31:53 -04:00
Seth Hall
1ac65f44d2 Fixing a bug with MIME entity hashing. 2011-06-19 02:24:48 -04:00
Seth Hall
60a305c111 Intelligence framwork updates.
- Split Item into Item and QueryItem as suggested by Robin.
- QueryItem now has $and_tags and $or_tags.  Each
  acts as AND or OR for the given tags against
  each relevant metadata value.
- 'insert' turned into a function and new insert_event created.
- First use of intelligence framework in HTTP analysis.
2011-06-17 23:30:16 -04:00
Seth Hall
e17193ff3e Renamed HTTP::build_url function to HTTP::build_url_http
- HTTP::build_url no longer prepends http:// to the url.
2011-06-17 23:26:54 -04:00
Seth Hall
291920b013 Some minor updates and comment tweaking. 2011-06-17 21:53:07 -04:00
Seth Hall
9f22a882cd Updates to mime scripts based on comments from Robin.
- Removed reverse dependency of mime loading smtp.
- Extracting filename correctly now.
- Now copes with mime_end_entity dual firing bug.
- File hashing interface more similar to other file
  hashing interfaces.
- New notice for when a hash is calculated.
2011-06-17 21:49:23 -04:00
Seth Hall
57297eeca4 Removed webapp detection from default load. 2011-06-16 13:22:19 -04:00
Seth Hall
51b926f16a Fixed problem with HTTP file hashing
- HTTP file hashing now won't generate MD5 sums if
  a content gap happened during the file transfer.
2011-06-16 10:48:55 -04:00
Seth Hall
a8f760c570 Loading the http/file-extract by default with the http/ scripts.
- Nothing is extracted by default.
2011-06-15 13:27:49 -04:00
Seth Hall
e792faab04 File identification and hashing now working and improved.
- File type identification falls back to libmagic
  if nothing is detected by the sigs.
- File extraction broken and waiting upon a fix for
  ticket #474
2011-06-15 13:11:11 -04:00
Seth Hall
dbbf73214c KnownServices only doing TCP based services now. 2011-06-15 13:09:22 -04:00
Seth Hall
ad66c9c4d9 Script cleanup.
- Defaults for all built-in asset tracking changed to LOCAL_HOSTS
- Added a tuning script for changing asset tracking
  to ALL_HOSTS in all of the core scripts that do
  asset tracking.
- Default Notice::policy files notices instead of alarming on them.
- Moved KnownHosts::Info back to export section because
  the log_known_hosts event can't be defined in the
  export section without it.
- Moved the Malware Hash Registry detection out of
  the core HTTP protocol scripts and added it to the
  all.bro script.
2011-06-15 11:27:39 -04:00
Seth Hall
5be7caa4d8 Updates to misc scripts based on comments from Robin and Jon. 2011-06-14 15:55:30 -04:00
Seth Hall
9ee7d02554 Renaming direction and host functions for clarity. 2011-06-14 14:28:34 -04:00
Seth Hall
4d35c0b8ca Reworked the directions and hosts functionality again.
- Split enum values into two separate enums.
- Renamed to fit the enum naming convention.
- New global variable named default_asset_tracking
  that changes default behavior of any script that
  tracks assets, usually by storing some amount
  of information about the network in memory.
2011-06-14 14:23:02 -04:00
Seth Hall
f13cf830ea Updates to several things that are loosely linked together.
- Changed enum values to determine hosts and directions.
- Fixed a bug in detecting mail clients.
- Fixed a couple of problems with vulnerable software detection.
- New variable "Software::asset_tracking" for
  determining which software to track.
2011-06-14 13:39:50 -04:00
Seth Hall
e0e0c99889 Cleaned up the webmail detection.
- Moved webmail detection into the smtp/software script.
- Added an option to detect mail clients based on
  the actual TCP connection the mail was seen being
  transferred over.
2011-06-14 12:47:25 -04:00
Seth Hall
c327144ac0 Extract application server software based on X-Powered-By header. 2011-06-13 21:56:18 -04:00
Seth Hall
08dca169f6 Fixed a problem with accessing the method attribute on an HTTP::Info record.
- Found by Jim Barlow.
2011-06-13 14:30:16 -04:00
Seth Hall
d29ffc759d Added Zimbra to the webmail detection over SMTP. 2011-06-10 14:09:26 -04:00
Seth Hall
cbe3dc811e HTTP script updates
- Fixed bug with new sessions accidently being created
  just after logging which caused a lot of empty records
  to be logged.
- Readded the HTTP::MD5 notice for when an MD5 sum is
  calculated for HTTP response bodies.
- Fixed bug with extracting value from content-length
  headers.
- Flushing values from md5 sum generation more reliably
  to avoid leaking memory.
2011-06-10 09:25:42 -04:00