Changeset 5961

Timestamp:

09/24/2017 01:28:47 PM (9 years ago)

Author:

SergeyBiryukov

Message:

Browse Happy API: Mark versions of Opera earlier than 12.18 as insecure.

Add Opera 12.18 user-agent string to test data.

Fixes #3161.

Location:

sites/trunk/api.wordpress.org/public_html/core/browse-happy/1.0

Files:

• browsers.php (modified) (1 diff)
• parse.php (modified) (1 diff)
• tests/phpunit/tests/browse-happy.php (modified) (2 diffs)

sites/trunk/api.wordpress.org/public_html/core/browse-happy/1.0/browsers.php

@@ -20 +20 @@
                 'Chrome'            => '18', // Lowest version at the moment (mobile)
                 'Firefox'           => '16',
-                'Opera'             => '12.11',
+                'Opera'             => '12.18',
                 'Safari'            => '5',
                 'Internet Explorer' => '11',

sites/trunk/api.wordpress.org/public_html/core/browse-happy/1.0/parse.php

@@ -126 +126 @@
         $data['current_version'] = get_browser_version_from_name( $data['name'] );
         $data['upgrade']         = ( ! empty( $data['current_version'] ) && version_compare( $data['version'], $data['current_version'], '<' ) );
-        $data['insecure']        = ( 'Internet Explorer' == $data['name'] && version_compare( $data['version'], '11', '<' ) );
+
+        if ( 'Internet Explorer' === $data['name'] && version_compare( $data['version'], '11', '<' ) ) {
+                $data['insecure'] = true;
+        } elseif ( 'Opera' === $data['name'] && version_compare( $data['version'], '12.18', '<' ) ) {
+                $data['insecure'] = true;
+        }
 
         return $data;

sites/trunk/api.wordpress.org/public_html/core/browse-happy/1.0/tests/phpunit/tests/browse-happy.php

@@ -115 +115 @@
                                 'Windows Opera 11.01',
                         ],
+                        // #3161
+                        [
+                                'Opera/9.80 (Windows NT 6.2; WOW64) Presto/2.12.388 Version/12.18',
+                                'Windows Opera 12.18',
+                        ],
                         [
                                 'Mozilla/5.0 (Windows; U; Windows NT 6.1; tr-TR) AppleWebKit/533.20.25 (KHTML, like Gecko) Version/5.0.4 Safari/533.20.27',
@@ -242 +247 @@
                 if ( 'Internet Explorer' === $parsed['name'] && version_compare( $parsed['version'], '11', '<' ) ) {
                         $this->assertTrue( $parsed['insecure'] );
+                } elseif ( 'Opera' === $parsed['name'] && version_compare( $parsed['version'], '12.18', '<' ) ) {
+                        $this->assertTrue( $parsed['insecure'] );
                 }
         }