Changeset 3337009

Timestamp:

07/31/2025 06:41:46 AM (7 months ago)

Author:

hideokamoto

Message:

Update to version 7.0.1 from GitHub

Location:

c3-cloudfront-clear-cache

Files:

• assets/banner-1544x500.png (modified) (1 prop) (previous)
• assets/banner-772x250.jpg (modified) (1 prop) (previous)
• assets/icon-128x128.png (modified) (1 prop) (previous)
• assets/icon-256x256.jpg (modified) (1 prop) (previous)
• tags/7.0.1 (copied) (copied from c3-cloudfront-clear-cache/trunk)
• tags/7.0.1/.cursor (added)
• tags/7.0.1/.cursor/rules (added)
• tags/7.0.1/.cursor/rules/c3-cloudfront-cache-implementation.mdc (added)
• tags/7.0.1/.github (added)
• tags/7.0.1/.github/workflows (added)
• tags/7.0.1/.github/workflows/deploy-docs.yml (added)
• tags/7.0.1/.github/workflows/docs.yml (added)
• tags/7.0.1/.github/workflows/push-asset-readme-update.yml (added)
• tags/7.0.1/.github/workflows/push-deploy.yml (added)
• tags/7.0.1/.github/workflows/test.yml (added)
• tags/7.0.1/.wordpress-org (added)
• tags/7.0.1/.wordpress-org/banner-1544x500.png (added)
• tags/7.0.1/.wordpress-org/banner-772x250.jpg (added)
• tags/7.0.1/.wordpress-org/icon-128x128.png (added)
• tags/7.0.1/.wordpress-org/icon-256x256.jpg (added)
• tags/7.0.1/.wp-env.json (added)
• tags/7.0.1/c3-cloudfront-clear-cache.php (modified) (1 diff)
• tags/7.0.1/classes/AWS/CloudFront_HTTP_Client.php (modified) (2 diffs)
• tags/7.0.1/composer.json (deleted)
• tags/7.0.1/package.json (deleted)
• tags/7.0.1/readme.txt (modified) (2 diffs)
• tags/7.0.1/renovate.json (added)
• trunk/.cursor (added)
• trunk/.cursor/rules (added)
• trunk/.cursor/rules/c3-cloudfront-cache-implementation.mdc (added)
• trunk/.github (added)
• trunk/.github/workflows (added)
• trunk/.github/workflows/deploy-docs.yml (added)
• trunk/.github/workflows/docs.yml (added)
• trunk/.github/workflows/push-asset-readme-update.yml (added)
• trunk/.github/workflows/push-deploy.yml (added)
• trunk/.github/workflows/test.yml (added)
• trunk/.wordpress-org (added)
• trunk/.wordpress-org/banner-1544x500.png (added)
• trunk/.wordpress-org/banner-772x250.jpg (added)
• trunk/.wordpress-org/icon-128x128.png (added)
• trunk/.wordpress-org/icon-256x256.jpg (added)
• trunk/.wp-env.json (added)
• trunk/c3-cloudfront-clear-cache.php (modified) (1 diff)
• trunk/classes/AWS/CloudFront_HTTP_Client.php (modified) (2 diffs)
• trunk/composer.json (deleted)
• trunk/package.json (deleted)
• trunk/readme.txt (modified) (2 diffs)
• trunk/renovate.json (added)

c3-cloudfront-clear-cache/tags/7.0.1/c3-cloudfront-clear-cache.php

@@ -2 +2 @@
 /**
  * Plugin Name: C3 Cloudfront Cache Controller
- * Version: 7.0.0
+ * Version: 7.0.1
  * Plugin URI:https://github.com/amimoto-ami/c3-cloudfront-clear-cache
  * Description: Manage CloudFront Cache and provide some fixtures.

c3-cloudfront-clear-cache/tags/7.0.1/classes/AWS/CloudFront_HTTP_Client.php

@@ -224 +224 @@
         }
 
-        libxml_use_internal_errors( true );
-        libxml_disable_entity_loader( true );
-        $xml = simplexml_load_string( $xml_body, 'SimpleXMLElement', LIBXML_NOCDATA | LIBXML_NOENT );
-
-        if ( false === $xml ) {
+        try {
+            $xml = $this->parse_aws_xml_with_simple_xml( $xml_body );
+            return json_decode( json_encode( $xml ), true );
+        } catch ( \Exception $e ) {
             return array( 'raw_response' => $xml_body );
         }
-
-        return json_decode( json_encode( $xml ), true );
     }
 
@@ -243 +240 @@
      */
     private function parse_error_response( $xml_body, $status_code ) {
+        try {
+            $xml = $this->parse_aws_xml_with_simple_xml( $xml_body );
+            if ( isset( $xml->Message ) ) {
+                return (string) $xml->Message;
+            }
+        } catch ( \Exception $e ) {
+        }
+
+        return "CloudFront API error (HTTP {$status_code}): {$xml_body}";
+    }
+
+    /**
+     * Parse AWS XML response using SimpleXML with security measures
+     * @param string $xml_string XML response string
+     * @return SimpleXMLElement Parsed SimpleXMLElement
+     * @throws InvalidArgumentException If XML string is empty
+     * @throws RuntimeException If XML parsing fails
+     */
+    private function parse_aws_xml_with_simple_xml( $xml_string ) {
+        if ( empty( $xml_string ) ) {
+            throw new \InvalidArgumentException( 'Empty XML string provided for parsing' );
+        }
+
         libxml_use_internal_errors( true );
-        libxml_disable_entity_loader( true );
-        $xml = simplexml_load_string( $xml_body, 'SimpleXMLElement', LIBXML_NOCDATA | LIBXML_NOENT );
-        if ( false !== $xml && isset( $xml->Message ) ) {
-            return (string) $xml->Message;
-        }
-
-        return "CloudFront API error (HTTP {$status_code}): {$xml_body}";
+        
+        $xml = simplexml_load_string( $xml_string, 'SimpleXMLElement', LIBXML_NOCDATA | LIBXML_NONET | LIBXML_NOENT );
+        
+        if ( $xml === false ) {
+            $errors = libxml_get_errors();
+            $error_messages = array();
+            foreach ( $errors as $error ) {
+                $error_messages[] = sprintf( 
+                    'Line %d: %s', 
+                    $error->line, 
+                    trim( $error->message ) 
+                );
+            }
+            libxml_clear_errors();
+            
+            $context = strlen( $xml_string ) > 200 ? substr( $xml_string, 0, 200 ) . '...' : $xml_string;
+            throw new \RuntimeException( 
+                sprintf( 
+                    'XML parsing failed with errors: %s. XML content: %s', 
+                    implode( '; ', $error_messages ),
+                    $context
+                )
+            );
+        }
+        
+        libxml_clear_errors();
+        return $xml;
     }
 }

c3-cloudfront-clear-cache/tags/7.0.1/readme.txt

@@ -5 +5 @@
 Requires at least: 4.9.0
 Tested up to: 6.8.1
-Stable tag: 7.0.0
+Stable tag: 7.0.1
 License: GPLv3 or later
 License URI: http://www.gnu.org/licenses/gpl-3.0.html
@@ -96 +96 @@
 == Changelog ==
 
+== 7.0.1 ==
+* [Update] Improved AWS API call processing for better security and PHP 8.x compatibility
+
 == 7.0.0 ==
 * [Breaking Change] Remove AWS SDK dependency and implement custom HTTP CloudFront API client

c3-cloudfront-clear-cache/trunk/c3-cloudfront-clear-cache.php

@@ -2 +2 @@
 /**
  * Plugin Name: C3 Cloudfront Cache Controller
- * Version: 7.0.0
+ * Version: 7.0.1
  * Plugin URI:https://github.com/amimoto-ami/c3-cloudfront-clear-cache
  * Description: Manage CloudFront Cache and provide some fixtures.

c3-cloudfront-clear-cache/trunk/classes/AWS/CloudFront_HTTP_Client.php

@@ -224 +224 @@
         }
 
-        libxml_use_internal_errors( true );
-        libxml_disable_entity_loader( true );
-        $xml = simplexml_load_string( $xml_body, 'SimpleXMLElement', LIBXML_NOCDATA | LIBXML_NOENT );
-
-        if ( false === $xml ) {
+        try {
+            $xml = $this->parse_aws_xml_with_simple_xml( $xml_body );
+            return json_decode( json_encode( $xml ), true );
+        } catch ( \Exception $e ) {
             return array( 'raw_response' => $xml_body );
         }
-
-        return json_decode( json_encode( $xml ), true );
     }
 
@@ -243 +240 @@
      */
     private function parse_error_response( $xml_body, $status_code ) {
+        try {
+            $xml = $this->parse_aws_xml_with_simple_xml( $xml_body );
+            if ( isset( $xml->Message ) ) {
+                return (string) $xml->Message;
+            }
+        } catch ( \Exception $e ) {
+        }
+
+        return "CloudFront API error (HTTP {$status_code}): {$xml_body}";
+    }
+
+    /**
+     * Parse AWS XML response using SimpleXML with security measures
+     * @param string $xml_string XML response string
+     * @return SimpleXMLElement Parsed SimpleXMLElement
+     * @throws InvalidArgumentException If XML string is empty
+     * @throws RuntimeException If XML parsing fails
+     */
+    private function parse_aws_xml_with_simple_xml( $xml_string ) {
+        if ( empty( $xml_string ) ) {
+            throw new \InvalidArgumentException( 'Empty XML string provided for parsing' );
+        }
+
         libxml_use_internal_errors( true );
-        libxml_disable_entity_loader( true );
-        $xml = simplexml_load_string( $xml_body, 'SimpleXMLElement', LIBXML_NOCDATA | LIBXML_NOENT );
-        if ( false !== $xml && isset( $xml->Message ) ) {
-            return (string) $xml->Message;
-        }
-
-        return "CloudFront API error (HTTP {$status_code}): {$xml_body}";
+        
+        $xml = simplexml_load_string( $xml_string, 'SimpleXMLElement', LIBXML_NOCDATA | LIBXML_NONET | LIBXML_NOENT );
+        
+        if ( $xml === false ) {
+            $errors = libxml_get_errors();
+            $error_messages = array();
+            foreach ( $errors as $error ) {
+                $error_messages[] = sprintf( 
+                    'Line %d: %s', 
+                    $error->line, 
+                    trim( $error->message ) 
+                );
+            }
+            libxml_clear_errors();
+            
+            $context = strlen( $xml_string ) > 200 ? substr( $xml_string, 0, 200 ) . '...' : $xml_string;
+            throw new \RuntimeException( 
+                sprintf( 
+                    'XML parsing failed with errors: %s. XML content: %s', 
+                    implode( '; ', $error_messages ),
+                    $context
+                )
+            );
+        }
+        
+        libxml_clear_errors();
+        return $xml;
     }
 }

c3-cloudfront-clear-cache/trunk/readme.txt

@@ -5 +5 @@
 Requires at least: 4.9.0
 Tested up to: 6.8.1
-Stable tag: 7.0.0
+Stable tag: 7.0.1
 License: GPLv3 or later
 License URI: http://www.gnu.org/licenses/gpl-3.0.html
@@ -96 +96 @@
 == Changelog ==
 
+== 7.0.1 ==
+* [Update] Improved AWS API call processing for better security and PHP 8.x compatibility
+
 == 7.0.0 ==
 * [Breaking Change] Remove AWS SDK dependency and implement custom HTTP CloudFront API client