Commit graph

9501 commits

Author SHA1 Message Date
Mauro Palumbo
df0a4b9bb7 fix key_id and digest (WIP) 2019-06-05 18:15:18 +02:00
Mauro Palumbo
2dc7695d87 fix wrong Assign with reference_id 2019-06-05 15:26:45 +02:00
Mauro Palumbo
48cda6a81d add tests for ntp protocol (finished) 2019-06-05 11:17:40 +02:00
Jon Siwek
80fe3d5583 Simplify threading::Value destructor 2019-06-04 19:30:21 -07:00
Jon Siwek
59596e0bfa Merge branch 'master' of https://github.com/ZekeMedley/zeek
* 'master' of https://github.com/ZekeMedley/zeek:
  Use the right delete and improve the leak test. Increases the size of the table being loaded in the pattern leak test and uses the right delete method.
  Fix formatting.
  Fix memory leak and add test.
  Add pattern support to input framework.
2019-06-04 19:19:19 -07:00
Jon Siwek
43104565a4 Merge remote-tracking branch 'origin/topic/timw/159-coerce-counts'
* origin/topic/timw/159-coerce-counts:
  GHI-155: set the type of a vector based on the variable's type, not the value's type
  GH-159: Allow coercion of numeric values into other types
  Allow passing a location to BroObj::Warning and BroObj::Error.
  Add CLion directories to gitignore
  Move #define outside of max_type for clarity
2019-06-04 17:57:15 -07:00
Tim Wojtulewicz
394aec5a72 GHI-155: set the type of a vector based on the variable's type, not the value's type 2019-06-04 14:59:17 -07:00
ZekeMedley
42b1f4fd2e Make paraglob serializable and copyable. 2019-06-04 14:56:48 -07:00
ZekeMedley
e1520a0d67 Initial paraglob integration. 2019-06-04 14:24:51 -07:00
Jon Siwek
9e43028137 Updating submodule(s).
[nomail]
2019-06-04 12:45:37 -07:00
Jon Siwek
264c571089 Updating submodule(s).
[nomail]
2019-06-04 11:22:30 -07:00
Jon Siwek
a388f51eaa Merge remote-tracking branch 'origin/topic/robin/clone-cycles'
* origin/topic/robin/clone-cycles:
  GH-293: Protect copy() against reference cycles.
2019-06-04 10:31:01 -07:00
Tim Wojtulewicz
76fe643c87 GH-159: Allow coercion of numeric values into other types 2019-06-04 10:08:41 -07:00
Mauro Palumbo
50f265353b add tests for ntp protocol (WIP) 2019-06-04 17:59:18 +02:00
Mauro Palumbo
75b7be302f fix problem with time vals 2019-06-04 17:10:57 +02:00
Mauro Palumbo
208768c0e9 add ntp records to init-bare.zeek 2019-06-04 16:09:32 +02:00
Mauro Palumbo
c8f4d68185 update ntp analyzer to val_mgr 2019-06-04 12:22:37 +02:00
Palumbo Mauro
ce07b10aa8 extend and refact script-side of NTP analyzer 2019-06-03 17:50:32 +02:00
Palumbo Mauro
411908a102 extend and refactor several fields 2019-06-03 17:46:22 +02:00
Palumbo Mauro
19fd5f66e8 refactor mode 7 2019-06-03 17:26:46 +02:00
Robin Sommer
0767598771 GH-293: Protect copy() against reference cycles.
Reference cycles shouldn't occur but there's nothing really preventing
people from creating them, so may just as well be safe and deal with
them when cloning values. While the code is a bit more cumbersome this
way, it could actually be bit faster as well as it no longer caches
non-mutable values. (I measured it with the test suite: That's about
the same in execution time, maybe tiny little bit faster now;
definitly not slower).
2019-06-03 15:20:30 +00:00
Palumbo Mauro
8b0098a8d4 remove events ntp_mode6_message and ntp_mode7_message 2019-06-03 17:17:38 +02:00
Palumbo Mauro
145c7f9a25 Merge remote-tracking branch 'origin/topic/vlad/ntp_rewrite' into ntp2 2019-06-03 17:04:17 +02:00
Johanna Amann
86ac468882 support the newer TLS 1.3 key_share extension.
This one adds a separate new case that has to be parsed differently - if
a hello-retry-request is sent, only the namedgroup is sent - without the
additional key material.

Support for the legacy extension is retained.
2019-06-03 14:40:33 +10:00
Johanna Amann
af59ed6bdb Merge remote-tracking branch 'origin/master' into topic/johanna/tls13-details 2019-06-03 12:19:12 +10:00
Jon Siwek
1e488d7ebe Remove old documentation reference to rotate_interval 2019-05-31 13:37:44 -07:00
Tim Wojtulewicz
2d61ea5cd6 Allow passing a location to BroObj::Warning and BroObj::Error.
This allows callers (such as check_and_promote) to pass an expression location to be logged if the location doesn't exist in the value being promoted.
2019-05-31 12:11:42 -07:00
Jon Siwek
39c201f88e Updating submodule(s).
[nomail]
2019-05-30 21:35:40 -07:00
Tim Wojtulewicz
8ca2cff13f Add CLion directories to gitignore 2019-05-30 16:00:18 -07:00
Tim Wojtulewicz
7243292136 Move #define outside of max_type for clarity 2019-05-30 16:00:18 -07:00
Jon Siwek
6860d5b083 Merge branch 'topic/christian/inputframework-warning-fix' of https://github.com/ckreibich/zeek
* 'topic/christian/inputframework-warning-fix' of https://github.com/ckreibich/zeek:
  Tweak to ASCII reader warning suppression
2019-05-30 11:00:19 -07:00
ZekeMedley
0733c857d2 Use the right delete and improve the leak test.
Increases the size of the table being loaded in the pattern leak
test and uses the right delete method.
2019-05-30 09:31:02 -07:00
Christian Kreibich
c21a411bfb Tweak to ASCII reader warning suppression
Warnings in the ASCII reader so far remained suppressed even when an
input file changed. It's helpful to learn about problems in the data
when putting in place new data files, so this isn't great. This change
maintains the existing warning suppression while processing a file,
but re-enables warnings after updates to a file.

Also includes minor comment clarifications, and maintains the
not-so-great code duplication between the ASCII and Config readers
until we refactor this properly.
2019-05-29 23:59:45 -07:00
Jon Siwek
1ce0fcce49 GH-387: update Broker topic names to use "zeek/" prefix 2019-05-29 15:56:37 -07:00
ZekeMedley
7227908d74 Fix formatting. 2019-05-29 15:34:31 -07:00
ZekeMedley
7584bf65e2 Fix memory leak and add test. 2019-05-29 15:29:30 -07:00
Jon Siwek
c25520cf3f Updating submodule(s).
[nomail]
2019-05-29 14:55:51 -07:00
ZekeMedley
cfeb6f0f0d Add pattern support to input framework. 2019-05-29 12:19:40 -07:00
Jon Siwek
c3725a5e3f Merge remote-tracking branch 'origin/topic/vlad/rdp_bluekeep'
* origin/topic/vlad/rdp_bluekeep:
  RDP: Add weird if specification violated for max channels allowed.
2019-05-29 09:48:31 -07:00
Vlad Grigorescu
2005a76896 WIP: BinPAC NTP analyzer 2019-05-29 09:37:55 -05:00
Vlad Grigorescu
be4f6eae0e Ran binpac_quickstart for NTP (UDP, not buffered) 2019-05-29 09:04:48 -05:00
Vlad Grigorescu
232bee4096 Remove old NTP analyzer. 2019-05-29 08:36:25 -05:00
Vlad Grigorescu
10109b6b93 RDP: Add weird if specification violated for max channels allowed. 2019-05-29 08:25:08 -05:00
Jon Siwek
574d2c363a Merge remote-tracking branch 'origin/topic/jsiwek/broker-less-copies'
* origin/topic/jsiwek/broker-less-copies:
  Reduce data copying in Broker message processing
2019-05-28 17:58:59 -07:00
Jon Siwek
ebbeb4517b Merge remote-tracking branch 'origin/topic/jsiwek/broker-store-process-n'
* origin/topic/jsiwek/broker-store-process-n:
  Improve Broker I/O loop integration: less mutex locking
  Improve processing of broker data store responses
2019-05-28 17:43:52 -07:00
Jon Siwek
4ff473a596 Updating submodule(s).
[nomail]
2019-05-28 14:07:35 -07:00
Jon Siwek
f88843c5e9 Updating submodule(s).
[nomail]
2019-05-28 13:33:46 -07:00
Jon Siwek
7bc9a3934d Merge remote-tracking branch 'origin/topic/vlad/rdp_bluekeep'
* origin/topic/vlad/rdp_bluekeep:
  RDP: Update existing baselines with new client_channels field
  RDP: Add parsing and logging of channels requested by the client. Can determine capabilities requested by the client, as well as attacks such as CVE-2019-0708
2019-05-28 11:33:20 -07:00
Jon Siwek
f2b7764769 Merge branch 'table-error' of https://github.com/ZekeMedley/zeek
* 'table-error' of https://github.com/ZekeMedley/zeek:
  Check table yield type on assignment.

Also extended the type checking to include sets as well as the full
table type (yield type as well as index types).
2019-05-28 10:51:50 -07:00
Vlad Grigorescu
85fc553136 RDP: Update existing baselines with new client_channels field 2019-05-28 09:31:32 -05:00