| Index: chrome/browser/extensions/extension_messages_apitest.cc
|
| diff --git a/chrome/browser/extensions/extension_messages_apitest.cc b/chrome/browser/extensions/extension_messages_apitest.cc
|
| index e8de072ca66969eeac17218eb20c4c51322adfa8..0543793ebd4be83e39280c25cb7d0011aa8fa606 100644
|
| --- a/chrome/browser/extensions/extension_messages_apitest.cc
|
| +++ b/chrome/browser/extensions/extension_messages_apitest.cc
|
| @@ -7,11 +7,17 @@
|
| #include "chrome/browser/extensions/extension_apitest.h"
|
| #include "chrome/browser/extensions/extension_system.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| +#include "chrome/browser/ui/browser.h"
|
| +#include "chrome/browser/ui/tabs/tab_strip_model.h"
|
| #include "chrome/common/chrome_notification_types.h"
|
| #include "chrome/common/chrome_switches.h"
|
| +#include "chrome/test/base/ui_test_utils.h"
|
| #include "content/public/browser/notification_registrar.h"
|
| #include "content/public/browser/notification_service.h"
|
| +#include "content/public/test/browser_test_utils.h"
|
| #include "googleurl/src/gurl.h"
|
| +#include "net/dns/mock_host_resolver.h"
|
| +#include "net/test/embedded_test_server/embedded_test_server.h"
|
|
|
| namespace {
|
|
|
| @@ -111,3 +117,150 @@ class PanelMessagingTest : public ExtensionApiTest {
|
| IN_PROC_BROWSER_TEST_F(PanelMessagingTest, MessagingPanel) {
|
| ASSERT_TRUE(RunExtensionTest("messaging/connect_panel")) << message_;
|
| }
|
| +
|
| +// Tests externally_connectable between a web page and an extension.
|
| +//
|
| +// TODO(kalman): Test between extensions. This is already tested in this file,
|
| +// but not with externally_connectable set in the manifest.
|
| +//
|
| +// TODO(kalman): Test with host permissions.
|
| +class ExternallyConnectableMessagingTest : public ExtensionApiTest {
|
| + protected:
|
| + // Result codes from the test. These must match up with |results| in
|
| + // c/t/d/extensions/api_test/externally_connectable/sites/assertions.json.
|
| + enum Result {
|
| + OK = 0,
|
| + NAMESPACE_NOT_DEFINED = 1,
|
| + FUNCTION_NOT_DEFINED = 2,
|
| + COULD_NOT_ESTABLISH_CONNECTION_ERROR = 3,
|
| + OTHER_ERROR = 4,
|
| + INCORRECT_RESPONSE_SENDER = 5,
|
| + INCORRECT_RESPONSE_MESSAGE = 6,
|
| + };
|
| +
|
| + Result CanConnectAndSendMessages(const std::string& extension_id) {
|
| + int result;
|
| + CHECK(content::ExecuteScriptAndExtractInt(
|
| + browser()->tab_strip_model()->GetActiveWebContents(),
|
| + "window.assertions.canConnectAndSendMessages('" + extension_id + "')",
|
| + &result));
|
| + return static_cast<Result>(result);
|
| + }
|
| +
|
| + testing::AssertionResult AreAnyNonWebApisDefined() {
|
| + // All runtime API methods are non-web except for sendRequest and connect.
|
| + const std::string non_messaging_apis[] = {
|
| + "getBackgroundPage",
|
| + "getManifest",
|
| + "getURL",
|
| + "reload",
|
| + "requestUpdateCheck",
|
| + "connectNative",
|
| + "sendNativeMessage",
|
| + "onStartup",
|
| + "onInstalled",
|
| + "onSuspend",
|
| + "onSuspendCanceled",
|
| + "onUpdateAvailable",
|
| + "onBrowserUpdateAvailable",
|
| + "onConnect",
|
| + "onConnectExternal",
|
| + "onMessage",
|
| + "onMessageExternal",
|
| + "id",
|
| + };
|
| + return AreAnyRuntimePropertiesDefined(std::vector<std::string>(
|
| + non_messaging_apis,
|
| + non_messaging_apis + arraysize(non_messaging_apis)));
|
| + }
|
| +
|
| + GURL GetURLForPath(const std::string& host, const std::string& path) {
|
| + GURL path_url = embedded_test_server()->GetURL(path);
|
| + GURL::Replacements replace_host;
|
| + replace_host.SetHostStr(host);
|
| + return path_url.ReplaceComponents(replace_host);
|
| + }
|
| +
|
| + private:
|
| + testing::AssertionResult AreAnyRuntimePropertiesDefined(
|
| + const std::vector<std::string>& names) {
|
| + for (size_t i = 0; i < names.size(); ++i) {
|
| + if (IsRuntimePropertyDefined(names[i]) == OK)
|
| + return testing::AssertionSuccess() << names[i] << " is defined";
|
| + }
|
| + return testing::AssertionFailure()
|
| + << "none of " << names.size() << " properties are defined";
|
| + }
|
| +
|
| + Result IsRuntimePropertyDefined(const std::string& name) {
|
| + int result_int;
|
| + CHECK(content::ExecuteScriptAndExtractInt(
|
| + browser()->tab_strip_model()->GetActiveWebContents(),
|
| + "window.assertions.isDefined('" + name + "')",
|
| + &result_int));
|
| + return static_cast<Result>(result_int);
|
| + }
|
| +};
|
| +
|
| +IN_PROC_BROWSER_TEST_F(ExternallyConnectableMessagingTest,
|
| + ExternallyConnectableMessaging) {
|
| + const std::string kExtensionDir = "messaging/externally_connectable";
|
| +
|
| + // The extension allows connections from chromium.org but not google.com.
|
| + const std::string kChromiumOrg = "www.chromium.org";
|
| + const std::string kGoogleCom = "www.google.com";
|
| +
|
| + host_resolver()->AddRule(kChromiumOrg, "127.0.0.1");
|
| + host_resolver()->AddRule(kGoogleCom, "127.0.0.1");
|
| +
|
| + embedded_test_server()->ServeFilesFromDirectory(
|
| + base::FilePath(FILE_PATH_LITERAL(
|
| + "chrome/test/data/extensions/api_test/" + kExtensionDir)));
|
| + ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
|
| +
|
| + const GURL kChromiumOrgUrl =
|
| + GetURLForPath(kChromiumOrg, "/sites/chromium.org.html");
|
| + const GURL kGoogleComUrl =
|
| + GetURLForPath(kGoogleCom, "/sites/google.com.html");
|
| +
|
| + // When an extension isn't installed all attempts to connect to it should
|
| + // fail.
|
| + const std::string kFakeId = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
|
| + ui_test_utils::NavigateToURL(browser(), kChromiumOrgUrl);
|
| + EXPECT_EQ(COULD_NOT_ESTABLISH_CONNECTION_ERROR,
|
| + CanConnectAndSendMessages(kFakeId));
|
| + EXPECT_FALSE(AreAnyNonWebApisDefined());
|
| +
|
| + ui_test_utils::NavigateToURL(browser(), kGoogleComUrl);
|
| + EXPECT_EQ(COULD_NOT_ESTABLISH_CONNECTION_ERROR,
|
| + CanConnectAndSendMessages(kFakeId));
|
| + EXPECT_FALSE(AreAnyNonWebApisDefined());
|
| +
|
| + // Install the web connectable extension. chromium.org can connect to it,
|
| + // google.com can't.
|
| + const extensions::Extension* web_connectable = LoadExtension(
|
| + test_data_dir_.AppendASCII(kExtensionDir).AppendASCII("web_connectable"));
|
| +
|
| + ui_test_utils::NavigateToURL(browser(), kChromiumOrgUrl);
|
| + EXPECT_EQ(OK, CanConnectAndSendMessages(web_connectable->id()));
|
| + EXPECT_FALSE(AreAnyNonWebApisDefined());
|
| +
|
| + ui_test_utils::NavigateToURL(browser(), kGoogleComUrl);
|
| + EXPECT_EQ(COULD_NOT_ESTABLISH_CONNECTION_ERROR,
|
| + CanConnectAndSendMessages(web_connectable->id()));
|
| + EXPECT_FALSE(AreAnyNonWebApisDefined());
|
| +
|
| + // Install the non-connectable extension. Nothing can connect to it.
|
| + const extensions::Extension* not_connectable = LoadExtension(
|
| + test_data_dir_.AppendASCII(kExtensionDir).AppendASCII("not_connectable"));
|
| +
|
| + ui_test_utils::NavigateToURL(browser(), kChromiumOrgUrl);
|
| + EXPECT_EQ(COULD_NOT_ESTABLISH_CONNECTION_ERROR,
|
| + CanConnectAndSendMessages(not_connectable->id()));
|
| + EXPECT_FALSE(AreAnyNonWebApisDefined());
|
| +
|
| + ui_test_utils::NavigateToURL(browser(), kGoogleComUrl);
|
| + EXPECT_EQ(COULD_NOT_ESTABLISH_CONNECTION_ERROR,
|
| + CanConnectAndSendMessages(not_connectable->id()));
|
| + EXPECT_FALSE(AreAnyNonWebApisDefined());
|
| +}
|
|
|