Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4352)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/renderer/chrome_content_renderer_client_unittest.cc

Issue 23466009: Expand whitelist for media stream APIs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Adjust Hangouts URL checking.x Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« chrome/renderer/chrome_content_renderer_client.cc ('K') | « chrome/renderer/chrome_content_renderer_client.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/chrome_content_renderer_client_unittest.cc
diff --git a/chrome/renderer/chrome_content_renderer_client_unittest.cc b/chrome/renderer/chrome_content_renderer_client_unittest.cc
index 915540010e9e9f142747abecc0355b42970aed6e..e49417bc360f869879db1ca2297d7fc41e243472 100644
--- a/chrome/renderer/chrome_content_renderer_client_unittest.cc
+++ b/chrome/renderer/chrome_content_renderer_client_unittest.cc
@@ -37,10 +37,14 @@ const bool kHostedApp = true;
const char kNaClMimeType[] = "application/x-nacl";
const char kExtensionUrl[] = "chrome-extension://extension_id/background.html";
-const char kAllowedNaClAppURL1[] = "https://plus.google.com";
-const char kAllowedNaClAppURL2[] = "https://plus.sandbox.google.com";
-const char kAllowedNaClManifestURL1[] = "https://ssl.gstatic.com/s2/oz/nacl/foo";
-const char kAllowedNaClManifestURL2[] = "https://ssl.gstatic.com/photos/nacl/foo";
+const char kPhotosAppURL1[] = "https://plus.google.com";
+const char kPhotosAppURL2[] = "https://plus.sandbox.google.com";
+const char kPhotosManifestURL1[] = "https://ssl.gstatic.com/s2/oz/nacl/foo";
+const char kPhotosManifestURL2[] = "https://ssl.gstatic.com/photos/nacl/foo";
+
+const char kHangoutsAppURL1[] = "https://talkgadget.google.com";
darin (slow to review) 2013/09/16 19:37:44 nit: Hangouts -> Chat
bbudge 2013/09/16 19:47:51 Done.
+const char kHangoutsAppURL2[] = "https://foo.talkgadget.google.com";
+const char kHangoutsManifestURL[] = "https://ssl.gstatic.com/chat/apps/fx";
bool AllowsDevInterfaces(const WebPluginParams& params) {
for (size_t i = 0; i < params.attributeNames.size(); ++i) {
@@ -203,46 +207,64 @@ TEST_F(ChromeContentRendererClientTest, NaClRestriction) {
// interfaces. There is a whitelist for the app URL and the manifest URL.
{
WebPluginParams params;
- // Whitelisted manifest URL #1, whitelisted app URL root #1 is allowed.
+ // Whitelisted Photos app is allowed (two app URLs, two manifest URLs)
+ EXPECT_TRUE(ChromeContentRendererClient::IsNaClAllowed(
+ GURL(kPhotosManifestURL1),
+ GURL(kPhotosAppURL1),
+ kNaClRestricted,
+ CreateExtension(kExtensionRestricted, kExtensionNotFromWebStore).get(),
+ &params));
+ EXPECT_FALSE(AllowsDevInterfaces(params));
EXPECT_TRUE(ChromeContentRendererClient::IsNaClAllowed(
- GURL(kAllowedNaClManifestURL1),
- GURL(kAllowedNaClAppURL1),
+ GURL(kPhotosManifestURL1),
+ GURL(kPhotosAppURL2),
kNaClRestricted,
CreateExtension(kExtensionRestricted, kExtensionNotFromWebStore).get(),
&params));
EXPECT_FALSE(AllowsDevInterfaces(params));
- // Whitelisted manifest URL #2, whitelisted app URL root #1 is allowed.
EXPECT_TRUE(ChromeContentRendererClient::IsNaClAllowed(
- GURL(kAllowedNaClManifestURL1),
- GURL(kAllowedNaClAppURL1),
+ GURL(kPhotosManifestURL2),
+ GURL(kPhotosAppURL1),
kNaClRestricted,
CreateExtension(kExtensionRestricted, kExtensionNotFromWebStore).get(),
&params));
EXPECT_FALSE(AllowsDevInterfaces(params));
- // Whitelisted manifest URL #1, whitelisted app URL root #2 is allowed.
EXPECT_TRUE(ChromeContentRendererClient::IsNaClAllowed(
- GURL(kAllowedNaClManifestURL1),
- GURL(kAllowedNaClAppURL2),
+ GURL(kPhotosManifestURL2),
+ GURL(kPhotosAppURL2),
kNaClRestricted,
CreateExtension(kExtensionRestricted, kExtensionNotFromWebStore).get(),
&params));
EXPECT_FALSE(AllowsDevInterfaces(params));
+ // Whitelisted Hangouts app is allowed.
+ EXPECT_TRUE(ChromeContentRendererClient::IsNaClAllowed(
+ GURL(kHangoutsManifestURL),
+ GURL(kHangoutsAppURL1),
+ kNaClRestricted,
+ CreateExtension(kExtensionRestricted, kExtensionNotFromWebStore).get(),
+ &params));
+ EXPECT_TRUE(ChromeContentRendererClient::IsNaClAllowed(
+ GURL(kHangoutsManifestURL),
+ GURL(kHangoutsAppURL2),
+ kNaClRestricted,
+ CreateExtension(kExtensionRestricted, kExtensionNotFromWebStore).get(),
+ &params));
// Whitelisted manifest URL, bad app URLs, NOT allowed.
EXPECT_FALSE(ChromeContentRendererClient::IsNaClAllowed(
- GURL(kAllowedNaClManifestURL1),
+ GURL(kPhotosManifestURL1),
GURL("http://plus.google.com/foo"), // http scheme
kNaClRestricted,
CreateExtension(kExtensionRestricted, kExtensionNotFromWebStore).get(),
&params));
EXPECT_FALSE(ChromeContentRendererClient::IsNaClAllowed(
- GURL(kAllowedNaClManifestURL1),
+ GURL(kPhotosManifestURL1),
GURL("http://plus.sandbox.google.com/foo"), // http scheme
kNaClRestricted,
CreateExtension(kExtensionRestricted, kExtensionNotFromWebStore).get(),
&params));
EXPECT_FALSE(ChromeContentRendererClient::IsNaClAllowed(
- GURL(kAllowedNaClManifestURL1),
+ GURL(kPhotosManifestURL1),
GURL("https://plus.google.evil.com/foo"), // bad host
kNaClRestricted,
CreateExtension(kExtensionRestricted, kExtensionNotFromWebStore).get(),
@@ -250,19 +272,19 @@ TEST_F(ChromeContentRendererClientTest, NaClRestriction) {
// Whitelisted app URL, bad manifest URL, NOT allowed.
EXPECT_FALSE(ChromeContentRendererClient::IsNaClAllowed(
GURL("http://ssl.gstatic.com/s2/oz/nacl/foo"), // http scheme
- GURL(kAllowedNaClAppURL1),
+ GURL(kPhotosAppURL1),
kNaClRestricted,
CreateExtension(kExtensionRestricted, kExtensionNotFromWebStore).get(),
&params));
EXPECT_FALSE(ChromeContentRendererClient::IsNaClAllowed(
GURL("https://ssl.gstatic.evil.com/s2/oz/nacl/foo"), // bad host
- GURL(kAllowedNaClAppURL1),
+ GURL(kPhotosAppURL1),
kNaClRestricted,
CreateExtension(kExtensionRestricted, kExtensionNotFromWebStore).get(),
&params));
EXPECT_FALSE(ChromeContentRendererClient::IsNaClAllowed(
GURL("https://ssl.gstatic.com/wrong/s2/oz/nacl/foo"), // bad path
- GURL(kAllowedNaClAppURL1),
+ GURL(kPhotosAppURL1),
kNaClRestricted,
CreateExtension(kExtensionRestricted, kExtensionNotFromWebStore).get(),
&params));
@@ -271,8 +293,8 @@ TEST_F(ChromeContentRendererClientTest, NaClRestriction) {
{
WebPluginParams params;
EXPECT_TRUE(ChromeContentRendererClient::IsNaClAllowed(
- GURL(kAllowedNaClManifestURL1),
- GURL(kAllowedNaClAppURL1),
+ GURL(kPhotosManifestURL1),
+ GURL(kPhotosAppURL1),
kNaClUnrestricted,
CreateExtension(kExtensionRestricted, kExtensionNotFromWebStore).get(),
&params));
@@ -284,8 +306,8 @@ TEST_F(ChromeContentRendererClientTest, NaClRestriction) {
WebPluginParams params;
AddFakeDevAttribute(&params);
EXPECT_TRUE(ChromeContentRendererClient::IsNaClAllowed(
- GURL(kAllowedNaClManifestURL1),
- GURL(kAllowedNaClAppURL1),
+ GURL(kPhotosManifestURL1),
+ GURL(kPhotosAppURL1),
kNaClRestricted,
CreateExtension(kExtensionRestricted, kExtensionNotFromWebStore).get(),
&params));
@@ -308,14 +330,14 @@ TEST_F(ChromeContentRendererClientTest, NaClRestriction) {
&params));
EXPECT_FALSE(ChromeContentRendererClient::IsNaClAllowed(
GURL(),
- GURL("https://plus.google.com.evil.com/foo3"),
+ GURL("https://talkgadget.google.com.evil.com/foo3"),
kNaClRestricted,
CreateExtension(kExtensionUnrestricted, kExtensionNotFromWebStore)
.get(),
&params));
EXPECT_FALSE(ChromeContentRendererClient::IsNaClAllowed(
GURL(),
- GURL("https://plus.google.com.evil.com/foo4"),
+ GURL("https://talkgadget.google.com.evil.com/foo4"),
kNaClRestricted,
CreateExtension(kExtensionUnrestricted, kExtensionFromWebStore).get(),
&params));
@@ -342,4 +364,17 @@ TEST_F(ChromeContentRendererClientTest, NaClRestriction) {
}
}
+TEST_F(ChromeContentRendererClientTest, AllowPepperMediaStreamAPI) {
+ ChromeContentRendererClient test;
+#if !defined(OS_ANDROID)
+ EXPECT_TRUE(test.AllowPepperMediaStreamAPI(GURL(kHangoutsAppURL1)));
+#else
+ EXPECT_FALSE(test.AllowPepperMediaStreamAPI(GURL(kHangoutsAppURL1)));
+#endif
+ EXPECT_FALSE(test.AllowPepperMediaStreamAPI(
juberti2 2013/09/16 19:41:52 add test for foo.talkgadget.google.com
bbudge 2013/09/16 19:47:51 Done.
+ GURL("http://talkgadget.google.com")));
+ EXPECT_FALSE(test.AllowPepperMediaStreamAPI(
+ GURL("https://talkgadget.evil.com")));
+}
+
} // namespace chrome
« chrome/renderer/chrome_content_renderer_client.cc ('K') | « chrome/renderer/chrome_content_renderer_client.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698