Fixed the bug in YoutubeVideoSanitizer related to not handling iframes

with youtube-nocookie host. Added tests for it.
ssnenov · Nov 2, 2016 · c48e63c · c48e63c
1 parent e51c806
commit c48e63c
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 1 deletion.
diff --git a/Html2Amp.IntegrationTests/Html2Amp.IntegrationTests.csproj b/Html2Amp.IntegrationTests/Html2Amp.IntegrationTests.csproj
@@ -141,6 +141,8 @@
     <None Include="TestData\YouTubeVideoSanitizationWithDataParamsAttributes\YouTubeVideoSanitizationWithDataParamsAttributes.out" />
     <None Include="TestData\YouTubeVideoSanitizationWithIdAttribute\YouTubeVideoSanitizationWithIdAttribute.in" />
     <None Include="TestData\YouTubeVideoSanitizationWithIdAttribute\YouTubeVideoSanitizationWithIdAttribute.out" />
+    <None Include="TestData\YouTubeVideoSanitizationWithNoCookieHost\YouTubeVideoSanitizationWithNoCookieHost.in" />
+    <None Include="TestData\YouTubeVideoSanitizationWithNoCookieHost\YouTubeVideoSanitizationWithNoCookieHost.out" />
     <None Include="TestData\YouTubeVideoSanitizationWithOtherNotAllowedAttributes\YouTubeVideoSanitizationWithOtherNotAllowedAttributes.in" />
     <None Include="TestData\YouTubeVideoSanitizationWithOtherNotAllowedAttributes\YouTubeVideoSanitizationWithOtherNotAllowedAttributes.out" />
     <None Include="TestData\YouTubeVideoSanitizationWithoutWidthAndHeight\YouTubeVideoSanitizationWithoutWidthAndHeight.in" />

diff --git a/...Data/YouTubeVideoSanitizationWithNoCookieHost/YouTubeVideoSanitizationWithNoCookieHost.in b/...Data/YouTubeVideoSanitizationWithNoCookieHost/YouTubeVideoSanitizationWithNoCookieHost.in
@@ -0,0 +1,2 @@
+<iframe width="640" height="390"
+  src="https://www.youtube-nocookie.com/embed/M7lc1UVf-VE"></iframe>
diff --git a/...ata/YouTubeVideoSanitizationWithNoCookieHost/YouTubeVideoSanitizationWithNoCookieHost.out b/...ata/YouTubeVideoSanitizationWithNoCookieHost/YouTubeVideoSanitizationWithNoCookieHost.out
@@ -0,0 +1,2 @@
+<amp-youtube width="640" height="390"
+   data-videoid="M7lc1UVf-VE" layout="responsive"></amp-youtube>
diff --git a/Html2Amp.IntegrationTests/Tests/YouTubeVideoSanitizationTests/YouTubeVideoSanitization.cs b/Html2Amp.IntegrationTests/Tests/YouTubeVideoSanitizationTests/YouTubeVideoSanitization.cs
@@ -131,5 +131,19 @@ public void YouTubeVideoSanitizationWithChildren()
 			HtmlAssert.AreEqual(TestDataProvider.GetOutFile(TestName), actualResult);
 			AmpAssert.IsValidAmp(TestName);
 		}
+
+		[TestMethod]
+		public void YouTubeVideoSanitizationWithNoCookieHost()
+		{
+			// Arrange
+			const string TestName = "YouTubeVideoSanitizationWithNoCookieHost";
+
+			// Act
+			var actualResult = HtmlTestFileToAmpConverter.Convert(TestName);
+
+			// Assert
+			HtmlAssert.AreEqual(TestDataProvider.GetOutFile(TestName), actualResult);
+			AmpAssert.IsValidAmp(TestName);
+		}
 	}
 }
diff --git a/Html2Amp.UnitTests/YouTubeVideoSanitizerTests/YouTubeVideoSanitizer_CanSanitizer_Should.cs b/Html2Amp.UnitTests/YouTubeVideoSanitizerTests/YouTubeVideoSanitizer_CanSanitizer_Should.cs
@@ -99,5 +99,19 @@ public void ReturnTrue_WhenSourceAttributeIsYouTubeDomainAndStartsWithWWW()
 			// Assert
 			Assert.IsTrue(actualResult);
 		}
+
+		[TestMethod]
+		public void ReturnTrue_WhenSourceAttributeIsYouTubeNoCookie()
+		{
+			// Arrange
+			var htmlElement = ElementFactory.CreateIFrame();
+			htmlElement.Source = "http://www.youtube-nocookie.com/embed/d8fr3AdK_tQ4";
+
+			// Act
+			var actualResult = new YouTubeVideoSanitizer().CanSanitize(htmlElement);
+
+			// Assert
+			Assert.IsTrue(actualResult);
+		}
 	}
 }
diff --git a/Html2Amp/Sanitization/Implementation/YouTubeVideoSanitizer.cs b/Html2Amp/Sanitization/Implementation/YouTubeVideoSanitizer.cs
@@ -28,7 +28,7 @@ public override bool CanSanitize(IElement element)
             if (Uri.TryCreate(sourceAttributeValue, UriKind.Absolute, out sourceUri))
             {
                 return sourceUri.LocalPath.StartsWith("/embed/")
-                    && Regex.IsMatch(sourceUri.Host, @"^(www\.)?youtube\.com$");
+                    && Regex.IsMatch(sourceUri.Host, @"^(www\.)?youtube(-nocookie)?\.com$");
             }
 
             return false;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		<iframe width="640" height="390"
		src="https://www.youtube-nocookie.com/embed/M7lc1UVf-VE"></iframe>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		<amp-youtube width="640" height="390"
		data-videoid="M7lc1UVf-VE" layout="responsive"></amp-youtube>