-
Notifications
You must be signed in to change notification settings - Fork 1.4k
Refactor validatePictureUrl for better image URL validation #7287
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.
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
Open
safiya2610
wants to merge
3
commits into
layer5io:master
Choose a base branch
from
safiya2610:fix-form
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+15
−19
Open
Changes from 1 commit
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -18,29 +18,50 @@ const validateEmail = (value) => { | |
| return error; | ||
| }; | ||
|
|
||
|
|
||
| const validatePictureUrl = (value) => { | ||
| let error; | ||
| if (value) { | ||
|
|
||
| if (value.startsWith("data:")) { | ||
| error = "Data URIs are not allowed. Please provide a URL, starting with http:// or https:// to an image file."; | ||
| } else { | ||
| try { | ||
| new URL(value); | ||
| const allowedImageExtensions = ["jpg", "jpeg", "png", "webp", "svg", "gif"]; | ||
| const extension = value.split(".").pop().toLowerCase(); | ||
| if (!allowedImageExtensions.includes(extension)) { | ||
| error = "URL must point to an image file (jpg, jpeg, png, svg, webp or gif)."; | ||
| } | ||
| } catch (err) { | ||
| console.error("Error in validatePictureUrl:", err); | ||
| return "Please enter a URL to an image file."; | ||
| } | ||
| if (!value) return error; | ||
|
|
||
| // Block base64 / data URIs | ||
| if (value.startsWith("data:")) { | ||
| return "Data URIs are not allowed. Please provide an image URL or Google Drive link."; | ||
| } | ||
|
|
||
| const isGoogleDrive = | ||
| value.includes("drive.google.com/file/d/") || | ||
| value.includes("drive.google.com/open?id=") || | ||
| value.includes("drive.google.com/uc?id="); | ||
|
|
||
| if (isGoogleDrive) { | ||
| return error; | ||
| } | ||
| try { | ||
| new URL(value); | ||
|
|
||
| const allowedImageExtensions = [ | ||
| "jpg", | ||
| "jpeg", | ||
| "png", | ||
| "webp", | ||
| "svg", | ||
| "gif" | ||
|
||
| ]; | ||
|
|
||
| const extension = value.split(".").pop().toLowerCase(); | ||
|
|
||
| if (!allowedImageExtensions.includes(extension)) { | ||
| error = | ||
| "URL must be an image (jpg, jpeg, png, svg, webp, gif) or a Google Drive image link."; | ||
| } | ||
| } catch (err) { | ||
| return "Please enter a valid image URL or Google Drive link."; | ||
| } | ||
|
|
||
| return error; | ||
| }; | ||
|
|
||
|
|
||
| const WebBasedForm = () => { | ||
|
|
||
| const [stepNumber, setStepNumber] = useState(0); | ||
|
|
||
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.
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.
Let's not callout Google Drive, specifically.
"Data URI" is not user-friendly language either.
We simply need to state that a hyperlink to an image is what is required.