Steve-Dee-Designs
/
woocommerce
mirror of https://github.com/woocommerce/woocommerce.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Limit cookie dedupe logic to only WooCommerce Cart cookies (#43504) 

* limit check to only Woo cookies

* limit logic to woo cookies only

* add changelog

* no need for set-cookie prefix
This commit is contained in:
Seghir Nadir 2024-01-11 15:53:50 +01:00 committed by GitHub
parent c686f605e6
commit 77d0a6a847
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 39 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/woocommerce/changelog/fix-only-dedub-cookies-with-same-path Normal file
View File

@ -0,0 +1,4 @@
Significance: patch
Type: fix
Limit cookie deduping to WooCommerce cookies only.

43
plugins/woocommerce/includes/class-wc-cart-session.php
View File

@ -272,29 +272,54 @@ final class WC_Cart_Session {
* Remove duplicate cookies from the response.
*/
private function dedupe_cookies() {
$all_cookies = array_filter(
headers_list(),
function( $header ) {
return stripos( $header, 'Set-Cookie:' ) !== false;
}
);
$final_cookies = array();
$update_cookies = false;
foreach ( $all_cookies as $cookie ) {
foreach ( headers_list() as $header ) {
if ( stripos( $header, 'Set-Cookie:' ) === false ) {
continue;
}
list(, $cookie_value) = explode( ':', $header, 2 );
list(, $cookie_value) = explode( ':', $cookie, 2 );
list($cookie_name, $cookie_value) = explode( '=', trim( $cookie_value ), 2 );
if ( array_key_exists( $cookie_name, $final_cookies ) ) {
if ( stripos( $cookie_name, 'woocommerce_' ) !== false ) {
$key = $this->find_cookie_by_name( $cookie_name, $final_cookies );
if ( false !== $key ) {
$update_cookies = true;
unset( $final_cookies[ $key ] );
}
$final_cookies[ $cookie_name ] = $cookie_value;
}
$final_cookies[] = $cookie;
}
if ( $update_cookies ) {
header_remove( 'Set-Cookie' );
foreach ( $final_cookies as $cookie_name => $cookie_value ) {
foreach ( $final_cookies as $cookie ) {
// Using header here preserves previous cookie args.
header( "Set-Cookie: {$cookie_name}={$cookie_value}", false );
header( $cookie, false );
}
}
}
/**
* Find a cookie by name in an array of cookies.
*
* @param string $cookie_name Name of the cookie to find.
* @param array $cookies Array of cookies to search.
* @return mixed Key of the cookie if found, false if not.
*/
private function find_cookie_by_name( $cookie_name, $cookies ) {
foreach ( $cookies as $key => $cookie ) {
if ( strpos( $cookie, $cookie_name ) !== false ) {
return $key;
}
}
return false;
}
/**
* Sets the php session data for the cart and coupons.
*/