Changeset 11099

Timestamp:

07/07/2021 01:52:55 AM (4 years ago)

Author:

dd32

Message:

Trac: Update the GitHub PR Bot & Slack Mentions Bot to use cookie based authentication to access trac.

Location:

sites/trunk

Files:

• api.wordpress.org/public_html/dotorg/slack/trac-bot.php (modified) (1 diff)
• api.wordpress.org/public_html/dotorg/trac/pr/class-trac.php (modified) (1 diff)
• api.wordpress.org/public_html/dotorg/trac/pr/index.php (modified) (1 diff)
• api.wordpress.org/public_html/dotorg/trac/pr/webhook.php (modified) (1 diff)
• common/includes/slack/trac/bot.php (modified) (1 diff)

sites/trunk/api.wordpress.org/public_html/dotorg/slack/trac-bot.php

@@ -2 +2 @@
 
 namespace {
-    require dirname( dirname( __DIR__ ) ) . '/includes/hyperdb/bb-10-hyper-db.php';
-    require dirname( dirname( __DIR__ ) ) . '/includes/object-cache.php';
+    require dirname( dirname( __DIR__ ) ) . '/wp-init.php';
 
     require dirname( dirname( __DIR__ ) ) . '/includes/slack-config.php';
 
-    require dirname( dirname( __DIR__ ) ) . '/includes/class-IXR.php';
     require dirname( dirname( __DIR__ ) ) . '/includes/class-trac.php';
 }

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

@@ -123 +123 @@
                 [
                     'Content-Type: application/json',
-                    'Authorization: Basic ' . base64_encode( $this->credentials[0] . ':' . $this->credentials[1] ),
+                    'Cookie: ' . LOGGED_IN_COOKIE . '=' . wp_generate_auth_cookie( get_user_by( 'login', $this->credentials[0] )->ID, time()+60, 'logged_in' ),
                 ],
             'content'       => json_encode( [

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

@@ -2 +2 @@
 namespace WordPressdotorg\API\Trac\GithubPRs;
 
-require dirname( dirname( dirname( __DIR__ ) ) ) . '/init.php';
-require dirname( dirname( dirname( __DIR__ ) ) ) . '/includes/hyperdb/bb-10-hyper-db.php';
-require dirname( dirname( dirname( __DIR__ ) ) ) . '/includes/wp-json-encode.php';
-require dirname( dirname( dirname( __DIR__ ) ) ) . '/includes/object-cache.php';
-\wp_cache_init();
-
+require dirname( dirname( dirname( __DIR__ ) ) ) . '/wp-init.php';
 require __DIR__ . '/functions.php';
 

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

@@ -2 +2 @@
 namespace WordPressdotorg\API\Trac\GithubPRs;
 
-require dirname( dirname( dirname( __DIR__ ) ) ) . '/init.php';
-require dirname( dirname( dirname( __DIR__ ) ) ) . '/includes/hyperdb/bb-10-hyper-db.php';
-require dirname( dirname( dirname( __DIR__ ) ) ) . '/includes/object-cache.php';
-\wp_cache_init();
-
+require dirname( dirname( dirname( __DIR__ ) ) ) . '/wp-init.php';
 require __DIR__ . '/functions.php';
 require __DIR__ . '/class-trac.php';

sites/trunk/common/includes/slack/trac/bot.php

@@ -53 +53 @@
         $tickets      = array();
 
-        // If the channel is not GitHub centric, require the trac to be suffixed like #1234-core
+        // If the channel is GitHub centric, require the trac to be suffixed like #1234-core
         $require_trac = in_array( $this->get_channel(), self::$github_channels, true );
         $require_trac = $require_trac ? '' : '?'; // regex optional.