diff --git a/typo3/sysext/core/Classes/LinkHandling/UrlLinkHandler.php b/typo3/sysext/core/Classes/LinkHandling/UrlLinkHandler.php
index aa9e05cbc11276947afab888bb9ec38983fbf9d8..f8008fcbdfcb5826b111015f4d8814de6226c1ce 100644
--- a/typo3/sysext/core/Classes/LinkHandling/UrlLinkHandler.php
+++ b/typo3/sysext/core/Classes/LinkHandling/UrlLinkHandler.php
@@ -54,6 +54,7 @@ class UrlLinkHandler implements LinkHandlingInterface
$scheme = parse_url($url, PHP_URL_SCHEME);
if (empty($scheme)) {
$url = 'http://' . $url;
+ // 'java{TAB}script:' is parsed as empty URL scheme, thus not ending up here
} elseif (in_array(strtolower($scheme), ['javascript', 'data'], true)) {
// deny using insecure scheme's like `javascript:` or `data:` as URL scheme
$url = '';
diff --git a/typo3/sysext/frontend/Classes/ContentObject/ContentObjectRenderer.php b/typo3/sysext/frontend/Classes/ContentObject/ContentObjectRenderer.php
index bb94e368dbf736cdb003bfd4afaba36e9e9e5e44..f171585b259c499b4fb917c5b1374fef67bc0243 100644
--- a/typo3/sysext/frontend/Classes/ContentObject/ContentObjectRenderer.php
+++ b/typo3/sysext/frontend/Classes/ContentObject/ContentObjectRenderer.php
@@ -4922,7 +4922,7 @@ class ContentObjectRenderer implements LoggerAwareInterface
// Resource was not found
return $linkText;
}
- } elseif (in_array(strtolower(trim($linkHandlerKeyword)), ['javascript', 'data'], true)) {
+ } elseif (in_array(strtolower(preg_replace('#\s|[[:cntrl:]]#', '', $linkHandlerKeyword)), ['javascript', 'data'], true)) {
// Disallow insecure scheme's like javascript: or data:
return $linkText;
} else {
diff --git a/typo3/sysext/frontend/Classes/Typolink/AbstractTypolinkBuilder.php b/typo3/sysext/frontend/Classes/Typolink/AbstractTypolinkBuilder.php
index 061e570dadfe9537fc39d24cf7388b662d190609..fdd147a33e08d063af555861ad1df492c50ace72 100644
--- a/typo3/sysext/frontend/Classes/Typolink/AbstractTypolinkBuilder.php
+++ b/typo3/sysext/frontend/Classes/Typolink/AbstractTypolinkBuilder.php
@@ -116,6 +116,20 @@ abstract class AbstractTypolinkBuilder
return $url;
}
+ /**
+ * Determines whether lib.parseFunc is defined.
+ *
+ * @return bool
+ */
+ protected function isLibParseFuncDefined(): bool
+ {
+ $configuration = $this->contentObjectRenderer->mergeTSRef(
+ ['parseFunc' => '< lib.parseFunc'],
+ 'parseFunc'
+ );
+ return !empty($configuration['parseFunc.']) && is_array($configuration['parseFunc.']);
+ }
+
/**
* Helper method to a fallback method parsing HTML out of it
*
@@ -125,10 +139,29 @@ abstract class AbstractTypolinkBuilder
*/
protected function parseFallbackLinkTextIfLinkTextIsEmpty(string $originalLinkText, string $fallbackLinkText): string
{
- if ($originalLinkText === '') {
+ if ($originalLinkText !== '') {
+ return $originalLinkText;
+ }
+ if ($this->isLibParseFuncDefined()) {
return $this->contentObjectRenderer->parseFunc($fallbackLinkText, ['makelinks' => 0], '< lib.parseFunc');
}
- return $originalLinkText;
+ // encode in case `lib.parseFunc` is not configured
+ return $this->encodeFallbackLinkTextIfLinkTextIsEmpty($originalLinkText, $fallbackLinkText);
+ }
+
+ /**
+ * Helper method to a fallback method properly encoding HTML.
+ *
+ * @param string $originalLinkText the original string, if empty, the fallback link text
+ * @param string $fallbackLinkText the string to be used.
+ * @return string the final text
+ */
+ protected function encodeFallbackLinkTextIfLinkTextIsEmpty(string $originalLinkText, string $fallbackLinkText): string
+ {
+ if ($originalLinkText !== '') {
+ return $originalLinkText;
+ }
+ return htmlspecialchars($fallbackLinkText, ENT_QUOTES);
}
/**
diff --git a/typo3/sysext/frontend/Classes/Typolink/ExternalUrlLinkBuilder.php b/typo3/sysext/frontend/Classes/Typolink/ExternalUrlLinkBuilder.php
index a20d11f0a802424c532462be415cfc1d72f0ec96..9b03bb9657bae9657aed66b79ccefa7b7651aa5a 100644
--- a/typo3/sysext/frontend/Classes/Typolink/ExternalUrlLinkBuilder.php
+++ b/typo3/sysext/frontend/Classes/Typolink/ExternalUrlLinkBuilder.php
@@ -28,7 +28,7 @@ class ExternalUrlLinkBuilder extends AbstractTypolinkBuilder
{
return [
$this->processUrl(UrlProcessorInterface::CONTEXT_EXTERNAL, $linkDetails['url'], $conf),
- $this->parseFallbackLinkTextIfLinkTextIsEmpty($linkText, $linkDetails['url']),
+ $this->encodeFallbackLinkTextIfLinkTextIsEmpty($linkText, $linkDetails['url']),
$target ?: $this->resolveTargetAttribute($conf, 'extTarget', true, $this->getTypoScriptFrontendController()->extTarget)
];
}
diff --git a/typo3/sysext/frontend/Classes/Typolink/FileOrFolderLinkBuilder.php b/typo3/sysext/frontend/Classes/Typolink/FileOrFolderLinkBuilder.php
index 91458eacb5bbbd1fd1fc2c1bfca1b33c5c2dd80a..846dd4655e586a5c1ee803775e64b41ec725610e 100644
--- a/typo3/sysext/frontend/Classes/Typolink/FileOrFolderLinkBuilder.php
+++ b/typo3/sysext/frontend/Classes/Typolink/FileOrFolderLinkBuilder.php
@@ -47,7 +47,7 @@ class FileOrFolderLinkBuilder extends AbstractTypolinkBuilder
$linkLocation = '';
}
// Setting title if blank value to link
- $linkText = $this->parseFallbackLinkTextIfLinkTextIsEmpty($linkText, rawurldecode($linkLocation));
+ $linkText = $this->encodeFallbackLinkTextIfLinkTextIsEmpty($linkText, rawurldecode($linkLocation));
if (strpos($linkLocation, '/') !== 0
&& parse_url($linkLocation, PHP_URL_SCHEME) === null
) {
diff --git a/typo3/sysext/frontend/Classes/Typolink/LegacyLinkBuilder.php b/typo3/sysext/frontend/Classes/Typolink/LegacyLinkBuilder.php
index 12c2b1a622bba0ef622f43a07ec7b162308ded3c..c3dcfd300a5d561dcba065afe59f53143dc0811b 100644
--- a/typo3/sysext/frontend/Classes/Typolink/LegacyLinkBuilder.php
+++ b/typo3/sysext/frontend/Classes/Typolink/LegacyLinkBuilder.php
@@ -33,7 +33,7 @@ class LegacyLinkBuilder extends AbstractTypolinkBuilder
$linkDetails['type'] = LinkService::TYPE_FILE;
$linkLocation = $linkDetails['file'];
// Setting title if blank value to link
- $linkText = $this->parseFallbackLinkTextIfLinkTextIsEmpty($linkText, rawurldecode($linkLocation));
+ $linkText = $this->encodeFallbackLinkTextIfLinkTextIsEmpty($linkText, rawurldecode($linkLocation));
$linkLocation = (strpos($linkLocation, '/') !== 0 ? $tsfe->absRefPrefix : '') . $linkLocation;
$url = $this->processUrl(UrlProcessorInterface::CONTEXT_FILE, $linkLocation, $conf);
$url = $this->forceAbsoluteUrl($url, $conf);
@@ -41,7 +41,7 @@ class LegacyLinkBuilder extends AbstractTypolinkBuilder
} elseif ($linkDetails['url']) {
$linkDetails['type'] = LinkService::TYPE_URL;
$target = $target ?: $this->resolveTargetAttribute($conf, 'extTarget', true, $tsfe->extTarget);
- $linkText = $this->parseFallbackLinkTextIfLinkTextIsEmpty($linkText, $linkDetails['url']);
+ $linkText = $this->encodeFallbackLinkTextIfLinkTextIsEmpty($linkText, $linkDetails['url']);
$url = $this->processUrl(UrlProcessorInterface::CONTEXT_EXTERNAL, $linkDetails['url'], $conf);
} else {
throw new UnableToLinkException('Unknown link detected, so ' . $linkText . ' was not linked.', 1490990031, null, $linkText);
diff --git a/typo3/sysext/frontend/Tests/Functional/SiteHandling/Fixtures/TypoLinkScenario.yaml b/typo3/sysext/frontend/Tests/Functional/SiteHandling/Fixtures/TypoLinkScenario.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..19edddb2cd48219ae7bb86302fc1537360a7f333
--- /dev/null
+++ b/typo3/sysext/frontend/Tests/Functional/SiteHandling/Fixtures/TypoLinkScenario.yaml
@@ -0,0 +1,40 @@
+__variables:
+ - &pageStandard 0
+ - &pageShortcut 4
+
+entitySettings:
+ '*':
+ nodeColumnName: 'pid'
+ columnNames: {id: 'uid', language: 'sys_language_uid'}
+ defaultValues: {pid: 0}
+ page:
+ isNode: true
+ tableName: 'pages'
+ parentColumnName: 'pid'
+ languageColumnNames: ['l10n_parent', 'l10n_source']
+ columnNames: {type: 'doktype', root: 'is_siteroot'}
+ defaultValues: {hidden: 0, doktype: *pageStandard}
+ valueInstructions:
+ shortcut:
+ first: {shortcut: 0, shortcut_mode: 1}
+ content:
+ tableName: 'tt_content'
+ languageColumnNames: ['l18n_parent', 'l10n_source']
+ columnNames: {title: 'header', type: 'CType'}
+ defaultValues: {hidden: 0, CType: 'text'}
+
+entities:
+ page:
+ - self: {id: 1000, title: 'ACME Inc', type: *pageShortcut, shortcut: 'first', root: true, slug: '/'}
+ children:
+ - self: {id: 1100, title: 'EN: Welcome', slug: '/welcome', subtitle: 'hello-and-welcome'}
+ entities:
+ content:
+ - self: {title: 'EN: Content Element #1'}
+ - self: {title: 'EN: Content Element #2'}
+ - self: {id: 1200, title: 'EN: Features', slug: '/features'}
+ - self: {id: 9911, title: '<good>', slug: '/test/good'}
+ - self: {id: 9912, title: '<good a="a/" b="thing(1)">', slug: '/test/good-a-b-spaced'}
+ - self: {id: 9913, title: '<good%20a="a/"%20b="thing(1)">', slug: '/test/good-a-b-enc-a'}
+ - self: {id: 9914, title: '<good/a="a/"/b="thing(1)">', slug: '/test/good-a-b-enc-b'}
+ - self: {id: 9921, title: '<bad>', slug: '/test/bad'}
diff --git a/typo3/sysext/frontend/Tests/Functional/SiteHandling/TypoLinkGeneratorTest.php b/typo3/sysext/frontend/Tests/Functional/SiteHandling/TypoLinkGeneratorTest.php
index 59921df2911cc932a5d46fd7fcd459854013208b..1e32bbc6ef4aeab7da74a31a2325aa21cb3a1aab 100644
--- a/typo3/sysext/frontend/Tests/Functional/SiteHandling/TypoLinkGeneratorTest.php
+++ b/typo3/sysext/frontend/Tests/Functional/SiteHandling/TypoLinkGeneratorTest.php
@@ -24,10 +24,12 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Frontend\Tests\Functional\SiteHandling\Fixtures\LinkHandlingController;
use TYPO3\TestingFramework\Core\Functional\Framework\DataHandling\Scenario\DataHandlerFactory;
use TYPO3\TestingFramework\Core\Functional\Framework\DataHandling\Scenario\DataHandlerWriter;
+use TYPO3\TestingFramework\Core\Functional\Framework\Frontend\Internal\AbstractInstruction;
use TYPO3\TestingFramework\Core\Functional\Framework\Frontend\Internal\ArrayValueInstruction;
use TYPO3\TestingFramework\Core\Functional\Framework\Frontend\Internal\TypoScriptInstruction;
use TYPO3\TestingFramework\Core\Functional\Framework\Frontend\InternalRequest;
use TYPO3\TestingFramework\Core\Functional\Framework\Frontend\InternalRequestContext;
+use TYPO3\TestingFramework\Core\Functional\Framework\Frontend\InternalResponse;
/**
* Test case for build URLs with TypoLink via Frontend Request.
@@ -88,7 +90,7 @@ class TypoLinkGeneratorTest extends AbstractTestCase
$backendUser = $this->setUpBackendUserFromFixture(1);
Bootstrap::initializeLanguageObject();
- $scenarioFile = __DIR__ . '/Fixtures/SlugScenario.yaml';
+ $scenarioFile = __DIR__ . '/Fixtures/TypoLinkScenario.yaml';
$factory = DataHandlerFactory::fromYamlFile($scenarioFile);
$writer = DataHandlerWriter::withBackendUser($backendUser);
$writer->invokeFactory($factory);
@@ -160,6 +162,10 @@ class TypoLinkGeneratorTest extends AbstractTestCase
't3://email?email=user@example.org&other=other#other',
'<a href="mailto:user@example.org">user@example.org</a>',
],
+ [
+ 't3://email?email=user@example.org?subject=Hello%20World#other',
+ '<a href="mailto:user@example.org?subject=Hello World">user@example.org?subject=Hello World</a>',
+ ],
[
't3://file?uid=1&type=1&other=other#other',
'<a href="/fileadmin/logo.png">fileadmin/logo.png</a>',
@@ -185,8 +191,16 @@ class TypoLinkGeneratorTest extends AbstractTestCase
'<a href="/features#c10001">EN: Features</a>',
],
[
- 't3://url?url=https://typo3.org&other=other#other',
- '<a href="https://typo3.org">https://typo3.org</a>',
+ 't3://url?url=https://typo3.org%3f%26param-a=a%26param-b=b&other=other#other',
+ '<a href="https://typo3.org?&param-a=a&param-b=b">https://typo3.org?&param-a=a&param-b=b</a>',
+ ],
+ [
+ '1200,1 target class title ¶m-a=a',
+ '<a href="/features?param-a=a&type=1&cHash=62ac35c73f425af5e13cfff14c04424e" title="title" target="target" class="class">EN: Features</a>'
+ ],
+ [
+ 'user@example.org target class title &other=other',
+ '<a href="mailto:user@example.org" title="title" target="target" class="class">user@example.org</a>'
],
];
return $this->keysFromTemplate($instructions, '%1$s;');
@@ -201,36 +215,303 @@ class TypoLinkGeneratorTest extends AbstractTestCase
*/
public function linkIsGenerated(string $parameter, string $expectation)
{
- $sourcePageId = 1100;
+ $response = $this->invokeTypoLink($parameter);
+ self::assertSame($expectation, (string)$response->getBody());
+ }
- $response = $this->executeFrontendRequest(
- (new InternalRequest('https://acme.us/'))
- ->withPageId($sourcePageId)
- ->withInstructions([
- (new TypoScriptInstruction(TemplateService::class))->withTypoScript([
- 'config.' => [
- 'recordLinks.' => [
- 'content.' => [
- 'forceLink' => 1,
- 'typolink.' => [
- 'parameter' => 1200,
- 'section.' => [
- 'data' => 'field:uid',
- 'wrap' => 'c|',
- ],
- ],
- ],
+ /**
+ * @return array
+ */
+ public function linkIsEncodedDataProvider(): array
+ {
+ $instructions = [
+ [
+ 't3://email?email=mailto:<bad>thing(1)</bad>',
+ '<a href="mailto:<bad>thing(1)</bad>"><bad>thing(1)</bad></a>',
+ ],
+ [
+ 't3://email?email=mailto:<good%20a="a/"%20b="thing(1)">',
+ '<a href="mailto:<good a="a/" b="thing(1)">"><good a="a/" b="thing(1)"></a>',
+ ],
+ [
+ 't3://email?email=<bad>thing(1)</bad>',
+ '<a href="mailto:<bad>thing(1)</bad>"><bad>thing(1)</bad></a>',
+ ],
+ [
+ 't3://email?email=<good%20a="a/"%20b="thing(1)">',
+ '<a href="mailto:<good a="a/" b="thing(1)">"><good a="a/" b="thing(1)"></a>',
+ ],
+ [
+ 't3://folder?identifier=<any>',
+ '',
+ ],
+ [
+ 't3://page?uid=<any>',
+ '',
+ ],
+ [
+ 't3://record?identifier=content&uid=<any>',
+ '',
+ ],
+ [
+ 't3://url?url=<bad>thing(1)</bad>',
+ '<a href="http://<bad>thing(1)</bad>">http://<bad>thing(1)</bad></a>'
+ ],
+ [
+ 't3://url?url=<good%20a="a/"%20b="thing(1)">',
+ '<a href="http://<good a="a/" b="thing(1)">">http://<good a="a/" b="thing(1)"></a>'
+ ],
+ [
+ 't3://url?url=javascript:good()',
+ '<a ></a>'
+ ],
+ [
+ "t3://url?url=java\tscript:good()",
+ '<a href="http://java_script:good()">http://java_script:good()</a>'
+ ],
+ [
+ 't3://url?url=java	script:good()',
+ '<a href="http://java">http://java</a>'
+ ],
+ [
+ 't3://url?url=javascript:good()',
+ '<a href="http://javascript">http://javascript</a>'
+ ],
+ [
+ 't3://url?url=data:text/html,<good>',
+ '<a ></a>'
+ ],
+ [
+ "t3://url?url=da\tsta:text/html,<good>",
+ '<a href="http://da_sta:text/html,<good>">http://da_sta:text/html,<good></a>'
+ ],
+ [
+ 't3://url?url=da	ta:text/html,<good>',
+ '<a href="http://da">http://da</a>'
+ ],
+ [
+ 't3://url?url=data:text/html,<good>',
+ '<a href="http://data">http://data</a>'
+ ],
+ [
+ 't3://url?url=%26%23106%3B%26%2397%3B%26%23118%3B%26%2397%3B%26%23115%3B%26%2399%3B%26%23114%3B%26%23105%3B%26%23112%3B%26%23116%3B%26%2358%3B%26%23103%3B%26%23111%3B%26%23111%3B%26%23100%3B%26%2340%3B%26%2341%3B',
+ '<a href="http://&#106;&#97;&#118;&#97;&#115;&#99;&#114;&#105;&#112;&#116;&#58;&#103;&#111;&#111;&#100;&#40;&#41;">http://&#106;&#97;&#118;&#97;&#115;&#99;&#114;&#105;&#112;&#116;&#58;&#103;&#111;&#111;&#100;&#40;&#41;</a>',
+ ],
+ [
+ '<bad>thing(1)</bad>',
+ '<a href="/<bad>thing(1)</bad>"><bad>thing(1)</bad></a>'
+ ],
+ [
+ '<good%20a="a/"%20b="thing(1)">',
+ '<a href="/<good%20a="a/"%20b="thing(1)">"><good a="a/" b="thing(1)"></a>'
+ ],
+ [
+ '<good/a="a/"/b="thing(1)"> target class title &other=other',
+ '<a href="/<good/a="a/"/b="thing(1)">" title="title" target="target" class="class"><good/a="a/"/b="thing(1)"></a>'
+ ],
+ [
+ 'javascript:good()',
+ '',
+ ],
+ [
+ "java\tscript:good()",
+ '',
+ ],
+ [
+ 'java	script:good()',
+ '<a href="java&#09;script:good()"></a>'
+ ],
+ [
+ 'javascript:good()',
+ ''
+ ],
+ [
+ 'data:text/html,<good>',
+ '',
+ ],
+ [
+ "da\tta:text/html,<good>",
+ '',
+ ],
+ [
+ 'da	ta:text/html,<good>',
+ '<a href="da&#09;ta:text/html,<good>"></a>',
+ ],
+ [
+ 'data:text/html,<good>',
+ '<a href="/data&colon;text/html,<good>">data&colon;text/html,<good></a>',
+ ],
+ [
+ '%26%23106%3B%26%2397%3B%26%23118%3B%26%2397%3B%26%23115%3B%26%2399%3B%26%23114%3B%26%23105%3B%26%23112%3B%26%23116%3B%26%2358%3B%26%23103%3B%26%23111%3B%26%23111%3B%26%23100%3B%26%2340%3B%26%2341%3B',
+ '',
+ ],
+ [
+ '</> <"> <"> <">',
+ '<a href="/</>" title="<">" target="<">" class="<">"></></a>',
+ ],
+ ];
+ return $this->keysFromTemplate($instructions, '%1$s;');
+ }
+
+ /**
+ * @param string $parameter
+ * @param string $expectation
+ *
+ * @test
+ * @dataProvider linkIsEncodedDataProvider
+ */
+ public function linkIsEncodedPerDefault(string $parameter, string $expectation)
+ {
+ $response = $this->invokeTypoLink($parameter);
+ self::assertSame($expectation, (string)$response->getBody());
+ }
+
+ /**
+ * @param string $parameter
+ * @param string $expectation
+ *
+ * @test
+ * @dataProvider linkIsEncodedDataProvider
+ */
+ public function linkIsEncodedHavingParseFunc(string $parameter, string $expectation)
+ {
+ $response = $this->invokeTypoLink($parameter, $this->createParseFuncInstruction([
+ 'allowTags' => 'good',
+ 'denyTags' => '*',
+ 'nonTypoTagStdWrap.' => [
+ 'HTMLparser.' => [
+ 'tags.' => [
+ 'good.' => [
+ 'allowedAttribs' => 0,
+ ],
+ ],
+ ],
+ ],
+ ]));
+ self::assertSame($expectation, (string)$response->getBody());
+ }
+
+ /**
+ * @return array
+ */
+ public function linkToPageIsProcessedDataProvider(): array
+ {
+ return [
+ [
+ 't3://page?uid=9911',
+ '<a href="/test/good"><good></a>',
+ false,
+ ],
+ [
+ 't3://page?uid=9911',
+ '<a href="/test/good"><good></a>',
+ true,
+ ],
+ [
+ 't3://page?uid=9912',
+ '<a href="/test/good-a-b-spaced"><good a="a/" b="thing(1)"></a>',
+ false,
+ ],
+ [
+ 't3://page?uid=9912',
+ '<a href="/test/good-a-b-spaced"><good></a>',
+ true,
+ ],
+ [
+ 't3://page?uid=9913',
+ '<a href="/test/good-a-b-enc-a"><good%20a="a/"%20b="thing(1)"></a>',
+ false,
+ ],
+ [
+ 't3://page?uid=9913',
+ '<a href="/test/good-a-b-enc-a"><good%20a="a/"%20b="thing(1)"></a>',
+ true,
+ ],
+ [
+ 't3://page?uid=9914',
+ '<a href="/test/good-a-b-enc-b"><good/a="a/"/b="thing(1)"></a>',
+ false,
+ ],
+ [
+ 't3://page?uid=9914',
+ '<a href="/test/good-a-b-enc-b"><good/a="a/"/b="thing(1)"></a>',
+ true,
+ ],
+ [
+ 't3://page?uid=9921',
+ '<a href="/test/bad"><bad></a>',
+ false,
+ ],
+ [
+ 't3://page?uid=9921',
+ '<a href="/test/bad"><bad></a>',
+ true,
+ ],
+ ];
+ }
+
+ /**
+ * @param string $parameter
+ * @param string $expectation
+ * @param bool $parseFuncEnabled
+ *
+ * @test
+ * @dataProvider linkToPageIsProcessedDataProvider
+ */
+ public function linkToPageIsProcessed(string $parameter, string $expectation, bool $parseFuncEnabled)
+ {
+ $instructions = [];
+ if ($parseFuncEnabled) {
+ $instructions[] = $this->createParseFuncInstruction([
+ 'allowTags' => 'good',
+ 'denyTags' => '*',
+ 'nonTypoTagStdWrap.' => [
+ 'HTMLparser.' => [
+ 'tags.' => [
+ 'good.' => [
+ 'allowedAttribs' => 0,
],
],
+ ],
+ ],
+ ]);
+ }
+ $response = $this->invokeTypoLink($parameter, ...$instructions);
+ self::assertSame($expectation, (string)$response->getBody());
+ }
+
+ /**
+ * @param string $parameter
+ * @param AbstractInstruction ...$instructions
+ * @return InternalResponse
+ */
+ private function invokeTypoLink(string $parameter, AbstractInstruction ...$instructions): InternalResponse
+ {
+ $sourcePageId = 1100;
+ $targetPageId = 1200;
+
+ $request = (new InternalRequest('https://acme.us/'))
+ ->withPageId($sourcePageId)
+ ->withInstructions(
+ [
+ $this->createRecordLinksInstruction([
+ 'parameter' => $targetPageId,
+ 'section.' => [
+ 'data' => 'field:uid',
+ 'wrap' => 'c|',
+ ],
]),
$this->createTypoLinkInstruction([
'parameter' => $parameter,
])
- ]),
- $this->internalRequestContext
- );
+ ]
+ );
- self::assertSame($expectation, (string)$response->getBody());
+ if (count($instructions) > 0) {
+ $request = $this->applyInstructions($request, ...$instructions);
+ }
+
+ return $this->executeFrontendRequest($request, $this->internalRequestContext);
}
/**
@@ -247,4 +528,126 @@ class TypoLinkGeneratorTest extends AbstractTestCase
]
]);
}
+
+ /**
+ * @param array $typoLink
+ * @return TypoScriptInstruction
+ */
+ private function createRecordLinksInstruction(array $typoLink): TypoScriptInstruction
+ {
+ return (new TypoScriptInstruction(TemplateService::class))
+ ->withTypoScript([
+ 'config.' => [
+ 'recordLinks.' => [
+ 'content.' => [
+ 'forceLink' => 1,
+ 'typolink.' => $typoLink,
+ ],
+ ],
+ ],
+ ]);
+ }
+
+ /**
+ * @param array $parseFunc
+ * @return TypoScriptInstruction
+ */
+ private function createParseFuncInstruction(array $parseFunc): TypoScriptInstruction
+ {
+ return (new TypoScriptInstruction(TemplateService::class))
+ ->withTypoScript([
+ 'lib.' => [
+ 'parseFunc.' => array_replace_recursive(
+ [
+ 'makelinks' => 1,
+ 'makelinks.' => [
+ 'http.' => [
+ 'keep' => 'path',
+ 'extTarget' => '_blank',
+ ],
+ 'mailto.' => [
+ 'keep' => 'path',
+ ],
+ ],
+ 'allowTags' => '',
+ 'denyTags' => '',
+ 'constants' => 1,
+ 'nonTypoTagStdWrap.' => [
+ 'HTMLparser' => 1,
+ 'HTMLparser.' => [
+ 'keepNonMatchedTags' => 1,
+ 'htmlSpecialChars' => 2,
+ ],
+ ],
+ ],
+ $parseFunc
+ ),
+ ],
+ ]);
+ }
+
+ /**
+ * @param InternalRequest $request
+ * @param AbstractInstruction ...$instructions
+ * @return InternalRequest
+ *
+ * @todo Instruction handling should be part of Testing Framework (multiple instructions per identifier, merge in interface)
+ */
+ private function applyInstructions(InternalRequest $request, AbstractInstruction ...$instructions): InternalRequest
+ {
+ $modifiedInstructions = [];
+
+ foreach ($instructions as $instruction) {
+ $identifier = $instruction->getIdentifier();
+ if (isset($modifiedInstructions[$identifier]) || $request->getInstruction($identifier) !== null) {
+ $modifiedInstructions[$identifier] = $this->mergeInstruction(
+ $modifiedInstructions[$identifier] ?? $request->getInstruction($identifier),
+ $instruction
+ );
+ } else {
+ $modifiedInstructions[$identifier] = $instruction;
+ }
+ }
+
+ return $request->withInstructions($modifiedInstructions);
+ }
+
+ /**
+ * @param AbstractInstruction $current
+ * @param AbstractInstruction $other
+ * @return AbstractInstruction
+ */
+ private function mergeInstruction(AbstractInstruction $current, AbstractInstruction $other): AbstractInstruction
+ {
+ if (get_class($current) !== get_class($other)) {
+ throw new \LogicException('Cannot merge different instruction types', 1565863174);
+ }
+
+ if ($current instanceof TypoScriptInstruction) {
+ /** @var $other TypoScriptInstruction */
+ $typoScript = array_replace_recursive(
+ $current->getTypoScript() ?? [],
+ $other->getTypoScript() ?? []
+ );
+ $constants = array_replace_recursive(
+ $current->getConstants() ?? [],
+ $other->getConstants() ?? []
+ );
+ if ($typoScript !== []) {
+ $current = $current->withTypoScript($typoScript);
+ }
+ if ($constants !== []) {
+ $current = $current->withConstants($constants);
+ }
+ return $current;
+ }
+
+ if ($current instanceof ArrayValueInstruction) {
+ /** @var $other ArrayValueInstruction */
+ $array = array_merge_recursive($current->getArray(), $other->getArray());
+ return $current->withArray($array);
+ }
+
+ return $current;
+ }
}