Commit graph

6849 commits

Author SHA1 Message Date
Daniel Thayer
9f5c820c7b Rename the BrokerComm namespace to Broker 2016-03-30 14:31:25 -05:00
Jan Grashoefer
2ebac70782 Added remove function to intel-framework. 2016-03-30 20:03:07 +02:00
Seth Hall
d249b76390 Added uid and conn_id to smb_auth log.
Thanks for Mike Reeves and Aaron Eppert for noticing.
2016-03-26 22:15:23 -04:00
Seth Hall
782e67d790 Merge remote-tracking branch 'origin/master' into topic/seth/smb 2016-03-26 21:15:41 -04:00
william
35a4e428cf Wrong regex literal in scripting doc 2016-03-26 01:54:51 -07:00
Johanna Amann
ee132b6da4 NetControl: fix acld whitelist command 2016-03-24 15:21:36 -07:00
Johanna Amann
ee4abb5db2 Merge remote-tracking branch 'origin/master' into topic/johanna/netcontrol-improvements 2016-03-24 15:07:38 -07:00
Johanna Amann
34ad4cf638 NetControl: add rule exists as state besides added and failure.
Rules that are already existing will, by default, not automatically be
timed out by NetControl.
2016-03-24 15:06:07 -07:00
Johanna Amann
8650841bf5 Only load openflow/netcontrol if compiled with broker. 2016-03-24 13:39:34 -07:00
Vlad Grigorescu
75de5481eb Merge remote-tracking branch 'origin/master' into topic/vladg/bit-1528 2016-03-24 11:27:31 -05:00
Seth Hall
802adb66ea Merge remote-tracking branch 'origin/master' into topic/seth/smb 2016-03-23 23:10:01 -04:00
Jan Grashoefer
cafae5351b Added support for subnets to intel-framework.
The intel-framework now supports the new indicator type Intel::SUBNET.
As subnets are matched against seen addresses, the field matched was
introduced to indicate which indicator types caused the hit. A testcase
for subents was added and the old ones have been updated accordingly.
2016-03-22 19:16:51 +01:00
Jan Grashoefer
06faee2cc8 Merge branch 'master' into topic/jgras/intel-update 2016-03-22 18:06:09 +01:00
Robin Sommer
a9cb90b6f5 Adding canonifier to test. 2016-03-21 21:08:42 -07:00
Robin Sommer
eae85afd60 Merge remote-tracking branch 'origin/topic/matthias/configure-fix'
* origin/topic/matthias/configure-fix:
  Adapt to recent change in CAF CMake script
2016-03-21 19:49:10 -07:00
Matthias Vallentin
357d52fd7d Adapt to recent change in CAF CMake script
Also deprecate --with-libcaf in favor of --with-caf, as already done in
Broker.
2016-03-21 19:02:25 -07:00
Robin Sommer
e27eef351e Merge remote-tracking branch 'origin/topic/matthias/configure-fix'
* origin/topic/matthias/configure-fix:
  Adapt to recent change in CAF CMake script
2016-03-21 18:10:07 -07:00
Matthias Vallentin
4e7e211ed0 Adapt to recent change in CAF CMake script
Also deprecate --with-libcaf in favor of --with-caf, as already done in
Broker.
2016-03-21 17:12:23 -07:00
Robin Sommer
c194919b57 Merge remote-tracking branch 'origin/topic/vladg/bit-1533'
BIT-1533 #merged

* origin/topic/vladg/bit-1533:
  Call ProtocolConfirmation in MySQL analyzer.
2016-03-21 12:46:45 -07:00
Robin Sommer
7388168a68 Merge remote-tracking branch 'origin/topic/johanna/filter_subnet_table'
BIT-1553 #merged

* origin/topic/johanna/filter_subnet_table:
  Check that there is only one of read, write, create_expire
  Update NEWS
  Fixed &read_expire for subnet-indexed tables
  Added &read_expire testcase for subnet tables
  Add filter_subnet_table bif
2016-03-21 12:20:24 -07:00
Robin Sommer
0588f3510b Updating submodule(s).
[nomail]
2016-03-21 11:59:41 -07:00
Seth Hall
095e6c2787 Fixing a test. 2016-03-21 12:08:02 -04:00
Seth Hall
89b4d79f93 Merge remote-tracking branch 'origin/master' into topic/seth/file-entropy
# Conflicts:
#	scripts/test-all-policy.bro
#	testing/btest/Baseline/coverage.default-load-baseline/canonified_loaded_scripts.log
2016-03-21 11:39:15 -04:00
Jan Grashoefer
0146e85c41 Refactoring of meta data handling for intel.
To simplify meta data handling inside the intel framework and avoid
duplicate insertion of meta data on update, meta data is stored in a
table indexed by meta data source.
2016-03-19 17:12:06 +01:00
Jan Grashoefer
c5c650b486 Added testcase for intel updates.
By addind debug output to Intel::insert() the testcase reveals that
updating an intel item will cause its metadata to be inserted again,
without the old being deleted.
2016-03-19 17:02:52 +01:00
Johanna Amann
cfffb6e634 Check that there is only one of read, write, create_expire 2016-03-18 12:34:26 -07:00
Johanna Amann
8de0804712 Update NEWS 2016-03-18 12:33:59 -07:00
Johanna Amann
33f9eca0c8 Update TLS constants and extensions from IANA. 2016-03-18 11:23:44 -07:00
Johanna Amann
0ac1a81388 Merge branch 'topic/johanna/filter_subnet_table' of https://github.com/J-Gras/bro into topic/johanna/filter_subnet_table
* 'topic/johanna/filter_subnet_table' of https://github.com/J-Gras/bro:
  Fixed &read_expire for subnet-indexed tables
  Added &read_expire testcase for subnet tables

Includes a bit of refactoring of commit code & code related to the
feature.
2016-03-17 21:26:57 -07:00
Vlad Grigorescu
d731cb9a18 Call ProtocolConfirmation in SNMP only if we saw a response SNMP packet 2016-03-17 14:25:15 -05:00
Vlad Grigorescu
f4141bde6d Call ProtocolConfirmation in SIP only if we saw a response SIP packet 2016-03-17 14:23:18 -05:00
Jan Grashoefer
d5034ccc19 Fixed &read_expire for subnet-indexed tables 2016-03-17 19:56:25 +01:00
Jan Grashoefer
a5f4e8aafe Added &read_expire testcase for subnet tables 2016-03-17 19:53:22 +01:00
Vlad Grigorescu
e8bdf14bfd Call ProtocolConfirmation in MySQL analyzer. 2016-03-17 13:49:06 -05:00
Johanna Amann
a6cb85d86a Add filter_subnet_table bif
This bif works similar to the matching_subnet bif. The difference is
that, instead of returning a vector of the subnets that match, we return
a filtered view of the original set/table only containing the changed
subnets.

This commit also fixes a small bug in TableVal::UpdateTimestamp
(ReadOperation only has to be called when LoggingAccess() is true).
2016-03-16 15:50:13 -07:00
Johanna Amann
bbbfac3af9 NetControl: Suppress duplicate "plugin activated" messages. 2016-03-16 10:36:12 -07:00
Johanna Amann
06414e5c40 NetControl: make new broker plugin options accessible 2016-03-14 21:10:30 -07:00
Johanna Amann
0bac1faa09 NetControl: add predicates to broker plugin
I apparently just forgot to add these.
2016-03-14 18:48:49 -07:00
Robin Sommer
f5ce4785ea Updating submodule(s).
[nomail]
2016-03-11 15:26:16 -08:00
Robin Sommer
2233521de7 Merge remote-tracking branch 'origin/topic/johanna/netcontrol'
BIT-1550 #merged

* origin/topic/johanna/netcontrol: (72 commits)
  Update baselines and news
  Move prefixtable back to all IPv6 internal handling.
  NetControl: Add functions to search for rules affecting IPs/subnets
  Add check_subnet bif that allows exact membership test for subnet tables.
  Rewrite internal handling of rules.
  Add bif that allows searching for all matching subnets in table.
  Add signaling of succesful initialization of plugins to NetControl.
  Add rule hooks to the acld plugin.
  Add new logfiles for shunting and drops to netcontrol
  Extend NetControl logging and fix bugs.
  Update OpenFlow API and events.
  small acld plugin fix
  Revert "introduce &weaken attribute"
  Fix crash when printing type of recursive structures.
  Testcase for crash when a record contains a function referencing a record.
  Rename Pacf to NetControl
  fix acld plugin to use address instead of subnet (and add functions for conversion)
  implement quarantine
  miscelaneous missing bits and pieces
  Acld implementation for Pacf - Bro side.
  ...
2016-03-11 14:29:23 -08:00
Johanna Amann
205ad0d55a Update baselines and news
Includes tiny patches to make all test succesfully pass.
2016-03-11 10:32:36 -08:00
Seth Hall
f2ecc7df23 Merge branch 'master' of ssh://git.bro-ids.org/bro 2016-03-11 12:56:55 -05:00
Seth Hall
08399da6cb Files transferred over FTP were showing incorrect sizes.
The server-reported file size was being collected poorly and if
a file name had a number in it, that was reported as the file
size instead of the actual size.

A new test is included to avoid reintroducing the problem.
2016-03-11 12:56:28 -05:00
Johanna Amann
50b03676ea Merge branch 'topic/johanna/netcontrol' of ssh://git.bro.org/bro into topic/johanna/netcontrol 2016-03-11 09:45:33 -08:00
Johanna Amann
ad9b0fc550 Move prefixtable back to all IPv6 internal handling.
Changing that was just a bad idea and unnecessary.
2016-03-11 09:44:57 -08:00
Johanna Amann
4d719ad4db Merge remote-tracking branch 'origin/master' into topic/johanna/netcontrol 2016-03-11 09:20:52 -08:00
Robin Sommer
15c157d8ff Updating submodule(s).
[nomail]
2016-03-10 13:25:33 -08:00
Robin Sommer
3d1b5814fd Updating submodule(s).
[nomail]
2016-03-10 12:06:48 -08:00
Robin Sommer
dde52abb1a Updating submodule(s).
[nomail]
2016-03-10 12:03:34 -08:00
Johanna Amann
21c300c333 NetControl: Add functions to search for rules affecting IPs/subnets
Adds the functions

NetControl::find_rules_addr and NetControl::fund_rules_subnet

which return a vector containing all rules affecting a certain IP or
subnet.
2016-03-09 21:32:15 -08:00