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

Side by Side Diff: mojo/shell/application_instance.cc

Issue 1244233002: Allow trusted brokers to restrict connections for spawned applications to whitelisted applications … (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 5 years, 5 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "mojo/shell/application_instance.h" 5 #include "mojo/shell/application_instance.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/stl_util.h" 8 #include "base/stl_util.h"
9 #include "mojo/application/public/interfaces/content_handler.mojom.h" 9 #include "mojo/application/public/interfaces/content_handler.mojom.h"
10 #include "mojo/common/common_type_converters.h" 10 #include "mojo/common/common_type_converters.h"
11 #include "mojo/common/url_type_converters.h" 11 #include "mojo/common/url_type_converters.h"
12 #include "mojo/shell/application_manager.h" 12 #include "mojo/shell/application_manager.h"
13 13
14 namespace mojo { 14 namespace mojo {
15 namespace shell { 15 namespace shell {
16 16
17 ApplicationInstance::QueuedClientRequest::QueuedClientRequest() { 17 ApplicationInstance::QueuedClientRequest::QueuedClientRequest() {
18 } 18 }
19 19
20 ApplicationInstance::QueuedClientRequest::~QueuedClientRequest() { 20 ApplicationInstance::QueuedClientRequest::~QueuedClientRequest() {
21 } 21 }
22 22
23 ApplicationInstance::ApplicationInstance( 23 ApplicationInstance::ApplicationInstance(
24 ApplicationPtr application, 24 ApplicationPtr application,
25 ApplicationManager* manager, 25 ApplicationManager* manager,
26 const Identity& identity, 26 const Identity& identity,
27 const CapabilityFilter& filter,
27 const base::Closure& on_application_end) 28 const base::Closure& on_application_end)
28 : manager_(manager), 29 : manager_(manager),
29 identity_(identity), 30 identity_(identity),
31 filter_(filter),
30 on_application_end_(on_application_end), 32 on_application_end_(on_application_end),
31 application_(application.Pass()), 33 application_(application.Pass()),
32 binding_(this), 34 binding_(this),
33 queue_requests_(false) { 35 queue_requests_(false) {
34 binding_.set_connection_error_handler([this]() { OnConnectionError(); }); 36 binding_.set_connection_error_handler([this]() { OnConnectionError(); });
35 } 37 }
36 38
37 ApplicationInstance::~ApplicationInstance() { 39 ApplicationInstance::~ApplicationInstance() {
38 STLDeleteElements(&queued_client_requests_); 40 STLDeleteElements(&queued_client_requests_);
39 } 41 }
40 42
41 void ApplicationInstance::InitializeApplication() { 43 void ApplicationInstance::InitializeApplication() {
42 ShellPtr shell; 44 ShellPtr shell;
43 binding_.Bind(GetProxy(&shell)); 45 binding_.Bind(GetProxy(&shell));
44 application_->Initialize(shell.Pass(), identity_.url.spec()); 46 application_->Initialize(shell.Pass(), identity_.url.spec());
45 } 47 }
46 48
47 void ApplicationInstance::ConnectToClient( 49 void ApplicationInstance::ConnectToClient(
50 ApplicationInstance* originator,
48 const GURL& requested_url, 51 const GURL& requested_url,
49 const GURL& requestor_url, 52 const GURL& requestor_url,
50 InterfaceRequest<ServiceProvider> services, 53 InterfaceRequest<ServiceProvider> services,
51 ServiceProviderPtr exposed_services) { 54 ServiceProviderPtr exposed_services,
55 CapabilityFilterPtr filter) {
52 if (queue_requests_) { 56 if (queue_requests_) {
53 QueuedClientRequest* queued_request = new QueuedClientRequest; 57 QueuedClientRequest* queued_request = new QueuedClientRequest;
58 queued_request->originator = originator;
54 queued_request->requested_url = requested_url; 59 queued_request->requested_url = requested_url;
55 queued_request->requestor_url = requestor_url; 60 queued_request->requestor_url = requestor_url;
56 queued_request->services = services.Pass(); 61 queued_request->services = services.Pass();
57 queued_request->exposed_services = exposed_services.Pass(); 62 queued_request->exposed_services = exposed_services.Pass();
63 queued_request->filter = filter.Pass(),
58 queued_client_requests_.push_back(queued_request); 64 queued_client_requests_.push_back(queued_request);
59 return; 65 return;
60 } 66 }
61 67
62 application_->AcceptConnection(requestor_url.spec(), services.Pass(), 68 CallAcceptConnection(originator, requestor_url, services.Pass(),
63 exposed_services.Pass(), requested_url.spec()); 69 exposed_services.Pass(), requested_url);
70 }
71
72 ApplicationInstance::AllowedInterfaces
73 ApplicationInstance::GetAllowedInterfaces(
74 const Identity& identity) const {
75 auto it = filter_.find(identity.url.spec());
76 return it != filter_.end() ? it->second : AllowedInterfaces();
64 } 77 }
65 78
66 // Shell implementation: 79 // Shell implementation:
67 void ApplicationInstance::ConnectToApplication( 80 void ApplicationInstance::ConnectToApplication(
68 mojo::URLRequestPtr app_request, 81 URLRequestPtr app_request,
69 InterfaceRequest<ServiceProvider> services, 82 InterfaceRequest<ServiceProvider> services,
70 ServiceProviderPtr exposed_services) { 83 ServiceProviderPtr exposed_services,
71 GURL app_gurl(app_request->url.To<std::string>()); 84 CapabilityFilterPtr filter) {
72 if (!app_gurl.is_valid()) { 85 std::string url_string = app_request->url.To<std::string>();
73 LOG(ERROR) << "Error: invalid URL: " << app_request; 86 if (!GURL(url_string).is_valid()) {
87 LOG(ERROR) << "Error: invalid URL: " << url_string;
74 return; 88 return;
75 } 89 }
76 manager_->ConnectToApplication(app_request.Pass(), std::string(), 90 if (filter_.empty() || filter_.find(url_string) != filter_.end()) {
77 identity_.url, services.Pass(), 91 manager_->ConnectToApplication(this, app_request.Pass(), std::string(),
78 exposed_services.Pass(), base::Closure()); 92 identity_.url, services.Pass(),
93 exposed_services.Pass(), filter.Pass(),
94 base::Closure());
95 } else {
96 DVLOG(2) << "CapabilityFilter prevented connection to: " << url_string;
97 }
79 } 98 }
80 99
81 void ApplicationInstance::QuitApplication() { 100 void ApplicationInstance::QuitApplication() {
82 queue_requests_ = true; 101 queue_requests_ = true;
83 application_->OnQuitRequested( 102 application_->OnQuitRequested(
84 base::Bind(&ApplicationInstance::OnQuitRequestedResult, 103 base::Bind(&ApplicationInstance::OnQuitRequestedResult,
85 base::Unretained(this))); 104 base::Unretained(this)));
86 } 105 }
87 106
107 void ApplicationInstance::CallAcceptConnection(
108 ApplicationInstance* originator,
109 const GURL& requestor_url,
110 InterfaceRequest<ServiceProvider> services,
111 ServiceProviderPtr exposed_services,
112 const GURL& requested_url) {
113 AllowedInterfaces interfaces;
114 if (originator)
115 interfaces = originator->GetAllowedInterfaces(identity_);
116 application_->AcceptConnection(requestor_url.spec(),
117 services.Pass(),
118 exposed_services.Pass(),
119 Array<String>::From(interfaces).Pass(),
120 requested_url.spec());
121 }
122
88 void ApplicationInstance::OnConnectionError() { 123 void ApplicationInstance::OnConnectionError() {
89 std::vector<QueuedClientRequest*> queued_client_requests; 124 std::vector<QueuedClientRequest*> queued_client_requests;
90 queued_client_requests_.swap(queued_client_requests); 125 queued_client_requests_.swap(queued_client_requests);
91 auto manager = manager_; 126 auto manager = manager_;
92 manager_->OnApplicationInstanceError(this); 127 manager_->OnApplicationInstanceError(this);
93 //|this| is deleted. 128 //|this| is deleted.
94 129
95 // If any queued requests came to shell during time it was shutting down, 130 // If any queued requests came to shell during time it was shutting down,
96 // start them now. 131 // start them now.
97 for (auto request : queued_client_requests) { 132 for (auto request : queued_client_requests) {
98 mojo::URLRequestPtr url(mojo::URLRequest::New()); 133 mojo::URLRequestPtr url(mojo::URLRequest::New());
99 url->url = mojo::String::From(request->requested_url.spec()); 134 url->url = mojo::String::From(request->requested_url.spec());
100 manager->ConnectToApplication(url.Pass(), std::string(), 135 manager->ConnectToApplication(this, url.Pass(), std::string(),
101 request->requestor_url, 136 request->requestor_url,
102 request->services.Pass(), 137 request->services.Pass(),
103 request->exposed_services.Pass(), 138 request->exposed_services.Pass(),
139 request->filter.Pass(),
104 base::Closure()); 140 base::Closure());
105 } 141 }
106 STLDeleteElements(&queued_client_requests); 142 STLDeleteElements(&queued_client_requests);
107 } 143 }
108 144
109 void ApplicationInstance::OnQuitRequestedResult(bool can_quit) { 145 void ApplicationInstance::OnQuitRequestedResult(bool can_quit) {
110 if (can_quit) 146 if (can_quit)
111 return; 147 return;
112 148
113 queue_requests_ = false; 149 queue_requests_ = false;
114 for (auto request : queued_client_requests_) { 150 for (auto request : queued_client_requests_) {
115 application_->AcceptConnection(request->requestor_url.spec(), 151 CallAcceptConnection(request->originator,
116 request->services.Pass(), 152 request->requestor_url,
117 request->exposed_services.Pass(), 153 request->services.Pass(),
118 request->requested_url.spec()); 154 request->exposed_services.Pass(),
155 request->requested_url);
119 } 156 }
120 STLDeleteElements(&queued_client_requests_); 157 STLDeleteElements(&queued_client_requests_);
121 } 158 }
122 159
123 } // namespace shell 160 } // namespace shell
124 } // namespace mojo 161 } // namespace mojo
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698