Changeset 3291

Timestamp:

06/02/2016 08:25:35 AM (8 years ago)

Author:

dd32

Message:

Plugin Directory: Execute the ZIP & SVN commands with an appropriate UTF-8 character set.

See #1578

Location:

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

Files:

• tools/class-svn.php (modified) (4 diffs)
• zip/class-builder.php (modified) (7 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/tools/class-svn.php

@@ -33 +33 @@
         $esc_url  = escapeshellarg( $url );
 
-        $output = shell_exec( "svn import $esc_options $esc_path $esc_url 2>&1" );
+        $output = self::shell_exec( "svn import $esc_options $esc_path $esc_url 2>&1" );
         if ( preg_match( '/Committed revision (?P<revision>\d+)[.]/i', $output, $m ) ) {
             $revision = (int) $m['revision'];
@@ -64 +64 @@
         $esc_destination = escapeshellarg( $destination );
 
-        $output = shell_exec( "svn export $esc_options $esc_url $esc_destination 2>&1" );
+        $output = self::shell_exec( "svn export $esc_options $esc_url $esc_destination 2>&1" );
         if ( preg_match( '/Exported revision (?P<revision>\d+)[.]/i', $output, $m ) ) {
             $revision = (int) $m['revision'];
@@ -94 +94 @@
         $esc_url = escapeshellarg( $url );
 
-        $output = shell_exec( "svn ls $esc_options $esc_url 2>&1" );
+        $output = self::shell_exec( "svn ls $esc_options $esc_url 2>&1" );
 
         $errors = self::parse_svn_errors( $output );
@@ -163 +163 @@
         return false;
     }
+
+    /**
+     * Executes a command with 'proper' locale/language settings
+     * so that utf8 strings are handled correctly.
+     *
+     * WordPress.org uses the en_US.UTF-8 locale.
+     */
+    protected static function shell_exec( $command ) {
+        return shell_exec( 'export LC_CTYPE="en_US.UTF-8" LANG="en_US.UTF-8"; ' . $command );
+    }
 }

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/zip/class-builder.php

@@ -114 +114 @@
 
         // Cleanup any symlinks that shouldn't be there
-        exec( sprintf(
+        $this->exec( sprintf(
             'find %s -type l -print0 | xargs -r0 rm',
             escapeshellarg( $build_dir )
@@ -133 +133 @@
     protected function fix_directory_dates() {
         // Find all files, output their modified dates, sort reverse numerically, grab the timestamp from the first entry
-        $latest_file_modified_timestamp = exec( sprintf(
+        $latest_file_modified_timestamp = $this->exec( sprintf(
             "find %s -type f -printf '%%T@\n' | sort -nr | head -c 10",
             escapeshellarg( $this->tmp_build_dir )
@@ -141 +141 @@
         }
 
-        exec( sprintf(
+        $this->exec( sprintf(
             'find %s -type d -exec touch -m -t %s {} \;',
             escapeshellarg( $this->tmp_build_dir ),
@@ -154 +154 @@
         // We have to remove the temporary 0-byte file first as zip will complain about not being able to find the zip structures.
         unlink( $this->tmp_build_file );
-        exec( $cmd = sprintf(
+        $this->exec( sprintf(
             'cd %s && find %s -print0 | sort -z | xargs -0 zip -Xu %s 2>&1',
             escapeshellarg( $this->tmp_build_dir ),
@@ -169 +169 @@
      * Moves the completed ZIP into it's real-life location.
      */
-    function move_into_place() {
-        exec( sprintf(
+    protected function move_into_place() {
+        $this->exec( sprintf(
             'mv -f %s %s',
             $this->tmp_build_file,
@@ -186 +186 @@
      * This can also be used for generating a package signature in the future.
      */
-    function generate_md5() {
-        exec( sprintf(
+    protected function generate_md5() {
+        $this->exec( sprintf(
             "md5sum %s | head -c 32 > %s",
             escapeshellarg( $this->zip_file ),
@@ -206 +206 @@
         }
         if ( $this->tmp_build_dir ) {
-            exec( sprintf( 'rm -rf %s', escapeshellarg( $this->tmp_build_dir ) ) );
-        }
-    }
+            $this->exec( sprintf( 'rm -rf %s', escapeshellarg( $this->tmp_build_dir ) ) );
+        }
+    }
+
+    /**
+     * Executes a command with 'proper' locale/language settings
+     * so that utf8 strings are handled correctly.
+     *
+     * WordPress.org uses the en_US.UTF-8 locale.
+     */
+    protected function exec( $command, &$output = null, &$return_val = null ) {
+        return exec( 'export LC_CTYPE="en_US.UTF-8" LANG="en_US.UTF-8"; ' . $command, $output, $return_val );
+    }
+
 }