Commit 9052837e authored by catch's avatar catch
Browse files

Issue #3264153 by neclimdul: Fix missing sprintf argument in CKEditor5ImageController 

(cherry picked from commit 1e35a287)
parent ec498202

core/modules/ckeditor5/src/Controller/CKEditor5ImageController.php

+1 −1
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ public function upload(Request $request) { 
    $lock_id = $this->generateLockIdFromFileUri($file_uri);



    if (!$this->lock->acquire($lock_id)) {

      throw new HttpException(503, sprintf('File "%s" is already locked for writing.'), NULL, ['Retry-After' => 1]);

      throw new HttpException(503, sprintf('File "%s" is already locked for writing.', $file_uri), NULL, ['Retry-After' => 1]);

    }



    // Begin building file entity.

core/modules/ckeditor5/tests/src/Functional/ImageUploadAccessTest.php

+12 −0
Original line number Diff line number Diff line
@@ -2,6 +2,9 @@ 


namespace Drupal\Tests\ckeditor5\Functional;



use Drupal\Component\Utility\Crypt;

use Drupal\Core\File\FileSystemInterface;



/**

 * Test image upload access.

 *
@@ -42,6 +45,15 @@ public function testCkeditor5ImageUploadRoute() { 
    $response = $this->uploadRequest($url, $test_image, 'test.jpg');

    $this->assertSame(201, $response->getStatusCode());



    // Ensure lock failures are reported correctly.

    $d = 'public://inline-images/test.jpg';

    $f = $this->container->get('file_system')->getDestinationFilename($d, FileSystemInterface::EXISTS_RENAME);

    $this->container->get('lock')

      ->acquire('file:ckeditor5:' . Crypt::hashBase64($f));

    $response = $this->uploadRequest($url, $test_image, 'test.jpg');

    $this->assertSame(503, $response->getStatusCode());

    $this->assertStringContainsString('File "public://inline-images/test_0.jpg" is already locked for writing.', (string) $response->getBody());



    // Ensure that users without permissions to the text format cannot upload

    // images.

    $this->drupalLogout();