Commit Graph

769 Commits

Author SHA1 Message Date
Toni Uhlig
2c771c54b0 Merge commit 'fb1dcc71de39e6dd5c11b8bc4288ec5e618fa946' 2024-10-17 12:16:40 +02:00
Toni Uhlig
fb1dcc71de Squashed 'dependencies/jsmn/' changes from 1aa2e8f8..25647e69
25647e69 Fix position of a comment in string parsing

git-subtree-dir: dependencies/jsmn
git-subtree-split: 25647e692c7906b96ffd2b05ca54c097948e879c
2024-10-17 12:16:40 +02:00
Toni Uhlig
071a9bcb91 Merge commit '9a14454d3c5589373253571cee7428c593adefd9' 2024-10-17 12:16:20 +02:00
Toni Uhlig
9a14454d3c Squashed 'dependencies/uthash/' changes from bf152630..f69112c0
f69112c0 utarray: Fix typo in docs
619fe95c Fix MSVC warning C4127 in HASH_BLOOM_TEST (#261)
eeba1961 uthash: Improve the docs for HASH_ADD_INORDER
ca98384c HASH_DEL should be able to delete a const-qualified node
095425f7 utlist: Add one more assertion in DL_DELETE2
399bf74b utarray: Stop making `oom` a synonym for `utarray_oom`
85bf75ab utarray_str_cpy: Remove strdup; utarray_oom() if strdup fails.
1a53f304 GitHub CI: Also test building the docs (#248)
4d01591e The MCST Elbrus C Compiler supports __typeof. (#247)
1e0baf06 CI: Add GitHub Actions CI
8844b529 Update test57.c per a suggestion by @mark-summerfield
44a66fe8 Update http:// URLs to https://, and copyright dates to 2022. NFC.

git-subtree-dir: dependencies/uthash
git-subtree-split: f69112c04f1b6e059b8071cb391a1fcc83791a00
2024-10-17 12:16:20 +02:00
Toni Uhlig
f9d9849300 Updated Grafana dashboard to make correct use of gauge max values.
Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
2024-10-17 12:14:28 +02:00
Toni
efed6f196e Read and parse configuration files. Fixes #41. (#42)
Read and parse configuration files. Fixes #41.

 * supports nDPId / nDPIsrvd via command line parameter `-f`
 * nDPId: read general/tuning and libnDPI settings
 * support for settings risk domains libnDPI option via config file or via `-R` (Fixes #45, thanks to @UnveilTech)
 * added some documentation in the config file
 * adjusted Systemd and Debian packaging to make use of config files

Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
2024-10-16 14:13:55 +02:00
Naix
3e2ce661f0 Added Filebeat Configuration (#44)
Added Filebeat Configuration

Co-authored-by: Toni <matzeton@googlemail.com>
2024-10-06 11:09:54 +02:00
Toni Uhlig
76e1ea0598 Updated Grafana dashboard.
Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
2024-10-02 19:29:14 +02:00
Toni Uhlig
0e792ba301 Generate global stats with microseconds precision.
Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
2024-10-01 11:58:39 +02:00
Toni Uhlig
9ef17b7bd8 Added some static assertion based sanity checks.
Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
2024-09-11 13:28:20 +02:00
Toni Uhlig
1c9aa85485 Save hostname after detection finished for later use within analyse/end/idle flow events. Fixes #39.
Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
2024-09-11 13:01:23 +02:00
Toni Uhlig
aef9d629f0 bump libnDPI to 92507c014626bc542f2ab11c729742802c0bc345
Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
2024-09-09 09:29:08 +02:00
Toni Uhlig
f97b3880b6 CI: Set nDPI minimum required version to 4.10
Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
2024-09-03 13:58:44 +02:00
Toni Uhlig
c55429c131 Updated flow event schema with risk names/severites.
Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
2024-09-03 13:56:15 +02:00
Toni Uhlig
7bebd7b2c7 Fix OpenWrt package build.
Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
2024-09-02 17:51:38 +02:00
Toni Uhlig
335708d3e3 Extend flow JSON schema with more properties from nDPI JSON serializer.
* unfortunately, JSON schema definitions could not be used to make this easier to read and maintain

Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
2024-08-22 17:36:59 +02:00
Toni Uhlig
2a0161c1bb Fix CI.
Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
2024-08-20 12:17:25 +02:00
Toni Uhlig
adb8fe96f5 CMake: add coverage-clean target and fix coverage dependency issue.
* improve/fix README

Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
2024-08-20 11:49:38 +02:00
Toni Uhlig
4efe7e43a2 Improved installation instructions. Fixes #40.
Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
2024-08-19 18:39:35 +02:00
Toni
5e4005162b Add PF_RING support. (#38) 2024-08-19 18:33:18 +02:00
Toni Uhlig
a230eaf061 Improved Keras Autoencoder hyper parameter.
Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
2024-08-16 13:20:35 +02:00
Toni Uhlig
68e0c1f280 Fix SonarCloud complaint.
Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
2024-08-16 13:19:13 +02:00
Toni Uhlig
8271f15e25 Fixed build error due to missing nDPI includes.
Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
2024-08-16 13:14:21 +02:00
Toni Uhlig
f6f3a4daab Extended analyse application to write global stats to a CSV.
Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
2024-08-16 12:33:46 +02:00
Toni Uhlig
762e6d36bf Some small fixes.
Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
2024-08-09 11:09:39 +02:00
Toni Uhlig
930aaf9276 Added global (heap) memory stats for daemon status events.
* added new CMake option `ENABLE_MEMORY_STATUS` to restore the old behavior
   (and increase performance)
 * splitted `ENABLE_MEMORY_PROFILING` into `ENABLE_MEMORY_STATUS` and `ENABLE_MEMORY_PROFILING`

Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
2024-06-19 14:25:42 +02:00
Toni Uhlig
165b18c829 Fixed OpenWrt nDPId-testing build.
Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
2024-06-12 15:07:17 +02:00
dependabot[bot]
1fbfd46fe8 Bump werkzeug from 3.0.1 to 3.0.3 in /examples/py-flow-dashboard (#37)
Bumps [werkzeug](https://github.com/pallets/werkzeug) from 3.0.1 to 3.0.3.
- [Release notes](https://github.com/pallets/werkzeug/releases)
- [Changelog](https://github.com/pallets/werkzeug/blob/main/CHANGES.rst)
- [Commits](https://github.com/pallets/werkzeug/compare/3.0.1...3.0.3)

---
updated-dependencies:
- dependency-name: werkzeug
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-05-29 14:03:11 +02:00
Toni Uhlig
5290f76b5f flow-info.py: Set min risk severity required to print a risk.
* ReadMe update

Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
2024-05-08 00:25:31 +02:00
Toni Uhlig
f4d0f80711 CI: don't run systemd integration test on mac
Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
2024-05-07 09:42:30 +02:00
Toni Uhlig
187ebeb4df CI: add DYLD_LIBRARY_PATH to env (mac/unix)
Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
2024-05-07 09:27:46 +02:00
Toni Uhlig
71d2fcc491 CMake: set MacOS RPATH
Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
2024-05-06 09:57:00 +02:00
Toni Uhlig
86aaf0e808 Workaround for fixing GitHub runners on macOS
* See: https://github.com/ntop/nDPI/pull/2411

Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
2024-05-06 09:41:09 +02:00
Toni Uhlig
e822bb6145 Fix OpenWrt builds.
Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
2024-04-17 09:25:37 +02:00
Toni Uhlig
4c91038274 Removed unmaintained C JSON dumper.
Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
2024-04-17 01:47:31 +02:00
Toni Uhlig
53126a0af9 bump libnDPI to 142c8f5afb90629762920db6703831826513e00b
* fixed `git format` hash length

Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
2024-04-10 16:06:53 +02:00
Toni Uhlig
15608bb571 bump libnDPI to 09bb383437c11ef55e926ed15cdf986c0d426827
* fixed "unused function" warning in `ndpi_bitmap64_fuse.c`

Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
2024-04-04 21:13:33 +02:00
Toni Uhlig
e93a4c9a81 bump libnDPI to df29e12f5efbe84306c1ee7c011a197caec6de50
* fixed "unused function" warning in `roaring.h`

Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
2024-04-04 19:33:34 +02:00
Toni Uhlig
b46f15de03 bump libnDPI to 6e61368cd609899048560405ad792705fffb1f1a
* fixed "unused function" warning in `gcrypt_light.c`

Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
2024-04-04 14:08:34 +02:00
Toni Uhlig
c7eace426c bump libnDPI to 9185c2ccc402d3368fc28ac90ab281b4f951719e
* incorporated API changes from 41eef9246c6a3055e3876e3dd7aeaadecb4b76c0

Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
2024-04-04 11:49:48 +02:00
Toni Uhlig
33560d64d2 Fix example build error if memory profiling enabled.
* CI: build against libnDPI with `-DNDPI_NO_PKGCONFIG=ON` and `-DSTATIC_LIBNDPI_INSTALLDIR=/usr`
 * CI: `ENABLE_DBUS=ON` for most builds

Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
2024-03-21 07:26:22 +01:00
Toni Uhlig
675640b0e6 Fixed libpcre2 build.
* CI: build against libpcre2 / libmaxminddb

Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
2024-03-20 14:55:09 +01:00
Toni Uhlig
5e5f268b3c Build against nDPI dev branch tarball if there is a new release required to build nDPId.
Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
2024-03-16 18:45:11 +01:00
Toni Uhlig
7ef7667da3 Fix random sanitizer crashes caused by high-entropy ASLR on Ubuntu Github Runner.
* removed arch condition (c&p mistake)

Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
2024-03-15 06:57:38 +01:00
Toni Uhlig
d43a3d1436 Fix random sanitizer crashes caused by high-entropy ASLR on Ubuntu Github Runner.
* See: https://github.com/actions/runner-images/issues/9491

Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
2024-03-14 18:26:31 +01:00
Toni Uhlig
b6e4162116 Extend CI pipeline build and test.
Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
2024-03-07 17:46:31 +01:00
Toni Uhlig
717d66b0e7 Fixed missing statistics updating for unknown mapping keys in collectd/influxd.
Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
2024-02-20 23:16:31 +01:00
Toni Uhlig
791b27219d CI maintenance
Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
2024-02-13 11:26:58 +01:00
Toni Uhlig
a487e53015 Added missing influxd test results.
Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
2024-02-13 10:50:51 +01:00
Toni Uhlig
aeb6e6f536 Enable CURL in the CI.
Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
2024-02-13 10:44:45 +01:00