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

Unified Diff: content/browser/manifest/manifest_manager_host.cc

Issue 537053002: Implement ManifestManager to handle manifest in content/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@manifest_fetcher
Patch Set: ipc security comments Created 6 years, 3 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 side-by-side diff with in-line comments
Download patch
Index: content/browser/manifest/manifest_manager_host.cc
diff --git a/content/browser/manifest/manifest_manager_host.cc b/content/browser/manifest/manifest_manager_host.cc
new file mode 100644
index 0000000000000000000000000000000000000000..ca65709a163dfd763dbf6a1761f12a00956789a3
--- /dev/null
+++ b/content/browser/manifest/manifest_manager_host.cc
@@ -0,0 +1,104 @@
+// Copyright 2014 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 "content/browser/manifest/manifest_manager_host.h"
+
+#include "content/common/manifest_manager_messages.h"
+#include "content/public/browser/render_frame_host.h"
+#include "content/public/common/manifest.h"
+
+namespace content {
+
+ManifestManagerHost::ManifestManagerHost(WebContents* web_contents)
+ : WebContentsObserver(web_contents) {
+}
+
+ManifestManagerHost::~ManifestManagerHost() {
+}
+
+ManifestManagerHost::CallbackMap* ManifestManagerHost::GetCallbackMapForFrame(
+ RenderFrameHost* render_frame_host) {
+ FrameCallbackMap::iterator it = pending_callbacks_.find(render_frame_host);
+ return it != pending_callbacks_.end() ? it->second : 0;
+}
+
+void ManifestManagerHost::RenderFrameDeleted(
+ RenderFrameHost* render_frame_host) {
+ CallbackMap* callbacks = GetCallbackMapForFrame(render_frame_host);
+ if (!callbacks)
+ return;
+
+ // Before deleting the callbacks, make sure they are called with a failure
+ // state.
+ CallbackMap::const_iterator it(callbacks);
+ for (; !it.IsAtEnd(); it.Advance())
+ it.GetCurrentValue()->Run(Manifest());
+
+ pending_callbacks_.erase(render_frame_host);
+}
+
+void ManifestManagerHost::GetManifest(RenderFrameHost* render_frame_host,
+ const GetManifestCallback& callback) {
+ CallbackMap* callbacks = GetCallbackMapForFrame(render_frame_host);
+ if (!callbacks) {
+ callbacks = new CallbackMap();
+ pending_callbacks_[render_frame_host] = callbacks;
+ }
+
+ int request_id = callbacks->Add(new GetManifestCallback(callback));
+
+ render_frame_host->Send(new ManifestManagerMsg_RequestManifest(
+ render_frame_host->GetRoutingID(), request_id));
+}
+
+bool ManifestManagerHost::OnMessageReceived(
+ const IPC::Message& message, RenderFrameHost* render_frame_host) {
+ bool handled = true;
+
+ IPC_BEGIN_MESSAGE_MAP_WITH_PARAM(ManifestManagerHost, message,
+ render_frame_host)
+ IPC_MESSAGE_HANDLER(ManifestManagerHostMsg_RequestManifestResponse,
+ OnRequestManifestResponse)
+ IPC_MESSAGE_UNHANDLED(handled = false)
+ IPC_END_MESSAGE_MAP()
+
+ return handled;
+}
+
+void ManifestManagerHost::OnRequestManifestResponse(
+ RenderFrameHost* render_frame_host,
+ int request_id,
+ const Manifest& insecure_manifest) {
+ CallbackMap* callbacks = GetCallbackMapForFrame(render_frame_host);
+ if (!callbacks) {
+ LOG(ERROR) << "Unexpected ManifestResponse to RenderFrameHost.";
jochen (gone - plz use gerrit) 2014/09/16 14:41:39 DVLOG(1) should be enough
mlamouri (slow - plz ping) 2014/09/16 15:32:36 Done.
+ return;
+ }
+
+ GetManifestCallback* callback = callbacks->Lookup(request_id);
+ if (!callback) {
+ LOG(ERROR) << "Received a request_id (" << request_id << ") from renderer "
jochen (gone - plz use gerrit) 2014/09/16 14:41:39 DVLOG(1). Also kill the renderer because an invali
mlamouri (slow - plz ping) 2014/09/16 15:32:36 Done. I've added some code to kill the renderer in
+ "with no associated callback.";
+ return;
+ }
+
+ // When receiving a Manifest, the browser process can't trust that it is
+ // coming from a known and secure source. It must be processed accordingly.
+ Manifest manifest = insecure_manifest;
+ manifest.name = base::NullableString16(
+ manifest.name.string().substr(0, Manifest::kMaxIPCStringLength),
+ manifest.name.is_null());
+ manifest.short_name = base::NullableString16(
+ manifest.short_name.string().substr(0, Manifest::kMaxIPCStringLength),
+ manifest.short_name.is_null());
+
+ callback->Run(manifest);
+ callbacks->Remove(request_id);
+ if (callbacks->IsEmpty()) {
+ delete callbacks;
+ pending_callbacks_.erase(render_frame_host);
+ }
+}
+
+} // namespace content

Powered by Google App Engine
This is Rietveld 408576698