1
=== modified file 'src/cookie/authority.cpp'
2
--- src/cookie/authority.cpp	2016-01-29 08:18:22 +0000
3
+++ src/cookie/authority.cpp	2016-02-26 22:51:56 +0000
4
@@ -123,13 +123,15 @@
5
123
class AuthorityNettle : public mir::cookie::Authority
123
class AuthorityNettle : public mir::cookie::Authority
6
124
{
124
{
7
125
public:
125
public:
9
126
    AuthorityNettle(mir::cookie::Secret const& secret)
126
    AuthorityNettle() = default;
10
127
11
128
    explicit AuthorityNettle(mir::cookie::Secret const& passed_secret)
12
127
    {
129
    {
15
128
        if (secret.size() < minimum_secret_size)
130
        if (passed_secret.size() < minimum_secret_size)
16
129
            BOOST_THROW_EXCEPTION(std::logic_error("Secret size " + std::to_string(secret.size()) + " is to small, require " +
131
            BOOST_THROW_EXCEPTION(std::logic_error("Secret size " + std::to_string(passed_secret.size()) +
17
132
                                                   " is too small, require " +
18
130
                                                   std::to_string(minimum_secret_size) + " or greater."));
133
                                                   std::to_string(minimum_secret_size) + " or greater."));
21
131
134
        set_secret(passed_secret);
20
132
        hmac_sha1_set_key(&ctx, secret.size(), secret.data());
22
133
    }
135
    }
23
134
136
24
135
    virtual ~AuthorityNettle() noexcept = default;
137
    virtual ~AuthorityNettle() noexcept = default;
25
@@ -137,6 +139,9 @@
26
137
139
27
138
    std::unique_ptr<mir::cookie::Cookie> make_cookie(uint64_t const& timestamp) override
140
    std::unique_ptr<mir::cookie::Cookie> make_cookie(uint64_t const& timestamp) override
28
139
    {
141
    {
29
142
        if (secret.empty())
30
143
            set_secret(get_random_data(optimal_secret_size()));
31
144
32
140
        return std::make_unique<mir::cookie::HMACCookie>(timestamp, calculate_cookie(timestamp), mir::cookie::Format::hmac_sha_1_8);
145
        return std::make_unique<mir::cookie::HMACCookie>(timestamp, calculate_cookie(timestamp), mir::cookie::Format::hmac_sha_1_8);
33
141
    }
146
    }
34
142
147
35
@@ -183,6 +188,12 @@
36
183
    }
188
    }
37
184
189
38
185
private:
190
private:
39
191
    void set_secret(mir::cookie::Secret const& passed_secret)
40
192
    {
41
193
        secret = passed_secret;
42
194
        hmac_sha1_set_key(&ctx, secret.size(), secret.data());
43
195
    }
44
196
45
186
    std::vector<uint8_t> calculate_cookie(uint64_t const& timestamp)
197
    std::vector<uint8_t> calculate_cookie(uint64_t const& timestamp)
46
187
    {
198
    {
47
188
        std::vector<uint8_t> mac(mac_byte_size);
199
        std::vector<uint8_t> mac(mac_byte_size);
48
@@ -204,6 +215,7 @@
49
204
    }
215
    }
50
205
216
51
206
    struct hmac_sha1_ctx ctx;
217
    struct hmac_sha1_ctx ctx;
52
218
    mir::cookie::Secret secret;
53
207
};
219
};
54
208
220
55
209
size_t mir::cookie::Authority::optimal_secret_size()
221
size_t mir::cookie::Authority::optimal_secret_size()
56
@@ -227,6 +239,5 @@
57
227
239
58
228
std::unique_ptr<mir::cookie::Authority> mir::cookie::Authority::create()
240
std::unique_ptr<mir::cookie::Authority> mir::cookie::Authority::create()
59
229
{
241
{
62
230
  auto secret = get_random_data(optimal_secret_size());
242
  return std::make_unique<AuthorityNettle>();
61
231
  return std::make_unique<AuthorityNettle>(secret);
63
232
}
243
}
64
233
244
65
=== modified file 'tests/acceptance-tests/test_server_startup.cpp'
66
--- tests/acceptance-tests/test_server_startup.cpp	2016-02-26 03:37:46 +0000
67
+++ tests/acceptance-tests/test_server_startup.cpp	2016-02-26 22:51:56 +0000
68
@@ -68,7 +68,7 @@
69
68
        });
68
        });
70
69
}
69
}
71
70
70
73
71
TEST(ServerStartupReliability, DISABLED_can_start_with_low_entropy)
71
TEST(ServerStartupReliability, can_start_with_low_entropy)
74
72
{   // Regression test for LP: #1536662 and LP: #1541188
72
{   // Regression test for LP: #1536662 and LP: #1541188
75
73
    using namespace ::testing;
73
    using namespace ::testing;
76
74
74
77
75
75
78
=== modified file 'tests/unit-tests/test_mir_cookie.cpp'
79
--- tests/unit-tests/test_mir_cookie.cpp	2016-02-26 03:37:46 +0000
80
+++ tests/unit-tests/test_mir_cookie.cpp	2016-02-26 22:51:56 +0000
81
@@ -119,7 +119,7 @@
82
119
        Ge(mir::cookie::Authority::minimum_secret_size));
119
        Ge(mir::cookie::Authority::minimum_secret_size));
83
120
}
120
}
84
121
121
86
122
TEST(MirCookieAuthority, DISABLED_given_low_entropy_does_not_hang_or_crash)
122
TEST(MirCookieAuthority, given_low_entropy_does_not_hang_or_crash)
87
123
{   // Regression test for LP: #1536662 and LP: #1541188
123
{   // Regression test for LP: #1536662 and LP: #1541188
88
124
    using namespace testing;
124
    using namespace testing;
89
125
125
Reviewer	Review Type	Date Requested	Status
Daniel van Vugt			Disapprove on 2016-02-29
Mir CI Bot	continuous-integration		Needs Fixing on 2016-02-27
Cemil Azizoglu (community)		2016-02-26	Needs Fixing on 2016-02-26
Review via email: mp+287372@code.launchpad.net
1	=== modified file 'src/cookie/authority.cpp'
2	--- src/cookie/authority.cpp 2016-01-29 08:18:22 +0000
3	+++ src/cookie/authority.cpp 2016-02-26 22:51:56 +0000
4	@@ -123,13 +123,15 @@
5	123	class AuthorityNettle : public mir::cookie::Authority	123	class AuthorityNettle : public mir::cookie::Authority
6	124	{	124	{
7	125	public:	125	public:
9	126	AuthorityNettle(mir::cookie::Secret const& secret)	126	AuthorityNettle() = default;
10			127
11			128	explicit AuthorityNettle(mir::cookie::Secret const& passed_secret)
12	127	{	129	{
15	128	if (secret.size() < minimum_secret_size)	130	if (passed_secret.size() < minimum_secret_size)
16	129	BOOST_THROW_EXCEPTION(std::logic_error("Secret size " + std::to_string(secret.size()) + " is to small, require " +	131	BOOST_THROW_EXCEPTION(std::logic_error("Secret size " + std::to_string(passed_secret.size()) +
17			132	" is too small, require " +
18	130	std::to_string(minimum_secret_size) + " or greater."));	133	std::to_string(minimum_secret_size) + " or greater."));
21	131		134	set_secret(passed_secret);
20	132	hmac_sha1_set_key(&ctx, secret.size(), secret.data());
22	133	}	135	}
23	134		136
24	135	virtual ~AuthorityNettle() noexcept = default;	137	virtual ~AuthorityNettle() noexcept = default;
25	@@ -137,6 +139,9 @@
26	137		139
27	138	std::unique_ptr<mir::cookie::Cookie> make_cookie(uint64_t const& timestamp) override	140	std::unique_ptr<mir::cookie::Cookie> make_cookie(uint64_t const& timestamp) override
28	139	{	141	{
29			142	if (secret.empty())
30			143	set_secret(get_random_data(optimal_secret_size()));
31			144
32	140	return std::make_unique<mir::cookie::HMACCookie>(timestamp, calculate_cookie(timestamp), mir::cookie::Format::hmac_sha_1_8);	145	return std::make_unique<mir::cookie::HMACCookie>(timestamp, calculate_cookie(timestamp), mir::cookie::Format::hmac_sha_1_8);
33	141	}	146	}
34	142		147
35	@@ -183,6 +188,12 @@
36	183	}	188	}
37	184		189
38	185	private:	190	private:
39			191	void set_secret(mir::cookie::Secret const& passed_secret)
40			192	{
41			193	secret = passed_secret;
42			194	hmac_sha1_set_key(&ctx, secret.size(), secret.data());
43			195	}
44			196
45	186	std::vector<uint8_t> calculate_cookie(uint64_t const& timestamp)	197	std::vector<uint8_t> calculate_cookie(uint64_t const& timestamp)
46	187	{	198	{
47	188	std::vector<uint8_t> mac(mac_byte_size);	199	std::vector<uint8_t> mac(mac_byte_size);
48	@@ -204,6 +215,7 @@
49	204	}	215	}
50	205		216
51	206	struct hmac_sha1_ctx ctx;	217	struct hmac_sha1_ctx ctx;
52			218	mir::cookie::Secret secret;
53	207	};	219	};
54	208		220
55	209	size_t mir::cookie::Authority::optimal_secret_size()	221	size_t mir::cookie::Authority::optimal_secret_size()
56	@@ -227,6 +239,5 @@
57	227		239
58	228	std::unique_ptr<mir::cookie::Authority> mir::cookie::Authority::create()	240	std::unique_ptr<mir::cookie::Authority> mir::cookie::Authority::create()
59	229	{	241	{
62	230	auto secret = get_random_data(optimal_secret_size());	242	return std::make_unique<AuthorityNettle>();
61	231	return std::make_unique<AuthorityNettle>(secret);
63	232	}	243	}
64	233		244
65	=== modified file 'tests/acceptance-tests/test_server_startup.cpp'
66	--- tests/acceptance-tests/test_server_startup.cpp 2016-02-26 03:37:46 +0000
67	+++ tests/acceptance-tests/test_server_startup.cpp 2016-02-26 22:51:56 +0000
68	@@ -68,7 +68,7 @@
69	68	});	68	});
70	69	}	69	}
71	70		70
73	71	TEST(ServerStartupReliability, DISABLED_can_start_with_low_entropy)	71	TEST(ServerStartupReliability, can_start_with_low_entropy)
74	72	{ // Regression test for LP: #1536662 and LP: #1541188	72	{ // Regression test for LP: #1536662 and LP: #1541188
75	73	using namespace ::testing;	73	using namespace ::testing;
76	74		74
77	75		75
78	=== modified file 'tests/unit-tests/test_mir_cookie.cpp'
79	--- tests/unit-tests/test_mir_cookie.cpp 2016-02-26 03:37:46 +0000
80	+++ tests/unit-tests/test_mir_cookie.cpp 2016-02-26 22:51:56 +0000
81	@@ -119,7 +119,7 @@
82	119	Ge(mir::cookie::Authority::minimum_secret_size));	119	Ge(mir::cookie::Authority::minimum_secret_size));
83	120	}	120	}
84	121		121
86	122	TEST(MirCookieAuthority, DISABLED_given_low_entropy_does_not_hang_or_crash)	122	TEST(MirCookieAuthority, given_low_entropy_does_not_hang_or_crash)
87	123	{ // Regression test for LP: #1536662 and LP: #1541188	123	{ // Regression test for LP: #1536662 and LP: #1541188
88	124	using namespace testing;	124	using namespace testing;
89	125		125