Skip to content

Commit cfdba2f

Browse files
committed
Merge branch 'develop' into entry_point_enum
2 parents d520987 + b0eaac6 commit cfdba2f

File tree

12 files changed

+627
-409
lines changed

12 files changed

+627
-409
lines changed

CHANGELOG.md

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,34 +11,74 @@ CHANGELOG
1111
------------------
1212

1313
### Configuration
14+
- Add new optional configuration parameters for `intelmq.bots.collectors.stomp.collector`
15+
and `intelmq.bots.outputs.stomp.output` (PR#2408 by Jan Kaliszewski):
16+
- `auth_by_ssl_client_certificate` (Boolean, default: *true*; if *false* then
17+
`ssl_client_certificate` and `ssl_client_certificate_key` will be ignored);
18+
- `username` (STOMP authentication login, default: "guest"; to be used only
19+
if `auth_by_ssl_client_certificate` is *false*);
20+
- `password` (STOMP authentication passcode, default: "guest"; to be used only
21+
if `auth_by_ssl_client_certificate` is *false*).
1422

1523
### Core
1624
- `intelmq.lib.message`: For invalid message keys, add a hint on the failure to the exception: not allowed by configuration or not matching regular expression (PR#2398 by Sebastian Wagner).
1725
- `intelmq.lib.exceptions.InvalidKey`: Add optional parameter `additional_text` (PR#2398 by Sebastian Wagner).
1826
- Change the way we discover bots to allow easy extending based on the entry point name. (PR#2413 by Kamil Mankowski)
27+
- `intelmq.lib.mixins`: Add a new class, `StompMixin` (defined in a new submodule: `stomp`),
28+
which provides certain common STOMP-bot-specific operations, factored out from
29+
`intelmq.bots.collectors.stomp.collector` and `intelmq.bots.outputs.stomp.output`
30+
(PR#2408 by Jan Kaliszewski).
1931

2032
### Development
2133

2234
### Data Format
2335

2436
### Bots
2537
#### Collectors
38+
- `intelmq.bots.collectors.stomp.collector` (PR#2408 by Jan Kaliszewski):
39+
- Add support for authentication based on STOMP login and passcode,
40+
introducing 3 new configuration parameters (see above: *Configuration*).
41+
- Update the code to support new versions of `stomp.py`, including the latest (`8.1.0`);
42+
fixes [#2342](https://github.com/certtools/intelmq/issues/2342).
43+
- Fix the reconnection behavior: do not attempt to reconnect after `shutdown`. Also,
44+
never attempt to reconnect if the version of `stomp.py` is older than `4.1.21` (it
45+
did not work properly anyway).
46+
- Add coercion of the `port` config parameter to `int`.
47+
- Add implementation of the `check` hook (verifying, in particular, accessibility
48+
of necessary file(s)).
49+
- Remove undocumented and unused attributes of `StompCollectorBot` instances:
50+
`ssl_ca_cert`, `ssl_cl_cert`, `ssl_cl_cert_key`.
51+
- Minor fixes/improvements and some refactoring (see also above: *Core*...).
2652

2753
#### Parsers
2854

2955
#### Experts
3056

3157
#### Outputs
58+
- `intelmq.bots.outputs.stomp.output` (PR#2408 by Jan Kaliszewski):
59+
- Add support for authentication based on STOMP login and passcode,
60+
introducing 3 new configuration parameters (see above: *Configuration*).
61+
- Update the code to support new versions of `stomp.py`, including the latest (`8.1.0`).
62+
- Fix `AttributeError` caused by attempts to get unset attributes of `StompOutputBot`
63+
(`ssl_ca_cert` et consortes).
64+
- Add coercion of the `port` config parameter to `int`.
65+
- Add implementation of the `check` hook (verifying, in particular, accessibility
66+
of necessary file(s)).
67+
- Add `stomp.py` version check (raise `MissingDependencyError` if not `>=4.1.8`).
68+
- Minor fixes/improvements and some refactoring (see also above: *Core*...).
3269

3370
### Documentation
3471
- Add a readthedocs configuration file to fix the build fail (PR#2403 by Sebastian Wagner).
3572
- Add a guide of developing extensions packages (PR#2413 by Kamil Mankowski)
73+
- Update/fix/improve the stuff related to the STOMP bots and integration with the *n6*'s
74+
Stream API (PR#2408 by Jan Kaliszewski).
3675

3776
### Packaging
3877

3978
### Tests
4079

4180
### Tools
81+
- `intelmq_psql_initdb` got support for providing custom harmonization file, generating view for storing `raw` fields separately, and adding `IF NOT EXISTS`/`OR REPLACE` clauses ([PR#2404](https://github.com/certtools/intelmq/pull/2404) by Kamil Mankowski).
4282

4383
### Contrib
4484

contrib/eventdb/separate-raws-table.sql

Lines changed: 0 additions & 305 deletions
This file was deleted.

0 commit comments

Comments
 (0)