Changeset 31936

Timestamp:

03/31/2015 02:10:06 AM (10 years ago)

Author:

dd32

Message:

Add some logic into wp_tempnam to prevent it creating 'falsey' directory names that might get used elsewhere within WordPress.
Although this logic looks a little strange at this low level, it's the best location within the Upgrades code for it to happen.
Fixes #31811

Location:

trunk

Files:

• src/wp-admin/includes/file.php (modified) (2 diffs)
• tests/phpunit/tests/file.php (modified) (1 diff)

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

@@ -142 +142 @@
  * @return string a writable filename
  */
-function wp_tempnam($filename = '', $dir = '') {
-    if ( empty($dir) )
+function wp_tempnam( $filename = '', $dir = '' ) {
+    if ( empty( $dir ) ) {
         $dir = get_temp_dir();
-    $filename = basename($filename);
-    if ( empty($filename) )
+    }
+
+    if ( empty( $filename ) || '.' == $filename ) {
         $filename = time();
-
-    $filename = preg_replace('|\..*$|', '.tmp', $filename);
-    $filename = $dir . wp_unique_filename($dir, $filename);
-    touch($filename);
-    return $filename;
+    }
+
+    // Use the basename of the given file without the extension as the name for the temporary directory
+    $temp_filename = basename( $filename );
+    $temp_filename = preg_replace( '|\.[^.]*$|', '', $temp_filename );
+
+    // If the folder is falsey, use it's parent directory name instead
+    if ( ! $temp_filename ) {
+        return wp_tempnam( dirname( $filename ), $dir );
+    }
+
+    $temp_filename .= '.tmp';
+    $temp_filename = $dir . wp_unique_filename( $dir, $temp_filename );
+    touch( $temp_filename );
+
+    return $temp_filename;
 }
 
@@ -628 +640 @@
     // Create those directories if need be:
     foreach ( $needed_dirs as $_dir ) {
-        if ( ! $wp_filesystem->mkdir($_dir, FS_CHMOD_DIR) && ! $wp_filesystem->is_dir($_dir) ) // Only check to see if the Dir exists upon creation failure. Less I/O this way.
+        // Only check to see if the Dir exists upon creation failure. Less I/O this way.
+        if ( ! $wp_filesystem->mkdir( $_dir, FS_CHMOD_DIR ) && ! $wp_filesystem->is_dir( $_dir ) ) {
             return new WP_Error( 'mkdir_failed_ziparchive', __( 'Could not create directory.' ), substr( $_dir, strlen( $to ) ) );
+        }
     }
     unset($needed_dirs);

trunk/tests/phpunit/tests/file.php

@@ -153 +153 @@
     }
 
+    /**
+     * @dataProvider data_wp_tempnam_filenames
+     */
+    function test_wp_tempnam( $case ) {
+        $file = wp_tempnam( $case );
+        unlink( $file );
+
+        $this->assertNotEmpty( basename( basename( $file, '.tmp' ), '.zip' ) );
+    }
+    function data_wp_tempnam_filenames() {
+        return array(
+            array( '0.zip' ),
+            array( '0.1.2.3.zip' ),
+            array( 'filename.zip' ),
+            array( 'directory/0.zip' ),
+            array( 'directory/filename.zip' ),
+            array( 'directory/0/0.zip' ),
+        );
+    }
+
 }