Skip to content
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

Jump to bottom

add prepare missing wpdb / improve sql security #161

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+20 −13
Open

add prepare missing wpdb / improve sql security #161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
36a3129
add prepare missing wpdb / improve sql security
herewithme Jul 30, 2024
9ab96d7
fix typo
herewithme Jul 30, 2024
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
24 changes: 12 additions & 12 deletions classes/cli/migration.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,27 +27,27 @@ private function get_blog_ids_with_meta_key() {
switch_to_blog( $blog->blog_id );

// Table exists ?
if ( $wpdb->get_var( "SHOW TABLES LIKE '$wpdb->postmeta'" ) != $wpdb->postmeta ) {
if ( $wpdb->get_var( $wpdb->prepare( "SHOW TABLES LIKE %s", $wpdb->postmeta ) ) !== $wpdb->postmeta ) {
restore_current_blog();
continue;
}

$selects[] = "(
SELECT pm.post_id AS post_id, pm.meta_value AS meta_value, {$blog->blog_id} AS blog_id
FROM {$wpdb->postmeta} AS pm
WHERE 1 = 1
AND pm.meta_key = '_origin_key'
)";
$blog_id = (int) $blog->blog_id; // Ensure the blog_id is an integer
$meta_key = '_origin_key'; // Define the meta_key explicitly

// Use prepare to ensure safe query construction
$selects[] = $wpdb->prepare( "(
SELECT pm.post_id AS post_id, pm.meta_value AS meta_value, %d AS blog_id
FROM {$wpdb->postmeta} AS pm
WHERE pm.meta_key = %s
)", $blog_id, $meta_key );

restore_current_blog();
}

// Make an union, group doublons with concat
$query = ' SELECT post_id, meta_value, blog_id FROM ( ';
$query .= implode( ' UNION ALL ', $selects );
$query .= ' ) AS wp ';
$union_all_query = implode( ' UNION ALL ', $selects );

return $wpdb->get_results( $query );
return $wpdb->get_results( "SELECT post_id, meta_value, blog_id FROM ( $union_all_query ) AS wp" );
}

/**
Expand Down
9 changes: 8 additions & 1 deletion classes/query.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,14 @@ public static function posts_join( $join, WP_Query $query ) {

$join_type = $query->get( 'bea_csf_filter' ) === 'local-only' ? 'LEFT' : 'INNER';

$join .= " $join_type JOIN $wpdb->bea_csf_relations AS bcr ON ( $wpdb->posts.ID = bcr.receiver_id AND bcr.receiver_blog_id = " . get_current_blog_id() . ' ) ';
// Get current blog ID safely
$current_blog_id = (int) get_current_blog_id();

// Prepare the join SQL
$join .= $wpdb->prepare(
" $join_type JOIN {$wpdb->bea_csf_relations} AS bcr ON ({$wpdb->posts}.ID = bcr.receiver_id AND bcr.receiver_blog_id = %d) ",
$current_blog_id
);

return $join;
}
Expand Down
Loading