[9.x] Fix Queue failed logging exception UNICODE (#41020)

Issues : #24263 #41016
laravel · Feb 16, 2022 · 6e44b09 · 6e44b09
1 parent c5166e8
commit 6e44b09
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 2 deletions.
diff --git a/src/Illuminate/Queue/Failed/DatabaseFailedJobProvider.php b/src/Illuminate/Queue/Failed/DatabaseFailedJobProvider.php
@@ -57,7 +57,7 @@ public function log($connection, $queue, $payload, $exception)
     {
         $failed_at = Date::now();
 
-        $exception = (string) $exception;
+        $exception = (string) mb_convert_encoding($exception, 'UTF-8');
 
         return $this->getTable()->insertGetId(compact(
             'connection', 'queue', 'payload', 'exception', 'failed_at'

diff --git a/src/Illuminate/Queue/Failed/DatabaseUuidFailedJobProvider.php b/src/Illuminate/Queue/Failed/DatabaseUuidFailedJobProvider.php
@@ -60,7 +60,7 @@ public function log($connection, $queue, $payload, $exception)
             'connection' => $connection,
             'queue' => $queue,
             'payload' => $payload,
-            'exception' => (string) $exception,
+            'exception' => (string) mb_convert_encoding($exception, 'UTF-8'),
             'failed_at' => Date::now(),
         ]);
 

diff --git a/tests/Queue/DatabaseFailedJobProviderTest.php b/tests/Queue/DatabaseFailedJobProviderTest.php
@@ -2,10 +2,12 @@
 
 namespace Illuminate\Tests\Queue;
 
+use Exception;
 use Illuminate\Database\Capsule\Manager as DB;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Queue\Failed\DatabaseFailedJobProvider;
 use Illuminate\Support\Facades\Date;
+use Illuminate\Support\Str;
 use PHPUnit\Framework\TestCase;
 
 class DatabaseFailedJobProviderTest extends TestCase
@@ -39,4 +41,34 @@ public function testCanFlushFailedJobs()
         $provider->flush(10 * 24);
         $this->assertSame(0, $db->getConnection()->table('failed_jobs')->count());
     }
+
+    public function testCanProperlyLogFailedJob()
+    {
+        $db = new DB;
+        $db->addConnection([
+            'driver' => 'sqlite',
+            'database' => ':memory:',
+        ]);
+
+        $db->getConnection()->getSchemaBuilder()->create('failed_jobs', function (Blueprint $table) {
+            $table->id();
+            $table->text('connection');
+            $table->text('queue');
+            $table->longText('payload');
+            $table->longText('exception');
+            $table->timestamp('failed_at')->useCurrent();
+        });
+
+        $uuid = Str::uuid();
+
+        $exception = new Exception(utf8_decode('ÐÑÙ0E\xE2\x�98\xA0World��7B¹!þÿ'));
+        $provider = new DatabaseFailedJobProvider($db->getDatabaseManager(), 'default', 'failed_jobs');
+
+        $provider->log('database', 'default', json_encode(['uuid' => (string) $uuid]), $exception);
+
+        $exception = (string) mb_convert_encoding($exception, 'UTF-8');
+
+        $this->assertSame(1, $db->getConnection()->table('failed_jobs')->count());
+        $this->assertSame($exception, $db->getConnection()->table('failed_jobs')->first()->exception);
+    }
 }