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

Side by Side Diff: third_party/WebKit/Source/core/loader/FrameLoader.cpp

Issue 2689653003: PlzNavigate: Enforce 'form-action' CSP on the browser-side. (Closed)
Patch Set: Rebase. Created 3 years, 9 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 /* 1 /*
2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights
3 * reserved. 3 * reserved.
4 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 4 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
5 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. 5 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
6 * (http://www.torchmobile.com/) 6 * (http://www.torchmobile.com/)
7 * Copyright (C) 2008 Alp Toker <alp@atoker.com> 7 * Copyright (C) 2008 Alp Toker <alp@atoker.com>
8 * Copyright (C) Research In Motion Limited 2009. All rights reserved. 8 * Copyright (C) Research In Motion Limited 2009. All rights reserved.
9 * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com> 9 * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com>
10 * Copyright (C) 2011 Google Inc. All rights reserved. 10 * Copyright (C) 2011 Google Inc. All rights reserved.
(...skipping 1675 matching lines...) Expand 10 before | Expand all | Expand 10 after
1686 m_frame->document()->enforceSandboxFlags(SandboxOrigin); 1686 m_frame->document()->enforceSandboxFlags(SandboxOrigin);
1687 m_frame->owner()->dispatchLoad(); 1687 m_frame->owner()->dispatchLoad();
1688 return NavigationPolicyIgnore; 1688 return NavigationPolicyIgnore;
1689 } 1689 }
1690 } 1690 }
1691 } 1691 }
1692 1692
1693 bool isFormSubmission = type == NavigationTypeFormSubmitted || 1693 bool isFormSubmission = type == NavigationTypeFormSubmitted ||
1694 type == NavigationTypeFormResubmitted; 1694 type == NavigationTypeFormResubmitted;
1695 if (isFormSubmission && 1695 if (isFormSubmission &&
1696 // 'form-action' check in the frame that is navigating is disabled on the
1697 // renderer side when PlzNavigate is enabled, but is enforced on the
1698 // browser side instead.
1699 // N.B. check in the frame that initiates the navigation stills occurs in
1700 // blink and is not enforced on the browser-side.
1701 // TODO(arthursonzogni) The 'form-action' check should be fully disabled
1702 // in blink when browser side navigation is enabled, except when the form
1703 // submission doesn't trigger a navigation(i.e. javascript urls). Please
1704 // see https://crbug.com/701749
1705 !browserSideNavigationEnabled &&
1696 !m_frame->document()->contentSecurityPolicy()->allowFormAction( 1706 !m_frame->document()->contentSecurityPolicy()->allowFormAction(
1697 request.url(), request.redirectStatus())) { 1707 request.url(), request.redirectStatus())) {
1698 return NavigationPolicyIgnore; 1708 return NavigationPolicyIgnore;
1699 } 1709 }
1700 1710
1701 bool replacesCurrentHistoryItem = 1711 bool replacesCurrentHistoryItem =
1702 frameLoadType == FrameLoadTypeReplaceCurrentItem; 1712 frameLoadType == FrameLoadTypeReplaceCurrentItem;
1703 policy = client()->decidePolicyForNavigation( 1713 policy = client()->decidePolicyForNavigation(
1704 request, loader, type, policy, replacesCurrentHistoryItem, 1714 request, loader, type, policy, replacesCurrentHistoryItem,
1705 isClientRedirect, form, shouldCheckMainWorldContentSecurityPolicy); 1715 isClientRedirect, form, shouldCheckMainWorldContentSecurityPolicy);
(...skipping 322 matching lines...) Expand 10 before | Expand all | Expand 10 after
2028 frameLoadRequest.clientRedirect()); 2038 frameLoadRequest.clientRedirect());
2029 2039
2030 loader->setLoadType(loadType); 2040 loader->setLoadType(loadType);
2031 loader->setNavigationType(navigationType); 2041 loader->setNavigationType(navigationType);
2032 loader->setReplacesCurrentHistoryItem(loadType == 2042 loader->setReplacesCurrentHistoryItem(loadType ==
2033 FrameLoadTypeReplaceCurrentItem); 2043 FrameLoadTypeReplaceCurrentItem);
2034 return loader; 2044 return loader;
2035 } 2045 }
2036 2046
2037 } // namespace blink 2047 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/form-action-src-get-blocked-with-redirect-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698