add image file name validation. #4249
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
add image file name validation.
|
Changelog(s) in markdown:
|
dorschw
reviewed
May 1, 2024
| @@ -295,6 +312,12 @@ def _validate(path: Path) -> None: | |||
| raise InvalidXDRCTemplatesFileName | |||
|
|
|||
|
|
|||
| def _validate_image_file_name(image_name: str): | |||
| pattern = r"[^0-9a-zA-Z-_]+" | |||
| if re.findall(pattern, image_name): | |||
There was a problem hiding this comment.
I think fullmatch would suit better
There was a problem hiding this comment.
fullmatch does not catch the invalid img file names from the unit test case
Co-authored-by: dorschw <81086590+dorschw@users.noreply.github.com>
dorschw
reviewed
May 5, 2024
| @@ -283,6 +290,9 @@ def _validate(path: Path) -> None: | |||
| ): | |||
| raise InvalidXSIAMReportFileName | |||
|
|
|||
| if first_level_folder == DOC_FILES_DIR: | |||
There was a problem hiding this comment.
Suggested change
| if first_level_folder == DOC_FILES_DIR: | |
| if first_level_folder == DOC_FILES_DIR and path.suffix in (".png", ".jpg", ".jpeg", ".gif"): |
- Have I missed any suffixes?
- Looks like we call it on all files under
DOC_FILES_DIR. Please insert this change and then modify the unit tests to match (make sure that it only fails on image files, test it with image suffixes and with non-image and make sure non-image files can contain chars that images are not allowed to).
There was a problem hiding this comment.
The constant ALLOWED_SUFFIXES support only jpg and svg
dorschw
reviewed
May 5, 2024
dorschw
reviewed
May 5, 2024
dorschw
approved these changes
May 6, 2024
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.
add image file name validation.
Related Issues
fixes: https://jira-dc.paloaltonetworks.com/browse/CIAC-5180
Description
Add image file name validation to validate_content_path script