Changeset 13729

Timestamp:

05/17/2024 06:14:37 AM (11 months ago)

Author:

dd32

Message:

Plugin Directory: Allow plugin slugs to be renamed during the approval stage.

This allows plugin reviewers to change the slug immediately after the plugin is approved, but before the author commits any code.

Fixes #6878.

Location:

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

Files:

• admin/class-customizations.php (modified) (3 diffs)
• tools/class-svn.php (modified) (1 diff)

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/class-customizations.php

@@ -4 +4 @@
 use \WordPressdotorg\Plugin_Directory;
 use \WordPressdotorg\Plugin_Directory\Tools;
+use \WordPressdotorg\Plugin_Directory\Tools\SVN;
 use \WordPressdotorg\Plugin_Directory\Template;
 use \WordPressdotorg\Plugin_Directory\Readme\Validator;
@@ -562 +563 @@
      */
     function check_existing_plugin_slug_on_post_update( $data, $postarr ) {
+        global $wpdb;
+
         if ( 'plugin' !== $data['post_type'] || ! isset( $postarr['ID'] ) ) {
             return $data;
         }
 
-        $existing_plugin = Plugin_Directory\Plugin_Directory::get_plugin_post( $data['post_name'] );
+        // If we can't locate the existing plugin, we can't check for a conflict.
+        $plugin = get_post( $postarr['ID'] );
+        if ( ! $plugin ) {
+            return $data;
+        }
+
+        $old_slug        = $plugin->post_name;
+        $new_slug        = $data['post_name'];
+        $existing_plugin = Plugin_Directory\Plugin_Directory::get_plugin_post( $new_slug );
 
         // Is there already a plugin with the same slug?
-        if ( $existing_plugin && $existing_plugin->ID != $postarr['ID'] ) {
+        if ( $existing_plugin && $existing_plugin->ID != $plugin->ID ) {
             wp_die( sprintf(
                 /* translators: %s: plugin slug */
                 __( 'Error: The plugin %s already exists.', 'wporg-plugins' ),
-                $data['post_name']
+                $new_slug
             ) );
         }
 
+        // If the plugin is approved, we'll need to perform a folder rename, and re-grant SVN access.
+        if ( 'approved' === $plugin->post_status ) {
+            // SVN Rename $old_slug to $new_slug
+            $result = SVN::rename(
+                "http://plugins.svn.wordpress.org/{$old_slug}/",
+                "http://plugins.svn.wordpress.org/{$new_slug}/",
+                array(
+                    'message' => sprintf( 'Renaming %1$s to %2$s.', $old_slug, $new_slug ),
+                )
+            );
+            if ( $result['errors'] ) {
+                $error = 'Error renaming SVN repository: ' . var_export( $result['errors'], true );
+                Tools::audit_log( $error, $plugin->ID );
+                wp_die( $error ); // Abort before the post is altered.
+            } else {
+                Tools::audit_log(
+                    sprintf(
+                        'Renamed SVN repository in %s.',
+                        'https://plugins.svn.wordpress.org/changeset/' . $result['revision']
+                    ),
+                    $plugin->ID
+                );
+
+                /*
+                 * Migrate Committers to new path.
+                 * As no committers have changed as part of this operation, just update the database.
+                 */
+                $wpdb->update(
+                    PLUGINS_TABLE_PREFIX . 'svn_access',
+                    [ 'path' => '/' . $new_slug ],
+                    [ 'path' => '/' . $old_slug ]
+                );
+            }
+        }
+
         // Record the slug change.
-        $plugin = get_post( $postarr['ID'] );
-        if ( $plugin && $plugin->post_name !== $data['post_name'] ) {
+        if ( $old_slug !== $new_slug ) {
             // Only log if the slugs don't appear to be rejection-related.
             if (
-                ! preg_match( '!^rejected-.+-rejected$!', $post->post_name ) &&
-                ! preg_match( '!^rejected-.+-rejected$!', $data['post_name'] )
+                ! preg_match( '!^rejected-.+-rejected$!', $old_slug ) &&
+                ! preg_match( '!^rejected-.+-rejected$!', $new_slug )
             ) {
                 Tools::audit_log( sprintf(
                     "Slug changed from '%s' to '%s'.",
-                    $plugin->post_name,
-                    $data['post_name']
+                    $old_slug,
+                    $new_slug
                 ), $plugin->ID );
             }
@@ -736 +781 @@
         remove_meta_box( 'commentstatusdiv', 'plugin', 'normal' );
 
-        // Remove slug metabox unless the slug is editable for the current user.
-        if ( ! in_array( $post->post_status, array( 'new', 'pending' ) ) || ! current_user_can( 'plugin_approve', $post ) ) {
+        // Remove slug metabox unless the slug is editable by the current user.
+        if ( ! in_array( $post->post_status, array( 'new', 'pending', 'approved' ) ) || ! current_user_can( 'plugin_approve', $post ) ) {
             remove_meta_box( 'slugdiv', 'plugin', 'normal' );
         }

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/tools/class-svn.php

@@ -430 +430 @@
 
     /**
+     * Rename a SVN path (or url).
+     *
+     * @static
+     *
+     * @param string $from    The path of the SVN folder to rename. May be a URL.
+     * @param string $to      The new path of the SVN folder. May be a URL.
+     * @param array  $options  Optional. A list of options to pass to SVN. Default: empty array.
+     * @return array {
+     *     @type bool        $result   The result of the operation.
+     *     @type int         $revision The revision.
+     *     @type false|array $errors   Whether any errors or warnings were encountered.
+     * }
+     */
+    public static function rename( $from, $to, $options = array() ) {
+        $options[] = 'non-interactive';
+        $is_url    = ( preg_match( '#https?://#i', $from ) && preg_match( '#https?://#i', $to ) );
+
+        if ( $is_url ) {
+            // Set the message if not provided.
+            if ( ! isset( $options['message'] ) && ! isset( $options['m'] ) ) {
+                $options['message'] = sprintf( "Rename %s to %s.", basename( $from ), basename( $to ) );
+            }
+
+            if ( empty( $options['username'] ) ) {
+                $options['username'] = PLUGIN_SVN_MANAGEMENT_USER;
+                $options['password'] = PLUGIN_SVN_MANAGEMENT_PASS;
+            }
+        }
+
+        $esc_options = self::parse_esc_parameters( $options );
+
+        $esc_from = escapeshellarg( $from );
+        $esc_to   = escapeshellarg( $to );
+
+        $output = self::shell_exec( "svn mv $esc_from $esc_to $esc_options 2>&1" );
+        if ( $is_url && preg_match( '/Committed revision (?P<revision>\d+)[.]/i', $output, $m ) ) {
+            $revision = (int) $m['revision'];
+            $result   = true;
+            $errors   = false;
+        } else {
+            $errors   = self::parse_svn_errors( $output );
+            $revision = false;
+
+            if ( $is_url || $errors ) {
+                $result = false;
+            } else {
+                $result = true;
+            }
+        }
+
+        return compact( 'result', 'revision', 'errors' );
+    }
+
+    /**
      * Parse and escape the provided SVN arguements for usage on the CLI.
      *