Changeset 11299

Timestamp:

10/27/2021 03:01:22 AM (5 years ago)

Author:

dd32

Message:

Theme Directory: When a SVN commit is blocked by the svn pre-commit hook, pass the quoted error back to the client.

This primarily will affect theme updates that are attempted to be uploaded that contain a PHP Fatal error that wasn't caught before this step.

Location:

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

Files:

• class-wporg-themes-upload.php (modified) (3 diffs)
• lib/class-exec-with-logging.php (modified) (2 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/class-wporg-themes-upload.php

@@ -659 +659 @@
         if ( $args['commit_to_svn'] ) {
             $result = $this->add_to_svn();
-            if ( ! $result ) {
+            if ( ! $result || is_wp_error( $result ) ) {
                 return new WP_Error(
                     'failed_svn_commit',
@@ -666 +666 @@
                         __( 'There was an error adding your theme to SVN. Please try again, if this error persists report the error to %s.', 'wporg-themes' ),
                         '<a href="mailto:themes@wordpress.org">themes@wordpress.org</a>'
+                    ) .
+                    (
+                        is_wp_error( $result ) && $result->get_error_message( 'pre-commit-hook' ) ?
+                            '<br><code>' . nl2br( esc_html( $result->get_error_message( 'pre-commit-hook' ) ) ) . '</code>' : 
+                            ''
                     )
                 );
@@ -1380 +1385 @@
         $password   = escapeshellarg( THEME_DROPBOX_PASSWORD );
 
-        $last_line = $this->exec_with_notify( self::SVN . " --non-interactive --username themedropbox --password {$password} --no-auto-props -m {$import_msg} import {$theme_path} {$svn_path}" );
+        $last_line = $this->exec_with_notify( self::SVN . " --non-interactive --username themedropbox --password {$password} --no-auto-props -m {$import_msg} import {$theme_path} {$svn_path}", $output, $return_var, $stderr );
+
+        // Pass through any error output from the SVN error handler.
+        if (
+            ! empty( $stderr ) &&
+            false !== stripos( $stderr[0], 'Commit blocked by pre-commit hook' ) &&
+            preg_match( '!([*]{12,})(.*?)\\1!s', implode( "\n", $stderr ) . "\n", $m )
+        ) {
+            return new WP_Error( 'pre-commit-hook', trim( $m[0] ) );
+        }
 
         if ( preg_match( '/Committed revision (\d+)\./i', $last_line, $m ) ) {

sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/lib/class-exec-with-logging.php

@@ -12 +12 @@
      * Execute a shell process, same behaviour as `exec()` but with PHP Warnings/Notices generated on errors.
      * 
-     * @param string $command    Command to execute. Escape it.
-     * @param array  $output     Array to append program output to. Passed by reference.
-     * @param int    $return_var The commands return value. Passed by reference.
+     * @param string $command      Command to execute. Escape it.
+     * @param array  $output       Array to append program output to. Passed by reference.
+     * @param int    $return_var   The commands return value. Passed by reference.
+     * @param array  $error_output Array to append program output to. Passed by reference.
      * 
      * @return false|string False on failure, last line of output on success, as per exec().
      */
-    public static function exec( $command, &$output = null, &$return_var = null ) {
+    public static function exec( $command, &$output = null, &$return_var = null, &$error_output = null ) {
         $proc = proc_open(
             $command,
@@ -39 +40 @@
         $return_var = proc_close( $proc );
 
+        // Redact any passwords that might be in a command and included in logged errors.
+        foreach ( [ 'command', 'stdout', 'stderr' ] as $field ) {
+            $$field = str_replace( [ THEME_TRACBOT_PASSWORD, THEME_DROPBOX_PASSWORD ], '[redacted]', $$field );
+        }
+
         // Append to $output, as `exec()` does.
         if ( ! is_array( $output ) ) {
             $output = [];
         }
+        if ( ! is_array( $error_output ) ) {
+            $error_output = [];
+        }
         if ( $stdout ) {
             $output = array_merge( $output, explode( "\n", rtrim( $stdout, "\r\n" ) ) );
         }
-
-        // Redact any passwords that might be in a command and included in logged errors.
-        $command = str_replace( [ THEME_TRACBOT_PASSWORD, THEME_DROPBOX_PASSWORD ], '[redacted]', $command );
+        if ( $stderr ) {
+            $error_output = array_merge( $error_output, explode( "\n", rtrim( $stderr, "\r\n" ) ) );
+        }
 
         if ( $return_var > 0 ) {