-
Notifications
You must be signed in to change notification settings - Fork 330
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Malcolm v5.0.1 is a patch release with minor bug and security fixes. * Bugs addressed: * Very large pcaps don't get proccesed idaholab#44 * pcap files with colon (:) in the name don't process correctly idaholab#2 * turning off AUTO_TAG feature disables tagging altogether idaholab#12 * recent debinterfaces release broke configure-interfaces.py idaholab#48 * opensearch indexes in yellow state idaholab#67 * arkime capture gives mlockall_init() warning on startup idaholab#66 * Security vulnerabilities addressed: * mitigations for CVE-2021-44228 (log4shell) idaholab#68 * Other * bumped Arkime from [v3.1.1 to v3.2.0](https://github.com/arkime/arkime/blob/v3.2.0/CHANGELOG#L25-L40) * bumped OpenSearch to [v1.2.1](https://opensearch.org/blog/releases/2021/12/update-to-1-2-1/) * switched from [elasticsearch](https://pypi.org/project/elasticsearch-dsl/) to [opensearch](https://pypi.org/project/opensearch-dsl/) python client libraries * write contributor's guide for source code contributions/modifications idaholab#25 * handle new fields in ethernet/IP logs (cisagov/icsnpp-enip@c4ae505) * use more recognizable dashboards logo for OpenSearch dashboards launcher in Malcolm ISO * include patches used to build Arkime Dockerfile when building Arkime for hedgehog as well * build Zeek spicy analyzers from their various repos rather than the zeek/spicy-analyzer meta-repo
- Loading branch information
Showing
48 changed files
with
501 additions
and
253 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,10 @@ | ||
| FROM opensearchproject/opensearch:1.2.0 | ||
| FROM opensearchproject/opensearch:1.2.1 | ||
|
|
||
| # Copyright (c) 2022 Battelle Energy Alliance, LLC. All rights reserved. | ||
| LABEL maintainer="[email protected]" | ||
| LABEL org.opencontainers.image.authors='[email protected]' | ||
| LABEL org.opencontainers.image.url='https://github.com/cisagov/Malcolm' | ||
| LABEL org.opencontainers.image.documentation='https://github.com/cisagov/Malcolm/blob/master/README.md' | ||
| LABEL org.opencontainers.image.documentation='https://github.com/cisagov/Malcolm/blob/main/README.md' | ||
| LABEL org.opencontainers.image.source='https://github.com/cisagov/Malcolm' | ||
| LABEL org.opencontainers.image.vendor='Cybersecurity and Infrastructure Security Agency' | ||
| LABEL org.opencontainers.image.title='malcolmnetsec/opensearch' | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| diff --git a/CHANGELOG b/CHANGELOG | ||
| index b758055d..ee4be26c 100644 | ||
| --- a/CHANGELOG | ||
| +++ b/CHANGELOG | ||
| @@ -22,6 +22,10 @@ Node Versions: | ||
| NOTICE: Restart wiseService before capture when upgrading | ||
| NOTICE: Cross-cluster Shortcuts require you to not restart all your viewers at once after upgrading | ||
|
|
||
| +======= | ||
| +3.2.1 2022/01/xx | ||
| + - viewer - fix --insecure which broke in 3.2.0 | ||
| + | ||
| 3.2.0 2021/12/07 | ||
| - release - node 14.18.2 | ||
| - release - remove daily.sh, setup a cron directly now | ||
| diff --git a/viewer/db.js b/viewer/db.js | ||
| index 3a937c03..4c471331 100644 | ||
| --- a/viewer/db.js | ||
| +++ b/viewer/db.js | ||
| @@ -133,6 +133,9 @@ exports.initialize = async (info, cb) => { | ||
|
|
||
| if (info.usersHost) { | ||
| User.initialize({ | ||
| + insecure: info.insecure, | ||
| + ca: info.ca, | ||
| + requestTimeout: info.requestTimeout, | ||
| node: info.usersHost, | ||
| clientKey: info.esClientKey, | ||
| clientCert: info.esClientCert, | ||
| @@ -144,6 +147,9 @@ exports.initialize = async (info, cb) => { | ||
| }); | ||
| } else { | ||
| User.initialize({ | ||
| + insecure: info.insecure, | ||
| + ca: info.ca, | ||
| + requestTimeout: info.requestTimeout, | ||
| node: info.host, | ||
| clientKey: info.esClientKey, | ||
| clientCert: info.esClientCert, | ||
| diff --git a/wiseService/wiseService.js b/wiseService/wiseService.js | ||
| index 6faa3228..9f9ef783 100644 | ||
| --- a/wiseService/wiseService.js | ||
| +++ b/wiseService/wiseService.js | ||
| @@ -224,6 +224,7 @@ function setupAuth () { | ||
| const es = getConfig('wiseService', 'usersElasticsearch', 'http://localhost:9200'); | ||
|
|
||
| User.initialize({ | ||
| + insecure: internals.insecure, | ||
| node: es, | ||
| prefix: getConfig('wiseService', 'usersPrefix', ''), | ||
| apiKey: getConfig('wiseService', 'usersElasticsearchAPIKey'), |
Oops, something went wrong.