asn, fake expert: default paths, asn: add checks #2606
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,9 +8,10 @@ | |
| import re | ||
| import sys | ||
| import bz2 | ||
| import requests | ||
| from pathlib import Path | ||
|
|
||
| from intelmq import VAR_STATE_PATH | ||
| from intelmq.lib.bot import ExpertBot | ||
| from intelmq.lib.exceptions import MissingDependencyError | ||
| from intelmq.lib.utils import get_bots_settings, create_request_session | ||
|
|
@@ -25,7 +26,7 @@ | |
|
|
||
| class ASNLookupExpertBot(ExpertBot): | ||
| """Add ASN and netmask information from a local BGP dump""" | ||
| database: str = f'{VAR_STATE_PATH}asn_lookup/ipasn.dat' # TODO: should be pathlib.Path | ||
| autoupdate_cached_database: bool = True # Activate/deactivate update-database functionality | ||
|
|
||
| def init(self): | ||
|
|
@@ -35,11 +36,11 @@ def init(self): | |
| try: | ||
| self._database = pyasn.pyasn(self.database) | ||
| except OSError: | ||
| raise ValueError(f"pyasn data file does not exist or could not be accessed in {self.database!r}. ", | ||
| "Please see https://docs.intelmq.org/latest/user/bots/#asn-lookup") | ||
| self.stop() | ||
| if not Path(self.database).is_file(): | ||
| raise ValueError('Database file does not exist or is not a file.') | ||
|
|
||
| def process(self): | ||
| event = self.receive_message() | ||
|
|
@@ -66,12 +67,15 @@ def process(self): | |
|
|
||
| @staticmethod | ||
| def check(parameters): | ||
| database_path = Path(parameters.get('database', '')) | ||
| if not database_path.exists(): | ||
| return [["error", f"File given as parameter 'database' ({database_path!s}) does not exist."]] | ||
|
There was a problem hiding this comment. Light suggestion: make it as warning Otherwise we create an error message for eventually expected state, and people will think the bot is buggy |
||
| elif not database_path.is_file(): | ||
| return [["error", f"Parameter 'database' ({database_path!s}) exists, but is not a file."]] | ||
| try: | ||
| pyasn.pyasn(parameters['database']) | ||
| except Exception as exc: | ||
| return [["error", f"Error reading database ({database_path!s}): %r." % exc]] | ||
|
There was a problem hiding this comment. Why mixing f-string and %? Let's pack |
||
|
|
||
| @classmethod | ||
| def run(cls, parsed_args=None): | ||
|
|
@@ -112,6 +116,12 @@ def update_database(cls, verbose=False): | |
| if pyasn is None: | ||
| raise MissingDependencyError("pyasn") | ||
|
|
||
| for database_path in set(bots.values()): | ||
| if not Path(database_path).is_file(): | ||
| raise ValueError('Database file does not exist or is not a file.') | ||
| elif not os.access(database_path, os.W_OK): | ||
| raise ValueError('Database file is not writeable.') | ||
|
|
||
| try: | ||
| if verbose: | ||
| print("Searching for the latest database update...") | ||
|
|
@@ -159,7 +169,7 @@ def update_database(cls, verbose=False): | |
| prefixes = pyasn.mrtx.parse_mrt_file(archive, print_progress=False, skip_record_on_error=True) | ||
|
|
||
| for database_path in set(bots.values()): | ||
| database_dir = Path(database_path).parent | ||
| database_dir.mkdir(parents=True, exist_ok=True) | ||
| pyasn.mrtx.dump_prefixes_to_file(prefixes, database_path) | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What would you think about adding a one more check - how old the file is? And issue a warning if it's older than a week (I think it should be updated more often, right?)? Something like "The ASN database is older than 7 days and may be not up-to-date any more. Is automated database update working?"
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I recall we had once a problem with broken ASN update cronjob, and it resulted in wrong assigning and wrong addressing some events - so a check for that might help someone :)