forked from crosswalk-project/chromium-crosswalk
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Cherry-picking hangouts.google.com whitelisting change into M52.
Urgent: whitelist hangouts.google.com further (should've been done in issue 1552383002 from Dec 2015, but...) to allow video effects plugin access; tag on meet.google.com for a similar purpose; tax: refactor whitelist checks into separate thing. [email protected],[email protected] BUG=614062 NOTRY=true NOPRESUBMIT=true Review-Url: https://codereview.chromium.org/1974413003 Cr-Commit-Position: refs/heads/master@{#395172} (cherry picked from commit 81dcbd6) Review-Url: https://codereview.chromium.org/2011623002 Cr-Commit-Position: refs/branch-heads/2743@{crosswalk-project#42} Cr-Branched-From: 2b3ae3b-refs/heads/master@{#394939}
- Loading branch information
1 parent
1bc8147
commit 0901e14
Showing
8 changed files
with
262 additions
and
123 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,3 +2,8 @@ | |
| per-file page_load_histograms*=file://components/page_load_metrics/OWNERS | ||
| # Instant/Search files. | ||
| per-file instant_restricted_id_cache*=file://chrome/browser/search/OWNERS | ||
| # Security checks and whitelists | ||
| per-file app_categorizer*=set noparent | ||
| per-file app_categorizer*[email protected] | ||
| per-file app_categorizer*[email protected] | ||
| per-file app_categorizer*[email protected] | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,80 @@ | ||
| // Copyright 2016 The Chromium Authors. All rights reserved. | ||
| // Use of this source code is governed by a BSD-style license that can be | ||
| // found in the LICENSE file. | ||
|
|
||
| #include "chrome/renderer/app_categorizer.h" | ||
|
|
||
| #include "base/macros.h" | ||
| #include "base/strings/string_util.h" | ||
| #include "url/gurl.h" | ||
|
|
||
| namespace { | ||
| // Note: all domain names here must be in lowercase (see GURL::DomainIs, which | ||
| // properly handles sub-domains). | ||
|
|
||
| const char* const kPredefinedHangoutsDomains[] = { | ||
| "hangouts.google.com", | ||
| "meet.google.com", | ||
| "talkgadget.google.com", | ||
| "plus.google.com", | ||
| "plus.sandbox.google.com" | ||
| }; | ||
|
|
||
| const char* const kPredefinedPlusDomains[] = { | ||
| "plus.google.com", | ||
| "plus.sandbox.google.com" | ||
| }; | ||
|
|
||
| bool IsInWhitelistedDomain( | ||
| const GURL& url, const char* const domains[], size_t number_of_domains) { | ||
| for (size_t i = 0; i < number_of_domains; ++i) { | ||
| if (url.DomainIs(domains[i])) { | ||
| return true; | ||
| } | ||
| } | ||
|
|
||
| return false; | ||
| } | ||
|
|
||
| } // namespace | ||
|
|
||
| bool AppCategorizer::IsHangoutsUrl(const GURL& url) { | ||
| // Whitelisted apps must be served over https. | ||
| return url.SchemeIsCryptographic() && | ||
| base::StartsWith(url.path(), "/hangouts/", | ||
| base::CompareCase::INSENSITIVE_ASCII) && | ||
| IsInWhitelistedDomain( | ||
| url, | ||
| kPredefinedHangoutsDomains, | ||
| arraysize(kPredefinedHangoutsDomains)); | ||
| } | ||
|
|
||
| bool AppCategorizer::IsWhitelistedApp( | ||
| const GURL& manifest_url, const GURL& app_url) { | ||
| // Whitelisted apps must be served over https. | ||
| if (!app_url.SchemeIsCryptographic()) | ||
| return false; | ||
|
|
||
| std::string manifest_url_path = manifest_url.path(); | ||
| bool is_photo_app = | ||
| manifest_url.SchemeIsCryptographic() && | ||
| manifest_url.DomainIs("ssl.gstatic.com") && | ||
| (base::StartsWith(manifest_url_path, "/s2/oz/nacl/", | ||
| base::CompareCase::SENSITIVE) || | ||
| base::StartsWith(manifest_url_path, "/photos/nacl/", | ||
| base::CompareCase::SENSITIVE)) && | ||
| IsInWhitelistedDomain( | ||
| app_url, | ||
| kPredefinedPlusDomains, | ||
| arraysize(kPredefinedPlusDomains)); | ||
|
|
||
| bool is_hangouts_app = | ||
| manifest_url.SchemeIsFileSystem() && | ||
| manifest_url.inner_url() != NULL && | ||
| manifest_url.inner_url()->SchemeIsCryptographic() && | ||
| // The manifest must be loaded from the host's FileSystem. | ||
| (manifest_url.inner_url()->host() == app_url.host()) && | ||
| IsHangoutsUrl(app_url); | ||
|
|
||
| return is_photo_app || is_hangouts_app; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| // Copyright 2016 The Chromium Authors. All rights reserved. | ||
| // Use of this source code is governed by a BSD-style license that can be | ||
| // found in the LICENSE file. | ||
|
|
||
| #ifndef CHROME_RENDERER_APP_CATEGORIZER_H_ | ||
| #define CHROME_RENDERER_APP_CATEGORIZER_H_ | ||
|
|
||
| class GURL; | ||
|
|
||
| class AppCategorizer { | ||
| public: | ||
| static bool IsHangoutsUrl(const GURL& url); | ||
| static bool IsWhitelistedApp(const GURL& manifest_url, const GURL& app_url); | ||
| }; | ||
|
|
||
| #endif // CHROME_RENDERER_APP_CATEGORIZER_H_ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,125 @@ | ||
| // Copyright 2016 The Chromium Authors. All rights reserved. | ||
| // Use of this source code is governed by a BSD-style license that can be | ||
| // found in the LICENSE file. | ||
|
|
||
| #include "chrome/renderer/app_categorizer.h" | ||
|
|
||
| #include "testing/gtest/include/gtest/gtest.h" | ||
| #include "url/gurl.h" | ||
|
|
||
| namespace { | ||
|
|
||
| const char* kChatAppURLs[] = { | ||
| "https://hangouts.google.com/hangouts/foo", | ||
| "https://hAnGoUtS.gOoGlE.com/HaNgOuTs/foo", | ||
| "https://meet.google.com/hangouts/foo", | ||
| "https://talkgadget.google.com/hangouts/foo", | ||
| "https://staging.talkgadget.google.com/hangouts/foo", | ||
| "https://plus.google.com/hangouts/foo", | ||
| "https://plus.sandbox.google.com/hangouts/foo" | ||
| }; | ||
|
|
||
| const char* kChatManifestFSs[] = { | ||
| "filesystem:https://hangouts.google.com/foo", | ||
| "filesystem:https://hAnGoUtS.gOoGlE.com/foo", | ||
| "filesystem:https://meet.google.com/foo", | ||
| "filesystem:https://talkgadget.google.com/foo", | ||
| "filesystem:https://staging.talkgadget.google.com/foo", | ||
| "filesystem:https://plus.google.com/foo", | ||
| "filesystem:https://plus.sandbox.google.com/foo" | ||
| }; | ||
|
|
||
| const char* kBadChatAppURLs[] = { | ||
| "http://talkgadget.google.com/hangouts/foo", // not https | ||
| "https://talkgadget.evil.com/hangouts/foo" // domain not whitelisted | ||
| }; | ||
|
|
||
| const char* kPhotosAppURLs[] = { | ||
| "https://foo.plus.google.com", | ||
| "https://foo.plus.sandbox.google.com" | ||
| }; | ||
|
|
||
| const char* kPhotosManifestURLs[] = { | ||
| "https://ssl.gstatic.com/photos/nacl/foo", | ||
| "https://ssl.gstatic.com/s2/oz/nacl/foo" | ||
| }; | ||
|
|
||
| const char* kBadPhotosAppURLs[] = { | ||
| "https://plus.google.com/foo", | ||
| "https://plus.google.com/foo", | ||
| "https://plus.google.com/foo", | ||
| "http://plus.google.com/foo", // http scheme | ||
| "https://plus.evil.com/foo", // domain not whitelisted | ||
| }; | ||
|
|
||
| const char* kBadPhotosManifestURLs[] = { | ||
| "http://ssl.gstatic.com/photos/nacl/foo", // http scheme | ||
| "https://lss.gstatic.com/photos/nacl/foo", // bad hostname | ||
| "https://ssl.gstatic.com/wrong/photos/nacl/foo", // bad path | ||
| "https://ssl.gstatic.com/photos/nacl/foo", | ||
| "https://ssl.gstatic.com/photos/nacl/foo", | ||
| }; | ||
|
|
||
| } // namespace | ||
|
|
||
| TEST(AppCategorizerTest, IsHangoutsUrl) { | ||
| for (size_t i = 0; i < arraysize(kChatAppURLs); ++i) { | ||
| EXPECT_TRUE(AppCategorizer::IsHangoutsUrl(GURL(kChatAppURLs[i]))); | ||
| } | ||
|
|
||
| for (size_t i = 0; i < arraysize(kBadChatAppURLs); ++i) { | ||
| EXPECT_FALSE(AppCategorizer::IsHangoutsUrl(GURL(kBadChatAppURLs[i]))); | ||
| } | ||
| } | ||
|
|
||
| TEST(AppCategorizerTest, IsWhitelistedApp) { | ||
| // Hangouts app | ||
| { | ||
| EXPECT_EQ(arraysize(kChatAppURLs), arraysize(kChatManifestFSs)); | ||
| for (size_t i = 0; i < arraysize(kChatAppURLs); ++i) { | ||
| EXPECT_TRUE(AppCategorizer::IsWhitelistedApp( | ||
| GURL(kChatManifestFSs[i]), GURL(kChatAppURLs[i]))); | ||
| } | ||
| for (size_t i = 0; i < arraysize(kBadChatAppURLs); ++i) { | ||
| EXPECT_FALSE(AppCategorizer::IsWhitelistedApp( | ||
| GURL("filesystem:https://irrelevant.com/"), | ||
| GURL(kBadChatAppURLs[i]))); | ||
| } | ||
|
|
||
| // Manifest URL not filesystem | ||
| EXPECT_FALSE(AppCategorizer::IsWhitelistedApp( | ||
| GURL("https://hangouts.google.com/foo"), | ||
| GURL("https://hangouts.google.com/hangouts/foo"))); | ||
|
|
||
| // Manifest URL not https | ||
| EXPECT_FALSE(AppCategorizer::IsWhitelistedApp( | ||
| GURL("filesystem:http://hangouts.google.com/foo"), | ||
| GURL("https://hangouts.google.com/hangouts/foo"))); | ||
|
|
||
| // Manifest URL hostname does not match that of the app URL | ||
| EXPECT_FALSE(AppCategorizer::IsWhitelistedApp( | ||
| GURL("filesystem:https://meet.google.com/foo"), | ||
| GURL("https://hangouts.google.com/hangouts/foo"))); | ||
| } | ||
|
|
||
| // Photos app | ||
| { | ||
| EXPECT_EQ(arraysize(kPhotosAppURLs), arraysize(kPhotosManifestURLs)); | ||
| for (size_t i = 0; i < arraysize(kPhotosAppURLs); ++i) { | ||
| EXPECT_TRUE(AppCategorizer::IsWhitelistedApp( | ||
| GURL(kPhotosManifestURLs[i]), GURL(kPhotosAppURLs[i]))); | ||
| } | ||
| // The app/manifest two sides do not have any coorelation for the Photos app | ||
| for (size_t i = 0; i < arraysize(kPhotosAppURLs); ++i) { | ||
| EXPECT_TRUE(AppCategorizer::IsWhitelistedApp( | ||
| GURL(kPhotosManifestURLs[(i + 1) % arraysize(kPhotosAppURLs)]), | ||
| GURL(kPhotosAppURLs[i]))); | ||
| } | ||
|
|
||
| EXPECT_EQ(arraysize(kBadPhotosAppURLs), arraysize(kBadPhotosManifestURLs)); | ||
| for (size_t i = 0; i < arraysize(kBadPhotosAppURLs); ++i) { | ||
| EXPECT_FALSE(AppCategorizer::IsWhitelistedApp( | ||
| GURL(kBadPhotosManifestURLs[i]), GURL(kBadPhotosAppURLs[i]))); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.