Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Delta Between Two Patch Sets: test/WebRequest.cpp

Issue 29377825: Issue 4951 - Restrict request headers in XMLHttpRequest.Also test Accept-Encoding with th… (Closed) Base URL: https://hg.adblockplus.org/libadblockplus/
Left Patch Set: Initial changes Created March 2, 2017, 9:39 p.m.
Right Patch Set: Updated based on the feedback. Created March 8, 2017, 4:15 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « lib/compat.js ('k') | no next file » | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
1 /* 1 /*
2 * This file is part of Adblock Plus <https://adblockplus.org/>, 2 * This file is part of Adblock Plus <https://adblockplus.org/>,
3 * Copyright (C) 2006-2016 Eyeo GmbH 3 * Copyright (C) 2006-2016 Eyeo GmbH
4 * 4 *
5 * Adblock Plus is free software: you can redistribute it and/or modify 5 * Adblock Plus is free software: you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License version 3 as 6 * it under the terms of the GNU General Public License version 3 as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
8 * 8 *
9 * Adblock Plus is distributed in the hope that it will be useful, 9 * Adblock Plus is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 * GNU General Public License for more details. 12 * GNU General Public License for more details.
13 * 13 *
14 * You should have received a copy of the GNU General Public License 14 * You should have received a copy of the GNU General Public License
15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. 15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>.
16 */ 16 */
17 17
18 #include <sstream> 18 #include <sstream>
19 #include "BaseJsTest.h" 19 #include "BaseJsTest.h"
20 #include "../src/Thread.h" 20 #include "../src/Thread.h"
21 21
22 namespace 22 namespace
23 { 23 {
24 class MockWebRequest : public AdblockPlus::WebRequest 24 class MockWebRequest : public AdblockPlus::WebRequest
25 { 25 {
26 public: 26 public:
27 AdblockPlus::ServerResponse GET(const std::string& url, const AdblockPlus::H eaderList& requestHeaders) const 27 AdblockPlus::ServerResponse GET(const std::string& url, const AdblockPlus::H eaderList& requestHeaders) const
28 { 28 {
29 lastRequestHeaders.clear();
sergei 2017/03/13 09:56:57 Sorry, I forgot to say it again when my comments h
sergei 2017/03/16 11:08:25 What about this point? Actually I find it very imp
30 for (auto header : requestHeaders)
31 {
32 lastRequestHeaders.insert(header.first);
33 }
34
29 AdblockPlus::Sleep(50); 35 AdblockPlus::Sleep(50);
30 36
31 AdblockPlus::ServerResponse result; 37 AdblockPlus::ServerResponse result;
32 result.status = NS_OK; 38 result.status = NS_OK;
33 result.responseStatus = 123; 39 result.responseStatus = 123;
34 result.responseHeaders.push_back(std::pair<std::string, std::string>("Foo" , "Bar")); 40 result.responseHeaders.push_back(std::pair<std::string, std::string>("Foo" , "Bar"));
35 result.responseText = url + "\n" + requestHeaders[0].first + "\n" + reques tHeaders[0].second; 41 result.responseText = url + "\n";
42 if (!requestHeaders.empty())
43 {
44 result.responseText += requestHeaders[0].first + "\n" + requestHeaders[0 ].second;
45 }
36 return result; 46 return result;
37 } 47 }
48
49 // mutable. Very Ugly. But we are testing and need to change this in GET whi ch is const.
50 mutable std::set<std::string> lastRequestHeaders;
38 }; 51 };
39 52
40 template<class T> 53 template<class T>
41 class WebRequestTest : public BaseJsTest 54 class WebRequestTest : public BaseJsTest
42 { 55 {
43 protected: 56 protected:
44 void SetUp() 57 void SetUp()
45 { 58 {
46 BaseJsTest::SetUp(); 59 BaseJsTest::SetUp();
47 jsEngine->SetWebRequest(AdblockPlus::WebRequestPtr(new T)); 60 jsEngine->SetWebRequest(AdblockPlus::WebRequestPtr(new T));
48 jsEngine->SetFileSystem(AdblockPlus::FileSystemPtr(new LazyFileSystem)); 61 jsEngine->SetFileSystem(AdblockPlus::FileSystemPtr(new LazyFileSystem));
49 } 62 }
50 }; 63 };
51 64
52 typedef WebRequestTest<MockWebRequest> MockWebRequestTest; 65 typedef WebRequestTest<MockWebRequest> MockWebRequestTest;
53 typedef WebRequestTest<AdblockPlus::DefaultWebRequest> DefaultWebRequestTest; 66 typedef WebRequestTest<AdblockPlus::DefaultWebRequest> DefaultWebRequestTest;
54 // This test doesn't need a real WebRequest.
55 typedef WebRequestTest<MockWebRequest> XMLHttpRequestTest; 67 typedef WebRequestTest<MockWebRequest> XMLHttpRequestTest;
68
69 void
Felix Dahlke 2017/03/09 15:10:58 Nit: Why the new line? Not really consistent with
hub 2017/03/09 15:33:02 probably habit. I'll remove it when I send you the
sergei 2017/03/13 09:56:56 Just in case for future, I would rather prefer to
70 ResetTestXHR(const AdblockPlus::JsEnginePtr& jsEngine)
71 {
72 jsEngine->Evaluate("\
73 var result;\
74 var request = new XMLHttpRequest();\
75 request.open('GET', 'https://easylist-downloads.adblockplus.org/easylist.t xt');\
76 request.overrideMimeType('text/plain');\
77 request.addEventListener('load', function() {result = request.responseText ;}, false);\
78 request.addEventListener('error', function() {result = 'error';}, false);\
79 ");
80 }
81
82 void WaitForVariable(const std::string& variable, const AdblockPlus::JsEngineP tr& jsEngine)
83 {
84 do
85 {
86 AdblockPlus::Sleep(60);
sergei 2017/03/13 09:56:56 Since we touched it here I would say that I person
hub 2017/03/13 14:16:51 I'll file an issue for that.
hub 2017/03/13 14:29:32 filed https://issues.adblockplus.org/ticket/4983
87 } while (jsEngine->Evaluate(variable)->IsUndefined());
88 }
89
56 } 90 }
57 91
58 TEST_F(MockWebRequestTest, BadCall) 92 TEST_F(MockWebRequestTest, BadCall)
59 { 93 {
60 ASSERT_ANY_THROW(jsEngine->Evaluate("_webRequest.GET()")); 94 ASSERT_ANY_THROW(jsEngine->Evaluate("_webRequest.GET()"));
61 ASSERT_ANY_THROW(jsEngine->Evaluate("_webRequest.GET('', {}, function(){})")); 95 ASSERT_ANY_THROW(jsEngine->Evaluate("_webRequest.GET('', {}, function(){})"));
62 ASSERT_ANY_THROW(jsEngine->Evaluate("_webRequest.GET({toString: false}, {}, fu nction(){})")); 96 ASSERT_ANY_THROW(jsEngine->Evaluate("_webRequest.GET({toString: false}, {}, fu nction(){})"));
63 ASSERT_ANY_THROW(jsEngine->Evaluate("_webRequest.GET('http://example.com/', nu ll, function(){})")); 97 ASSERT_ANY_THROW(jsEngine->Evaluate("_webRequest.GET('http://example.com/', nu ll, function(){})"));
64 ASSERT_ANY_THROW(jsEngine->Evaluate("_webRequest.GET('http://example.com/', {} , null)")); 98 ASSERT_ANY_THROW(jsEngine->Evaluate("_webRequest.GET('http://example.com/', {} , null)"));
65 ASSERT_ANY_THROW(jsEngine->Evaluate("_webRequest.GET('http://example.com/', {} , function(){}, 0)")); 99 ASSERT_ANY_THROW(jsEngine->Evaluate("_webRequest.GET('http://example.com/', {} , function(){}, 0)"));
66 } 100 }
67 101
68 TEST_F(MockWebRequestTest, SuccessfulRequest) 102 TEST_F(MockWebRequestTest, SuccessfulRequest)
69 { 103 {
70 jsEngine->Evaluate("_webRequest.GET('http://example.com/', {X: 'Y'}, function( result) {foo = result;} )"); 104 jsEngine->Evaluate("_webRequest.GET('http://example.com/', {X: 'Y'}, function( result) {foo = result;} )");
71 ASSERT_TRUE(jsEngine->Evaluate("this.foo")->IsUndefined()); 105 ASSERT_TRUE(jsEngine->Evaluate("this.foo")->IsUndefined());
72 AdblockPlus::Sleep(200); 106 AdblockPlus::Sleep(200);
73 ASSERT_EQ(AdblockPlus::WebRequest::NS_OK, jsEngine->Evaluate("foo.status")->As Int()); 107 ASSERT_EQ(AdblockPlus::WebRequest::NS_OK, jsEngine->Evaluate("foo.status")->As Int());
74 ASSERT_EQ(123, jsEngine->Evaluate("foo.responseStatus")->AsInt()); 108 ASSERT_EQ(123, jsEngine->Evaluate("foo.responseStatus")->AsInt());
75 ASSERT_EQ("http://example.com/\nX\nY", jsEngine->Evaluate("foo.responseText")- >AsString()); 109 ASSERT_EQ("http://example.com/\nX\nY", jsEngine->Evaluate("foo.responseText")- >AsString());
76 ASSERT_EQ("{\"Foo\":\"Bar\"}", jsEngine->Evaluate("JSON.stringify(foo.response Headers)")->AsString()); 110 ASSERT_EQ("{\"Foo\":\"Bar\"}", jsEngine->Evaluate("JSON.stringify(foo.response Headers)")->AsString());
77 } 111 }
78 112
79 #if defined(HAVE_CURL) || defined(_WIN32) 113 #if defined(HAVE_CURL) || defined(_WIN32)
80 TEST_F(DefaultWebRequestTest, RealWebRequest) 114 TEST_F(DefaultWebRequestTest, RealWebRequest)
81 { 115 {
82 // This URL should redirect to easylist-downloads.adblockplus.org and we 116 // This URL should redirect to easylist-downloads.adblockplus.org and we
83 // should get the actual filter list back. 117 // should get the actual filter list back.
84 jsEngine->Evaluate("_webRequest.GET('https://easylist-downloads.adblockplus.or g/easylist.txt', {}, function(result) {foo = result;} )"); 118 jsEngine->Evaluate("_webRequest.GET('https://easylist-downloads.adblockplus.or g/easylist.txt', {}, function(result) {foo = result;} )");
85 do 119 WaitForVariable("this.foo", jsEngine);
86 {
87 AdblockPlus::Sleep(200);
88 } while (jsEngine->Evaluate("this.foo")->IsUndefined());
89 ASSERT_EQ("text/plain", jsEngine->Evaluate("foo.responseHeaders['content-type' ].substr(0, 10)")->AsString()); 120 ASSERT_EQ("text/plain", jsEngine->Evaluate("foo.responseHeaders['content-type' ].substr(0, 10)")->AsString());
90 ASSERT_EQ(AdblockPlus::WebRequest::NS_OK, jsEngine->Evaluate("foo.status")->As Int()); 121 ASSERT_EQ(AdblockPlus::WebRequest::NS_OK, jsEngine->Evaluate("foo.status")->As Int());
91 ASSERT_EQ(200, jsEngine->Evaluate("foo.responseStatus")->AsInt()); 122 ASSERT_EQ(200, jsEngine->Evaluate("foo.responseStatus")->AsInt());
92 ASSERT_EQ("[Adblock Plus ", jsEngine->Evaluate("foo.responseText.substr(0, 14) ")->AsString()); 123 ASSERT_EQ("[Adblock Plus ", jsEngine->Evaluate("foo.responseText.substr(0, 14) ")->AsString());
93 ASSERT_EQ("text/plain", jsEngine->Evaluate("foo.responseHeaders['content-type' ].substr(0, 10)")->AsString()); 124 ASSERT_EQ("text/plain", jsEngine->Evaluate("foo.responseHeaders['content-type' ].substr(0, 10)")->AsString());
94 #if defined(HAVE_CURL) 125 #if defined(HAVE_CURL)
95 ASSERT_EQ("gzip", jsEngine->Evaluate("foo.responseHeaders['content-encoding']. substr(0, 4)")->AsString()); 126 ASSERT_EQ("gzip", jsEngine->Evaluate("foo.responseHeaders['content-encoding']. substr(0, 4)")->AsString());
96 #endif 127 #endif
97 ASSERT_TRUE(jsEngine->Evaluate("foo.responseHeaders['location']")->IsUndefined ()); 128 ASSERT_TRUE(jsEngine->Evaluate("foo.responseHeaders['location']")->IsUndefined ());
98 } 129 }
99 130
100 TEST_F(DefaultWebRequestTest, XMLHttpRequest) 131 TEST_F(DefaultWebRequestTest, XMLHttpRequest)
101 { 132 {
102 AdblockPlus::FilterEngine filterEngine(jsEngine); 133 AdblockPlus::FilterEngine filterEngine(jsEngine);
103 134
104 jsEngine->Evaluate("\ 135 ResetTestXHR(jsEngine);
105 var result;\ 136 jsEngine->Evaluate("\
106 var request = new XMLHttpRequest();\
107 request.open('GET', 'https://easylist-downloads.adblockplus.org/easylist.txt ');\
108 request.setRequestHeader('X', 'Y');\ 137 request.setRequestHeader('X', 'Y');\
109 request.setRequestHeader('X2', 'Y2');\ 138 request.setRequestHeader('X2', 'Y2');\
110 request.overrideMimeType('text/plain');\
111 request.addEventListener('load', function() {result = request.responseText;} , false);\
112 request.addEventListener('error', function() {result = 'error';}, false);\
113 request.send(null);"); 139 request.send(null);");
114 do 140 WaitForVariable("result", jsEngine);
115 {
116 AdblockPlus::Sleep(200);
117 } while (jsEngine->Evaluate("result")->IsUndefined());
118 ASSERT_EQ(AdblockPlus::WebRequest::NS_OK, jsEngine->Evaluate("request.channel. status")->AsInt()); 141 ASSERT_EQ(AdblockPlus::WebRequest::NS_OK, jsEngine->Evaluate("request.channel. status")->AsInt());
119 ASSERT_EQ(200, jsEngine->Evaluate("request.status")->AsInt()); 142 ASSERT_EQ(200, jsEngine->Evaluate("request.status")->AsInt());
120 ASSERT_EQ("[Adblock Plus ", jsEngine->Evaluate("result.substr(0, 14)")->AsStri ng()); 143 ASSERT_EQ("[Adblock Plus ", jsEngine->Evaluate("result.substr(0, 14)")->AsStri ng());
121 ASSERT_EQ("text/plain", jsEngine->Evaluate("request.getResponseHeader('Content -Type').substr(0, 10)")->AsString()); 144 ASSERT_EQ("text/plain", jsEngine->Evaluate("request.getResponseHeader('Content -Type').substr(0, 10)")->AsString());
122 #if defined(HAVE_CURL) 145 #if defined(HAVE_CURL)
sergei 2017/03/13 09:56:56 It seems, it should be in commit https://github.co
123 ASSERT_EQ("gzip", jsEngine->Evaluate("request.getResponseHeader('Content-Encod ing').substr(0, 4)")->AsString()); 146 ASSERT_EQ("gzip", jsEngine->Evaluate("request.getResponseHeader('Content-Encod ing').substr(0, 4)")->AsString());
124 #endif 147 #endif
125 ASSERT_TRUE(jsEngine->Evaluate("request.getResponseHeader('Location')")->IsNul l()); 148 ASSERT_TRUE(jsEngine->Evaluate("request.getResponseHeader('Location')")->IsNul l());
126 } 149 }
127 #else 150 #else
128 TEST_F(DefaultWebRequestTest, DummyWebRequest) 151 TEST_F(DefaultWebRequestTest, DummyWebRequest)
129 { 152 {
130 jsEngine->Evaluate("_webRequest.GET('https://easylist-downloads.adblockplus.or g/easylist.txt', {}, function(result) {foo = result;} )"); 153 jsEngine->Evaluate("_webRequest.GET('https://easylist-downloads.adblockplus.or g/easylist.txt', {}, function(result) {foo = result;} )");
131 do 154 WaitForVariable("this.foo", jsEngine);
132 {
133 AdblockPlus::Sleep(200);
134 } while (jsEngine->Evaluate("this.foo")->IsUndefined());
135 ASSERT_EQ(AdblockPlus::WebRequest::NS_ERROR_FAILURE, jsEngine->Evaluate("foo.s tatus")->AsInt()); 155 ASSERT_EQ(AdblockPlus::WebRequest::NS_ERROR_FAILURE, jsEngine->Evaluate("foo.s tatus")->AsInt());
136 ASSERT_EQ(0, jsEngine->Evaluate("foo.responseStatus")->AsInt()); 156 ASSERT_EQ(0, jsEngine->Evaluate("foo.responseStatus")->AsInt());
137 ASSERT_EQ("", jsEngine->Evaluate("foo.responseText")->AsString()); 157 ASSERT_EQ("", jsEngine->Evaluate("foo.responseText")->AsString());
138 ASSERT_EQ("{}", jsEngine->Evaluate("JSON.stringify(foo.responseHeaders)")->AsS tring()); 158 ASSERT_EQ("{}", jsEngine->Evaluate("JSON.stringify(foo.responseHeaders)")->AsS tring());
139 } 159 }
140 160
141 TEST_F(DefaultWebRequestTest, XMLHttpRequest) 161 TEST_F(DefaultWebRequestTest, XMLHttpRequest)
142 { 162 {
143 AdblockPlus::FilterEngine filterEngine(jsEngine); 163 AdblockPlus::FilterEngine filterEngine(jsEngine);
144 164
145 jsEngine->Evaluate("\ 165 ResetTestXHR(jsEngine);
146 var result;\ 166 jsEngine->Evaluate("\
147 var request = new XMLHttpRequest();\
148 request.open('GET', 'https://easylist-downloads.adblockplus.org/easylist.txt ');\
149 request.setRequestHeader('X', 'Y');\ 167 request.setRequestHeader('X', 'Y');\
150 request.overrideMimeType('text/plain');\
151 request.addEventListener('load', function() {result = request.responseText;} , false);\
152 request.addEventListener('error', function() {result = 'error';}, false);\
153 request.send(null);"); 168 request.send(null);");
154 do 169 WaitForVariable("result", jsEngine);
155 {
156 AdblockPlus::Sleep(200);
157 } while (jsEngine->Evaluate("result")->IsUndefined());
158 ASSERT_EQ(AdblockPlus::WebRequest::NS_ERROR_FAILURE, jsEngine->Evaluate("reque st.channel.status")->AsInt()); 170 ASSERT_EQ(AdblockPlus::WebRequest::NS_ERROR_FAILURE, jsEngine->Evaluate("reque st.channel.status")->AsInt());
159 ASSERT_EQ(0, jsEngine->Evaluate("request.status")->AsInt()); 171 ASSERT_EQ(0, jsEngine->Evaluate("request.status")->AsInt());
160 ASSERT_EQ("error", jsEngine->Evaluate("result")->AsString()); 172 ASSERT_EQ("error", jsEngine->Evaluate("result")->AsString());
161 ASSERT_TRUE(jsEngine->Evaluate("request.getResponseHeader('Content-Type')")->I sNull()); 173 ASSERT_TRUE(jsEngine->Evaluate("request.getResponseHeader('Content-Type')")->I sNull());
162 } 174 }
163 175
164 #endif 176 #endif
165 177
178 namespace
179 {
180 class CatchLogSystem : public AdblockPlus::LogSystem
181 {
182 public:
183 AdblockPlus::LogSystem::LogLevel lastLogLevel;
184 std::string lastMessage;
185
186 CatchLogSystem()
187 : AdblockPlus::LogSystem(),
188 lastLogLevel(AdblockPlus::LogSystem::LOG_LEVEL_TRACE)
189 {
190 }
191
192 void operator()(AdblockPlus::LogSystem::LogLevel logLevel,
193 const std::string& message, const std::string&)
194 {
195 lastLogLevel = logLevel;
196 lastMessage = message;
197 }
198
199 void clear()
200 {
201 lastLogLevel = AdblockPlus::LogSystem::LOG_LEVEL_TRACE;
202 lastMessage.clear();
203 }
204 };
205
206 typedef std::shared_ptr<CatchLogSystem> CatchLogSystemPtr;
207 }
208
166 TEST_F(XMLHttpRequestTest, RequestHeaderValidation) 209 TEST_F(XMLHttpRequestTest, RequestHeaderValidation)
167 { 210 {
211 auto catchLogSystem = CatchLogSystemPtr(new CatchLogSystem);
sergei 2017/03/13 09:56:56 Could we please always use either () or {} for con
sergei 2017/03/13 09:56:57 I would prefer to have std::make_shared<CatchLogSy
Felix Dahlke 2017/03/13 10:05:47 I definitely prefer omitting these when not necess
sergei 2017/03/13 10:31:02 It seems Mozilla's coding style does not mention i
Felix Dahlke 2017/03/13 11:05:42 We are talking a bout `new CatchLogSystem` vs `new
sergei 2017/03/13 11:39:16 Yes.
Felix Dahlke 2017/03/13 11:55:06 I see - rusty after all :P Looking at our existing
sergei 2017/03/13 12:19:58 On 2017/03/13 11:55:06, Felix Dahlke wrote: ...
hub 2017/03/13 14:16:51 I see two occurences, line 60 and 61 of this file.
hub 2017/03/13 14:16:51 I did submit a follow up patch to address these. I
212 jsEngine->SetLogSystem(catchLogSystem);
213
168 AdblockPlus::FilterEngine filterEngine(jsEngine); 214 AdblockPlus::FilterEngine filterEngine(jsEngine);
215 auto webRequest =
216 std::static_pointer_cast<MockWebRequest>(jsEngine->GetWebRequest());
sergei 2017/03/13 09:56:56 Although it's fine here, I would rather prefer to
217
218 ASSERT_TRUE(webRequest);
169 219
170 const std::string msg = "Attempt to set a forbidden header was denied: "; 220 const std::string msg = "Attempt to set a forbidden header was denied: ";
171 // The test will override console.warning so that the 221
sergei 2017/03/02 22:25:31 I think we should rather check in WebRequest::GET
hub 2017/03/02 23:30:13 I didn't realize there was LogSystem to check for
sergei 2017/03/03 08:38:59 What about check in WebRequest::GET?
172 // header rejection cause result to be set. 222 // The test will check that console.warn has been called when the
173 // While this is an implementation detail, since the DOM API 223 // header is rejected. While this is an implementation detail, we
sergei 2017/03/02 22:25:31 Could you please remove "DOM" because it's not a D
hub 2017/03/02 23:30:13 Acknowledged.
174 // doesn't seem to return anything, we have no other way to check 224 // have no other way to check this
175 // the failure.
176 jsEngine->Evaluate("\
177 var result;\
178 console.warning = function(msg) { result = msg; };\
179 var request = new XMLHttpRequest();\
180 request.open('GET', 'https://easylist-downloads.adblockplus.org/easylist.txt ');");
181 225
182 // test 'Accept-Encoding' is rejected 226 // test 'Accept-Encoding' is rejected
sergei 2017/03/02 22:25:31 What about having several tests, at least checking
183 jsEngine->Evaluate("\ 227 catchLogSystem->clear();
184 result = undefined;\ 228 ResetTestXHR(jsEngine);
185 request.setRequestHeader('Accept-Encoding', 'gzip');"); 229 jsEngine->Evaluate("\
186 auto value = jsEngine->Evaluate("result"); 230 request.setRequestHeader('Accept-Encoding', 'gzip');\nrequest.send();");
187 ASSERT_FALSE(value->IsUndefined()); 231 EXPECT_EQ(AdblockPlus::LogSystem::LOG_LEVEL_WARN, catchLogSystem->lastLogLevel );
188 ASSERT_EQ(msg + "Accept-Encoding", value->AsString()); 232 EXPECT_EQ(msg + "Accept-Encoding", catchLogSystem->lastMessage);
233 WaitForVariable("result", jsEngine);
234 EXPECT_TRUE(webRequest->lastRequestHeaders.cend() ==
235 webRequest->lastRequestHeaders.find("Accept-Encoding"));
236
237 // test 'DNT' is rejected
238 catchLogSystem->clear();
239 ResetTestXHR(jsEngine);
240 jsEngine->Evaluate("\
241 request.setRequestHeader('DNT', '1');\nrequest.send();");
242 EXPECT_EQ(AdblockPlus::LogSystem::LOG_LEVEL_WARN, catchLogSystem->lastLogLevel );
243 EXPECT_EQ(msg + "DNT", catchLogSystem->lastMessage);
244 WaitForVariable("result", jsEngine);
245 EXPECT_TRUE(webRequest->lastRequestHeaders.cend() ==
246 webRequest->lastRequestHeaders.find("DNT"));
189 247
190 // test random 'X' header is accepted 248 // test random 'X' header is accepted
191 jsEngine->Evaluate("\ 249 catchLogSystem->clear();
192 result = undefined;\ 250 ResetTestXHR(jsEngine);
193 request.setRequestHeader('X', 'y');"); 251 jsEngine->Evaluate("\
194 value = value = jsEngine->Evaluate("result"); 252 request.setRequestHeader('X', 'y');\nrequest.send();");
sergei 2017/03/02 22:25:31 value = value =
hub 2017/03/02 23:30:13 Acknowledged. Cut&paste error. I missed it.
195 ASSERT_TRUE(value->IsUndefined()); 253 EXPECT_EQ(AdblockPlus::LogSystem::LOG_LEVEL_TRACE, catchLogSystem->lastLogLeve l);
sergei 2017/03/02 22:25:31 I think we should use EXPECT_* when the test can c
hub 2017/03/02 23:30:12 Acknowledged.
254 EXPECT_EQ("", catchLogSystem->lastMessage);
255 WaitForVariable("result", jsEngine);
256 EXPECT_FALSE(webRequest->lastRequestHeaders.cend() ==
257 webRequest->lastRequestHeaders.find("X"));
196 258
197 // test /^Proxy-/ is rejected. 259 // test /^Proxy-/ is rejected.
198 jsEngine->Evaluate("\ 260 catchLogSystem->clear();
199 result = undefined;\ 261 ResetTestXHR(jsEngine);
200 request.setRequestHeader('Proxy-foo', 'bar');"); 262 jsEngine->Evaluate("\
201 value = value = jsEngine->Evaluate("result"); 263 request.setRequestHeader('Proxy-foo', 'bar');\nrequest.send();");
202 ASSERT_FALSE(value->IsUndefined()); 264 EXPECT_EQ(AdblockPlus::LogSystem::LOG_LEVEL_WARN, catchLogSystem->lastLogLevel );
203 ASSERT_EQ(msg + "Proxy-foo", value->AsString()); 265 EXPECT_EQ(msg + "Proxy-foo", catchLogSystem->lastMessage);
266 WaitForVariable("result", jsEngine);
267 EXPECT_TRUE(webRequest->lastRequestHeaders.cend() ==
268 webRequest->lastRequestHeaders.find("Proxy-foo"));
204 269
205 // test /^Sec-/ is rejected. 270 // test /^Sec-/ is rejected.
206 jsEngine->Evaluate("\ 271 catchLogSystem->clear();
207 result = undefined;\ 272 ResetTestXHR(jsEngine);
208 request.setRequestHeader('Sec-foo', 'bar');"); 273 jsEngine->Evaluate("\
209 value = value = jsEngine->Evaluate("result"); 274 request.setRequestHeader('Sec-foo', 'bar');\nrequest.send();");
210 ASSERT_FALSE(value->IsUndefined()); 275 EXPECT_EQ(AdblockPlus::LogSystem::LOG_LEVEL_WARN, catchLogSystem->lastLogLevel );
211 ASSERT_EQ(msg + "Sec-foo", value->AsString()); 276 EXPECT_EQ(msg + "Sec-foo", catchLogSystem->lastMessage);
212 277 WaitForVariable("result", jsEngine);
213 // test 'Security' is rejected. 278 EXPECT_TRUE(webRequest->lastRequestHeaders.cend() ==
214 jsEngine->Evaluate("\ 279 webRequest->lastRequestHeaders.find("Sec-foo"));
215 result = undefined;\ 280
216 request.setRequestHeader('Security', 'theater');"); 281 // test 'Security' is accepted.
217 value = value = jsEngine->Evaluate("result"); 282 catchLogSystem->clear();
218 ASSERT_TRUE(value->IsUndefined()); 283 ResetTestXHR(jsEngine);
219 } 284 jsEngine->Evaluate("\
285 request.setRequestHeader('Security', 'theater');\nrequest.send();");
286 EXPECT_EQ(AdblockPlus::LogSystem::LOG_LEVEL_TRACE, catchLogSystem->lastLogLeve l);
287 EXPECT_EQ("", catchLogSystem->lastMessage);
288 WaitForVariable("result", jsEngine);
289 EXPECT_FALSE(webRequest->lastRequestHeaders.cend() ==
290 webRequest->lastRequestHeaders.find("Security"));
291 }
LEFTRIGHT

Powered by Google App Engine
This is Rietveld