Changeset 1714477

Timestamp:

08/17/2017 06:32:47 AM (7 years ago)

Author:

batmoo

Message:

Bump trunk to 0.5.1

​https://github.com/Automattic/amp-wp/releases/tag/0.5.1

Location:

amp/trunk

Files:

• amp.php (modified) (2 diffs)
• includes/sanitizers/class-amp-tag-and-attribute-sanitizer.php (modified) (5 diffs)
• includes/utils/class-amp-image-dimension-extractor.php (modified) (1 diff)
• readme.txt (modified) (2 diffs)

amp/trunk/amp.php

@@ -6 +6 @@
  * Author: Automattic
  * Author URI: https://automattic.com
- * Version: 0.5
+ * Version: 0.5
  * Text Domain: amp
  * Domain Path: /languages/
@@ -14 +14 @@
 define( 'AMP__FILE__', __FILE__ );
 define( 'AMP__DIR__', dirname( __FILE__ ) );
-define( 'AMP__VERSION', '0.5' );
+define( 'AMP__VERSION', '0.5' );
 
 require_once( AMP__DIR__ . '/back-compat/back-compat.php' );

amp/trunk/includes/sanitizers/class-amp-tag-and-attribute-sanitizer.php

@@ -84 +84 @@
         // Remove nodes with non-whitelisted tags.
         if ( ! $this->is_amp_allowed_tag( $node ) ) {
-
             // If it's not an allowed tag, replace the node with it's children
             $this->replace_node_with_children( $node );
@@ -110 +109 @@
 
         // The remaining validations all have to do with attributes.
-        if ( $node->hasAttributes() ) {
-            $attr_spec_list = array();
-
-            // If we have exactly one rule_spec, use it's attr_spec_list to
-            // validate the node's attributes.
-            if ( 1 == count( $rule_spec_list_to_validate ) ) {
-                $rule_spec = array_pop( $rule_spec_list_to_validate );
-                $attr_spec_list = $rule_spec[AMP_Rule_Spec::ATTR_SPEC_LIST];
-
+        $attr_spec_list = array();
+
+        // If we have exactly one rule_spec, use it's attr_spec_list to
+        // validate the node's attributes.
+        if ( 1 == count( $rule_spec_list_to_validate ) ) {
+            $rule_spec = array_pop( $rule_spec_list_to_validate );
+            $attr_spec_list = $rule_spec[AMP_Rule_Spec::ATTR_SPEC_LIST];
+        } else {
             // If there is more than one valid rule_spec for this node, then
             // try to deduce which one is intended by inspecting the node's
             // attributes.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
             } else {
-
-                // Get a score from each attr_spec_list by seeing how many
-                // attributes and values match the node.
-                $attr_spec_scores = array();
-                foreach ( $rule_spec_list_to_validate as $spec_id => $rule_spec ) {
-                    $attr_spec_scores[ $spec_id ] = $this->validate_attr_spec_list_for_node( $node, $rule_spec[AMP_Rule_Spec::ATTR_SPEC_LIST] );
-                }
-
-                // Get the key(s) to the highest score(s).
-                $spec_ids_sorted = array_keys( $attr_spec_scores, max( $attr_spec_scores ) );
-
-                // If there is exactly one attr_spec with a max score, use that one.
-                if ( 1 == count( $spec_ids_sorted ) ) {
-                    $attr_spec_list = $rule_spec_list_to_validate[ $spec_ids_sorted[0] ][AMP_Rule_Spec::ATTR_SPEC_LIST];
-
-                // Otherwise...
-                } else {
-                    // This shoud not happen very often, but...
-                    // If we're here, then we have no idea which spec should
-                    // be used. Try to merge the top scoring ones and cross
-                    // your fingers.
-                    foreach( $spec_ids_sorted as $id ) {
-                        $attr_spec_list = array_merge( $attr_spec_list, $rule_spec_list_to_validate[ $id ][AMP_Rule_Spec::ATTR_SPEC_LIST] );
-                    }
-                }
-            }
-
-            // Remove any remaining disallowed attributes.
-            $this->sanitize_disallowed_attributes_in_node( $node, $attr_spec_list );
-
-            // Remove values that don't conform to the attr_spec.
-            $this->sanitize_disallowed_attribute_values_in_node( $node, $attr_spec_list );
-        }
+                // This should not happen very often, but...
+                // If we're here, then we're not sure which spec should
+                // be used. Let's use the top scoring ones.
+                foreach( $spec_ids_sorted as $id ) {
+                    $attr_spec_list = array_merge( $attr_spec_list, $rule_spec_list_to_validate[ $id ][AMP_Rule_Spec::ATTR_SPEC_LIST] );
+                }
+            }
+        }
+
+        // If an attribute is mandatory and we don't have it, just remove the node and move on.
+        foreach ( $attr_spec_list as $attr_name => $attr_spec_rule_value ) {
+            $is_mandatory =
+                isset( $attr_spec_rule_value[ AMP_Rule_Spec::MANDATORY ] )
+                ? (bool) $attr_spec_rule_value[ AMP_Rule_Spec::MANDATORY ]
+                : false;
+            $attribute_exists = $node->hasAttribute( $attr_name );
+
+            if ( $is_mandatory && ! $attribute_exists ) {
+                $this->remove_node( $node );
+                return;
+            }
+        }
+
+        // Remove any remaining disallowed attributes.
+        $this->sanitize_disallowed_attributes_in_node( $node, $attr_spec_list );
+
+        // Remove values that don't conform to the attr_spec.
+        $this->sanitize_disallowed_attribute_values_in_node( $node, $attr_spec_list );
     }
 
@@ -168 +176 @@
      */
     private function validate_tag_spec_for_node( $node, $tag_spec ) {
-
         if ( ! empty( $tag_spec[AMP_Rule_Spec::MANDATORY_PARENT] ) &&
             ! $this->has_parent( $node, $tag_spec[AMP_Rule_Spec::MANDATORY_PARENT] ) ) {
@@ -365 +372 @@
         }
 
+
+
         foreach( $node->attributes as $attr_name => $attr_node ) {
 
@@ -371 +380 @@
             }
 
-            $attr_spec_rule = $attr_spec_list[$attr_name];
+            $should_remove_node = false;
+            $attr_spec_rule = $attr_spec_list[ $attr_name ];
 
             if ( isset( $attr_spec_rule[AMP_Rule_Spec::VALUE] ) &&
                 AMP_Rule_Spec::FAIL == $this->check_attr_spec_rule_value( $node, $attr_name, $attr_spec_rule ) ) {
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
                 $attrs_to_remove[] = $attr_name;
-                continue;
-            }
-
-            if ( isset( $attr_spec_rule[AMP_Rule_Spec::VALUE_CASEI] ) &&
-                AMP_Rule_Spec::FAIL == $this->check_attr_spec_rule_value_casei( $node, $attr_name, $attr_spec_rule ) ) {
-                $attrs_to_remove[] = $attr_name;
-                continue;
-            }
-
-            if ( isset( $attr_spec_rule[AMP_Rule_Spec::VALUE_REGEX] ) &&
-                AMP_Rule_Spec::FAIL == $this->check_attr_spec_rule_value_regex( $node, $attr_name, $attr_spec_rule ) ) {
-                $attrs_to_remove[] = $attr_name;
-                continue;
-            }
-
-            if ( isset( $attr_spec_rule[AMP_Rule_Spec::VALUE_REGEX_CASEI] ) &&
-                AMP_Rule_Spec::FAIL == $this->check_attr_spec_rule_value_regex_casei( $node, $attr_name, $attr_spec_rule ) ) {
-                $attrs_to_remove[] = $attr_name;
-                continue;
-            }
-
-            if ( isset( $attr_spec_rule[AMP_Rule_Spec::ALLOWED_PROTOCOL] ) &&
-                AMP_Rule_Spec::FAIL == $this->check_attr_spec_rule_allowed_protocol( $node, $attr_name, $attr_spec_rule ) ) {
-                $attrs_to_remove[] = $attr_name;
-                continue;
-            }
-
-            if ( isset( $attr_spec_rule[AMP_Rule_Spec::ALLOW_RELATIVE] ) &&
-                AMP_Rule_Spec::FAIL == $this->check_attr_spec_rule_disallowed_relative( $node, $attr_name, $attr_spec_rule ) ) {
-                $attrs_to_remove[] = $attr_name;
-                continue;
-            }
-
-            if ( isset( $attr_spec_rule[AMP_Rule_Spec::ALLOW_EMPTY] ) &&
-                AMP_Rule_Spec::FAIL == $this->check_attr_spec_rule_disallowed_empty( $node, $attr_name, $attr_spec_rule ) ) {
-                $attrs_to_remove[] = $attr_name;
-                continue;
-            }
-
-            if ( isset( $attr_spec_rule[AMP_Rule_Spec::DISALLOWED_DOMAIN] ) &&
-                AMP_Rule_Spec::FAIL == $this->check_attr_spec_rule_disallowed_domain( $node, $attr_name, $attr_spec_rule ) ) {
-                $attrs_to_remove[] = $attr_name;
-                continue;
-            }
-
-            if ( isset( $attr_spec_rule[AMP_Rule_Spec::BLACKLISTED_VALUE_REGEX] ) &&
-                AMP_Rule_Spec::FAIL == $this->check_attr_spec_rule_blacklisted_value_regex( $node, $attr_name, $attr_spec_rule ) ) {
-                $attrs_to_remove[] = $attr_name;
-                continue;
             }
         }

amp/trunk/includes/utils/class-amp-image-dimension-extractor.php

@@ -11 +11 @@
         }
 
-        $valid_urls = array();
-        foreach ( $urls as $url ) {
-            $url = self::normalize_url( $url );
-            if ( false !== $url ) {
-                $valid_urls[] = $url;
-            }
-        }
-
-        $dimensions = array_fill_keys( $valid_urls, false );
-        $dimensions = apply_filters( 'amp_extract_image_dimensions_batch', $dimensions );
-
-        return $dimensions;
+        $return_dimensions = array();
+
+        // Normalize URLs and also track a map of normalized-to-original as we'll need it to reformat things when returning the data.
+        $url_map = array();
+        $normalized_urls = array();
+        foreach ( $urls as $original_url ) {
+            $normalized_url = self::normalize_url( $original_url );
+            if ( false !== $normalized_url ) {
+                $url_map[ $normalized_url ] = $original_url;
+                $normalized_urls[] = $normalized_url;
+            } else {
+                // This is not a URL we can extract dimensions from, so default to false.
+                $return_dimensions[ $original_url ] = false;
+            }
+        }
+
+        $extracted_dimensions = array_fill_keys( $normalized_urls, false );
+        $extracted_dimensions = apply_filters( 'amp_extract_image_dimensions_batch', $extracted_dimensions );
+
+        // We need to return a map with the original (un-normalized URL) as we that to match nodes that need dimensions.
+        foreach ( $extracted_dimensions as $normalized_url => $dimension ) {
+            $original_url = $url_map[ $normalized_url ];
+            $return_dimensions[ $original_url ] = $dimension;
+        }
+
+        return $return_dimensions;
     }
 

amp/trunk/readme.txt

@@ -4 +4 @@
 Requires at least: 4.7
 Tested up to: 4.8
-Stable tag: 0.5
+Stable tag: 0.5
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -53 +53 @@
 
 == Changelog ==
+
+
+
+
+
 
 = 0.5 (2017-08-04) =