Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes #2471 #2472

Merged
merged 1 commit into from
Apr 9, 2024
Merged

Fixes #2471 #2472

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions intelmq/lib/upgrades.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ def v110_shadowserver_feednames(configuration, harmonization, dry_run, **kwargs)
if bot_id == 'global':
continue
if bot["module"] == "intelmq.bots.parsers.shadowserver.parser":
if bot["parameters"]["feedname"] in mapping:
if bot["parameters"].get("feedname") and bot["parameters"]["feedname"] in mapping:
changed = True
bot["parameters"]["feedname"] = mapping[bot["parameters"]["feedname"]]

Expand Down Expand Up @@ -760,7 +760,7 @@ def v310_shadowserver_feednames(configuration, harmonization, dry_run, **kwargs)
if bot_id == 'global':
continue
if bot["module"] == "intelmq.bots.parsers.shadowserver.parser":
if bot["parameters"]["feedname"] in legacy:
if bot["parameters"].get("feedname") and bot["parameters"]["feedname"] in legacy:
names.append(bot["parameters"]["feedname"])
return 'A discontinued feed has been found and must be removed %s' % ', '.join(names) if names else changed, configuration, harmonization

Expand Down
Loading