Have i been Pwned fix #4185
Merged
Have i been Pwned fix #4185
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
# Conflicts: # Integrations/Pwned-V2/CHANGELOG.md
ronykoz
reviewed
Aug 25, 2019
ronykoz
changed the title
ronykoz
suggested changes
Aug 25, 2019
|
@kirbles19 please review the CHANGELOG.md file please |
ronykoz
approved these changes
Aug 25, 2019
|
@teizenman @ronykoz Done. Please check for technical accuracy. |
glicht
suggested changes
Sep 21, 2019
# Conflicts: # Tests/conf.json
# Conflicts: # Tests/conf.json
yaakovi
suggested changes
Sep 24, 2019
Integrations/Pwned-V2/Pwned-V2.py
Outdated
| @@ -33,6 +35,8 @@ | |||
| EMAIL_TRUNCATE_VERIFIED_SUFFIX = '?truncateResponse=false&includeUnverified=true' | |||
| DOMAIN_TRUNCATE_VERIFIED_SUFFIX = '&truncateResponse=false&includeUnverified=true' | |||
|
|
|||
| retries_end_time = datetime.min | |||
There was a problem hiding this comment.
global should be upper case
Integrations/Pwned-V2/Pwned-V2.py
Outdated
| @@ -48,7 +52,13 @@ def http_request(method, url_suffix, params=None, data=None): | |||
|
|
|||
| if res.status_code == 404: | |||
| return None | |||
| elif not res.status_code == 200: | |||
| elif res.status_code == 429: | |||
There was a problem hiding this comment.
no need for elif after return
Integrations/Pwned-V2/Pwned-V2.py
Outdated
| records_found = False | ||
|
|
||
| md = '### Have I Been Pwned query for ' + query_type.lower() + ': *' + query_arg + '*\n' | ||
|
|
||
| if hibp_res and len(hibp_res) > 0: | ||
| if api_res and len(api_res) > 0: |
There was a problem hiding this comment.
both expressions check the same thing
Suggested change
| if api_res and len(api_res) > 0: | |
| if api_res: |
Integrations/Pwned-V2/Pwned-V2.py
Outdated
| verified_breach = 'Verified' if breach['IsVerified'] else 'Unverified' | ||
| md += '#### ' + breach['Title'] + ' (' + breach['Domain'] + '): ' + str(breach['PwnCount']) + \ | ||
| ' records breached [' + verified_breach + ' breach]\n' | ||
| md += 'Date: **' + breach['BreachDate'] + '**\n\n' | ||
| md += html_description_to_human_readable(breach['Description']) + '\n' | ||
| md += 'Data breached: **' + ','.join(breach['DataClasses']) + '**\n' | ||
|
|
||
| if hibp_paste_res and len(hibp_paste_res) > 0: | ||
| if api_paste_res and len(api_paste_res) > 0: |
Integrations/Pwned-V2/Pwned-V2.py
Outdated
| @@ -187,6 +197,29 @@ def domain_to_entry_context(domain, hibp_res): | |||
| return comp_domain | |||
|
|
|||
|
|
|||
| def rate_limit_retry(amount_of_seconds, request_type): | |||
| if datetime.now() > retries_end_time: | |||
| return_error('Max retry time has exceeded') | |||
There was a problem hiding this comment.
Suggested change
| return_error('Max retry time has exceeded') | |
| return_error('Max retry time has exceeded.') |
Integrations/Pwned-V2/Pwned-V2.py
Outdated
|
|
||
| def retry_needed(api_res, api_paste_res=None): | ||
| global retries_end_time | ||
| if retries_end_time == datetime.min and not MAX_RETRY_ALLOWED == -1: |
There was a problem hiding this comment.
Suggested change
| if retries_end_time == datetime.min and not MAX_RETRY_ALLOWED == -1: | |
| if retries_end_time == datetime.min and MAX_RETRY_ALLOWED != -1: |
glicht
suggested changes
Sep 25, 2019
glicht
approved these changes
Sep 25, 2019
yaakovi
approved these changes
Sep 25, 2019
|
@kirbles19 I removed the docs-approved label since I added something new that needs to be reviewed. |
|
@teizenman Done. |
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.
Status
Ready
Related Issues
fixes: https://github.com/demisto/etc/issues/18102
fixes: https://github.com/demisto/etc/issues/18781
Description
Removed 'Mandatory' tag from commands' arguments