Url of adlist can contain userinfo (basicauth) #1683
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
Web side of fix pi-hole/pi-hole#3912 Signed-off-by: Matej Dujava <mdujava@kocurkovo.cz>
mdujava
commented
Jan 6, 2021
| if(preg_match("/[^a-zA-Z0-9:\/?&%=~._()-;]/", $address) !== 0) { | ||
| // this will remove first @ that is after schema and before domain | ||
|  // $1 is optional schema, $2 is userinfo | ||
| $check_address = preg_replace("|([^:/]*://)?([^/]+)@|", "$1$2", $address, 1); |
There was a problem hiding this comment.
phpstan error: looks like False positive, changing comment to multi-line form is fixing the error.
PromoFaux
reviewed
Jan 13, 2021
PromoFaux
approved these changes
Jan 13, 2021
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.
By submitting this pull request, I confirm the following:
git rebase)git commit --signoff)What does this PR aim to accomplish?:
This PR is admin page side of fix for parsing adlist urls, pi-hole/pi-hole#3912
How does this PR accomplish the above?:
Similar to the pi-hole code, before validation against regex, char
@is removed if it is inside of authority section of url. Then already existing regex is used to check if only allowed chars are present in url.What documentation changes (if any) are needed to support this PR?:
No documentation is needed as this is only change of check on backend side, no user facing change.