OLD | NEW |
---|---|
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/extensions/extension_function_dispatcher.h" | 5 #include "chrome/browser/extensions/extension_function_dispatcher.h" |
6 | 6 |
7 #include <map> | 7 #include <map> |
8 | 8 |
9 #include "base/memory/ref_counted.h" | 9 #include "base/memory/ref_counted.h" |
10 #include "base/memory/singleton.h" | 10 #include "base/memory/singleton.h" |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
44 #include "chrome/browser/extensions/extension_tabs_module.h" | 44 #include "chrome/browser/extensions/extension_tabs_module.h" |
45 #include "chrome/browser/extensions/extension_test_api.h" | 45 #include "chrome/browser/extensions/extension_test_api.h" |
46 #include "chrome/browser/extensions/extension_tts_api.h" | 46 #include "chrome/browser/extensions/extension_tts_api.h" |
47 #include "chrome/browser/extensions/extension_tts_engine_api.h" | 47 #include "chrome/browser/extensions/extension_tts_engine_api.h" |
48 #include "chrome/browser/extensions/extension_web_socket_proxy_private_api.h" | 48 #include "chrome/browser/extensions/extension_web_socket_proxy_private_api.h" |
49 #include "chrome/browser/extensions/extension_web_ui.h" | 49 #include "chrome/browser/extensions/extension_web_ui.h" |
50 #include "chrome/browser/extensions/extension_webnavigation_api.h" | 50 #include "chrome/browser/extensions/extension_webnavigation_api.h" |
51 #include "chrome/browser/extensions/extension_webrequest_api.h" | 51 #include "chrome/browser/extensions/extension_webrequest_api.h" |
52 #include "chrome/browser/extensions/extension_webstore_private_api.h" | 52 #include "chrome/browser/extensions/extension_webstore_private_api.h" |
53 #include "chrome/browser/extensions/extensions_quota_service.h" | 53 #include "chrome/browser/extensions/extensions_quota_service.h" |
54 #include "chrome/browser/extensions/process_map.h" | |
54 #include "chrome/browser/extensions/speech_input/extension_speech_input_api.h" | 55 #include "chrome/browser/extensions/speech_input/extension_speech_input_api.h" |
55 #include "chrome/browser/external_protocol/external_protocol_handler.h" | 56 #include "chrome/browser/external_protocol/external_protocol_handler.h" |
56 #include "chrome/browser/history/history_extension_api.h" | 57 #include "chrome/browser/history/history_extension_api.h" |
57 #include "chrome/browser/history/top_sites_extension_api.h" | 58 #include "chrome/browser/history/top_sites_extension_api.h" |
58 #include "chrome/browser/infobars/infobar_extension_api.h" | 59 #include "chrome/browser/infobars/infobar_extension_api.h" |
59 #include "chrome/browser/profiles/profile.h" | 60 #include "chrome/browser/profiles/profile.h" |
60 #include "chrome/browser/renderer_host/chrome_render_message_filter.h" | 61 #include "chrome/browser/renderer_host/chrome_render_message_filter.h" |
61 #include "chrome/browser/rlz/rlz_extension_api.h" | 62 #include "chrome/browser/rlz/rlz_extension_api.h" |
62 #include "chrome/browser/ui/browser_list.h" | 63 #include "chrome/browser/ui/browser_list.h" |
63 #include "chrome/browser/ui/browser_window.h" | 64 #include "chrome/browser/ui/browser_window.h" |
65 #include "chrome/common/extensions/api/extension_api.h" | |
64 #include "chrome/common/extensions/extension_messages.h" | 66 #include "chrome/common/extensions/extension_messages.h" |
65 #include "chrome/common/url_constants.h" | 67 #include "chrome/common/url_constants.h" |
66 #include "content/browser/renderer_host/render_view_host.h" | 68 #include "content/browser/renderer_host/render_view_host.h" |
67 #include "ipc/ipc_message.h" | 69 #include "ipc/ipc_message.h" |
68 #include "ipc/ipc_message_macros.h" | 70 #include "ipc/ipc_message_macros.h" |
69 #include "third_party/skia/include/core/SkBitmap.h" | 71 #include "third_party/skia/include/core/SkBitmap.h" |
70 | 72 |
71 #if defined(TOOLKIT_VIEWS) | 73 #if defined(TOOLKIT_VIEWS) |
72 #include "chrome/browser/extensions/extension_input_api.h" | 74 #include "chrome/browser/extensions/extension_input_api.h" |
73 #endif | 75 #endif |
74 | 76 |
75 #if defined(OS_CHROMEOS) && defined(TOUCH_UI) | 77 #if defined(OS_CHROMEOS) && defined(TOUCH_UI) |
76 #include "chrome/browser/extensions/extension_input_ui_api.h" | 78 #include "chrome/browser/extensions/extension_input_ui_api.h" |
77 #endif | 79 #endif |
78 | 80 |
79 #if defined(OS_CHROMEOS) | 81 #if defined(OS_CHROMEOS) |
80 #include "chrome/browser/extensions/extension_file_browser_private_api.h" | 82 #include "chrome/browser/extensions/extension_file_browser_private_api.h" |
81 #include "chrome/browser/extensions/extension_info_private_api_chromeos.h" | 83 #include "chrome/browser/extensions/extension_info_private_api_chromeos.h" |
82 #include "chrome/browser/extensions/extension_input_ime_api.h" | 84 #include "chrome/browser/extensions/extension_input_ime_api.h" |
83 #include "chrome/browser/extensions/extension_input_method_api.h" | 85 #include "chrome/browser/extensions/extension_input_method_api.h" |
84 #include "chrome/browser/extensions/extension_mediaplayer_private_api.h" | 86 #include "chrome/browser/extensions/extension_mediaplayer_private_api.h" |
85 #endif | 87 #endif |
86 | 88 |
89 using extensions::ExtensionAPI; | |
90 | |
87 // FactoryRegistry ------------------------------------------------------------- | 91 // FactoryRegistry ------------------------------------------------------------- |
88 | 92 |
89 namespace { | 93 namespace { |
90 | 94 |
91 // Template for defining ExtensionFunctionFactory. | 95 // Template for defining ExtensionFunctionFactory. |
92 template<class T> | 96 template<class T> |
93 ExtensionFunction* NewExtensionFunction() { | 97 ExtensionFunction* NewExtensionFunction() { |
94 return new T(); | 98 return new T(); |
95 } | 99 } |
96 | 100 |
(...skipping 421 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
518 | 522 |
519 // static | 523 // static |
520 void ExtensionFunctionDispatcher::DispatchOnIOThread( | 524 void ExtensionFunctionDispatcher::DispatchOnIOThread( |
521 ExtensionInfoMap* extension_info_map, | 525 ExtensionInfoMap* extension_info_map, |
522 void* profile, | 526 void* profile, |
523 int render_process_id, | 527 int render_process_id, |
524 base::WeakPtr<ChromeRenderMessageFilter> ipc_sender, | 528 base::WeakPtr<ChromeRenderMessageFilter> ipc_sender, |
525 int routing_id, | 529 int routing_id, |
526 const ExtensionHostMsg_Request_Params& params) { | 530 const ExtensionHostMsg_Request_Params& params) { |
527 const Extension* extension = | 531 const Extension* extension = |
528 extension_info_map->extensions().GetByURL(params.source_url); | 532 extension_info_map->extensions().GetByID(params.extension_id); |
529 | 533 |
530 scoped_refptr<ExtensionFunction> function( | 534 scoped_refptr<ExtensionFunction> function( |
531 CreateExtensionFunction(params, extension, render_process_id, | 535 CreateExtensionFunction(params, extension, render_process_id, |
532 extension_info_map->process_map(), profile, | 536 extension_info_map->process_map(), profile, |
533 ipc_sender, routing_id)); | 537 ipc_sender, routing_id)); |
534 if (!function) | 538 if (!function) |
535 return; | 539 return; |
536 | 540 |
537 IOThreadExtensionFunction* function_io = | 541 IOThreadExtensionFunction* function_io = |
538 function->AsIOThreadExtensionFunction(); | 542 function->AsIOThreadExtensionFunction(); |
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
590 } | 594 } |
591 | 595 |
592 void ExtensionFunctionDispatcher::Dispatch( | 596 void ExtensionFunctionDispatcher::Dispatch( |
593 const ExtensionHostMsg_Request_Params& params, | 597 const ExtensionHostMsg_Request_Params& params, |
594 RenderViewHost* render_view_host) { | 598 RenderViewHost* render_view_host) { |
595 ExtensionService* service = profile()->GetExtensionService(); | 599 ExtensionService* service = profile()->GetExtensionService(); |
596 extensions::ProcessMap* process_map = service->process_map(); | 600 extensions::ProcessMap* process_map = service->process_map(); |
597 if (!service || !process_map) | 601 if (!service || !process_map) |
598 return; | 602 return; |
599 | 603 |
600 // TODO(aa): When we allow content scripts to call extension APIs, we will | 604 const Extension* extension = service->GetExtensionById( |
601 // have to pass the extension ID explicitly here, not use the source URL. | 605 params.extension_id, false); |
602 const Extension* extension = service->GetExtensionByURL(params.source_url); | |
603 if (!extension) | 606 if (!extension) |
604 extension = service->GetExtensionByWebExtent(params.source_url); | 607 extension = service->GetExtensionByWebExtent(params.source_url); |
605 | 608 |
606 scoped_refptr<ExtensionFunction> function( | 609 scoped_refptr<ExtensionFunction> function( |
607 CreateExtensionFunction(params, extension, | 610 CreateExtensionFunction(params, extension, |
608 render_view_host->process()->id(), | 611 render_view_host->process()->id(), |
609 *(service->process_map()), | 612 *(service->process_map()), |
610 profile(), render_view_host, | 613 profile(), render_view_host, |
611 render_view_host->routing_id())); | 614 render_view_host->routing_id())); |
612 if (!function) | 615 if (!function) |
(...skipping 30 matching lines...) Expand all Loading... | |
643 const extensions::ProcessMap& process_map, | 646 const extensions::ProcessMap& process_map, |
644 void* profile, | 647 void* profile, |
645 IPC::Message::Sender* ipc_sender, | 648 IPC::Message::Sender* ipc_sender, |
646 int routing_id) { | 649 int routing_id) { |
647 if (!extension) { | 650 if (!extension) { |
648 LOG(ERROR) << "Specified extension does not exist."; | 651 LOG(ERROR) << "Specified extension does not exist."; |
649 SendAccessDenied(ipc_sender, routing_id, params.request_id); | 652 SendAccessDenied(ipc_sender, routing_id, params.request_id); |
650 return NULL; | 653 return NULL; |
651 } | 654 } |
652 | 655 |
653 if (!process_map.Contains(extension->id(), requesting_process_id)) { | 656 if (!process_map.Contains(extension->id(), requesting_process_id)) |
Matt Perry
2011/11/11 20:07:19
did you mean to remove this?
Aaron Boodman
2011/11/11 23:12:02
Yes, merge failure. Thanks.
| |
657 return false; | |
658 | |
659 if (!ExtensionAPI::GetInstance()->IsFullNameUnprivileged(params.name) && | |
660 !process_map.Contains(extension->id(), requesting_process_id)) { | |
654 LOG(ERROR) << "Extension API called from incorrect process " | 661 LOG(ERROR) << "Extension API called from incorrect process " |
655 << requesting_process_id | 662 << requesting_process_id |
656 << " from URL " << params.source_url.spec(); | 663 << " from URL " << params.source_url.spec(); |
657 SendAccessDenied(ipc_sender, routing_id, params.request_id); | 664 SendAccessDenied(ipc_sender, routing_id, params.request_id); |
658 return NULL; | 665 return NULL; |
659 } | 666 } |
660 | 667 |
661 if (!extension->HasAPIPermission(params.name)) { | 668 if (!extension->HasAPIPermission(params.name)) { |
662 LOG(ERROR) << "Extension " << extension->id() << " does not have " | 669 LOG(ERROR) << "Extension " << extension->id() << " does not have " |
663 << "permission to function: " << params.name; | 670 << "permission to function: " << params.name; |
(...skipping 13 matching lines...) Expand all Loading... | |
677 return function; | 684 return function; |
678 } | 685 } |
679 | 686 |
680 // static | 687 // static |
681 void ExtensionFunctionDispatcher::SendAccessDenied( | 688 void ExtensionFunctionDispatcher::SendAccessDenied( |
682 IPC::Message::Sender* ipc_sender, int routing_id, int request_id) { | 689 IPC::Message::Sender* ipc_sender, int routing_id, int request_id) { |
683 ipc_sender->Send(new ExtensionMsg_Response( | 690 ipc_sender->Send(new ExtensionMsg_Response( |
684 routing_id, request_id, false, std::string(), | 691 routing_id, request_id, false, std::string(), |
685 "Access to extension API denied.")); | 692 "Access to extension API denied.")); |
686 } | 693 } |
OLD | NEW |