Changeset 13213

Timestamp:

02/15/2024 03:21:06 AM (7 months ago)

Author:

dd32

Message:

Trac: Github PRs: Load GitHub embedded images directly, avoiding CORS.

See #7442.

Location:

sites/trunk

Files:

• api.wordpress.org/public_html/dotorg/trac/pr/functions.php (modified) (1 diff)
• trac.wordpress.org/conf/common-extended.ini (modified) (1 diff)
• trac.wordpress.org/templates/site.html (modified) (1 diff)
• wordpress.org/public_html/style/trac/wp-trac.js (modified) (1 diff)

sites/trunk/api.wordpress.org/public_html/dotorg/trac/pr/functions.php

@@ -398 +398 @@
 
     // Convert Images (Must happen prior to Links, as the only difference is a preceeding !)
-    $desc = preg_replace( '#!\[(.+?)\]\(https?://(.+?)\)#', '[[Image(https://i0.wp.com/$2)]]', $desc );
+    $desc = preg_replace( '#!\[(.+?)\]\((.+?)\)#', '[[Image($2)]]', $desc );
     // Convert Images embedded as `<img>`.
-    $desc = preg_replace( '#<img[^>]+src=(["\'])https?://(.+?)\\1[^>]*>#', '[[Image(https://i0.wp.com/$2)]]', $desc );
+    $desc = preg_replace( '#<img[^>]+src=(["\'])(.+?)\\1[^>]*>#', '[[Image($2)]]', $desc );
 
     // Convert Links.

sites/trunk/trac.wordpress.org/conf/common-extended.ini

@@ -56 +56 @@
 max_size = 1048576
 split_page_names = false
+safe_origins = https://github.com/
 
 [ticket]

sites/trunk/trac.wordpress.org/templates/site.html

@@ -5 +5 @@
 
 <?python
-    scripts_version = '216'
+    scripts_version = '217'
     project_slug = req.environ['HTTP_HOST'].split(':')[0].split('.')[0]
     wporg_endpoint = 'https://make.wordpress.org/' + project_slug + '/'

sites/trunk/wordpress.org/public_html/style/trac/wp-trac.js

@@ -1743 +1743 @@
                 // Fetch the PRs immediately
                 fetchPRs();
+
+                // deProxy github images, CORS changes.
+                deProxyImages();
+            }
+
+            // See https://meta.trac.wordpress.org/ticket/7442
+            function deProxyImages() {
+                $('img[src*="i0.wp.com/github.com/"]').each( function() {
+                    var $this = $(this), $parent = $this.parent('a');
+                    $this.removeAttr('crossorigin'); // We trust GitHub for these images.
+                    $this.prop( 'src', $this.prop('src').replace(/i0\.wp\.com/, '' ) );
+                    $this.prop( 'alt', $this.prop('alt').replace(/i0\.wp\.com/, '' ) );
+                    $this.prop( 'title', $this.prop('title').replace(/i0\.wp\.com/, '' ) );
+                    $parent.prop( 'href', $parent.prop('href').replace(/i0\.wp\.com/, '' ) );
+                } );
             }