feat: [extensions] implement a couple of tabs APIs (#21779)
This commit is contained in:
parent
8278a64e00
commit
b9eb68c0b4
21 changed files with 568 additions and 17 deletions
133
shell/browser/extensions/api/tabs/tabs_api.cc
Normal file
133
shell/browser/extensions/api/tabs/tabs_api.cc
Normal file
|
@ -0,0 +1,133 @@
|
|||
// Copyright (c) 2019 Slack Technologies, Inc.
|
||||
// Use of this source code is governed by the MIT license that can be
|
||||
// found in the LICENSE file.
|
||||
|
||||
#include "shell/browser/extensions/api/tabs/tabs_api.h"
|
||||
|
||||
#include <memory>
|
||||
#include <utility>
|
||||
|
||||
#include "extensions/browser/extension_api_frame_id_map.h"
|
||||
#include "extensions/common/error_utils.h"
|
||||
#include "extensions/common/manifest_constants.h"
|
||||
#include "extensions/common/permissions/permissions_data.h"
|
||||
#include "shell/browser/api/atom_api_web_contents.h"
|
||||
|
||||
namespace extensions {
|
||||
|
||||
const char kFrameNotFoundError[] = "No frame with id * in tab *.";
|
||||
|
||||
using api::extension_types::InjectDetails;
|
||||
|
||||
ExecuteCodeInTabFunction::ExecuteCodeInTabFunction() : execute_tab_id_(-1) {}
|
||||
|
||||
ExecuteCodeInTabFunction::~ExecuteCodeInTabFunction() {}
|
||||
|
||||
ExecuteCodeFunction::InitResult ExecuteCodeInTabFunction::Init() {
|
||||
if (init_result_)
|
||||
return init_result_.value();
|
||||
|
||||
// |tab_id| is optional so it's ok if it's not there.
|
||||
int tab_id = -1;
|
||||
if (args_->GetInteger(0, &tab_id) && tab_id < 0)
|
||||
return set_init_result(VALIDATION_FAILURE);
|
||||
|
||||
// |details| are not optional.
|
||||
base::DictionaryValue* details_value = NULL;
|
||||
if (!args_->GetDictionary(1, &details_value))
|
||||
return set_init_result(VALIDATION_FAILURE);
|
||||
std::unique_ptr<InjectDetails> details(new InjectDetails());
|
||||
if (!InjectDetails::Populate(*details_value, details.get()))
|
||||
return set_init_result(VALIDATION_FAILURE);
|
||||
|
||||
if (tab_id == -1) {
|
||||
// There's no useful concept of a "default tab" in Electron.
|
||||
// TODO(nornagon): we could potentially kick this to an event to allow the
|
||||
// app to decide what "default tab" means for them?
|
||||
return set_init_result(VALIDATION_FAILURE);
|
||||
}
|
||||
|
||||
execute_tab_id_ = tab_id;
|
||||
details_ = std::move(details);
|
||||
set_host_id(HostID(HostID::EXTENSIONS, extension()->id()));
|
||||
return set_init_result(SUCCESS);
|
||||
}
|
||||
|
||||
bool ExecuteCodeInTabFunction::CanExecuteScriptOnPage(std::string* error) {
|
||||
// If |tab_id| is specified, look for the tab. Otherwise default to selected
|
||||
// tab in the current window.
|
||||
CHECK_GE(execute_tab_id_, 0);
|
||||
auto* contents = electron::api::WebContents::FromWeakMapID(
|
||||
v8::Isolate::GetCurrent(), execute_tab_id_);
|
||||
if (!contents) {
|
||||
return false;
|
||||
}
|
||||
|
||||
int frame_id = details_->frame_id ? *details_->frame_id
|
||||
: ExtensionApiFrameIdMap::kTopFrameId;
|
||||
content::RenderFrameHost* rfh =
|
||||
ExtensionApiFrameIdMap::GetRenderFrameHostById(contents->web_contents(),
|
||||
frame_id);
|
||||
if (!rfh) {
|
||||
*error = ErrorUtils::FormatErrorMessage(
|
||||
kFrameNotFoundError, base::NumberToString(frame_id),
|
||||
base::NumberToString(execute_tab_id_));
|
||||
return false;
|
||||
}
|
||||
|
||||
// Content scripts declared in manifest.json can access frames at about:-URLs
|
||||
// if the extension has permission to access the frame's origin, so also allow
|
||||
// programmatic content scripts at about:-URLs for allowed origins.
|
||||
GURL effective_document_url(rfh->GetLastCommittedURL());
|
||||
bool is_about_url = effective_document_url.SchemeIs(url::kAboutScheme);
|
||||
if (is_about_url && details_->match_about_blank &&
|
||||
*details_->match_about_blank) {
|
||||
effective_document_url = GURL(rfh->GetLastCommittedOrigin().Serialize());
|
||||
}
|
||||
|
||||
if (!effective_document_url.is_valid()) {
|
||||
// Unknown URL, e.g. because no load was committed yet. Allow for now, the
|
||||
// renderer will check again and fail the injection if needed.
|
||||
return true;
|
||||
}
|
||||
|
||||
// NOTE: This can give the wrong answer due to race conditions, but it is OK,
|
||||
// we check again in the renderer.
|
||||
if (!extension()->permissions_data()->CanAccessPage(effective_document_url,
|
||||
execute_tab_id_, error)) {
|
||||
if (is_about_url &&
|
||||
extension()->permissions_data()->active_permissions().HasAPIPermission(
|
||||
APIPermission::kTab)) {
|
||||
*error = ErrorUtils::FormatErrorMessage(
|
||||
manifest_errors::kCannotAccessAboutUrl,
|
||||
rfh->GetLastCommittedURL().spec(),
|
||||
rfh->GetLastCommittedOrigin().Serialize());
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
ScriptExecutor* ExecuteCodeInTabFunction::GetScriptExecutor(
|
||||
std::string* error) {
|
||||
auto* contents = electron::api::WebContents::FromWeakMapID(
|
||||
v8::Isolate::GetCurrent(), execute_tab_id_);
|
||||
if (!contents)
|
||||
return nullptr;
|
||||
return contents->script_executor();
|
||||
}
|
||||
|
||||
bool ExecuteCodeInTabFunction::IsWebView() const {
|
||||
return false;
|
||||
}
|
||||
|
||||
const GURL& ExecuteCodeInTabFunction::GetWebViewSrc() const {
|
||||
return GURL::EmptyGURL();
|
||||
}
|
||||
|
||||
bool TabsExecuteScriptFunction::ShouldInsertCSS() const {
|
||||
return false;
|
||||
}
|
||||
|
||||
} // namespace extensions
|
49
shell/browser/extensions/api/tabs/tabs_api.h
Normal file
49
shell/browser/extensions/api/tabs/tabs_api.h
Normal file
|
@ -0,0 +1,49 @@
|
|||
// Copyright (c) 2019 Slack Technologies, Inc.
|
||||
// Use of this source code is governed by the MIT license that can be
|
||||
// found in the LICENSE file.
|
||||
|
||||
#ifndef SHELL_BROWSER_EXTENSIONS_API_TABS_TABS_API_H_
|
||||
#define SHELL_BROWSER_EXTENSIONS_API_TABS_TABS_API_H_
|
||||
|
||||
#include <string>
|
||||
|
||||
#include "extensions/browser/api/execute_code_function.h"
|
||||
#include "extensions/browser/extension_function.h"
|
||||
#include "extensions/common/extension_resource.h"
|
||||
#include "url/gurl.h"
|
||||
|
||||
namespace extensions {
|
||||
|
||||
// Implement API call tabs.executeScript and tabs.insertCSS.
|
||||
class ExecuteCodeInTabFunction : public ExecuteCodeFunction {
|
||||
public:
|
||||
ExecuteCodeInTabFunction();
|
||||
|
||||
protected:
|
||||
~ExecuteCodeInTabFunction() override;
|
||||
|
||||
// Initializes |execute_tab_id_| and |details_|.
|
||||
InitResult Init() override;
|
||||
bool CanExecuteScriptOnPage(std::string* error) override;
|
||||
ScriptExecutor* GetScriptExecutor(std::string* error) override;
|
||||
bool IsWebView() const override;
|
||||
const GURL& GetWebViewSrc() const override;
|
||||
|
||||
private:
|
||||
// Id of tab which executes code.
|
||||
int execute_tab_id_;
|
||||
};
|
||||
|
||||
class TabsExecuteScriptFunction : public ExecuteCodeInTabFunction {
|
||||
protected:
|
||||
bool ShouldInsertCSS() const override;
|
||||
|
||||
private:
|
||||
~TabsExecuteScriptFunction() override {}
|
||||
|
||||
DECLARE_EXTENSION_FUNCTION("tabs.executeScript", TABS_EXECUTESCRIPT)
|
||||
};
|
||||
|
||||
} // namespace extensions
|
||||
|
||||
#endif // SHELL_BROWSER_EXTENSIONS_API_TABS_TABS_API_H_
|
|
@ -36,6 +36,7 @@
|
|||
#include "shell/browser/extensions/atom_extension_web_contents_observer.h"
|
||||
#include "shell/browser/extensions/atom_navigation_ui_data.h"
|
||||
#include "shell/browser/extensions/electron_extensions_api_client.h"
|
||||
#include "shell/browser/extensions/electron_extensions_browser_api_provider.h"
|
||||
#include "shell/browser/extensions/electron_process_manager_delegate.h"
|
||||
|
||||
using content::BrowserContext;
|
||||
|
@ -53,7 +54,8 @@ AtomExtensionsBrowserClient::AtomExtensionsBrowserClient()
|
|||
|
||||
AddAPIProvider(
|
||||
std::make_unique<extensions::CoreExtensionsBrowserAPIProvider>());
|
||||
// AddAPIProvider(std::make_unique<AtomExtensionsBrowserAPIProvider>());
|
||||
AddAPIProvider(
|
||||
std::make_unique<extensions::ElectronExtensionsBrowserAPIProvider>());
|
||||
}
|
||||
|
||||
AtomExtensionsBrowserClient::~AtomExtensionsBrowserClient() {}
|
||||
|
|
|
@ -0,0 +1,26 @@
|
|||
// Copyright (c) 2019 Slack Technologies, Inc.
|
||||
// Use of this source code is governed by the MIT license that can be
|
||||
// found in the LICENSE file.
|
||||
|
||||
#include "shell/browser/extensions/electron_extensions_browser_api_provider.h"
|
||||
|
||||
#include "extensions/browser/extension_function_registry.h"
|
||||
#include "shell/browser/extensions/api/tabs/tabs_api.h"
|
||||
|
||||
namespace extensions {
|
||||
|
||||
ElectronExtensionsBrowserAPIProvider::ElectronExtensionsBrowserAPIProvider() =
|
||||
default;
|
||||
ElectronExtensionsBrowserAPIProvider::~ElectronExtensionsBrowserAPIProvider() =
|
||||
default;
|
||||
|
||||
void ElectronExtensionsBrowserAPIProvider::RegisterExtensionFunctions(
|
||||
ExtensionFunctionRegistry* registry) {
|
||||
registry->RegisterFunction<TabsExecuteScriptFunction>();
|
||||
/*
|
||||
// Generated APIs from Electron.
|
||||
api::ElectronGeneratedFunctionRegistry::RegisterAll(registry);
|
||||
*/
|
||||
}
|
||||
|
||||
} // namespace extensions
|
|
@ -0,0 +1,27 @@
|
|||
// Copyright (c) 2019 Slack Technologies, Inc.
|
||||
// Use of this source code is governed by the MIT license that can be
|
||||
// found in the LICENSE file.
|
||||
|
||||
#ifndef SHELL_BROWSER_EXTENSIONS_ELECTRON_EXTENSIONS_BROWSER_API_PROVIDER_H_
|
||||
#define SHELL_BROWSER_EXTENSIONS_ELECTRON_EXTENSIONS_BROWSER_API_PROVIDER_H_
|
||||
|
||||
#include "base/macros.h"
|
||||
#include "extensions/browser/extensions_browser_api_provider.h"
|
||||
|
||||
namespace extensions {
|
||||
|
||||
class ElectronExtensionsBrowserAPIProvider
|
||||
: public ExtensionsBrowserAPIProvider {
|
||||
public:
|
||||
ElectronExtensionsBrowserAPIProvider();
|
||||
~ElectronExtensionsBrowserAPIProvider() override;
|
||||
|
||||
void RegisterExtensionFunctions(ExtensionFunctionRegistry* registry) override;
|
||||
|
||||
private:
|
||||
DISALLOW_COPY_AND_ASSIGN(ElectronExtensionsBrowserAPIProvider);
|
||||
};
|
||||
|
||||
} // namespace extensions
|
||||
|
||||
#endif // SHELL_BROWSER_EXTENSIONS_ELECTRON_EXTENSIONS_BROWSER_API_PROVIDER_H_
|
|
@ -23,6 +23,8 @@
|
|||
#include "ui/gfx/native_widget_types.h"
|
||||
#include "url/gurl.h"
|
||||
|
||||
#include "shell/browser/api/atom_api_web_contents.h"
|
||||
|
||||
namespace extensions {
|
||||
|
||||
ElectronMessagingDelegate::ElectronMessagingDelegate() = default;
|
||||
|
@ -39,13 +41,28 @@ ElectronMessagingDelegate::IsNativeMessagingHostAllowed(
|
|||
|
||||
std::unique_ptr<base::DictionaryValue>
|
||||
ElectronMessagingDelegate::MaybeGetTabInfo(content::WebContents* web_contents) {
|
||||
if (web_contents) {
|
||||
auto* api_contents = electron::api::WebContents::FromWrappedClass(
|
||||
v8::Isolate::GetCurrent(), web_contents);
|
||||
if (api_contents) {
|
||||
auto tab = std::make_unique<base::DictionaryValue>();
|
||||
tab->SetWithoutPathExpansion(
|
||||
"id", std::make_unique<base::Value>(api_contents->ID()));
|
||||
return tab;
|
||||
}
|
||||
}
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
content::WebContents* ElectronMessagingDelegate::GetWebContentsByTabId(
|
||||
content::BrowserContext* browser_context,
|
||||
int tab_id) {
|
||||
return nullptr;
|
||||
auto* contents = electron::api::WebContents::FromWeakMapID(
|
||||
v8::Isolate::GetCurrent(), tab_id);
|
||||
if (!contents) {
|
||||
return nullptr;
|
||||
}
|
||||
return contents->web_contents();
|
||||
}
|
||||
|
||||
std::unique_ptr<MessagePort> ElectronMessagingDelegate::CreateReceiverForTab(
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue