content/public/browser/navigation_controller.h - Issue 10544175: Add an ability to call WebKit's WebFrame::loadData via NavigationController.

Side by Side Diff: content/public/browser/navigation_controller.h

Issue 10544175: Add an ability to call WebKit's WebFrame::loadData via NavigationController. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Updated comments Created 8 years, 6 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 | Annotate | Revision Log

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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 #ifndef CONTENT_PUBLIC_BROWSER_NAVIGATION_CONTROLLER_H_	5 #ifndef CONTENT_PUBLIC_BROWSER_NAVIGATION_CONTROLLER_H_

6 #define CONTENT_PUBLIC_BROWSER_NAVIGATION_CONTROLLER_H_	6 #define CONTENT_PUBLIC_BROWSER_NAVIGATION_CONTROLLER_H_

7 #pragma once	7 #pragma once

8	8

9 #include <string>	9 #include <string>

10 #include <vector>	10 #include <vector>

(...skipping 149 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
160 PageTransition type,	160 PageTransition type,

161 const std::string& extra_headers) = 0;	161 const std::string& extra_headers) = 0;

162	162

163 // Same as LoadURL, but for renderer-initiated navigations. This state is	163 // Same as LoadURL, but for renderer-initiated navigations. This state is

164 // important for tracking whether to display pending URLs.	164 // important for tracking whether to display pending URLs.

165 virtual void LoadURLFromRenderer(const GURL& url,	165 virtual void LoadURLFromRenderer(const GURL& url,

166 const Referrer& referrer,	166 const Referrer& referrer,

167 PageTransition type,	167 PageTransition type,

168 const std::string& extra_headers) = 0;	168 const std::string& extra_headers) = 0;

169	169

	170 // Loads a 'data:' scheme URL with specified base URL and a history entry URL.
	Charlie Reis 2012/06/18 18:34:29 "history entry URL" isn't clear to me. It appears "history entry URL" isn't clear to me. It appears you're using this for the virtual URL that gets displayed in the omnibox. Perhaps display_url? Also, please note in the comment that this can only be used for browser-initiated navigations. mnaganov (inactive) 2012/06/19 12:52:32 A comment added. This URL isn't only displayed in Show quoted text On 2012/06/18 18:34:29, creis wrote: > "history entry URL" isn't clear to me. It appears you're using this for the > virtual URL that gets displayed in the omnibox. Perhaps display_url? > > Also, please note in the comment that this can only be used for > browser-initiated navigations. A comment added. This URL isn't only displayed in the omnibox, it is actually used when the client calls NavigationController::goBack. You can see it yourself. This is a small patch for the content shell to use the new method: http://pastebin.com/fACmV2gh If you run patched shell like this: ./content_shell 'data:text/html,<html><body>Hello, World!</body></html>' about:blank http://www.google.com you'll see a "Hello, World!" page with google.com URL in the address bar. Then if you'll navigate to some other page, and then press the "Go back" button, you'll get to google.com page. This is the intended behavior, what Android's WebView.loadDataWithBaseURL does. I'm not sure how this is exactly implemented in WebKit, I only know that the backwards navigation backwards goes through WebFrame::loadHistoryItem and it seems to do the right thing. Charlie Reis 2012/06/19 17:17:24 Hmm. The name is fine, then, but this does scare Show quoted text On 2012/06/19 12:52:32, Mikhail Naganov (Chromium) wrote: > This URL isn't only displayed in the omnibox, it is actually used when the > client calls NavigationController::goBack. > > You can see it yourself. This is a small patch for the content shell to use the > new method: http://pastebin.com/fACmV2gh > > If you run patched shell like this: > > ./content_shell 'data:text/html,<html><body>Hello, World!</body></html>' > about:blank http://www.google.com > > you'll see a "Hello, World!" page with http://google.com URL in the address bar. Then > if you'll navigate to some other page, and then press the "Go back" button, > you'll get to http://google.com page. This is the intended behavior, what Android's > WebView.loadDataWithBaseURL does. > > I'm not sure how this is exactly implemented in WebKit, I only know that the > backwards navigation backwards goes through WebFrame::loadHistoryItem and it > seems to do the right thing. Hmm. The name is fine, then, but this does scare me. This is a recipe for URL spoof vulnerabilities if used improperly. What can we do to enforce that "history_url" can't be misused? Can we put a CHECK into RenderViewHostImpl::Navigate that params.history_url_for_data is only present if params.url has a data scheme? More importantly, are there any limitations on what can be put into history_url? (I'm quite uncomfortable with putting up fake content for arbitrary URLs like http://www.google.com.) Charlie Reis 2012/07/03 17:54:37 Thanks, I see that you added a check for params.ur Show quoted text On 2012/06/19 17:17:24, creis wrote: > Hmm. The name is fine, then, but this does scare me. This is a recipe for URL > spoof vulnerabilities if used improperly. > > What can we do to enforce that "history_url" can't be misused? Can we put a > CHECK into RenderViewHostImpl::Navigate that params.history_url_for_data is only > present if params.url has a data scheme? Thanks, I see that you added a check for params.url having a data scheme. Show quoted text > More importantly, are there any limitations on what can be put into history_url? > (I'm quite uncomfortable with putting up fake content for arbitrary URLs like > http://www.google.com.) What about this part? I'm still concerned about showing fake content for otherwise trusted web URLs. At the moment, it looks like this could even be used to spoof HTTPS URLs.
	171 virtual void LoadDataWithBaseURL(const GURL& data_url,

	172 const Referrer& referrer,

	173 const GURL& base_url,

	174 const GURL& history_url,

	175 bool is_overriding_user_agent) = 0;

	176

170 // Behaves like LoadURL() and LoadURLFromRenderer() but marks the new	177 // Behaves like LoadURL() and LoadURLFromRenderer() but marks the new

171 // navigation as being transferred from one RVH to another. In this case the	178 // navigation as being transferred from one RVH to another. In this case the

172 // browser can recycle the old request once the new renderer wants to	179 // browser can recycle the old request once the new renderer wants to

173 // navigate.	180 // navigate.

174 // \|transferred_global_request_id\| identifies the request ID of the old	181 // \|transferred_global_request_id\| identifies the request ID of the old

175 // request.	182 // request.

176 virtual void TransferURL(	183 virtual void TransferURL(

177 const GURL& url,	184 const GURL& url,

178 const Referrer& referrer,	185 const Referrer& referrer,

179 PageTransition transition,	186 PageTransition transition,

(...skipping 80 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
260 virtual void CopyStateFromAndPrune(NavigationController* source) = 0;	267 virtual void CopyStateFromAndPrune(NavigationController* source) = 0;

261	268

262 // Removes all the entries except the active entry. If there is a new pending	269 // Removes all the entries except the active entry. If there is a new pending

263 // navigation it is preserved.	270 // navigation it is preserved.

264 virtual void PruneAllButActive() = 0;	271 virtual void PruneAllButActive() = 0;

265 };	272 };

266	273

267 } // namespace content	274 } // namespace content

268	275

269 #endif // CONTENT_PUBLIC_BROWSER_NAVIGATION_CONTROLLER_H_	276 #endif // CONTENT_PUBLIC_BROWSER_NAVIGATION_CONTROLLER_H_

OLD	NEW

« content/common/view_messages.h ('K') | « content/common/view_messages.h ('k') | content/public/browser/navigation_entry.h » ('j') | content/public/browser/navigation_entry.h » ('J')