Changeset 14565

Timestamp:

10/24/2025 06:11:26 AM (3 months ago)

Author:

dd32

Message:

Plugin Directory: Run Plugin Check over new plugin releases.

Props davidperez, dd32.
Closes ​https://github.com/WordPress/wordpress.org/pull/515
See #6108, #5637, #5868.
Fixes #8018.

Location:

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory

Files:

• jobs/class-manager.php (modified) (2 diffs)
• jobs/class-plugin-updates-pcp.php (added)
• shortcodes/class-upload-handler.php (modified) (4 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/jobs/class-manager.php

@@ -22 +22 @@
         'import_plugin_i18n' => array( __NAMESPACE__ . '\Plugin_i18n_Import', 'cron_trigger' ),
         'import_zip'         => array( __NAMESPACE__ . '\Plugin_ZIP_Import', 'cron_trigger' ),
+        'scan_plugin'        => array( __NAMESPACE__ . '\Plugin_Updates_PCP', 'cron_trigger' ),
     );
 
@@ -41 +42 @@
         add_action( 'plugin_directory_daily_post_checks', array( __NAMESPACE__ . '\Daily_Post_Checks', 'cron_trigger' ) );
         add_action( 'plugin_directory_create_svn_repo', array( __NAMESPACE__ . '\SVN_Repo_Creation', 'cron_trigger' ) );
+
+        // Hook into the plugin import process to queue a job.
+        add_action( 'wporg_plugins_imported', array( __NAMESPACE__ . '\Plugin_Updates_PCP', 'wporg_plugins_imported' ), 10, 5 );
 
         // A cronjob to check cronjobs

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/shortcodes/class-upload-handler.php

@@ -4 +4 @@
 use WP_Error;
 use WordPressdotorg\Plugin_Directory\CLI\Import;
+use WordPressdotorg\Plugin_Directory\Jobs\Plugin_Updates_PCP;
 use WordPressdotorg\Plugin_Directory\Readme\Parser;
 use WordPressdotorg\Plugin_Directory\Plugin_Directory;
@@ -656 +657 @@
 
     /**
-     * Sends a plugin through Plugin Check.
+     * Checks the uploaded plugin via Plugin Check.
      *
      * @return array The results of the plugin check.
      */
     public function check_plugin() {
-        // Run the checks.
-        if (
-            ! defined( 'WPCLI' ) ||
-            ! defined( 'WP_CLI_CONFIG_PATH' ) ||
-            // The plugin must be activated in order to have plugin-check run.
-            ! defined( 'WP_PLUGIN_CHECK_VERSION' ) ||
-            // WordPress.org only..
-            ! function_exists( 'notify_slack' )
-        ) {
-            // If we can't run plugin-check, we'll just return a pass.
-            return [
-                'verdict' => true,
-                'results' => [],
-                'html'    => '',
-            ];
-        }
-
-        // Run plugin check via CLI
-        $start_time = microtime(1);
-        $env_vars   = [
-            'PATH'               => $_ENV['PATH'] ?? '/usr/local/bin:/usr/bin:/bin',
-            'WP_CLI_CONFIG_PATH' => WP_CLI_CONFIG_PATH,
+        // If we can't run plugin-check, we'll just return a pass.
+        $default_return = [
+            'verdict' => true,
+            'results' => [],
+            'html'    => '',
         ];
-        $command    = WPCLI . ' --url=https://wordpress.org/plugins ' .
-                      'plugin check ' .
-                      '--error-severity=7 --warning-severity=6 --include-low-severity-errors ' .
-                      '--categories=plugin_repo --format=json ' .
-                      '--slug=' . escapeshellarg( $this->plugin_slug ) . ' ' .
-                      escapeshellarg( $this->plugin_root );
-
-        $plugin_check_process = proc_open(
-            $command,
-            [
-                1 => [ 'pipe', 'w' ], // STDOUT
-                2 => [ 'pipe', 'w' ], // STDERR
-            ],
-            $pipes,
-            null,
-            $env_vars
-        );
-        if ( ! $plugin_check_process ) {
-            // If we can't run plugin-check, we'll just return a pass.
-            return [
-                'verdict' => true,
-                'results' => [],
-                'html'    => '',
-            ];
-        }
-        do {
-            usleep( 100000 ); // 0.1s
-
-            $total_time = round( microtime(1) - $start_time, 1 );
-
-            $proc_status = proc_get_status( $plugin_check_process );
-            $return_code = $proc_status['exitcode'] ?? 1;
-
-            if ( $total_time >= 45 && $proc_status['running'] ) {
-                // Terminate it.
-                proc_terminate( $plugin_check_process );
-            }
-        } while ( $proc_status['running'] && $total_time <= 60 ); // 60s max, just in case.
-
-        $output = stream_get_contents( $pipes[1] );
-        $stderr = rtrim( stream_get_contents( $pipes[2] ), "\n" );
-
-        // Remove ABSPATH from the output if present.
-        $output = str_replace( ABSPATH, '/', $output );
-        $output = str_replace( str_replace( '/', '\/', ABSPATH ), '\/', $output ); // JSON encoded
-        $stderr = str_replace( ABSPATH, '/', $stderr );
-
-        // Close the process.
-        fclose( $pipes[1] );
-        fclose( $pipes[2] );
-        proc_close( $plugin_check_process );
-
-        /**
-         * Anything that plugin-check outputs that we want to discard completely.
-         */
-        $is_ignored_code = static function( $code ) {
-            $ignored_codes = [
-            ];
-
-            return (
-                in_array( $code, $ignored_codes, true ) ||
-                // All the Readme parser warnings are duplicated, we'll exclude those.
-                str_starts_with( $code, 'readme_parser_warnings_' )
-            );
-        };
-
-        /*
-         * Convert the output into an array.
-         * Format:
-         * FILE: example.extension
-         * [{.....}]
-         *
-         * FILE: example2.extension
-         * [{.....}]
-         */
-        $verdict         = true;
-        $results         = [];
-        $results_by_type = [];
-        $output          = explode( "\n", $output );
-        foreach ( array_chunk( $output, 3 ) as $file_result ) {
-            if ( ! str_starts_with( $file_result[0], 'FILE:' ) ) {
-                continue;
-            }
-
-            $filename = trim( explode( ':' , $file_result[0], 2 )[1] );
-            $json     = json_decode( $file_result[1], true );
-
-            foreach ( $json as $record ) {
-                $record['file'] = $filename;
-
-                if ( $is_ignored_code( $record['code'] ) ) {
-                    continue;
-                }
-
-                $results[] = $record;
-
-                $results_by_type[ $record['type'] ] ??= [];
-                $results_by_type[ $record['type'] ][] = $record;
-
-                // Record submission stats.
-                if ( function_exists( 'bump_stats_extra' ) && 'production' === wp_get_environment_type() ) {
-                    bump_stats_extra( 'plugin-check-' . $record['type'], $record['code'] );
-                }
-
-                // Determine if it failed the checks.
-                if ( $verdict && 'ERROR' === $record['type'] ) {
-                    $verdict = false;
-                }
-            }
-        }
+
+        if ( ! function_exists( 'notify_slack' ) ) {
+            return $default_return;
+        }
+
+        $result = Plugin_Updates_PCP::run_plugin_check( $this->plugin_slug, $this->plugin_root, '' /* should be stable tag */, 'new' );
+        if ( false === $result ) {
+            return $default_return;
+        }
+
+        $verdict     = $result['verdict'];
+        $results     = $result['results'];
+        $return_code = $result['return_code'];
+        $total_time  = $result['total_time'];
 
         // Generage the HTML for the Plugin Check output.
@@ -838 +726 @@
         if ( ! $verdict ) {
             // Slack dm the logs.
-            $zip_name = reset( $_FILES )['name'];
+            $zip_name = reset( $_FILES )['name'] ?? '';
             $failpass = $verdict ? ':white_check_mark: passed' : ':x: failed';
             if ( $return_code > 1 ) { // TODO: Temporary, as we're always hitting this branch.
@@ -879 +767 @@
         } elseif ( $return_code ) {
             // Log plugin-check timing out.
-            $zip_name   = reset( $_FILES )['name'];
+            $zip_name   = reset( $_FILES )['name'] ?? '';
             $output     = implode( "\n", $output );
             $debug      = '';