Changing the logic in the requests configuration #600
Merged
Conversation
This file contains 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
kazet
reviewed
Nov 6, 2023
artemis/config.py
Outdated
| @@ -129,12 +129,12 @@ class Limits: | |||
| "E.g. when set to 100, Artemis will send no more than 100 port scanning packets per seconds per port scanner instance.", | |||
| ] = get_config("SCANNING_PACKETS_PER_SECOND", default=100, cast=int) | |||
|
|
|||
| SECONDS_PER_REQUEST: Annotated[ | |||
| REQUEST_PER_SECOND: Annotated[ | |||
kazet
reviewed
Nov 6, 2023
artemis/config.py
Outdated
| int, | ||
| """ | ||
| E.g. when set to 2, Artemis will make sure no HTTP/MySQL connect/... request takes less than 2 seconds, sleeping if needed. | ||
| E.g. when set to 2, Artemis will make sure no more HTTP/MySQL connect/... requests take place per second, sleeping if needed. |
kazet
reviewed
Nov 6, 2023
artemis/utils.py
Outdated
| if func_time < average_time_per_request: | ||
| time.sleep(average_time_per_request - func_time) | ||
| elif request_per_second < 1: | ||
| seconds_for_req = math.floor(1 / request_per_second) |
There was a problem hiding this comment.
czemu floor? jak ma byc 0.75 requesta per second to sleep 1/0.75 i zalatwione
There was a problem hiding this comment.
Assuming int, now is float - so it can be that way.
kazet
reviewed
Nov 6, 2023
| str(int(Config.Limits.SECONDS_PER_REQUEST * 1000.0 / len(tasks_filtered))), | ||
| str(int((1 / Config.Limits.REQUEST_PER_SECOND) * 1000.0 / len(tasks_filtered))) | ||
| if Config.Limits.REQUEST_PER_SECOND != 0 | ||
| else str(int(0)), |
There was a problem hiding this comment.
I changed the value here, not the structure. It was earlier here, and I assumed it had its purpose. But if you change the structure, it won't work (nuclei takes int), and tests will (obviously) not pass in one of our config conditions. So - do you propose something specific here, or you just asked?
There was a problem hiding this comment.
I meant that 'else str(int(0))' can be reduced to 'else str(0)'
kazet
reviewed
Nov 14, 2023
| if time_elapsed < Config.Limits.SECONDS_PER_REQUEST: | ||
| time.sleep(Config.Limits.SECONDS_PER_REQUEST - time_elapsed) | ||
| elif request_per_second >= 1: | ||
| average_time_per_request = 1 / request_per_second |
There was a problem hiding this comment.
now you have two duplicate if branches
kazet
approved these changes
Nov 17, 2023
anna1492
deleted the
changing-the-logic-in-the-requests-configuration
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
No description provided.