Changeset 10787

Timestamp:

03/05/2021 04:18:19 AM (6 years ago)

Author:

dd32

Message:

Theme Directory: reformat the layout of the failed command errors, for better handling in the error logging.

Follow up to [10786].

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/class-wporg-themes-upload.php (modified) (1 diff)

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

@@ -1281 +1281 @@
                 }
 
+                // 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 ( $return_var > 0 ) {
-                        trigger_error( "Command failed, `{$command}` return value: {$return_var} STDOUT: ```{$stdout}``` STDERR: ```{$stderr}```", E_USER_WARNING );
+                        trigger_error(
+                                "Command failed, `{$command}`\n" .
+                                        "Return Value: {$return_var}\n" . 
+                                        "STDOUT: ```{$stdout}```\n" .
+                                        "STDERR: ```{$stderr}```",
+                                E_USER_WARNING
+                        );
                 } elseif ( $stderr ) {
-                        trigger_error( "Command produced errors, `{$command}` return value: {$return_var} STDOUT: ```{$stdout}``` STDERR: ```{$stderr}```", E_USER_NOTICE );
+                        trigger_error(
+                                "Command produced errors, `{$command}`\n" .
+                                        "Return Value: {$return_var}\n" .
+                                        "STDOUT: ```{$stdout}```\n" .
+                                        "STDERR: ```{$stderr}```",
+                                E_USER_NOTICE
+                        );
                 }