Skip to content

Draft: Fix beyondtrust pra forward infinity #511

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

Draft
DBischoff0 wants to merge 1 commit into
base: dev
Choose a base branch
from
Draft

Draft: Fix beyondtrust pra forward infinity #511

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
12 changes: 7 additions & 5 deletions vulture_os/toolkit/api_parser/beyondtrust_pra/beyondtrust_pra.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,11 +304,13 @@
last_datetime = datetime.fromtimestamp(int(last_datetime), tz=timezone.utc) + timedelta(seconds=1)
self.last_collected_timestamps[f"beyondtrust_pra_{report_type}"] = last_datetime
except (TypeError, ValueError):
# Update timestamp +24 if since < now, otherwise +1
delta = 24 if since < timezone.now() - timedelta(hours=24) else 1
msg = f"No logs, advancing timestamp by {delta} hour(s)"
logger.debug(f"[{__parser__}]:execute: {msg}", extra={'frontend': str(self.frontend)})
self.last_collected_timestamps[f"beyondtrust_pra_{report_type}"] = since + timedelta(hours=delta)
# except if no logs because "last_datetime" == None
# If no logs where retrieved during the last 24hours,
# move forward 1h to prevent stagnate ad vitam eternam
if since < timezone.now() - timedelta(hours=24):
msg = f"No logs, advancing timestamp by 1 hour(s)"

Check failure on line 311 in vulture_os/toolkit/api_parser/beyondtrust_pra/beyondtrust_pra.py

View workflow job for this annotation

GitHub Actions / check

Ruff (F541) 

vulture_os/toolkit/api_parser/beyondtrust_pra/beyondtrust_pra.py:311:31: F541 f-string without any placeholders
logger.debug(f"[{__parser__}]:execute: {msg}", extra={'frontend': str(self.frontend)})
self.last_collected_timestamps[f"beyondtrust_pra_{report_type}"] = since + timedelta(hours=1)
finally:
msg = "Current timestamp for {report_type} is {timestamp}".format(
report_type=report_type,
Expand Down