Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ Please refer to the [NEWS](NEWS.md) for a list of changes which have an affect o
#### Collectors

#### Parsers
- `intelmq.bots.parsers.generic_csv.parser_csv`: Handle empty string parameter `columns_required` as unset (PR#2680 by Sebastian Wagner, fixes #2679).

#### Experts

Expand Down
2 changes: 1 addition & 1 deletion intelmq/bots/parsers/generic/parser_csv.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ def init(self):
expected=("blacklist", "whitelist"),
docs=DOCS)

if self.columns_required is None:
if self.columns_required in [None, '']:
self.columns_required = [True for _ in self.columns]
if len(self.columns) != len(self.columns_required):
raise ValueError("Length of parameters 'columns' (%d) and 'columns_required' (%d) "
Expand Down
6 changes: 6 additions & 0 deletions intelmq/tests/bots/parsers/generic/test_parser_csv.py
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,12 @@ def test_compose_fields(self):
'delimiter': ','})
self.assertMessageEqual(0, COMPOSE_EVENT)

def test_empty_required_colums(self):
""" #2679 """
self.run_bot(parameters={'columns_required': ''})
self.assertMessageEqual(0, EXAMPLE_EVENT)
self.run_bot(parameters={'columns_required': None})


if __name__ == '__main__': # pragma: no cover
unittest.main()
Loading