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

Side by Side Diff: chrome/common/secure_origin_whitelist.cc

Issue 1383483007: Add scheme exceptions for isSecureContext (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: Simplify LoadExtension call Created 5 years, 2 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 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "chrome/common/secure_origin_whitelist.h" 5 #include "chrome/common/secure_origin_whitelist.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/strings/string_split.h" 10 #include "base/strings/string_split.h"
11 #include "chrome/common/chrome_switches.h" 11 #include "chrome/common/chrome_switches.h"
12 #include "extensions/common/constants.h"
12 13
13 void GetSecureOriginWhitelist(std::set<GURL>* origins) { 14 void GetSecureOriginWhitelist(std::set<GURL>* origins) {
14 // If kUnsafelyTreatInsecureOriginAsSecure option is given and 15 // If kUnsafelyTreatInsecureOriginAsSecure option is given and
15 // kUserDataDir is present, add the given origins as trustworthy 16 // kUserDataDir is present, add the given origins as trustworthy
16 // for whitelisting. 17 // for whitelisting.
17 const base::CommandLine& command_line = 18 const base::CommandLine& command_line =
18 *base::CommandLine::ForCurrentProcess(); 19 *base::CommandLine::ForCurrentProcess();
19 if (command_line.HasSwitch(switches::kUnsafelyTreatInsecureOriginAsSecure) && 20 if (command_line.HasSwitch(switches::kUnsafelyTreatInsecureOriginAsSecure) &&
20 command_line.HasSwitch(switches::kUserDataDir)) { 21 command_line.HasSwitch(switches::kUserDataDir)) {
21 std::string origins_str = command_line.GetSwitchValueASCII( 22 std::string origins_str = command_line.GetSwitchValueASCII(
22 switches::kUnsafelyTreatInsecureOriginAsSecure); 23 switches::kUnsafelyTreatInsecureOriginAsSecure);
23 for (const std::string& origin : base::SplitString( 24 for (const std::string& origin : base::SplitString(
24 origins_str, ",", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL)) 25 origins_str, ",", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL))
25 origins->insert(GURL(origin)); 26 origins->insert(GURL(origin));
26 } 27 }
27 } 28 }
29
30 void GetSchemesBypassingSecureContextCheckWhitelist(
31 std::set<std::string>* schemes) {
32 schemes->insert(extensions::kExtensionScheme);
33 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698