Skip to content

CNAME regression fix #177

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 5 commits into from
Sep 1, 2020
Merged

CNAME regression fix #177

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cae89df
Use filtered value as the value to store in the db
Aug 31, 2020
d79d45d
Remove regex approach to fetch cname and look for more potential cnam…
Aug 31, 2020
6a95e29
Fix whitespaces
Sep 1, 2020
74380a7
Use elseif instead of else if
Sep 1, 2020
78daccc
Fix whitespaces
Sep 1, 2020
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
73 changes: 56 additions & 17 deletions cloudinary-image-management-and-manipulation-in-the-cloud-cdn/php/class-connect.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,7 @@ public function media_library_script() {
public function verify_connection( $data ) {
if ( empty( $data['cloudinary_url'] ) ) {
delete_option( self::META_KEYS['signature'] );
delete_option( self::META_KEYS['cname'] );

add_settings_error(
'cloudinary_connect',
Expand All @@ -158,10 +159,14 @@ public function verify_connection( $data ) {
$data['cloudinary_url'] = str_replace( 'CLOUDINARY_URL=', '', $data['cloudinary_url'] );
$current = $this->plugin->config['settings']['connect'];

// Same URL, return original data.
if ( $current['cloudinary_url'] === $data['cloudinary_url'] ) {
return $data;
}

// Always clear out CNAME when re-saving.
delete_option( self::META_KEYS['cname'] );

// Pattern match to ensure validity of the provided url
if ( ! preg_match( '~' . self::CLOUDINARY_VARIABLE_REGEX . '~', $data['cloudinary_url'] ) ) {
add_settings_error(
Expand All @@ -183,9 +188,9 @@ public function verify_connection( $data ) {
}

// Check if the given URL has a cname and store it if present.
if ( preg_match( '/(?:@\w+)\/(([a-z0-9|-]+\.)*[a-z0-9|-]+\.[a-z]+)/', $data['cloudinary_url'], $cname ) ) {
$cname = filter_var( $cname[1], FILTER_VALIDATE_DOMAIN );
update_option( self::META_KEYS['cname'], $cname[1] );
$cname = $this->extract_cname( wp_parse_url( $data['cloudinary_url'] ) );
if ( $cname && $this->validate_domain( $cname ) ) {
update_option( self::META_KEYS['cname'], $cname );
}

add_settings_error(
Expand All @@ -211,6 +216,7 @@ public function is_connected() {
if ( null === $signature ) {
return false;
}

// Get the last test transient.
if ( get_transient( $signature ) ) {
return true;
Expand Down Expand Up @@ -279,22 +285,14 @@ function ( $a ) {
return $result;
}

// Test if has a cname and is valid.
if ( ! empty( $test['path'] ) ) {
$cname = ltrim( $test['path'], '/' );
if ( defined( 'FILTER_VALIDATE_DOMAIN' ) ) {
$is_valid = filter_var( $cname, FILTER_VALIDATE_DOMAIN, FILTER_FLAG_HOSTNAME );
} else {
$cname = 'https://' . $cname;
$is_valid = filter_var( $cname, FILTER_VALIDATE_URL );
}
$cname_str = $this->extract_cname( $test );
$cname_valid = $this->validate_domain( $cname_str );

if ( ! substr_count( $is_valid, '.' ) || false === $is_valid ) {
$result['type'] = 'invalid_cname';
$result['message'] = __( 'CNAME is not a valid domain name.', 'cloudinary' );
if ( $cname_str && ( ! substr_count( $cname_valid, '.' ) || false === $cname_valid ) ) {
$result['type'] = 'invalid_cname';
$result['message'] = __( 'CNAME is not a valid domain name.', 'cloudinary' );

return $result;
}
return $result;
}

$this->config_from_url( $url );
Expand All @@ -313,6 +311,47 @@ function ( $a ) {
return $result;
}

/**
* Extracts the CNAME from a parsed connection URL.
*
* @param array $parsed_url
*
* @return string|null
*/
protected function extract_cname( $parsed_url ) {
$cname = null;

if ( ! empty( $test['query'] ) ) {
$config_params = array();
wp_parse_str( $parsed_url['query'], $config_params );
$cname = isset( $config_params['cname'] ) ? $config_params['cname'] : $cname;
} elseif ( ! empty( $parsed_url['path'] ) ) {
$cname = ltrim( $parsed_url['path'], '/' );
}

return $cname;
}

/**
* Safely validate a domain.
*
* @param string $domain
*
* @return bool
*/
protected function validate_domain( $domain ) {
$is_valid = false;

if ( defined( 'FILTER_VALIDATE_DOMAIN' ) ) {
$is_valid = filter_var( $domain, FILTER_VALIDATE_DOMAIN, FILTER_FLAG_HOSTNAME );
} else {
$domain = 'https://' . $domain;
$is_valid = filter_var( $domain, FILTER_VALIDATE_URL );
}

return $is_valid;
}

/**
* Get the Cloudinary credentials.
*
Expand Down