Skip to content

Commit f5416e4

Browse files
author
Birger Schacht
committed
Deprecate the XMPP bots
Both the XMPP output bot as well as the XMPP collector bot require the `sleekxmpp` library which is deprecated. It would be possible to modify the bots to use the successor `slixmpp` library, but a short survey https://lists.cert.at/pipermail/intelmq-users/2020-October/000177.html did not bring up anyone using the bots, so they are being marked as deprecated for now and will be removed in version 3.0.
1 parent 7aa3c07 commit f5416e4

File tree

5 files changed

+17
-3
lines changed

5 files changed

+17
-3
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ CHANGELOG
3434
- Added PGP signature check functionality (PR#1602 by sinus-x).
3535
- If status code is not 2xx, the request's and response's headers and body are logged in debug logging level (#1615).
3636
- `intelmq.bots.collectors.kafka.collector`: Added (PR#1654, closes #1634)
37+
- `intelmq.bots.collectors.xmpp.collector`: marked as deprecated (see https://lists.cert.at/pipermail/intelmq-users/2020-October/000177.html)
3738

3839
#### Parsers
3940
- `intelmq.bots.parsers.eset.parser`: Added (PR#1554 by Mikk Margus Möll).
@@ -73,6 +74,7 @@ CHANGELOG
7374

7475
#### Outputs
7576
- `intelmq.bots.outputs.rt`: Added Request Tracker output bot (PR#1589 by Marius Urkis).
77+
- `intelmq.bots.outputs.xmpp.output`: marked as deprecated (see https://lists.cert.at/pipermail/intelmq-users/2020-October/000177.html)
7678

7779
### Documentation
7880
- Feeds:

NEWS.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ The documentation is now available at [intelmq.readthedocs.io](https://intelmq.r
1212

1313
### Tools
1414

15+
### Bots
16+
1517
#### Bot option `--updata-database`
1618
- Bots that require a database file (such as `maxmind_geoip`, `asn_lookup`, `tor_nodes` and `recordedfuture_iprisk`)
1719
have new command line option `--update-database`. It is not necessary to specify a
@@ -29,6 +31,9 @@ The documentation is now available at [intelmq.readthedocs.io](https://intelmq.r
2931
```
3032
The provided shell scripts use these new commands, however they are now deprecated and will be removed in version 3.0.
3133

34+
#### XMPP Bots
35+
Both the XMPP output bot and the XMPP collector bot log a deprecation warning now. The plan is to remove them in version 3.0.
36+
3237
### Harmonization
3338

3439
### Configuration

docs/user/bots.rst

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -627,6 +627,10 @@ If you intend to link two IntelMQ instance via TCP, have a look at the TCP outpu
627627

628628
XMPP collector
629629
^^^^^^^^^^^^^^
630+
631+
**Warning:** This bot is deprecated and will be removed in the version 3.0 of IntelMQ.
632+
**Warning:** This bot is currently *unmaintained*. The used XMPP library *sleekxmpp* is deprecated. For more information see :issue:`Issue #1614 <1614>`.
633+
630634
**Information**
631635

632636
* `name:` intelmq.bots.collectors.xmpp.collector
@@ -635,8 +639,6 @@ XMPP collector
635639
* `cache (redis db):` none
636640
* `description:` This bot can connect to an XMPP Server and one room, in order to receive reports from it. TLS is used by default. rate_limit is ineffective here. Bot can either pass the body or the whole event.
637641

638-
**Warning:** This bot is currently *unmaintained* and needs to be adapted. The used XMPP library *sleekxmpp* is deprecated, therefore the bots needs to be adapted to the successor library *slixmpp*. For more information see :issue:`Issue #1614 <1614>`.
639-
640642
**Requirements**
641643

642644
The Sleekxmpp - Library needs to be installed on your System
@@ -3496,6 +3498,8 @@ Resulting line in syslog:
34963498
34973499
XMPP
34983500
^^^^
3501+
**Warning:** This bot is deprecated and will be removed in the version 3.0 of IntelMQ.
3502+
**Warning:** This bot is currently *unmaintained*. The used XMPP library *sleekxmpp* is deprecated. For more information see :issue:`Issue #1614 <1614>`.
34993503

35003504
**Information**
35013505

@@ -3505,7 +3509,6 @@ XMPP
35053509
* `cache (redis db):` none
35063510
* `description:` The XMPP Output is capable of sending Messages to XMPP Rooms and as direct messages.
35073511

3508-
**Warning:** This bot is currently *unmaintained* and needs to be adapted. The used XMPP library *sleekxmpp* is deprecated, therefore the bots needs to be adapted to the successor library *slixmpp*. For more information see :issue:`Issue #1614 <1614>`.
35093512

35103513
**Requirements**
35113514

intelmq/bots/collectors/xmpp/collector.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,8 @@ class XMPPCollectorBot(CollectorBot):
8383
collector_empty_process = True
8484

8585
def init(self):
86+
self.logger.warning("The output bot 'intelmq.bots.outputs.xmpp.output' "
87+
"is deprecated. It will be removed in version 3.0.")
8688
if sleekxmpp is None:
8789
raise MissingDependencyError("sleekxmpp")
8890

intelmq/bots/outputs/xmpp/output.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,8 @@ class XMPPOutputBot(Bot):
8181
xmpp = None
8282

8383
def init(self):
84+
self.logger.warning("The output bot 'intelmq.bots.outputs.xmpp.output' "
85+
"is deprecated. It will be removed in version 3.0.")
8486
if sleekxmpp is None:
8587
raise MissingDependencyError("sleekxmpp")
8688

0 commit comments

Comments
 (0)