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

Side by Side Diff: Source/core/frame/csp/CSPSourceList.cpp

Issue 184343002: Extract MediaListDirective and SourceListDirective from ContentSecurityPolicy. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Feedback Created 6 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
« no previous file with comments | « Source/core/frame/csp/CSPSourceList.h ('k') | Source/core/frame/csp/MediaListDirective.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #include "config.h" 5 #include "config.h"
6 #include "core/frame/csp/CSPSourceList.h" 6 #include "core/frame/csp/CSPSourceList.h"
7 7
8 #include "core/frame/ContentSecurityPolicy.h" 8 #include "core/frame/ContentSecurityPolicy.h"
9 #include "core/frame/csp/CSPSource.h" 9 #include "core/frame/csp/CSPSource.h"
10 #include "platform/ParsingUtilities.h" 10 #include "platform/ParsingUtilities.h"
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 CSPSourceList::CSPSourceList(ContentSecurityPolicy* policy, const String& direct iveName) 64 CSPSourceList::CSPSourceList(ContentSecurityPolicy* policy, const String& direct iveName)
65 : m_policy(policy) 65 : m_policy(policy)
66 , m_directiveName(directiveName) 66 , m_directiveName(directiveName)
67 , m_allowStar(false) 67 , m_allowStar(false)
68 , m_allowInline(false) 68 , m_allowInline(false)
69 , m_allowEval(false) 69 , m_allowEval(false)
70 , m_hashAlgorithmsUsed(0) 70 , m_hashAlgorithmsUsed(0)
71 { 71 {
72 } 72 }
73 73
74 bool CSPSourceList::matches(const KURL& url) 74 bool CSPSourceList::matches(const KURL& url) const
75 { 75 {
76 if (m_allowStar) 76 if (m_allowStar)
77 return true; 77 return true;
78 78
79 KURL effectiveURL = SecurityOrigin::shouldUseInnerURL(url) ? SecurityOrigin: :extractInnerURL(url) : url; 79 KURL effectiveURL = SecurityOrigin::shouldUseInnerURL(url) ? SecurityOrigin: :extractInnerURL(url) : url;
80 80
81 for (size_t i = 0; i < m_list.size(); ++i) { 81 for (size_t i = 0; i < m_list.size(); ++i) {
82 if (m_list[i].matches(effectiveURL)) 82 if (m_list[i].matches(effectiveURL))
83 return true; 83 return true;
84 } 84 }
(...skipping 422 matching lines...) Expand 10 before | Expand all | Expand 10 after
507 } 507 }
508 508
509 void CSPSourceList::addSourceHash(const ContentSecurityPolicyHashAlgorithm& algo rithm, const DigestValue& hash) 509 void CSPSourceList::addSourceHash(const ContentSecurityPolicyHashAlgorithm& algo rithm, const DigestValue& hash)
510 { 510 {
511 m_hashes.add(CSPHashValue(algorithm, hash)); 511 m_hashes.add(CSPHashValue(algorithm, hash));
512 m_hashAlgorithmsUsed |= algorithm; 512 m_hashAlgorithmsUsed |= algorithm;
513 } 513 }
514 514
515 515
516 } // namespace WebCore 516 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/frame/csp/CSPSourceList.h ('k') | Source/core/frame/csp/MediaListDirective.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698