Merge pull request #5567 from pineray/check-consecutive-slashes

連続するスラッシュが含まれる場合はエラーとなるように変更

src/Eccube/Form/Type/Admin/BlockType.php

@@ -77,6 +77,9 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     new Assert\Regex([
                         'pattern' => '/^[0-9a-zA-Z\/_]+$/',
                     ]),
+                    new Assert\Regex([
+                        'pattern' => '/^(?!.*\/\/).+$/',
+                    ]),
                 ],
             ])
             ->add('block_html', TextareaType::class, [

tests/Eccube/Tests/Form/Type/Admin/BlockTypeTest.php

@@ -0,0 +1,113 @@
+<?php
+
+namespace Eccube\Tests\Form\Type\Admin;
+
+use Eccube\Entity\Master\DeviceType;
+use Eccube\Form\Type\Admin\BlockType;
+use Symfony\Component\HttpFoundation\Request;
+
+class BlockTypeTest extends \Eccube\Tests\Form\Type\AbstractTypeTestCase
+{
+    /** @var \Symfony\Component\Form\FormInterface */
+    protected $form;
+
+    /** @var array デフォルト値（正常系）を設定 */
+    protected $formData = [
+        'name' => 'new/Block_1',
+        'file_name' => 'file_name',
+        'block_html' => '<p>test</p>',
+        'DeviceType' => DeviceType::DEVICE_TYPE_MB,
+        'id' => 1,
+    ];
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        // CSRF tokenを無効にしてFormを作成
+        // ブロック登録・編集
+        $this->form = $this->formFactory
+            ->createBuilder(BlockType::class, null, [
+                'csrf_protection' => false,
+            ])
+            ->getForm();
+        self::$container->get('request_stack')->push(new Request());
+    }
+
+    public function testValidData()
+    {
+        $this->form->submit($this->formData);
+        $this->assertTrue($this->form->isValid());
+    }
+
+    public function testInvalidNameBlank()
+    {
+        $this->formData['name'] = '';
+        $this->form->submit($this->formData);
+        $this->assertFalse($this->form['name']->isValid());
+    }
+
+    public function testInvalidNameMaxLengthInvalid()
+    {
+        $str = str_repeat('S', $this->eccubeConfig['eccube_stext_len']).'S';
+        $this->formData['name'] = $str;
+
+        $this->form->submit($this->formData);
+        $this->assertFalse($this->form['name']->isValid());
+    }
+
+    public function testInvalidNameMaxLengthValid()
+    {
+        $str = str_repeat('S', $this->eccubeConfig['eccube_stext_len']);
+        $this->formData['name'] = $str;
+
+        $this->form->submit($this->formData);
+        $this->assertTrue($this->form['name']->isValid());
+    }
+
+    public function testInvalidFileNameBlank()
+    {
+        $this->formData['file_name'] = '';
+        $this->form->submit($this->formData);
+        $this->assertFalse($this->form['file_name']->isValid());
+    }
+
+    public function testInvalidFileNameMaxLengthInvalid()
+    {
+        $str = str_repeat('S', $this->eccubeConfig['eccube_stext_len']).'S';
+        $this->formData['file_name'] = $str;
+
+        $this->form->submit($this->formData);
+        $this->assertFalse($this->form['file_name']->isValid());
+    }
+
+    public function testInvalidFileNameMaxLengthValid()
+    {
+        $str = str_repeat('S', $this->eccubeConfig['eccube_stext_len']);
+        $this->formData['file_name'] = $str;
+
+        $this->form->submit($this->formData);
+        $this->assertTrue($this->form['file_name']->isValid());
+    }
+
+    public function testInvalidFileNameCharacter()
+    {
+        $this->formData['file_name'] = 'new/Block_1.*{;';
+        $this->form->submit($this->formData);
+        $this->assertFalse($this->form['file_name']->isValid());
+    }
+
+    public function testInvalidFileNameContinuousSlashes()
+    {
+        $this->formData['file_name'] = 'new//Block_1';
+        $this->form->submit($this->formData);
+        $this->assertFalse($this->form['file_name']->isValid());
+    }
+
+    public function testInvalidBlockHtmlBlank()
+    {
+        $this->formData['block_html'] = '';
+        $this->form->submit($this->formData);
+        $this->assertFalse($this->form['block_html']->isValid());
+    }
+}