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

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

Issue 2157363004: Fix SecureOriginWhiteListTest.UnsafelyTreatInsecureOriginAsSecure to not leak test state (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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
« no previous file with comments | « no previous file | content/common/origin_util.cc » ('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 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 "base/command_line.h" 5 #include "base/command_line.h"
6 #include "base/test/scoped_command_line.h"
6 #include "chrome/common/chrome_switches.h" 7 #include "chrome/common/chrome_switches.h"
7 #include "content/public/common/origin_util.h" 8 #include "content/public/common/origin_util.h"
8 #include "testing/gtest/include/gtest/gtest.h" 9 #include "testing/gtest/include/gtest/gtest.h"
9 #include "url/gurl.h" 10 #include "url/gurl.h"
10 11
11 using content::IsOriginSecure; 12 using content::IsOriginSecure;
12 13
13 namespace chrome { 14 namespace chrome {
14 15
15 TEST(SecureOriginWhiteList, UnsafelyTreatInsecureOriginAsSecure) { 16 class SecureOriginWhiteListTest : public testing::Test {
17 void TearDown() override {
18 // Ensure that we reset the whitelisted origins without any flags applied.
19 content::ResetSchemesAndOriginsWhitelistForTesting();
20 };
21 };
22
23 TEST_F(SecureOriginWhiteListTest, UnsafelyTreatInsecureOriginAsSecure) {
16 EXPECT_FALSE(content::IsOriginSecure(GURL("http://example.com/a.html"))); 24 EXPECT_FALSE(content::IsOriginSecure(GURL("http://example.com/a.html")));
17 EXPECT_FALSE( 25 EXPECT_FALSE(
18 content::IsOriginSecure(GURL("http://127.example.com/a.html"))); 26 content::IsOriginSecure(GURL("http://127.example.com/a.html")));
19
20 // Add http://example.com and http://127.example.com to whitelist by 27 // Add http://example.com and http://127.example.com to whitelist by
21 // command-line and see if they are now considered secure origins. 28 // command-line and see if they are now considered secure origins.
22 // (The command line is applied via 29 // (The command line is applied via
23 // ChromeContentClient::AddSecureSchemesAndOrigins) 30 // ChromeContentClient::AddSecureSchemesAndOrigins)
24 base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); 31 base::test::ScopedCommandLine scoped_command_line;
32 base::CommandLine* command_line = scoped_command_line.GetProcessCommandLine();
25 command_line->AppendSwitchASCII( 33 command_line->AppendSwitchASCII(
26 switches::kUnsafelyTreatInsecureOriginAsSecure, 34 switches::kUnsafelyTreatInsecureOriginAsSecure,
27 "http://example.com,http://127.example.com"); 35 "http://example.com,http://127.example.com");
28 command_line->AppendSwitch(switches::kUserDataDir); 36 command_line->AppendSwitch(switches::kUserDataDir);
29 content::ResetSchemesAndOriginsWhitelistForTesting(); 37 content::ResetSchemesAndOriginsWhitelistForTesting();
30 38
31 // They should be now white-listed. 39 // They should be now white-listed.
32 EXPECT_TRUE(content::IsOriginSecure(GURL("http://example.com/a.html"))); 40 EXPECT_TRUE(content::IsOriginSecure(GURL("http://example.com/a.html")));
33 EXPECT_TRUE(content::IsOriginSecure(GURL("http://127.example.com/a.html"))); 41 EXPECT_TRUE(content::IsOriginSecure(GURL("http://127.example.com/a.html")));
34 42
35 // Check that similarly named sites are not considered secure. 43 // Check that similarly named sites are not considered secure.
36 EXPECT_FALSE(content::IsOriginSecure(GURL("http://128.example.com/a.html"))); 44 EXPECT_FALSE(content::IsOriginSecure(GURL("http://128.example.com/a.html")));
37 EXPECT_FALSE(content::IsOriginSecure( 45 EXPECT_FALSE(content::IsOriginSecure(
38 GURL("http://foobar.127.example.com/a.html"))); 46 GURL("http://foobar.127.example.com/a.html")));
39 } 47 }
40 48
41 } // namespace chrome 49 } // namespace chrome
OLDNEW
« no previous file with comments | « no previous file | content/common/origin_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698