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

Side by Side Diff: Source/platform/weborigin/SecurityOriginTest.cpp

Issue 666593002: Convert ARRAYSIZE_UNSAFE -> arraysize. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 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
« no previous file with comments | « Source/platform/weborigin/KURLTest.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 26 matching lines...) Expand all
37 using blink::SecurityOrigin; 37 using blink::SecurityOrigin;
38 38
39 namespace { 39 namespace {
40 40
41 const int MaxAllowedPort = 65535; 41 const int MaxAllowedPort = 65535;
42 42
43 TEST(SecurityOriginTest, InvalidPortsCreateUniqueOrigins) 43 TEST(SecurityOriginTest, InvalidPortsCreateUniqueOrigins)
44 { 44 {
45 int ports[] = { -100, -1, MaxAllowedPort + 1, 1000000 }; 45 int ports[] = { -100, -1, MaxAllowedPort + 1, 1000000 };
46 46
47 for (size_t i = 0; i < ARRAYSIZE_UNSAFE(ports); ++i) { 47 for (size_t i = 0; i < arraysize(ports); ++i) {
48 RefPtr<SecurityOrigin> origin = SecurityOrigin::create("http", "example. com", ports[i]); 48 RefPtr<SecurityOrigin> origin = SecurityOrigin::create("http", "example. com", ports[i]);
49 EXPECT_TRUE(origin->isUnique()) << "Port " << ports[i] << " should have generated a unique origin."; 49 EXPECT_TRUE(origin->isUnique()) << "Port " << ports[i] << " should have generated a unique origin.";
50 } 50 }
51 } 51 }
52 52
53 TEST(SecurityOriginTest, ValidPortsCreateNonUniqueOrigins) 53 TEST(SecurityOriginTest, ValidPortsCreateNonUniqueOrigins)
54 { 54 {
55 int ports[] = { 0, 80, 443, 5000, MaxAllowedPort }; 55 int ports[] = { 0, 80, 443, 5000, MaxAllowedPort };
56 56
57 for (size_t i = 0; i < ARRAYSIZE_UNSAFE(ports); ++i) { 57 for (size_t i = 0; i < arraysize(ports); ++i) {
58 RefPtr<SecurityOrigin> origin = SecurityOrigin::create("http", "example. com", ports[i]); 58 RefPtr<SecurityOrigin> origin = SecurityOrigin::create("http", "example. com", ports[i]);
59 EXPECT_FALSE(origin->isUnique()) << "Port " << ports[i] << " should not have generated a unique origin."; 59 EXPECT_FALSE(origin->isUnique()) << "Port " << ports[i] << " should not have generated a unique origin.";
60 } 60 }
61 } 61 }
62 62
63 TEST(SecurityOriginTest, CanAccessFeatureRequringSecureOrigin) 63 TEST(SecurityOriginTest, CanAccessFeatureRequringSecureOrigin)
64 { 64 {
65 struct TestCase { 65 struct TestCase {
66 bool accessGranted; 66 bool accessGranted;
67 const char* url; 67 const char* url;
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 { false, "blob:ftp://evil:99/578223a1-8c13-17b3-84d5-eca045ae384a" }, 117 { false, "blob:ftp://evil:99/578223a1-8c13-17b3-84d5-eca045ae384a" },
118 118
119 // filesystem: URLs work the same as blob: URLs, and look to the inner 119 // filesystem: URLs work the same as blob: URLs, and look to the inner
120 // URL for security origin. 120 // URL for security origin.
121 { true, "filesystem:http://localhost:1000/foo" }, 121 { true, "filesystem:http://localhost:1000/foo" },
122 { true, "filesystem:https://foopy:99/foo" }, 122 { true, "filesystem:https://foopy:99/foo" },
123 { false, "filesystem:http://baz:99/foo" }, 123 { false, "filesystem:http://baz:99/foo" },
124 { false, "filesystem:ftp://evil:99/foo" }, 124 { false, "filesystem:ftp://evil:99/foo" },
125 }; 125 };
126 126
127 for (size_t i = 0; i < ARRAYSIZE_UNSAFE(inputs); ++i) { 127 for (size_t i = 0; i < arraysize(inputs); ++i) {
128 SCOPED_TRACE(i); 128 SCOPED_TRACE(i);
129 RefPtr<SecurityOrigin> origin = SecurityOrigin::createFromString(inputs[ i].url); 129 RefPtr<SecurityOrigin> origin = SecurityOrigin::createFromString(inputs[ i].url);
130 String errorMessage; 130 String errorMessage;
131 EXPECT_EQ(inputs[i].accessGranted, origin->canAccessFeatureRequiringSecu reOrigin(errorMessage)); 131 EXPECT_EQ(inputs[i].accessGranted, origin->canAccessFeatureRequiringSecu reOrigin(errorMessage));
132 EXPECT_EQ(inputs[i].accessGranted, errorMessage.isEmpty()); 132 EXPECT_EQ(inputs[i].accessGranted, errorMessage.isEmpty());
133 } 133 }
134 134
135 // Unique origins are not considered secure. 135 // Unique origins are not considered secure.
136 RefPtr<SecurityOrigin> uniqueOrigin = SecurityOrigin::createUnique(); 136 RefPtr<SecurityOrigin> uniqueOrigin = SecurityOrigin::createUnique();
137 String errorMessage; 137 String errorMessage;
138 EXPECT_FALSE(uniqueOrigin->canAccessFeatureRequiringSecureOrigin(errorMessag e)); 138 EXPECT_FALSE(uniqueOrigin->canAccessFeatureRequiringSecureOrigin(errorMessag e));
139 EXPECT_EQ("Only secure origins are allowed. http://goo.gl/lq4gCo", errorMess age); 139 EXPECT_EQ("Only secure origins are allowed. http://goo.gl/lq4gCo", errorMess age);
140 } 140 }
141 141
142 } // namespace 142 } // namespace
143 143
OLDNEW
« no previous file with comments | « Source/platform/weborigin/KURLTest.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698