Changeset 54218 for trunk/src/wp-includes/pluggable.php

Timestamp:

09/19/2022 09:34:52 PM (4 years ago)

Author:

audrasjb

Message:

General: Pass $action to nonce_life filter.

This changeset contextualizes the usage of nonce_life filter by passing the $action parameter. It allows to alterate the default lifespan of nonces on a case by case basis.

Props giuseppemazzapica, dwainm, DrewAPicture, jorbin, audrasjb, SergeyBiryukov, costdev, antonvlasenko.
Fixes #35188.

File:

• trunk/src/wp-includes/pluggable.php (modified) (3 diffs)

trunk/src/wp-includes/pluggable.php

@@ -2246 +2246 @@
          *
          * @since 2.5.0
-         *
+         * @since 6.1.0 Added `action` argument.
+         *
+         * @param string|int $action Optional. The current nonce action. Default -1.
          * @return float Float value rounded up to the next highest integer.
          */
-        function wp_nonce_tick() {
+        function wp_nonce_tick( $action = -1 ) {
                 /**
                  * Filters the lifespan of nonces in seconds.
                  *
                  * @since 2.5.0
-                 *
-                 * @param int $lifespan Lifespan of nonces in seconds. Default 86,400 seconds, or one day.
-                 */
-                $nonce_life = apply_filters( 'nonce_life', DAY_IN_SECONDS );
+                 * @since 6.1.0 Added `action` argument to allow for more targeted filters.
+                 *
+                 * @param int        $lifespan Lifespan of nonces in seconds. Default 86,400 seconds, or one day.
+                 * @param string|int $action   The current nonce action.
+                 */
+                $nonce_life = apply_filters( 'nonce_life', DAY_IN_SECONDS, $action );
 
                 return ceil( time() / ( $nonce_life / 2 ) );
@@ -2298 +2302 @@
 
                 $token = wp_get_session_token();
-                $i     = wp_nonce_tick();
+                $i     = wp_nonce_tick( $action );
 
                 // Nonce generated 0-12 hours ago.
@@ -2348 +2352 @@
                 }
 
-                $token = wp_get_session_token();
-                $i     = wp_nonce_tick();
+                $token = wp_get_session_token( $action );
+                $i     = wp_nonce_tick( $action );
 
                 return substr( wp_hash( $i . '|' . $action . '|' . $uid . '|' . $token, 'nonce' ), -12, 10 );