1
=== modified file 'include/unity/scopes/internal/smartscopes/SmartScopesClient.h'
2
--- include/unity/scopes/internal/smartscopes/SmartScopesClient.h	2014-02-20 19:19:25 +0000
3
+++ include/unity/scopes/internal/smartscopes/SmartScopesClient.h	2014-02-25 09:40:06 +0000
4
@@ -128,6 +128,11 @@
5
128
128
6
129
    virtual ~SmartScopesClient();
129
    virtual ~SmartScopesClient();
7
130
130
8
131
    void reset_url(std::string const& url = "");
9
132
    void reset_port(uint port = 0);
10
133
    std::string url();
11
134
    uint port();
12
135
13
131
    bool get_remote_scopes(std::vector<RemoteScope>& scopes, std::string const& locale = "", bool caching_enabled = true);
136
    bool get_remote_scopes(std::vector<RemoteScope>& scopes, std::string const& locale = "", bool caching_enabled = true);
14
132
137
15
133
    SearchHandle::UPtr search(std::string const& base_url,
138
    SearchHandle::UPtr search(std::string const& base_url,
16
134
139
17
=== modified file 'src/scopes/internal/smartscopes/SmartScopesClient.cpp'
18
--- src/scopes/internal/smartscopes/SmartScopesClient.cpp	2014-02-20 19:19:25 +0000
19
+++ src/scopes/internal/smartscopes/SmartScopesClient.cpp	2014-02-25 09:40:06 +0000
20
@@ -93,38 +93,32 @@
21
93
                                     uint port)
93
                                     uint port)
22
94
    : http_client_(http_client)
94
    : http_client_(http_client)
23
95
    , json_node_(json_node)
95
    , json_node_(json_node)
26
96
    , url_(url)
96
    , port_(0)
25
97
    , port_(port)
27
98
    , have_latest_cache_(false)
97
    , have_latest_cache_(false)
28
99
    , query_counter_(0)
98
    , query_counter_(0)
29
100
{
99
{
57
101
    // initialise url_
100
    try
58
102
    if (url_.empty())
101
    {
59
103
    {
102
        // try to set url from url supplied
60
104
        char* base_url_env = ::getenv("SMART_SCOPES_SERVER");
103
        reset_url(url);
61
105
        std::string base_url = base_url_env ? base_url_env : "";
104
    }
62
106
        if (!base_url.empty())
105
    catch(...)
63
107
        {
106
    {
64
108
            // find the last occurrence of ':' in the url in order to extract the port number
107
        try
65
109
            // * ignore the colon after "http"/"https"
108
        {
66
110
109
            // url supplied failed, try to set url automatically
67
111
            const size_t hier_pos = strlen("https");
110
            reset_url();
68
112
111
        }
69
113
            uint64_t found = base_url.find_last_of(':');
112
        catch(...)
70
114
            if (found != std::string::npos && found > hier_pos)
113
        {
71
115
            {
114
            std::cerr << "SmartScopesClient::SmartScopesClient: Failed to initialise SSS url" << std::endl;
72
116
                url_ = base_url.substr(0, found);
115
        }
73
117
                port_ = std::stoi(base_url.substr(found + 1));
116
    }
74
118
            }
117
75
119
            else
118
    // force set a port only if one was explicitly provided
76
120
            {
119
    if (port != 0)
77
121
                url_ = base_url;
120
    {
78
122
            }
121
        reset_port(port);
52
123
        }
53
124
        else
54
125
        {
55
126
            url_ = c_base_url;
56
127
        }
79
128
    }
122
    }
80
129
123
81
130
    // initialise cached_scopes_
124
    // initialise cached_scopes_
82
@@ -135,6 +129,88 @@
83
135
{
129
{
84
136
}
130
}
85
137
131
86
132
void SmartScopesClient::reset_url(std::string const& url)
87
133
{
88
134
    std::string base_url = url;
89
135
90
136
    // if a url was not provided, get the environment variable
91
137
    if (base_url.empty())
92
138
    {
93
139
        char* sss_url_env = ::getenv("SMART_SCOPES_SERVER");
94
140
        base_url = sss_url_env ? sss_url_env : "";
95
141
96
142
        // if the env var was not provided, use the c_base_url constant
97
143
        if (base_url.empty())
98
144
        {
99
145
            base_url = c_base_url;
100
146
        }
101
147
    }
102
148
103
149
    // find the last occurrence of ':' in the url in order to extract the port number
104
150
    // * ignore the colon after "http" / "https"
105
151
106
152
    const size_t hier_pos = strlen("https");
107
153
    std::string::size_type port_pos = base_url.find_last_of(':');
108
154
109
155
    // if there is a port specified in the url (i.e. a colon occurs after "http:" / "https:")
110
156
    if (port_pos != std::string::npos && port_pos > hier_pos)
111
157
    {
112
158
        url_ = base_url.substr(0, port_pos);
113
159
        std::string port_str;
114
160
        std::string::size_type url_cont = base_url.find('/', port_pos);
115
161
116
162
        // if the address continues after the port
117
163
        if (url_cont != std::string::npos)
118
164
        {
119
165
            // extract port, and add the rest of the address to url_
120
166
            url_ += base_url.substr(url_cont);
121
167
            port_str = base_url.substr(port_pos + 1, url_cont - port_pos - 1);
122
168
        }
123
169
        // else if the remainder of the string is just the port
124
170
        else
125
171
        {
126
172
            // extract port
127
173
            port_str = base_url.substr(port_pos + 1);
128
174
        }
129
175
130
176
        // check if port_str is actually a number before setting port_
131
177
        if (!port_str.empty() &&
132
178
                std::find_if(begin(port_str), end(port_str),
133
179
                             [](char const& c){ return !std::isdigit(c); }) == port_str.end())
134
180
        {
135
181
            port_ = std::stoi(port_str);
136
182
        }
137
183
        else
138
184
        {
139
185
            // the port supplied is not a number, don't trust the url either
140
186
            url_ = "";
141
187
            port_ = 0;
142
188
            throw unity::InvalidArgumentException("Invalid url: " + url);
143
189
        }
144
190
    }
145
191
    // else if there is no port specified in the url
146
192
    else
147
193
    {
148
194
        url_ = base_url;
149
195
        port_ = 0;
150
196
    }
151
197
}
152
198
153
199
void SmartScopesClient::reset_port(uint port)
154
200
{
155
201
    port_ = port;
156
202
}
157
203
158
204
std::string SmartScopesClient::url()
159
205
{
160
206
    return url_;
161
207
}
162
208
163
209
uint SmartScopesClient::port()
164
210
{
165
211
    return port_;
166
212
}
167
213
168
138
// returns false if cache used
214
// returns false if cache used
169
139
bool SmartScopesClient::get_remote_scopes(std::vector<RemoteScope>& remote_scopes, std::string const& locale, bool caching_enabled)
215
bool SmartScopesClient::get_remote_scopes(std::vector<RemoteScope>& remote_scopes, std::string const& locale, bool caching_enabled)
170
140
{
216
{
171
141
217
172
=== modified file 'test/gtest/scopes/internal/smartscopes/SmartScopesClient/SmartScopesClient_test.cpp'
173
--- test/gtest/scopes/internal/smartscopes/SmartScopesClient/SmartScopesClient_test.cpp	2014-02-20 19:19:25 +0000
174
+++ test/gtest/scopes/internal/smartscopes/SmartScopesClient/SmartScopesClient_test.cpp	2014-02-25 09:40:06 +0000
175
@@ -190,4 +190,152 @@
176
190
    EXPECT_EQ(2, results.size());
190
    EXPECT_EQ(2, results.size());
177
191
}
191
}
178
192
192
179
193
TEST_F(SmartScopesClientTest, url_parsing)
180
194
{
181
195
    // check initial values to be expected test values
182
196
    EXPECT_EQ(server_.port_, ssc_->port());
183
197
    EXPECT_EQ("http://127.0.0.1", ssc_->url());
184
198
185
199
    // empty the environment var (in case there already is one set)
186
200
    std::string server_url_env = "SMART_SCOPES_SERVER=";
187
201
    ::putenv(const_cast<char*>(server_url_env.c_str()));
188
202
189
203
    // reset url and check that we now have contant values
190
204
    EXPECT_NO_THROW(ssc_->reset_url());
191
205
    EXPECT_EQ(0, ssc_->port());
192
206
    EXPECT_EQ("https://productsearch.ubuntu.com/smartscopes/v2", ssc_->url());
193
207
194
208
    // http addr, no port
195
209
    EXPECT_NO_THROW(ssc_->reset_url("http://hello.com/there"));
196
210
    EXPECT_EQ(0, ssc_->port());
197
211
    EXPECT_EQ("http://hello.com/there", ssc_->url());
198
212
199
213
    // https addr, no port
200
214
    EXPECT_NO_THROW(ssc_->reset_url("https://hello.com/there"));
201
215
    EXPECT_EQ(0, ssc_->port());
202
216
    EXPECT_NO_THROW(ssc_->reset_port(1500));
203
217
    EXPECT_EQ(1500, ssc_->port());
204
218
    EXPECT_EQ("https://hello.com/there", ssc_->url());
205
219
206
220
    // http addr, with port (end)
207
221
    EXPECT_NO_THROW(ssc_->reset_url("http://hello.com:1500"));
208
222
    EXPECT_EQ(1500, ssc_->port());
209
223
    EXPECT_EQ("http://hello.com", ssc_->url());
210
224
211
225
    // https addr, with port (end)
212
226
    EXPECT_NO_THROW(ssc_->reset_url("https://hello.com:1500"));
213
227
    EXPECT_EQ(1500, ssc_->port());
214
228
    EXPECT_NO_THROW(ssc_->reset_port(2000));
215
229
    EXPECT_EQ(2000, ssc_->port());
216
230
    EXPECT_EQ("https://hello.com", ssc_->url());
217
231
218
232
    // http addr, with port (mid)
219
233
    EXPECT_NO_THROW(ssc_->reset_url("http://hello.com:1500/there"));
220
234
    EXPECT_EQ(1500, ssc_->port());
221
235
    EXPECT_EQ("http://hello.com/there", ssc_->url());
222
236
223
237
    // https addr, with port (mid)
224
238
    EXPECT_NO_THROW(ssc_->reset_url("https://hello.com:1500/there"));
225
239
    EXPECT_EQ(1500, ssc_->port());
226
240
    EXPECT_EQ("https://hello.com/there", ssc_->url());
227
241
228
242
    // https addr, with broken port
229
243
    EXPECT_THROW(ssc_->reset_url("https://hello.com:15d00/there"), std::exception);
230
244
    EXPECT_EQ(0, ssc_->port());
231
245
    EXPECT_EQ("", ssc_->url());
232
246
233
247
    // https addr, with floating colon
234
248
    EXPECT_THROW(ssc_->reset_url("https://hello.com:1500/the:re"), std::exception);
235
249
    EXPECT_EQ(0, ssc_->port());
236
250
    EXPECT_NO_THROW(ssc_->reset_port(1500));
237
251
    EXPECT_EQ(1500, ssc_->port());
238
252
    EXPECT_EQ("", ssc_->url());
239
253
}
240
254
241
255
TEST_F(SmartScopesClientTest, url_parsing_env_var)
242
256
{
243
257
    // check initial values to be expected test values
244
258
    EXPECT_EQ(server_.port_, ssc_->port());
245
259
    EXPECT_EQ("http://127.0.0.1", ssc_->url());
246
260
247
261
    // empty the environment var (in case there already is one set)
248
262
    std::string server_url_env = "SMART_SCOPES_SERVER=";
249
263
    ::putenv(const_cast<char*>(server_url_env.c_str()));
250
264
251
265
    // reset url and check that we now have contant values
252
266
    EXPECT_NO_THROW(ssc_->reset_url());
253
267
    EXPECT_EQ(0, ssc_->port());
254
268
    EXPECT_EQ("https://productsearch.ubuntu.com/smartscopes/v2", ssc_->url());
255
269
256
270
    // env var, http addr, no port
257
271
    server_url_env = "SMART_SCOPES_SERVER=http://hello.com/there";
258
272
    ::putenv(const_cast<char*>(server_url_env.c_str()));
259
273
260
274
    EXPECT_NO_THROW(ssc_->reset_url());
261
275
    EXPECT_EQ(0, ssc_->port());
262
276
    EXPECT_EQ("http://hello.com/there", ssc_->url());
263
277
264
278
    // env var, https addr, no port
265
279
    server_url_env = "SMART_SCOPES_SERVER=https://hello.com/there";
266
280
    ::putenv(const_cast<char*>(server_url_env.c_str()));
267
281
268
282
    EXPECT_NO_THROW(ssc_->reset_url());
269
283
    EXPECT_EQ(0, ssc_->port());
270
284
    EXPECT_NO_THROW(ssc_->reset_port(1500));
271
285
    EXPECT_EQ(1500, ssc_->port());
272
286
    EXPECT_EQ("https://hello.com/there", ssc_->url());
273
287
274
288
    // env var, http addr, with port (end)
275
289
    server_url_env = "SMART_SCOPES_SERVER=http://hello.com:1500";
276
290
    ::putenv(const_cast<char*>(server_url_env.c_str()));
277
291
278
292
    EXPECT_NO_THROW(ssc_->reset_url());
279
293
    EXPECT_EQ(1500, ssc_->port());
280
294
    EXPECT_EQ("http://hello.com", ssc_->url());
281
295
282
296
    // env var, https addr, with port (end)
283
297
    server_url_env = "SMART_SCOPES_SERVER=https://hello.com:1500";
284
298
    ::putenv(const_cast<char*>(server_url_env.c_str()));
285
299
286
300
    EXPECT_NO_THROW(ssc_->reset_url());
287
301
    EXPECT_EQ(1500, ssc_->port());
288
302
    EXPECT_NO_THROW(ssc_->reset_port(2000));
289
303
    EXPECT_EQ(2000, ssc_->port());
290
304
    EXPECT_EQ("https://hello.com", ssc_->url());
291
305
292
306
    // env var, http addr, with port (mid)
293
307
    server_url_env = "SMART_SCOPES_SERVER=http://hello.com:1500/there";
294
308
    ::putenv(const_cast<char*>(server_url_env.c_str()));
295
309
296
310
    EXPECT_NO_THROW(ssc_->reset_url());
297
311
    EXPECT_EQ(1500, ssc_->port());
298
312
    EXPECT_EQ("http://hello.com/there", ssc_->url());
299
313
300
314
    // env var, https addr, with port (mid)
301
315
    server_url_env = "SMART_SCOPES_SERVER=https://hello.com:1500/there";
302
316
    ::putenv(const_cast<char*>(server_url_env.c_str()));
303
317
304
318
    EXPECT_NO_THROW(ssc_->reset_url());
305
319
    EXPECT_EQ(1500, ssc_->port());
306
320
    EXPECT_EQ("https://hello.com/there", ssc_->url());
307
321
308
322
    // env var, https addr, with broken port
309
323
    server_url_env = "SMART_SCOPES_SERVER=https://hello.com:15d00/there";
310
324
    ::putenv(const_cast<char*>(server_url_env.c_str()));
311
325
312
326
    EXPECT_THROW(ssc_->reset_url(), std::exception);
313
327
    EXPECT_EQ(0, ssc_->port());
314
328
    EXPECT_EQ("", ssc_->url());
315
329
316
330
    // env var, https addr, with floating colon
317
331
    server_url_env = "SMART_SCOPES_SERVER=https://hello.com:1500/the:re";
318
332
    ::putenv(const_cast<char*>(server_url_env.c_str()));
319
333
320
334
    EXPECT_THROW(ssc_->reset_url(), std::exception);
321
335
    EXPECT_EQ(0, ssc_->port());
322
336
    EXPECT_NO_THROW(ssc_->reset_port(1500));
323
337
    EXPECT_EQ(1500, ssc_->port());
324
338
    EXPECT_EQ("", ssc_->url());
325
339
}
326
340
327
193
} // namespace
341
} // namespace
328
194
342
329
=== modified file 'test/gtest/scopes/internal/smartscopes/smartscopesproxy/smartscopesproxy_test.cpp'
330
--- test/gtest/scopes/internal/smartscopes/smartscopesproxy/smartscopesproxy_test.cpp	2014-02-20 19:19:25 +0000
331
+++ test/gtest/scopes/internal/smartscopes/smartscopesproxy/smartscopesproxy_test.cpp	2014-02-25 09:40:06 +0000
332
@@ -41,8 +41,6 @@
333
41
using namespace unity::scopes::internal::smartscopes;
41
using namespace unity::scopes::internal::smartscopes;
334
42
using namespace unity::test::scopes::internal::smartscopes;
42
using namespace unity::test::scopes::internal::smartscopes;
335
43
43
336
44
///! TODO: more tests
337
45
338
46
namespace
44
namespace
339
47
{
45
{
340
48
46
341
49
47
342
=== modified file 'valgrind-suppress'
343
--- valgrind-suppress	2014-02-03 11:29:47 +0000
344
+++ valgrind-suppress	2014-02-25 09:40:06 +0000
345
@@ -72,7 +72,6 @@
346
72
    obj:/lib/x86_64-linux-gnu/ld-2.18.so
72
    obj:/lib/x86_64-linux-gnu/ld-2.18.so
347
73
}
73
}
348
74
74
349
75
350
76
# False positives for memory leaks in Qt
75
# False positives for memory leaks in Qt
351
77
76
352
78
{
77
{
353
@@ -99,7 +98,6 @@
354
99
   ...
98
   ...
355
100
   fun:_ZN21QNetworkAccessManager13createRequestENS_9OperationERK15QNetworkRequestP9QIODevice
99
   fun:_ZN21QNetworkAccessManager13createRequestENS_9OperationERK15QNetworkRequestP9QIODevice
356
101
   fun:_ZN21QNetworkAccessManager3getERK15QNetworkRequest
100
   fun:_ZN21QNetworkAccessManager3getERK15QNetworkRequest
357
102
   fun:_ZN18HttpClientQtThread3runEv
358
103
}
101
}
359
104
102
360
105
{
103
{
361
@@ -109,3 +107,21 @@
362
109
   ...
107
   ...
363
110
   fun:_ZNK14QFactoryLoader8instanceEi
108
   fun:_ZNK14QFactoryLoader8instanceEi
364
111
}
109
}
365
110
366
111
# Bogus "invalid read" reports for ::putenv and ::genenv
367
112
368
113
{
369
114
   putenv_read
370
115
   Memcheck:Addr1
371
116
   ...
372
117
   fun:putenv
373
118
   ...
374
119
}
375
120
376
121
{
377
122
   getenv_read
378
123
   Memcheck:Addr2
379
124
   ...
380
125
   fun:getenv
381
126
   ...
382
127
}
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Approve on 2014-02-25
Paweł Stołowski (community)		2014-02-24	Approve on 2014-02-25
Michi Henning (community)			Needs Information on 2014-02-24
Review via email: mp+207864@code.launchpad.net