Skip to content

use esc_url_raw() for sanitization of url as wp_http_validate_url() rejects port in urls #184

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.

Sign up for GitHub

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

Merged
merged 4 commits into from
Feb 13, 2023
Merged

use esc_url_raw() for sanitization of url as wp_http_validate_url() rejects port in urls #184

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b7cfce5
use esc_url_raw() for sanitization of url as wp_http_validate_url() r…
ashfame Feb 9, 2023
f67af50
show correct value in the error message as entered by the user
ashfame Feb 11, 2023
4b821e8
use sanitize_url() instead of esc_url_raw(), its an alias but conveys…
ashfame Feb 13, 2023
1dd1248
Merge branch 'main' into fix_hs_url_validation
ashfame Feb 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions src/Admin/Settings/settings.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,11 +88,22 @@ function sanitize_value( $field_name, $value, $original_value ) {
$value = $original_value;
}

if ( ! wp_http_validate_url( $value ) ) {
// set a default scheme if none is supplied, otherwise esc_url_raw() doesn't like it.
$scheme_added = false;
if ( is_null( wp_parse_url( $value, PHP_URL_SCHEME ) ) ) {
$value = 'https://' . $value;
$scheme_added = true;
}

if ( sanitize_url( $value ) !== $value ) {
// translators: %s is the value the user entered.
add_error( 'homeserver-invalid', sprintf( __( '<tt>%s</tt> is not a valid homeserver URL.' ), $value ) );
add_error( 'homeserver-invalid', sprintf( __( '<tt>%s</tt> is not a valid homeserver URL.' ), $original_value ) );
$value = $original_value;
}

if ( $scheme_added ) {
$value = substr( $value, 8 );
}
}

if ( 'room' === $field_name ) {
Expand Down