1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
|
diff -uar chromium-43.0.2357.132.orig/chrome/browser/password_manager/native_backend_kwallet_x.cc chromium-43.0.2357.132/chrome/browser/password_manager/native_backend_kwallet_x.cc
--- chromium-43.0.2357.132.orig/chrome/browser/password_manager/native_backend_kwallet_x.cc 2015-07-07 23:57:09.000000000 +0200
+++ chromium-43.0.2357.132/chrome/browser/password_manager/native_backend_kwallet_x.cc 2015-07-08 19:59:36.865817805 +0200
@@ -30,7 +30,7 @@
// In case the fields in the pickle ever change, version them so we can try to
// read old pickles. (Note: do not eat old pickles past the expiration date.)
-const int kPickleVersion = 6;
+const int kPickleVersion = 7;
// We could localize this string, but then changing your locale would cause
// you to lose access to all your stored passwords. Maybe best not to do that.
@@ -218,12 +218,18 @@
}
if (version > 5) {
- if (!iter.ReadInt(&generation_upload_status)) {
+ bool read_success = iter.ReadInt(&generation_upload_status);
+ if (!read_success && version > 6) {
+ // Valid version 6 pickles might still lack the
+ // generation_upload_status, see http://crbug.com/494229#c11.
LogDeserializationWarning(version, signon_realm, false);
+ return false;
+ }
+ if (read_success) {
+ form->generation_upload_status =
+ static_cast<PasswordForm::GenerationUploadStatus>(
+ generation_upload_status);
}
- form->generation_upload_status =
- static_cast<PasswordForm::GenerationUploadStatus>(
- generation_upload_status);
}
converted_forms.push_back(form.release());
@@ -259,6 +265,7 @@
pickle->WriteString(form->avatar_url.spec());
pickle->WriteString(form->federation_url.spec());
pickle->WriteBool(form->skip_zero_click);
+ pickle->WriteInt(form->generation_upload_status);
}
}
diff -uar chromium-43.0.2357.132.orig/chrome/browser/password_manager/native_backend_kwallet_x_unittest.cc chromium-43.0.2357.132/chrome/browser/password_manager/native_backend_kwallet_x_unittest.cc
--- chromium-43.0.2357.132.orig/chrome/browser/password_manager/native_backend_kwallet_x_unittest.cc 2015-07-07 23:57:09.000000000 +0200
+++ chromium-43.0.2357.132/chrome/browser/password_manager/native_backend_kwallet_x_unittest.cc 2015-07-08 20:07:26.970585840 +0200
@@ -170,6 +170,7 @@
form_google_.avatar_url = GURL("http://www.google.com/avatar");
form_google_.federation_url = GURL("http://www.google.com/federation_url");
form_google_.skip_zero_click = true;
+ form_google_.generation_upload_status = PasswordForm::NEGATIVE_SIGNAL_SENT;
form_isc_.origin = GURL("http://www.isc.org/");
form_isc_.action = GURL("http://www.isc.org/auth");
@@ -930,15 +931,21 @@
class NativeBackendKWalletPickleTest : public NativeBackendKWalletTestBase {
protected:
- void CreateVersion6Pickle(const PasswordForm& form, Pickle* pickle);
- void CreateVersion5Pickle(const PasswordForm& form, Pickle* pickle);
- void CreateVersion3Pickle(const PasswordForm& form, Pickle* pickle);
- void CreateVersion2Pickle(const PasswordForm& form, Pickle* pickle);
- void CreateVersion1Pickle(const PasswordForm& form, Pickle* pickle);
+ // Based on |form|, fills |pickle| with data conforming to
+ // |effective_version|, but marking the pickle version as |stored_version|. In
+ // most cases the two versions should be the same.
+ void CreateVersion1PlusPickle(const PasswordForm& form,
+ Pickle* pickle,
+ int stored_version,
+ int effective_version);
void CreateVersion0Pickle(bool size_32,
const PasswordForm& form,
Pickle* pickle);
- void CheckVersion6Pickle();
+ // As explained in http://crbug.com/494229#c11, version 6 added a new optional
+ // field to version 5. This field became required in version 7. Depending on
+ // |with_optional_field|, this method checks deserialization with or without
+ // the optional field.
+ void CheckVersion6Pickle(bool with_optional_field);
void CheckVersion5Pickle();
void CheckVersion3Pickle();
void CheckVersion2Pickle();
@@ -956,62 +963,32 @@
Pickle* pickle);
};
-void NativeBackendKWalletPickleTest::CreateVersion6Pickle(
+void NativeBackendKWalletPickleTest::CreateVersion1PlusPickle(
const PasswordForm& form,
- Pickle* pickle) {
- pickle->WriteInt(6);
+ Pickle* pickle,
+ int stored_version,
+ int effective_version) {
+ pickle->WriteInt(stored_version);
CreatePickle(false, true, form, pickle);
+ if (effective_version < 2)
+ return;
pickle->WriteInt(form.type);
pickle->WriteInt(form.times_used);
autofill::SerializeFormData(form.form_data, pickle);
+ if (effective_version < 3)
+ return;
pickle->WriteInt64(form.date_synced.ToInternalValue());
+ if (effective_version < 4)
+ return;
pickle->WriteString16(form.display_name);
pickle->WriteString(form.avatar_url.spec());
pickle->WriteString(form.federation_url.spec());
pickle->WriteBool(form.skip_zero_click);
+ if (effective_version < 7)
+ return;
pickle->WriteInt(form.generation_upload_status);
}
-void NativeBackendKWalletPickleTest::CreateVersion5Pickle(
- const PasswordForm& form,
- Pickle* pickle) {
- pickle->WriteInt(5);
- CreatePickle(false, true, form, pickle);
- pickle->WriteInt(form.type);
- pickle->WriteInt(form.times_used);
- autofill::SerializeFormData(form.form_data, pickle);
- pickle->WriteInt64(form.date_synced.ToInternalValue());
- pickle->WriteString16(form.display_name);
- pickle->WriteString(form.avatar_url.spec());
- pickle->WriteString(form.federation_url.spec());
- pickle->WriteBool(form.skip_zero_click);
-}
-
-void NativeBackendKWalletPickleTest::CreateVersion3Pickle(
- const PasswordForm& form, Pickle* pickle) {
- pickle->WriteInt(3);
- CreatePickle(false, false, form, pickle);
- pickle->WriteInt(form.type);
- pickle->WriteInt(form.times_used);
- autofill::SerializeFormData(form.form_data, pickle);
- pickle->WriteInt64(form.date_synced.ToInternalValue());
-}
-
-void NativeBackendKWalletPickleTest::CreateVersion2Pickle(
- const PasswordForm& form, Pickle* pickle) {
- pickle->WriteInt(2);
- CreatePickle(false, false, form, pickle);
- pickle->WriteInt(form.type);
- pickle->WriteInt(form.times_used);
- autofill::SerializeFormData(form.form_data, pickle);
-}
-
-void NativeBackendKWalletPickleTest::CreateVersion1Pickle(
- const PasswordForm& form, Pickle* pickle) {
- pickle->WriteInt(1);
- CreatePickle(false, false, form, pickle);
-}
-
void NativeBackendKWalletPickleTest::CreateVersion0Pickle(
bool size_32, const PasswordForm& form, Pickle* pickle) {
pickle->WriteInt(0);
@@ -1043,11 +1020,15 @@
pickle->WriteInt64(form.date_created.ToTimeT());
}
-void NativeBackendKWalletPickleTest::CheckVersion6Pickle() {
+void NativeBackendKWalletPickleTest::CheckVersion6Pickle(
+ bool with_optional_field) {
Pickle pickle;
PasswordForm form = form_google_;
- form.generation_upload_status = PasswordForm::NEGATIVE_SIGNAL_SENT;
- CreateVersion6Pickle(form, &pickle);
+ if (!with_optional_field) {
+ PasswordForm default_values;
+ form.generation_upload_status = default_values.generation_upload_status;
+ }
+ CreateVersion1PlusPickle(form, &pickle, 6, with_optional_field ? 7 : 5);
ScopedVector<PasswordForm> form_list =
NativeBackendKWalletStub::DeserializeValue(form.signon_realm, pickle);
@@ -1060,8 +1041,11 @@
void NativeBackendKWalletPickleTest::CheckVersion5Pickle() {
Pickle pickle;
+ PasswordForm default_values;
PasswordForm form = form_google_;
- CreateVersion5Pickle(form, &pickle);
+ // Remove the field which was not present in version #5.
+ form.generation_upload_status = default_values.generation_upload_status;
+ CreateVersion1PlusPickle(form, &pickle, 5, 5);
ScopedVector<PasswordForm> form_list =
NativeBackendKWalletStub::DeserializeValue(form.signon_realm, pickle);
@@ -1073,13 +1057,15 @@
void NativeBackendKWalletPickleTest::CheckVersion3Pickle() {
Pickle pickle;
+ PasswordForm default_values;
PasswordForm form = form_google_;
// Remove the fields which were not present in version #3.
- form.display_name.clear();
- form.avatar_url = GURL();
- form.federation_url = GURL();
- form.skip_zero_click = false;
- CreateVersion3Pickle(form, &pickle);
+ form.display_name = default_values.display_name;
+ form.avatar_url = default_values.avatar_url;
+ form.federation_url = default_values.federation_url;
+ form.skip_zero_click = default_values.skip_zero_click;
+ form.generation_upload_status = default_values.generation_upload_status;
+ CreateVersion1PlusPickle(form, &pickle, 3, 3);
ScopedVector<PasswordForm> form_list =
NativeBackendKWalletStub::DeserializeValue(form.signon_realm, pickle);
@@ -1095,7 +1081,7 @@
form.times_used = form_google_.times_used;
form.type = form_google_.type;
form.form_data = form_google_.form_data;
- CreateVersion2Pickle(form, &pickle);
+ CreateVersion1PlusPickle(form, &pickle, 2, 2);
ScopedVector<PasswordForm> form_list =
NativeBackendKWalletStub::DeserializeValue(form.signon_realm, pickle);
@@ -1109,7 +1095,7 @@
void NativeBackendKWalletPickleTest::CheckVersion1Pickle() {
Pickle pickle;
PasswordForm form = form_google_;
- CreateVersion1Pickle(form, &pickle);
+ CreateVersion1PlusPickle(form, &pickle, 1, 1);
ScopedVector<autofill::PasswordForm> form_list =
NativeBackendKWalletStub::DeserializeValue(form.signon_realm, pickle);
@@ -1197,5 +1183,6 @@
}
TEST_F(NativeBackendKWalletPickleTest, CheckVersion6Pickle) {
- CheckVersion6Pickle();
+ CheckVersion6Pickle(false);
+ CheckVersion6Pickle(true);
}
|
