From d9c604f280fe6160dfa8f4a26db1cb24a7e520ad Mon Sep 17 00:00:00 2001
From: Ruud Silvrants <ruudsilvrants@gmail.com>
Date: Thu, 15 Sep 2016 08:34:41 +0200
Subject: [PATCH] [BUGFIX] Use only domain with scheme at youtube origin
Resolves: #77953
Releases: master, 7.6
Change-Id: I263e865953f58778565e362ddc04b8489d019a48
Reviewed-on: https://review.typo3.org/49941
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Dmitry Dulepov <dmitry.dulepov@gmail.com>
Tested-by: Dmitry Dulepov <dmitry.dulepov@gmail.com>
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Tested-by: Wouter Wolters <typo3@wouterwolters.nl>
---
.../Classes/Resource/Rendering/YouTubeRenderer.php | 2 +-
.../Unit/Resource/Rendering/YouTubeRendererTest.php | 11 +++++------
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/typo3/sysext/core/Classes/Resource/Rendering/YouTubeRenderer.php b/typo3/sysext/core/Classes/Resource/Rendering/YouTubeRenderer.php
index a7bbfa7fba94..9ecff66216c6 100644
--- a/typo3/sysext/core/Classes/Resource/Rendering/YouTubeRenderer.php
+++ b/typo3/sysext/core/Classes/Resource/Rendering/YouTubeRenderer.php
@@ -108,7 +108,7 @@ class YouTubeRenderer implements FileRendererInterface
$urlParams[] = 'loop=1';
}
if (!isset($options['enablejsapi']) || !empty($options['enablejsapi'])) {
- $urlParams[] = 'enablejsapi=1&origin=' . GeneralUtility::getIndpEnv('TYPO3_REQUEST_URL');
+ $urlParams[] = 'enablejsapi=1&origin=' . GeneralUtility::getIndpEnv('TYPO3_REQUEST_HOST');
}
$urlParams[] = 'showinfo=' . (int)!empty($options['showinfo']);
diff --git a/typo3/sysext/core/Tests/Unit/Resource/Rendering/YouTubeRendererTest.php b/typo3/sysext/core/Tests/Unit/Resource/Rendering/YouTubeRendererTest.php
index ee807e60c9b5..f740a26e69bd 100644
--- a/typo3/sysext/core/Tests/Unit/Resource/Rendering/YouTubeRendererTest.php
+++ b/typo3/sysext/core/Tests/Unit/Resource/Rendering/YouTubeRendererTest.php
@@ -39,7 +39,6 @@ class YouTubeRendererTest extends UnitTestCase
parent::setUp();
GeneralUtility::flushInternalRuntimeCaches();
$_SERVER['HTTP_HOST'] = 'test.server.org';
- $_SERVER['REQUEST_URI'] = '/test-page/';
/** @var YouTubeHelper|\PHPUnit_Framework_MockObject_MockObject $youTubeHelper */
$youTubeHelper = $this->getAccessibleMock(YouTubeHelper::class, ['getOnlineMediaId'], ['youtube']);
@@ -95,7 +94,7 @@ class YouTubeRendererTest extends UnitTestCase
$fileResourceMock = $this->createMock(File::class);
$this->assertSame(
- '<iframe src="https://www.youtube.com/embed/7331?autohide=1&controls=2&enablejsapi=1&origin=http://test.server.org/test-page/&showinfo=0" allowfullscreen width="300" height="200"></iframe>',
+ '<iframe src="https://www.youtube.com/embed/7331?autohide=1&controls=2&enablejsapi=1&origin=http://test.server.org&showinfo=0" allowfullscreen width="300" height="200"></iframe>',
$this->subject->render($fileResourceMock, '300m', '200')
);
}
@@ -109,7 +108,7 @@ class YouTubeRendererTest extends UnitTestCase
$fileResourceMock = $this->createMock(File::class);
$this->assertSame(
- '<iframe src="https://www.youtube.com/embed/7331?autohide=1&controls=2&loop=1&enablejsapi=1&origin=http://test.server.org/test-page/&showinfo=0" allowfullscreen width="300" height="200"></iframe>',
+ '<iframe src="https://www.youtube.com/embed/7331?autohide=1&controls=2&loop=1&enablejsapi=1&origin=http://test.server.org&showinfo=0" allowfullscreen width="300" height="200"></iframe>',
$this->subject->render($fileResourceMock, '300m', '200', ['loop' => 1])
);
}
@@ -123,7 +122,7 @@ class YouTubeRendererTest extends UnitTestCase
$fileResourceMock = $this->createMock(File::class);
$this->assertSame(
- '<iframe src="https://www.youtube.com/embed/7331?autohide=1&controls=2&autoplay=1&enablejsapi=1&origin=http://test.server.org/test-page/&showinfo=0" allowfullscreen width="300" height="200"></iframe>',
+ '<iframe src="https://www.youtube.com/embed/7331?autohide=1&controls=2&autoplay=1&enablejsapi=1&origin=http://test.server.org&showinfo=0" allowfullscreen width="300" height="200"></iframe>',
$this->subject->render($fileResourceMock, '300m', '200', ['autoplay' => 1])
);
}
@@ -142,7 +141,7 @@ class YouTubeRendererTest extends UnitTestCase
$fileReferenceMock->expects($this->any())->method('getOriginalFile')->willReturn($fileResourceMock);
$this->assertSame(
- '<iframe src="https://www.youtube.com/embed/7331?autohide=1&controls=2&autoplay=1&enablejsapi=1&origin=http://test.server.org/test-page/&showinfo=0" allowfullscreen width="300" height="200"></iframe>',
+ '<iframe src="https://www.youtube.com/embed/7331?autohide=1&controls=2&autoplay=1&enablejsapi=1&origin=http://test.server.org&showinfo=0" allowfullscreen width="300" height="200"></iframe>',
$this->subject->render($fileReferenceMock, '300m', '200')
);
}
@@ -156,7 +155,7 @@ class YouTubeRendererTest extends UnitTestCase
$fileResourceMock = $this->createMock(File::class);
$this->assertSame(
- '<iframe src="https://www.youtube.com/embed/7331?autohide=1&autoplay=1&enablejsapi=1&origin=http://test.server.org/test-page/&showinfo=0" allowfullscreen width="300" height="200"></iframe>',
+ '<iframe src="https://www.youtube.com/embed/7331?autohide=1&autoplay=1&enablejsapi=1&origin=http://test.server.org&showinfo=0" allowfullscreen width="300" height="200"></iframe>',
$this->subject->render($fileResourceMock, '300m', '200', ['controls' => 0, 'autoplay' => 1])
);
}
--
GitLab