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

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

Issue 1489253002: Plumb document's strict mixed content checking for RemoteFrames (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix Created 5 years 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 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 1495 matching lines...) Expand 10 before | Expand all | Expand 10 after
1506 flags |= parentFrame->securityContext()->sandboxFlags(); 1506 flags |= parentFrame->securityContext()->sandboxFlags();
1507 return flags; 1507 return flags;
1508 } 1508 }
1509 1509
1510 bool FrameLoader::shouldEnforceStrictMixedContentChecking() const 1510 bool FrameLoader::shouldEnforceStrictMixedContentChecking() const
1511 { 1511 {
1512 Frame* parentFrame = m_frame->tree().parent(); 1512 Frame* parentFrame = m_frame->tree().parent();
1513 if (!parentFrame) 1513 if (!parentFrame)
1514 return false; 1514 return false;
1515 1515
1516 // FIXME: We need a way to propagate strict mixed content checking flags to 1516 return parentFrame->shouldEnforceStrictMixedContentChecking();
1517 // out-of-process frames. For now, we'll always enforce.
1518 if (!parentFrame->isLocalFrame())
1519 return true;
1520
1521 ASSERT(toLocalFrame(parentFrame)->document());
1522 return toLocalFrame(parentFrame)->document()->shouldEnforceStrictMixedConten tChecking();
1523 } 1517 }
1524 1518
1525 SecurityContext::InsecureRequestsPolicy FrameLoader::insecureRequestsPolicy() co nst 1519 SecurityContext::InsecureRequestsPolicy FrameLoader::insecureRequestsPolicy() co nst
1526 { 1520 {
1527 Frame* parentFrame = m_frame->tree().parent(); 1521 Frame* parentFrame = m_frame->tree().parent();
1528 if (!parentFrame) 1522 if (!parentFrame)
1529 return SecurityContext::InsecureRequestsDoNotUpgrade; 1523 return SecurityContext::InsecureRequestsDoNotUpgrade;
1530 1524
1531 // FIXME: We need a way to propagate insecure requests policy flags to 1525 // FIXME: We need a way to propagate insecure requests policy flags to
1532 // out-of-process frames. For now, we'll always use default behavior. 1526 // out-of-process frames. For now, we'll always use default behavior.
(...skipping 14 matching lines...) Expand all
1547 // FIXME: We need a way to propagate insecure requests policy flags to 1541 // FIXME: We need a way to propagate insecure requests policy flags to
1548 // out-of-process frames. For now, we'll always use default behavior. 1542 // out-of-process frames. For now, we'll always use default behavior.
1549 if (!parentFrame->isLocalFrame()) 1543 if (!parentFrame->isLocalFrame())
1550 return nullptr; 1544 return nullptr;
1551 1545
1552 ASSERT(toLocalFrame(parentFrame)->document()); 1546 ASSERT(toLocalFrame(parentFrame)->document());
1553 return toLocalFrame(parentFrame)->document()->insecureNavigationsToUpgrade() ; 1547 return toLocalFrame(parentFrame)->document()->insecureNavigationsToUpgrade() ;
1554 } 1548 }
1555 1549
1556 } // namespace blink 1550 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698