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

Side by Side Diff: third_party/WebKit/Source/core/dom/Document.cpp

Issue 1507023004: Harden the implementation of '--disable-web-security' (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: esprehn feedback 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) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2001 Dirk Mueller (mueller@kde.org) 4 * (C) 2001 Dirk Mueller (mueller@kde.org)
5 * (C) 2006 Alexey Proskuryakov (ap@webkit.org) 5 * (C) 2006 Alexey Proskuryakov (ap@webkit.org)
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All r ights reserved. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All r ights reserved.
7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
8 * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved. 8 * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved.
9 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) 9 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
10 * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved. 10 * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved.
(...skipping 4785 matching lines...) Expand 10 before | Expand all | Expand 10 after
4796 } 4796 }
4797 4797
4798 if (Settings* settings = initializer.settings()) { 4798 if (Settings* settings = initializer.settings()) {
4799 if (!settings->webSecurityEnabled()) { 4799 if (!settings->webSecurityEnabled()) {
4800 // Web security is turned off. We should let this document access ev ery other document. This is used primary by testing 4800 // Web security is turned off. We should let this document access ev ery other document. This is used primary by testing
4801 // harnesses for web sites. 4801 // harnesses for web sites.
4802 securityOrigin()->grantUniversalAccess(); 4802 securityOrigin()->grantUniversalAccess();
4803 } else if (securityOrigin()->isLocal()) { 4803 } else if (securityOrigin()->isLocal()) {
4804 if (settings->allowUniversalAccessFromFileURLs()) { 4804 if (settings->allowUniversalAccessFromFileURLs()) {
4805 // Some clients want local URLs to have universal access, but th at setting is dangerous for other clients. 4805 // Some clients want local URLs to have universal access, but th at setting is dangerous for other clients.
4806 securityOrigin()->grantUniversalAccess(); 4806 securityOrigin()->grantUniversalAccessForFileOrigins();
4807 } else if (!settings->allowFileAccessFromFileURLs()) { 4807 } else if (!settings->allowFileAccessFromFileURLs()) {
4808 // Some clients do not want local URLs to have access to other l ocal URLs. 4808 // Some clients do not want local URLs to have access to other l ocal URLs.
4809 securityOrigin()->blockLocalAccessFromLocalOrigin(); 4809 securityOrigin()->blockLocalAccessFromLocalOrigin();
4810 } 4810 }
4811 } 4811 }
4812 } 4812 }
4813 4813
4814 if (initializer.shouldTreatURLAsSrcdocDocument()) { 4814 if (initializer.shouldTreatURLAsSrcdocDocument()) {
4815 m_isSrcdocDocument = true; 4815 m_isSrcdocDocument = true;
4816 setBaseURLOverride(initializer.parentBaseURL()); 4816 setBaseURLOverride(initializer.parentBaseURL());
(...skipping 1021 matching lines...) Expand 10 before | Expand all | Expand 10 after
5838 #ifndef NDEBUG 5838 #ifndef NDEBUG
5839 using namespace blink; 5839 using namespace blink;
5840 void showLiveDocumentInstances() 5840 void showLiveDocumentInstances()
5841 { 5841 {
5842 Document::WeakDocumentSet& set = Document::liveDocumentSet(); 5842 Document::WeakDocumentSet& set = Document::liveDocumentSet();
5843 fprintf(stderr, "There are %u documents currently alive:\n", set.size()); 5843 fprintf(stderr, "There are %u documents currently alive:\n", set.size());
5844 for (Document* document : set) 5844 for (Document* document : set)
5845 fprintf(stderr, "- Document %p URL: %s\n", document, document->url().str ing().utf8().data()); 5845 fprintf(stderr, "- Document %p URL: %s\n", document, document->url().str ing().utf8().data());
5846 } 5846 }
5847 #endif 5847 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698