Changeset 45112

Timestamp:

04/05/2019 05:19:15 AM (8 years ago)

Author:

tellyworth

Message:

Upgrade/Install: Add more context in signature verify failures.

This includes version numbers and signature counts in error reports, to help diagnose isolated failures that have no apparent cause.

Props dd32.
See #39309.

File:

• trunk/src/wp-admin/includes/file.php (modified) (6 diffs)

trunk/src/wp-admin/includes/file.php

@@ -1155 +1155 @@
                                 __( 'The authenticity of %1$s could not be verified as no signature was found.' ),
                                 '<span class="code">' . esc_html( $filename_for_errors ) . '</span>'
+                        ),
+                        array(
+                                'filename' => $filename_for_errors,
                         )
                 );
@@ -1164 +1167 @@
         mbstring_binary_safe_encoding();
 
+        $skipped_key = $skipped_signature = 0;
+
         foreach ( (array) $signatures as $signature ) {
                 $signature_raw = base64_decode( $signature );
@@ -1169 +1174 @@
                 // Ensure only valid-length signatures are considered.
                 if ( SODIUM_CRYPTO_SIGN_BYTES !== strlen( $signature_raw ) ) {
+                        $skipped_signature++;
                         continue;
                 }
@@ -1177 +1183 @@
                         // Only pass valid public keys through.
                         if ( SODIUM_CRYPTO_SIGN_PUBLICKEYBYTES !== strlen( $key_raw ) ) {
+                                $skipped_key++;
                                 continue;
                         }
@@ -1198 +1205 @@
                 // Error data helpful for debugging:
                 array(
-                        'filename'   => $filename_for_errors,
-                        'keys'       => $trusted_keys,
-                        'signatures' => $signatures,
-                        'hash'       => bin2hex( $file_hash ),
+                        'filename'    => $filename_for_errors,
+                        'keys'        => $trusted_keys,
+                        'signatures'  => $signatures,
+                        'hash'        => bin2hex( $file_hash ),
+                        'skipped_key' => $skipped_key,
+                        'skipped_sig' => $skipped_signature,
+                        'php'         => phpversion(),
+                        'sodium'      => defined( 'SODIUM_LIBRARY_VERSION' ) ? SODIUM_LIBRARY_VERSION : ( defined( 'ParagonIE_Sodium_Compat::VERSION_STRING' ) ? ParagonIE_Sodium_Compat::VERSION_STRING : false ),
                 )
         );
@@ -1211 +1222 @@
  * @since 5.2.0
  *
- * @return array List of hex-encoded Signing keys.
+ * @return array List of base64-encoded Signing keys.
  */
 function wp_trusted_keys() {