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
|
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
// useMLBF=true only supports blocking by version+ID, not by regexp.
enable_blocklist_v2_instead_of_useMLBF();
const BLOCKLIST_DATA = [
{
guid: "/^abcd.*/",
versionRange: [],
expectedType: "RegExp",
},
{
guid: "test@example.com",
versionRange: [],
expectedType: "string",
},
{
guid: "/^((a)|(b)|(c))$/",
versionRange: [],
expectedType: "Set",
},
{
guid: "/^((a@b)|(\\{6d9ddd6e-c6ee-46de-ab56-ce9080372b3\\})|(c@d.com))$/",
versionRange: [],
expectedType: "Set",
},
// The same as the above, but with escape sequences that disqualify it from
// being treated as a set (and a different guid)
{
guid: "/^((s@t)|(\\{6d9eee6e-c6ee-46de-ab56-ce9080372b3\\})|(c@d\\w.com))$/",
versionRange: [],
expectedType: "RegExp",
},
// Also the same, but with other magical regex characters.
// (and a different guid)
{
guid: "/^((u@v)|(\\{6d9fff6e*-c6ee-46de-ab56-ce9080372b3\\})|(c@dee?.com))$/",
versionRange: [],
expectedType: "RegExp",
},
];
/**
* Verify that both IDs being OR'd in a regex work,
* and that other regular expressions continue being
* used as regular expressions.
*/
add_task(async function test_check_matching_works() {
createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1", "1.9");
await promiseStartupManager();
await AddonTestUtils.loadBlocklistRawData({
extensions: BLOCKLIST_DATA,
});
const { BlocklistPrivate } = ChromeUtils.importESModule(
"resource://gre/modules/Blocklist.sys.mjs"
);
let parsedEntries = BlocklistPrivate.ExtensionBlocklistRS._entries;
// Unfortunately, the parsed entries aren't in the same order as the original.
function strForTypeOf(val) {
if (typeof val == "string") {
return "string";
}
if (val) {
return val.constructor.name;
}
return "other";
}
for (let type of ["Set", "RegExp", "string"]) {
let numberParsed = parsedEntries.filter(parsedEntry => {
return type == strForTypeOf(parsedEntry.matches.id);
}).length;
let expected = BLOCKLIST_DATA.filter(entry => {
return type == entry.expectedType;
}).length;
Assert.equal(
numberParsed,
expected,
type + " should have expected number of entries"
);
}
// Shouldn't block everything.
Assert.ok(
!(await Blocklist.getAddonBlocklistEntry({ id: "nonsense", version: "1" }))
);
// Should block IDs starting with abcd
Assert.ok(
await Blocklist.getAddonBlocklistEntry({ id: "abcde", version: "1" })
);
// Should block the literal string listed
Assert.ok(
await Blocklist.getAddonBlocklistEntry({
id: "test@example.com",
version: "1",
})
);
// Should block the IDs in (a)|(b)|(c)
Assert.ok(await Blocklist.getAddonBlocklistEntry({ id: "a", version: "1" }));
Assert.ok(await Blocklist.getAddonBlocklistEntry({ id: "b", version: "1" }));
Assert.ok(await Blocklist.getAddonBlocklistEntry({ id: "c", version: "1" }));
// Should block all the items processed to a set:
Assert.ok(
await Blocklist.getAddonBlocklistEntry({ id: "a@b", version: "1" })
);
Assert.ok(
await Blocklist.getAddonBlocklistEntry({
id: "{6d9ddd6e-c6ee-46de-ab56-ce9080372b3}",
version: "1",
})
);
Assert.ok(
await Blocklist.getAddonBlocklistEntry({ id: "c@d.com", version: "1" })
);
// Should block items that remained a regex:
Assert.ok(
await Blocklist.getAddonBlocklistEntry({ id: "s@t", version: "1" })
);
Assert.ok(
await Blocklist.getAddonBlocklistEntry({
id: "{6d9eee6e-c6ee-46de-ab56-ce9080372b3}",
version: "1",
})
);
Assert.ok(
await Blocklist.getAddonBlocklistEntry({ id: "c@dx.com", version: "1" })
);
Assert.ok(
await Blocklist.getAddonBlocklistEntry({ id: "u@v", version: "1" })
);
Assert.ok(
await Blocklist.getAddonBlocklistEntry({
id: "{6d9fff6eeeeeeee-c6ee-46de-ab56-ce9080372b3}",
version: "1",
})
);
Assert.ok(
await Blocklist.getAddonBlocklistEntry({ id: "c@dee.com", version: "1" })
);
});
// We should be checking all properties, not just the first one we come across.
add_task(async function check_all_properties() {
await AddonTestUtils.loadBlocklistRawData({
extensions: [
{
guid: "literal@string.com",
creator: "Foo",
versionRange: [],
},
{
guid: "/regex.*@regex\\.com/",
creator: "Foo",
versionRange: [],
},
{
guid: "/^((set@set\\.com)|(anotherset@set\\.com)|(reallyenoughsetsalready@set\\.com))$/",
creator: "Foo",
versionRange: [],
},
],
});
let { Blocklist } = ChromeUtils.importESModule(
"resource://gre/modules/Blocklist.sys.mjs"
);
// Check 'wrong' creator doesn't match.
Assert.ok(
!(await Blocklist.getAddonBlocklistEntry({
id: "literal@string.com",
version: "1",
creator: { name: "Bar" },
}))
);
Assert.ok(
!(await Blocklist.getAddonBlocklistEntry({
id: "regexaaaaa@regex.com",
version: "1",
creator: { name: "Bar" },
}))
);
Assert.ok(
!(await Blocklist.getAddonBlocklistEntry({
id: "set@set.com",
version: "1",
creator: { name: "Bar" },
}))
);
// Check 'wrong' ID doesn't match.
Assert.ok(
!(await Blocklist.getAddonBlocklistEntry({
id: "someotherid@foo.com",
version: "1",
creator: { name: "Foo" },
}))
);
// Check items matching all filters do match
Assert.ok(
await Blocklist.getAddonBlocklistEntry({
id: "literal@string.com",
version: "1",
creator: { name: "Foo" },
})
);
Assert.ok(
await Blocklist.getAddonBlocklistEntry({
id: "regexaaaaa@regex.com",
version: "1",
creator: { name: "Foo" },
})
);
Assert.ok(
await Blocklist.getAddonBlocklistEntry({
id: "set@set.com",
version: "1",
creator: { name: "Foo" },
})
);
});
|
