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

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

Issue 1010893003: Upgrade insecure requests: Pipe navigational hosts down into nested documents. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase. Created 5 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 | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserv ed. 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserv ed.
3 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 3 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
4 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 4 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
5 * Copyright (C) 2008 Alp Toker <alp@atoker.com> 5 * Copyright (C) 2008 Alp Toker <alp@atoker.com>
6 * Copyright (C) Research In Motion Limited 2009. All rights reserved. 6 * Copyright (C) Research In Motion Limited 2009. All rights reserved.
7 * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com> 7 * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com>
8 * Copyright (C) 2011 Google Inc. All rights reserved. 8 * Copyright (C) 2011 Google Inc. All rights reserved.
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
(...skipping 1402 matching lines...) Expand 10 before | Expand all | Expand 10 after
1413 return SecurityContext::InsecureRequestsDoNotUpgrade; 1413 return SecurityContext::InsecureRequestsDoNotUpgrade;
1414 1414
1415 // FIXME: We need a way to propagate insecure requests policy flags to 1415 // FIXME: We need a way to propagate insecure requests policy flags to
1416 // out-of-process frames. For now, we'll always use default behavior. 1416 // out-of-process frames. For now, we'll always use default behavior.
1417 if (!parentFrame->isLocalFrame()) 1417 if (!parentFrame->isLocalFrame())
1418 return SecurityContext::InsecureRequestsDoNotUpgrade; 1418 return SecurityContext::InsecureRequestsDoNotUpgrade;
1419 1419
1420 return toLocalFrame(parentFrame)->document()->insecureRequestsPolicy(); 1420 return toLocalFrame(parentFrame)->document()->insecureRequestsPolicy();
1421 } 1421 }
1422 1422
1423 SecurityContext::InsecureNavigationsSet* FrameLoader::insecureNavigationsToUpgra de() const
1424 {
1425 Frame* parentFrame = m_frame->tree().parent();
Yoav Weiss 2015/03/17 15:17:28 ASSERT for m_frame? (although the rest of the file
Mike West 2015/03/18 09:31:53 Done.
1426 if (!parentFrame)
1427 return nullptr;
1428
1429 // FIXME: We need a way to propagate insecure requests policy flags to
1430 // out-of-process frames. For now, we'll always use default behavior.
1431 if (!parentFrame->isLocalFrame())
1432 return nullptr;
1433
1434 return toLocalFrame(parentFrame)->document()->insecureNavigationsToUpgrade() ;
Yoav Weiss 2015/03/17 15:17:28 are we sure the parent frame has a doc?
Mike West 2015/03/18 09:31:53 If the parent frame didn't have a doc, it wouldn't
1435 }
1436
1423 } // namespace blink 1437 } // namespace blink
OLDNEW
« Source/core/frame/csp/ContentSecurityPolicy.cpp ('K') | « Source/core/loader/FrameLoader.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698