Skip to content

Commit 5d2b0a5

Browse files
committed
remove broken blueliv bots
collector is broken because of it's dependency parser is obsolete with the removed collector fixes #2593
1 parent b95f9e6 commit 5d2b0a5

File tree

16 files changed

+43
-294
lines changed

16 files changed

+43
-294
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,11 @@ Please refer to the [NEWS](NEWS.md) for a list of changes which have an affect o
2525

2626
### Bots
2727
#### Collectors
28+
- Remove `intelmq.bots.collectors.blueliv` as it uses an unmaintained library, does not work any more and breaks other CI tests (fixes #2593, PR#2632 by Sebastian Wagner).
2829

2930
#### Parsers
3031
- `intelmq.bots.parsers.cymru.parser_cap_program`: Add mapping for TOR and ipv6-icmp protocol (PR#2621 by Mikk Margus Möll).
32+
- Remove `intelmq.bots.collectors.blueliv` as it is obsolete with the removed collector (PR#2632 by Sebastian Wagner).
3133

3234
#### Experts
3335
- `intelmq.bots.experts.asn_lookup.expert`:

docs/user/bots.md

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1045,34 +1045,6 @@ input. If you intend to link two IntelMQ instance via TCP, have a look at the TC
10451045

10461046
---
10471047

1048-
### Blueliv Crimeserver <div id="intelmq.bots.collectors.blueliv.collector_crimeserver" />
1049-
1050-
Collects report messages from Blueliv API.
1051-
1052-
For more information visit <https://github.com/Blueliv/api-python-sdk>
1053-
1054-
**Module:** `intelmq.bots.collectors.blueliv.collector_crimeserver`
1055-
1056-
**Requirements**
1057-
1058-
Install the required library:
1059-
1060-
```bash
1061-
pip3 install -r intelmq/bots/collectors/blueliv/REQUIREMENTS.txt
1062-
```
1063-
1064-
**Parameters (also expects [feed parameters](#feed-parameters)):**
1065-
1066-
**`api_key`**
1067-
1068-
(required, string) location of information resource, see <https://map.blueliv.com/?redirect=get-started#signup>
1069-
1070-
**`api_url`**
1071-
1072-
(optional, string) The optional API endpoint. Defaults to `https://freeapi.blueliv.com`.
1073-
1074-
---
1075-
10761048
### Calidog Certstream <div id="intelmq.bots.collectors.calidog.collector_certstream" />
10771049

10781050
A Bot to collect data from the Certificate Transparency Log (CTL). This bot works based on certstream library
@@ -1388,16 +1360,6 @@ No additional parameters.
13881360

13891361
---
13901362

1391-
### Blueliv Crimeserver <div id="intelmq.bots.parsers.blueliv.parser_crimeserver" />
1392-
1393-
Parses data from Blueliv Crimeserver feed.
1394-
1395-
**Module:** `intelmq.bots.parsers.blueliv.parser_crimeserver`
1396-
1397-
No additional parameters.
1398-
1399-
---
1400-
14011363
### Calidog Certstream <div id="intelmq.bots.parsers.calidog.parser_certstream" />
14021364

14031365
Parses data from Certificate Transparency Log.

intelmq/bots/collectors/blueliv/REQUIREMENTS.txt

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

intelmq/bots/collectors/blueliv/__init__.py

Whitespace-only changes.

intelmq/bots/collectors/blueliv/collector_crimeserver.py

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

intelmq/bots/parsers/blueliv/__init__.py

Whitespace-only changes.

intelmq/bots/parsers/blueliv/parser_crimeserver.py

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

intelmq/etc/feeds.yaml

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -188,39 +188,6 @@ providers:
188188
revision: 2020-07-07
189189
documentation: https://urlhaus.abuse.ch/feeds/
190190
public: true
191-
Blueliv:
192-
CrimeServer:
193-
description: Blueliv Crimeserver Collector is the bot responsible to get the
194-
report through the API.
195-
additional_information:
196-
The service uses a different API for free users and paying subscribers. In 'CrimeServer'
197-
feed the difference lies in the data points present in the feed. The non-free API
198-
available from Blueliv contains, for this specific feed, following extra fields not
199-
present in the free API;
200-
"_id" - Internal unique ID
201-
"subType" - Subtype of the Crime Server
202-
"countryName" - Country name where the Crime Server is located, in English
203-
"city" - City where the Crime Server is located
204-
"domain" - Domain of the Crime Server
205-
"host" - Host of the Crime Server
206-
"createdAt" - Date when the Crime Server was added to Blueliv CrimeServer database
207-
"asnCidr" - Range of IPs that belong to an ISP (registered via Autonomous System Number (ASN))
208-
"asnId" - Identifier of an ISP registered via ASN
209-
"asnDesc" Description of the ISP registered via ASN
210-
bots:
211-
collector:
212-
module: intelmq.bots.collectors.blueliv.collector_crimeserver
213-
parameters:
214-
rate_limit: 3600
215-
api_key: __APIKEY__
216-
name: __FEED__
217-
provider: __PROVIDER__
218-
parser:
219-
module: intelmq.bots.parsers.blueliv.parser_crimeserver
220-
parameters:
221-
revision: 2018-01-20
222-
documentation: https://www.blueliv.com/
223-
public: false
224191
Team Cymru:
225192
CAP:
226193
description: Team Cymru provides daily lists of compromised or abused devices

intelmq/lib/upgrades.py

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@
4141
'v320_update_turris_greylist_url',
4242
'v322_url_replacement',
4343
'v322_removed_feeds_and_bots',
44-
'v340_deprecations'
44+
'v340_deprecations',
45+
'v341_blueliv_removal',
4546
]
4647

4748

@@ -974,6 +975,29 @@ def v340_deprecations(configuration, harmonization, dry_run, **kwargs):
974975
return message or changed, configuration, harmonization
975976

976977

978+
def v341_blueliv_removal(configuration, harmonization, dry_run, **kwargs):
979+
"""
980+
Remove blueliv collector and parser
981+
"""
982+
message = ''
983+
discontinued_bots = []
984+
discontinued_bots_modules = (
985+
"intelmq.bots.collectors.blueliv.collector_crimeserver",
986+
"intelmq.bots.parsers.blueliv.parser_crimeserver",
987+
)
988+
989+
for bot_id, bot in configuration.items():
990+
if bot_id == 'global':
991+
continue
992+
if bot["module"] in discontinued_bots_modules:
993+
discontinued_bots.append(bot_id)
994+
995+
if discontinued_bots:
996+
message = f"Found discontinued bots: {', '.join(discontinued_bots)}. Remove the affected bots from the configuration."
997+
998+
return message, configuration, harmonization
999+
1000+
9771001
UPGRADES = OrderedDict([
9781002
((1, 0, 0, 'dev7'), (v100_dev7_modify_syntax,)),
9791003
((1, 1, 0), (v110_shadowserver_feednames, v110_deprecations)),
@@ -1004,7 +1028,7 @@ def v340_deprecations(configuration, harmonization, dry_run, **kwargs):
10041028
((3, 3, 0), ()),
10051029
((3, 3, 1), ()),
10061030
((3, 4, 0), (v340_deprecations, )),
1007-
((3, 4, 1), ()),
1031+
((3, 4, 1), (v341_blueliv_removal, )),
10081032
])
10091033

10101034
ALWAYS = (harmonization,)

intelmq/tests/bots/collectors/blueliv/__init__.py

Whitespace-only changes.

0 commit comments

Comments
 (0)