forked from mirrors/gecko-dev
Backed out 7 changesets (bug 1894958) for causing bc failures on browser_usercharacteristics_gamepads. CLOSED TREE
Backed out changeset 2d6a773b1cfe (bug 1894958) Backed out changeset 64fa5abd15b1 (bug 1894958) Backed out changeset 73017dc41a54 (bug 1894958) Backed out changeset 99498fc1e89c (bug 1894958) Backed out changeset 4ef86875b1c2 (bug 1894958) Backed out changeset 31e1c5284927 (bug 1894958) Backed out changeset 29545556fe0b (bug 1894958)
This commit is contained in:
Cosmin Sabou
parent
5d2fa207a6
commit
14bfc537ab
17 changed files with 56 additions and 1242 deletions
|
|
@ -1447,7 +1447,6 @@ toolkit/components/normandy/vendor/
|
||||||
toolkit/components/passwordmgr/PasswordRulesParser.sys.mjs
|
toolkit/components/passwordmgr/PasswordRulesParser.sys.mjs
|
||||||
toolkit/components/protobuf/
|
toolkit/components/protobuf/
|
||||||
toolkit/components/reader/readability/
|
toolkit/components/reader/readability/
|
||||||
toolkit/components/resistfingerprinting/content/gl-matrix.js
|
|
||||||
toolkit/components/translation/cld2/
|
toolkit/components/translation/cld2/
|
||||||
toolkit/components/translations/bergamot-translator/thirdparty
|
toolkit/components/translations/bergamot-translator/thirdparty
|
||||||
toolkit/components/translations/bergamot-translator/bergamot-translator.js
|
toolkit/components/translations/bergamot-translator/bergamot-translator.js
|
||||||
|
|
|
||||||
|
|
@ -108,7 +108,7 @@ static const RedirEntry kRedirMap[] = {
|
||||||
{"credits", "https://www.mozilla.org/credits/",
|
{"credits", "https://www.mozilla.org/credits/",
|
||||||
nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
|
nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
|
||||||
nsIAboutModule::URI_MUST_LOAD_IN_CHILD},
|
nsIAboutModule::URI_MUST_LOAD_IN_CHILD},
|
||||||
{"fingerprintingprotection",
|
{"fingerprinting",
|
||||||
"chrome://global/content/usercharacteristics/usercharacteristics.html",
|
"chrome://global/content/usercharacteristics/usercharacteristics.html",
|
||||||
nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
|
nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
|
||||||
nsIAboutModule::HIDE_FROM_ABOUTABOUT | nsIAboutModule::ALLOW_SCRIPT |
|
nsIAboutModule::HIDE_FROM_ABOUTABOUT | nsIAboutModule::ALLOW_SCRIPT |
|
||||||
|
|
|
||||||
|
|
@ -16,7 +16,7 @@ about_pages = [
|
||||||
'crashgpu',
|
'crashgpu',
|
||||||
'crashextensions',
|
'crashextensions',
|
||||||
'credits',
|
'credits',
|
||||||
'fingerprintingprotection',
|
'fingerprinting',
|
||||||
'httpsonlyerror',
|
'httpsonlyerror',
|
||||||
'license',
|
'license',
|
||||||
'logging',
|
'logging',
|
||||||
|
|
|
||||||
|
|
@ -1340,8 +1340,7 @@ void nsContentSecurityUtils::AssertAboutPageHasCSP(Document* aDocument) {
|
||||||
"about:sync-log"_ns,
|
"about:sync-log"_ns,
|
||||||
// about:logo just displays the firefox logo -> no CSP
|
// about:logo just displays the firefox logo -> no CSP
|
||||||
"about:logo"_ns,
|
"about:logo"_ns,
|
||||||
// about:sync is a special mozilla-signed developer addon with low usage
|
// about:sync is a special mozilla-signed developer addon with low usage ->
|
||||||
// ->
|
|
||||||
// no CSP
|
// no CSP
|
||||||
"about:sync"_ns,
|
"about:sync"_ns,
|
||||||
# if defined(ANDROID)
|
# if defined(ANDROID)
|
||||||
|
|
@ -1364,11 +1363,11 @@ void nsContentSecurityUtils::AssertAboutPageHasCSP(Document* aDocument) {
|
||||||
"about: page must contain a CSP denying object-src");
|
"about: page must contain a CSP denying object-src");
|
||||||
|
|
||||||
// preferences and downloads allow legacy inline scripts through hash src.
|
// preferences and downloads allow legacy inline scripts through hash src.
|
||||||
MOZ_ASSERT(
|
MOZ_ASSERT(!foundScriptSrc ||
|
||||||
!foundScriptSrc || StringBeginsWith(aboutSpec, "about:preferences"_ns) ||
|
StringBeginsWith(aboutSpec, "about:preferences"_ns) ||
|
||||||
StringBeginsWith(aboutSpec, "about:settings"_ns) ||
|
StringBeginsWith(aboutSpec, "about:settings"_ns) ||
|
||||||
StringBeginsWith(aboutSpec, "about:downloads"_ns) ||
|
StringBeginsWith(aboutSpec, "about:downloads"_ns) ||
|
||||||
StringBeginsWith(aboutSpec, "about:fingerprintingprotection"_ns) ||
|
StringBeginsWith(aboutSpec, "about:fingerprinting"_ns) ||
|
||||||
StringBeginsWith(aboutSpec, "about:asrouter"_ns) ||
|
StringBeginsWith(aboutSpec, "about:asrouter"_ns) ||
|
||||||
StringBeginsWith(aboutSpec, "about:newtab"_ns) ||
|
StringBeginsWith(aboutSpec, "about:newtab"_ns) ||
|
||||||
StringBeginsWith(aboutSpec, "about:logins"_ns) ||
|
StringBeginsWith(aboutSpec, "about:logins"_ns) ||
|
||||||
|
|
|
||||||
|
|
@ -118,7 +118,7 @@ class _RFPHelper {
|
||||||
UserCharacteristicsDataDone: { wantUntrusted: true },
|
UserCharacteristicsDataDone: { wantUntrusted: true },
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
matches: ["about:fingerprintingprotection"],
|
matches: ["about:fingerprinting"],
|
||||||
remoteTypes: ["privilegedabout"],
|
remoteTypes: ["privilegedabout"],
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
@ -324,11 +324,6 @@ class _RFPHelper {
|
||||||
}
|
}
|
||||||
|
|
||||||
_registerLetterboxingActor() {
|
_registerLetterboxingActor() {
|
||||||
/*
|
|
||||||
* It turns out that this triggers a warning that we're registering a Desktop-only actor
|
|
||||||
* in toolkit (which will also run on mobile.) It just happens this actor only handles
|
|
||||||
* letterboxing, which isn't used on mobile, but we should resolve this.
|
|
||||||
*/
|
|
||||||
ChromeUtils.registerWindowActor("RFPHelper", {
|
ChromeUtils.registerWindowActor("RFPHelper", {
|
||||||
parent: {
|
parent: {
|
||||||
esModuleURI: "resource:///actors/RFPHelperParent.sys.mjs",
|
esModuleURI: "resource:///actors/RFPHelperParent.sys.mjs",
|
||||||
|
|
|
||||||
|
|
@ -169,7 +169,7 @@ export class UserCharacteristicsPageService {
|
||||||
};
|
};
|
||||||
|
|
||||||
let userCharacteristicsPageURI = Services.io.newURI(
|
let userCharacteristicsPageURI = Services.io.newURI(
|
||||||
"about:fingerprintingprotection"
|
"about:fingerprinting"
|
||||||
);
|
);
|
||||||
|
|
||||||
browser.loadURI(userCharacteristicsPageURI, loadURIOptions);
|
browser.loadURI(userCharacteristicsPageURI, loadURIOptions);
|
||||||
|
|
@ -190,39 +190,8 @@ export class UserCharacteristicsPageService {
|
||||||
for (let gamepad of data.output.gamepads) {
|
for (let gamepad of data.output.gamepads) {
|
||||||
Glean.characteristics.gamepads.add(gamepad);
|
Glean.characteristics.gamepads.add(gamepad);
|
||||||
}
|
}
|
||||||
|
|
||||||
Glean.characteristics.zoomCount.set(await this.populateZoomPrefs());
|
Glean.characteristics.zoomCount.set(await this.populateZoomPrefs());
|
||||||
|
|
||||||
try {
|
|
||||||
Glean.characteristics.canvasdata1.set(data.output.canvas1data);
|
|
||||||
Glean.characteristics.canvasdata2.set(data.output.canvas2data);
|
|
||||||
Glean.characteristics.canvasdata3.set(data.output.canvas3data);
|
|
||||||
Glean.characteristics.canvasdata4.set(data.output.canvas4data);
|
|
||||||
Glean.characteristics.canvasdata5.set(data.output.canvas5data);
|
|
||||||
Glean.characteristics.canvasdata6.set(data.output.canvas6data);
|
|
||||||
Glean.characteristics.canvasdata7.set(data.output.canvas7data);
|
|
||||||
Glean.characteristics.canvasdata8.set(data.output.canvas8data);
|
|
||||||
Glean.characteristics.canvasdata9.set(data.output.canvas9data);
|
|
||||||
Glean.characteristics.canvasdata10.set(data.output.canvas10data);
|
|
||||||
Glean.characteristics.canvasdata11Webgl.set(data.output.glcanvasdata);
|
|
||||||
Glean.characteristics.canvasdata12Fingerprintjs1.set(
|
|
||||||
data.output.fingerprintjscanvas1data
|
|
||||||
);
|
|
||||||
Glean.characteristics.canvasdata13Fingerprintjs2.set(
|
|
||||||
data.output.fingerprintjscanvas2data
|
|
||||||
);
|
|
||||||
|
|
||||||
for (let gamepad of data.output.gamepads) {
|
|
||||||
Glean.characteristics.gamepads.add(gamepad);
|
|
||||||
}
|
|
||||||
} catch (e) {
|
|
||||||
// Grab the exception and send it to the console
|
|
||||||
// (we don't see it otherwise)
|
|
||||||
lazy.console.debug(e);
|
|
||||||
// But still fail
|
|
||||||
throw e;
|
|
||||||
}
|
|
||||||
|
|
||||||
lazy.console.debug("Unregistering actor");
|
lazy.console.debug("Unregistering actor");
|
||||||
Services.obs.notifyObservers(
|
Services.obs.notifyObservers(
|
||||||
null,
|
null,
|
||||||
|
|
|
||||||
|
|
@ -1,19 +0,0 @@
|
||||||
Copyright (c) 2015-2021, Brandon Jones, Colin MacKenzie IV.
|
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
|
||||||
in the Software without restriction, including without limitation the rights
|
|
||||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
copies of the Software, and to permit persons to whom the Software is
|
|
||||||
furnished to do so, subject to the following conditions:
|
|
||||||
|
|
||||||
The above copyright notice and this permission notice shall be included in
|
|
||||||
all copies or substantial portions of the Software.
|
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
||||||
THE SOFTWARE.
|
|
||||||
File diff suppressed because one or more lines are too long
|
|
@ -1,20 +0,0 @@
|
||||||
schema: 1
|
|
||||||
|
|
||||||
bugzilla:
|
|
||||||
product: "Core"
|
|
||||||
component: "Privacy: Anti-Tracking"
|
|
||||||
|
|
||||||
origin:
|
|
||||||
name: "gl-matrix"
|
|
||||||
description: "High performance matrix and vector operations"
|
|
||||||
|
|
||||||
url: "https://github.com/toji/gl-matrix/tree/master"
|
|
||||||
license: "MIT"
|
|
||||||
license-file: "gl-matrix.LICENSE"
|
|
||||||
|
|
||||||
release: 2.7.0
|
|
||||||
revision: b836df92c5a959ebf766b53d50148123d0844db4
|
|
||||||
|
|
||||||
notes: >
|
|
||||||
This library is not exposed to attacker input and indeed only given fixed input from usercharacteristics.js
|
|
||||||
so although it is out of date, this is not a concern.
|
|
||||||
|
|
@ -1,7 +0,0 @@
|
||||||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
||||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
||||||
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
|
|
||||||
|
|
||||||
.testcanvas {
|
|
||||||
border: 1px solid #2600ff;
|
|
||||||
}
|
|
||||||
|
|
@ -8,263 +8,11 @@
|
||||||
<meta charset="utf-8" />
|
<meta charset="utf-8" />
|
||||||
<meta
|
<meta
|
||||||
http-equiv="Content-Security-Policy"
|
http-equiv="Content-Security-Policy"
|
||||||
content="default-src data: resource: chrome:; style-src-elem chrome:; object-src 'none'; script-src chrome:"
|
content="default-src 'none'; object-src 'none'; script-src chrome:"
|
||||||
/>
|
|
||||||
<title>about:fingerprintingprotection</title>
|
|
||||||
|
|
||||||
<link
|
|
||||||
href="chrome://global/content/usercharacteristics/usercharacteristics.css"
|
|
||||||
rel="stylesheet"
|
|
||||||
type="text/css"
|
|
||||||
/>
|
/>
|
||||||
|
<title>about:fingerprinting</title>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<div id="test_canvases">
|
|
||||||
<h2>Test Canvases</h2>
|
|
||||||
<div>
|
|
||||||
<h3>Canvas 1</h3>
|
|
||||||
<canvas
|
|
||||||
class="testcanvas"
|
|
||||||
width="250"
|
|
||||||
height="250"
|
|
||||||
id="canvas1"
|
|
||||||
></canvas>
|
|
||||||
<table>
|
|
||||||
<tr>
|
|
||||||
<td>ImageData:</td>
|
|
||||||
<td>
|
|
||||||
<input type="text" name="canvas1data" id="canvas1data" readonly />
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
</table>
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<h3>Canvas 2</h3>
|
|
||||||
<canvas
|
|
||||||
class="testcanvas"
|
|
||||||
width="250"
|
|
||||||
height="250"
|
|
||||||
id="canvas2"
|
|
||||||
></canvas>
|
|
||||||
<table>
|
|
||||||
<tr>
|
|
||||||
<td>ImageData:</td>
|
|
||||||
<td>
|
|
||||||
<input type="text" name="canvas2data" id="canvas2data" readonly />
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
</table>
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<h3>Canvas 3</h3>
|
|
||||||
<canvas
|
|
||||||
class="testcanvas"
|
|
||||||
width="250"
|
|
||||||
height="250"
|
|
||||||
id="canvas3"
|
|
||||||
></canvas>
|
|
||||||
<table>
|
|
||||||
<tr>
|
|
||||||
<td>ImageData:</td>
|
|
||||||
<td>
|
|
||||||
<input type="text" name="canvas3data" id="canvas3data" readonly />
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
</table>
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<h3>Canvas 4</h3>
|
|
||||||
<canvas
|
|
||||||
class="testcanvas"
|
|
||||||
width="250"
|
|
||||||
height="250"
|
|
||||||
id="canvas4"
|
|
||||||
></canvas>
|
|
||||||
<table>
|
|
||||||
<tr>
|
|
||||||
<td>ImageData:</td>
|
|
||||||
<td>
|
|
||||||
<input type="text" name="canvas4data" id="canvas4data" readonly />
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
</table>
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<h3>Canvas 5</h3>
|
|
||||||
<canvas
|
|
||||||
class="testcanvas"
|
|
||||||
width="250"
|
|
||||||
height="250"
|
|
||||||
id="canvas5"
|
|
||||||
></canvas>
|
|
||||||
<table>
|
|
||||||
<tr>
|
|
||||||
<td>ImageData:</td>
|
|
||||||
<td>
|
|
||||||
<input type="text" name="canvas5data" id="canvas5data" readonly />
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
</table>
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<h3>Canvas 6</h3>
|
|
||||||
<canvas
|
|
||||||
class="testcanvas"
|
|
||||||
width="250"
|
|
||||||
height="250"
|
|
||||||
id="canvas6"
|
|
||||||
></canvas>
|
|
||||||
<table>
|
|
||||||
<tr>
|
|
||||||
<td>ImageData:</td>
|
|
||||||
<td>
|
|
||||||
<input type="text" name="canvas6data" id="canvas6data" readonly />
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
</table>
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<h3>Canvas 7</h3>
|
|
||||||
<canvas
|
|
||||||
class="testcanvas"
|
|
||||||
width="250"
|
|
||||||
height="250"
|
|
||||||
id="canvas7"
|
|
||||||
></canvas>
|
|
||||||
<table>
|
|
||||||
<tr>
|
|
||||||
<td>ImageData:</td>
|
|
||||||
<td>
|
|
||||||
<input type="text" name="canvas7data" id="canvas7data" readonly />
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
</table>
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<h3>Canvas 8</h3>
|
|
||||||
<canvas
|
|
||||||
class="testcanvas"
|
|
||||||
width="250"
|
|
||||||
height="250"
|
|
||||||
id="canvas8"
|
|
||||||
></canvas>
|
|
||||||
<table>
|
|
||||||
<tr>
|
|
||||||
<td>ImageData:</td>
|
|
||||||
<td>
|
|
||||||
<input type="text" name="canvas8data" id="canvas8data" readonly />
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
</table>
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<h3>Canvas 9</h3>
|
|
||||||
<canvas
|
|
||||||
class="testcanvas"
|
|
||||||
width="250"
|
|
||||||
height="250"
|
|
||||||
id="canvas9"
|
|
||||||
></canvas>
|
|
||||||
<table>
|
|
||||||
<tr>
|
|
||||||
<td>ImageData:</td>
|
|
||||||
<td>
|
|
||||||
<input type="text" name="canvas9data" id="canvas9data" readonly />
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
</table>
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<h3>Canvas 10</h3>
|
|
||||||
<canvas
|
|
||||||
class="testcanvas"
|
|
||||||
width="250"
|
|
||||||
height="250"
|
|
||||||
id="canvas10"
|
|
||||||
></canvas>
|
|
||||||
<table>
|
|
||||||
<tr>
|
|
||||||
<td>ImageData:</td>
|
|
||||||
<td>
|
|
||||||
<input
|
|
||||||
type="text"
|
|
||||||
name="canvas10data"
|
|
||||||
id="canvas10data"
|
|
||||||
readonly
|
|
||||||
/>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
</table>
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<h3>WebGL Canvas</h3>
|
|
||||||
<canvas
|
|
||||||
class="testcanvas"
|
|
||||||
width="250"
|
|
||||||
height="250"
|
|
||||||
id="glcanvas"
|
|
||||||
></canvas>
|
|
||||||
<table>
|
|
||||||
<tr>
|
|
||||||
<td>ImageData:</td>
|
|
||||||
<td>
|
|
||||||
<input
|
|
||||||
type="text"
|
|
||||||
name="glcanvasdata"
|
|
||||||
id="glcanvasdata"
|
|
||||||
readonly
|
|
||||||
/>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
</table>
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<h3>FingerprintJS Canvas 1 (Text)</h3>
|
|
||||||
<canvas
|
|
||||||
class="testcanvas"
|
|
||||||
width="240"
|
|
||||||
height="60"
|
|
||||||
id="fingerprintjscanvas1"
|
|
||||||
></canvas>
|
|
||||||
<table>
|
|
||||||
<tr>
|
|
||||||
<td>ImageData:</td>
|
|
||||||
<td>
|
|
||||||
<input
|
|
||||||
type="text"
|
|
||||||
name="fingerprintjscanvas1data"
|
|
||||||
id="fingerprintjscanvas1data"
|
|
||||||
readonly
|
|
||||||
/>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
</table>
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<h3>FingerprintJS Canvas 2 (Geometry)</h3>
|
|
||||||
<canvas
|
|
||||||
class="testcanvas"
|
|
||||||
width="122"
|
|
||||||
height="110"
|
|
||||||
id="fingerprintjscanvas2"
|
|
||||||
></canvas>
|
|
||||||
<table>
|
|
||||||
<tr>
|
|
||||||
<td>ImageData:</td>
|
|
||||||
<td>
|
|
||||||
<input
|
|
||||||
type="text"
|
|
||||||
name="fingerprintjscanvas2data"
|
|
||||||
id="fingerprintjscanvas2data"
|
|
||||||
readonly
|
|
||||||
/>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
</table>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<script src="chrome://global/content/usercharacteristics/gl-matrix.js"></script>
|
|
||||||
<script src="chrome://global/content/usercharacteristics/usercharacteristics.js"></script>
|
<script src="chrome://global/content/usercharacteristics/usercharacteristics.js"></script>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|
|
||||||
File diff suppressed because one or more lines are too long
|
|
@ -3,7 +3,5 @@
|
||||||
# file, You can obtain one at https://mozilla.org/MPL/2.0/.
|
# file, You can obtain one at https://mozilla.org/MPL/2.0/.
|
||||||
|
|
||||||
toolkit.jar:
|
toolkit.jar:
|
||||||
content/global/usercharacteristics/gl-matrix.js (content/gl-matrix.js)
|
|
||||||
content/global/usercharacteristics/usercharacteristics.css (content/usercharacteristics.css)
|
|
||||||
content/global/usercharacteristics/usercharacteristics.html (content/usercharacteristics.html)
|
content/global/usercharacteristics/usercharacteristics.html (content/usercharacteristics.html)
|
||||||
content/global/usercharacteristics/usercharacteristics.js (content/usercharacteristics.js)
|
content/global/usercharacteristics/usercharacteristics.js (content/usercharacteristics.js)
|
||||||
|
|
|
||||||
|
|
@ -1047,266 +1047,6 @@ characteristics:
|
||||||
data_sensitivity:
|
data_sensitivity:
|
||||||
- interaction
|
- interaction
|
||||||
|
|
||||||
canvasdata1:
|
|
||||||
type: text
|
|
||||||
description: >
|
|
||||||
The base64 encoded form of an image rendered on a canvas. The image is a simple organge box and used as a control image
|
|
||||||
lifetime: application
|
|
||||||
send_in_pings:
|
|
||||||
- user-characteristics
|
|
||||||
notification_emails:
|
|
||||||
- tom@mozilla.com
|
|
||||||
bugs:
|
|
||||||
- https://bugzilla.mozilla.org/show_bug.cgi?id=1879151
|
|
||||||
- https://bugzilla.mozilla.org/show_bug.cgi?id=1894958
|
|
||||||
data_reviews:
|
|
||||||
- https://bugzilla.mozilla.org/show_bug.cgi?id=xxx
|
|
||||||
expires: never
|
|
||||||
data_sensitivity:
|
|
||||||
# Text metrics are _required_ to be web_activity or highly_sensitive, so even though this
|
|
||||||
# is more like 'technical' (per the Data Review), I'm marking highly sensitive.
|
|
||||||
- highly_sensitive
|
|
||||||
|
|
||||||
canvasdata2:
|
|
||||||
type: text
|
|
||||||
description: >
|
|
||||||
The base64 encoded form of an image rendered on a canvas. The image is a bordered triage, and used to test point interpolation
|
|
||||||
lifetime: application
|
|
||||||
send_in_pings:
|
|
||||||
- user-characteristics
|
|
||||||
notification_emails:
|
|
||||||
- tom@mozilla.com
|
|
||||||
bugs:
|
|
||||||
- https://bugzilla.mozilla.org/show_bug.cgi?id=1879151
|
|
||||||
- https://bugzilla.mozilla.org/show_bug.cgi?id=1894958
|
|
||||||
data_reviews:
|
|
||||||
- https://bugzilla.mozilla.org/show_bug.cgi?id=xxx
|
|
||||||
expires: never
|
|
||||||
data_sensitivity:
|
|
||||||
# Text metrics are _required_ to be web_activity or highly_sensitive, so even though this
|
|
||||||
# is more like 'technical' (per the Data Review), I'm marking highly sensitive.
|
|
||||||
- highly_sensitive
|
|
||||||
|
|
||||||
canvasdata3:
|
|
||||||
type: text
|
|
||||||
description: >
|
|
||||||
The base64 encoded form of an image rendered on a canvas. The image is a stretched photographic image, used to test image operations.
|
|
||||||
lifetime: application
|
|
||||||
send_in_pings:
|
|
||||||
- user-characteristics
|
|
||||||
notification_emails:
|
|
||||||
- tom@mozilla.com
|
|
||||||
bugs:
|
|
||||||
- https://bugzilla.mozilla.org/show_bug.cgi?id=1879151
|
|
||||||
- https://bugzilla.mozilla.org/show_bug.cgi?id=1894958
|
|
||||||
data_reviews:
|
|
||||||
- https://bugzilla.mozilla.org/show_bug.cgi?id=xxx
|
|
||||||
expires: never
|
|
||||||
data_sensitivity:
|
|
||||||
# Text metrics are _required_ to be web_activity or highly_sensitive, so even though this
|
|
||||||
# is more like 'technical' (per the Data Review), I'm marking highly sensitive.
|
|
||||||
- highly_sensitive
|
|
||||||
|
|
||||||
canvasdata4:
|
|
||||||
type: text
|
|
||||||
description: >
|
|
||||||
The base64 encoded form of an image rendered on a canvas. The image is two rotated, semi-transparenct overlapping squares, used to test transparency and point interpolation.
|
|
||||||
lifetime: application
|
|
||||||
send_in_pings:
|
|
||||||
- user-characteristics
|
|
||||||
notification_emails:
|
|
||||||
- tom@mozilla.com
|
|
||||||
bugs:
|
|
||||||
- https://bugzilla.mozilla.org/show_bug.cgi?id=1879151
|
|
||||||
- https://bugzilla.mozilla.org/show_bug.cgi?id=1894958
|
|
||||||
data_reviews:
|
|
||||||
- https://bugzilla.mozilla.org/show_bug.cgi?id=xxx
|
|
||||||
expires: never
|
|
||||||
data_sensitivity:
|
|
||||||
# Text metrics are _required_ to be web_activity or highly_sensitive, so even though this
|
|
||||||
# is more like 'technical' (per the Data Review), I'm marking highly sensitive.
|
|
||||||
- highly_sensitive
|
|
||||||
|
|
||||||
canvasdata5:
|
|
||||||
type: text
|
|
||||||
description: >
|
|
||||||
The base64 encoded form of an image rendered on a canvas. The image is a local font rendered normally.
|
|
||||||
lifetime: application
|
|
||||||
send_in_pings:
|
|
||||||
- user-characteristics
|
|
||||||
notification_emails:
|
|
||||||
- tom@mozilla.com
|
|
||||||
bugs:
|
|
||||||
- https://bugzilla.mozilla.org/show_bug.cgi?id=1879151
|
|
||||||
- https://bugzilla.mozilla.org/show_bug.cgi?id=1894958
|
|
||||||
data_reviews:
|
|
||||||
- https://bugzilla.mozilla.org/show_bug.cgi?id=xxx
|
|
||||||
expires: never
|
|
||||||
data_sensitivity:
|
|
||||||
# Text metrics are _required_ to be web_activity or highly_sensitive, so even though this
|
|
||||||
# is more like 'technical' (per the Data Review), I'm marking highly sensitive.
|
|
||||||
- highly_sensitive
|
|
||||||
|
|
||||||
canvasdata6:
|
|
||||||
type: text
|
|
||||||
description: >
|
|
||||||
The base64 encoded form of an image rendered on a canvas. The image is a local font rendered with italics, rotation, and shadow-blur.
|
|
||||||
lifetime: application
|
|
||||||
send_in_pings:
|
|
||||||
- user-characteristics
|
|
||||||
notification_emails:
|
|
||||||
- tom@mozilla.com
|
|
||||||
bugs:
|
|
||||||
- https://bugzilla.mozilla.org/show_bug.cgi?id=1879151
|
|
||||||
- https://bugzilla.mozilla.org/show_bug.cgi?id=1894958
|
|
||||||
data_reviews:
|
|
||||||
- https://bugzilla.mozilla.org/show_bug.cgi?id=xxx
|
|
||||||
expires: never
|
|
||||||
data_sensitivity:
|
|
||||||
# Text metrics are _required_ to be web_activity or highly_sensitive, so even though this
|
|
||||||
# is more like 'technical' (per the Data Review), I'm marking highly sensitive.
|
|
||||||
- highly_sensitive
|
|
||||||
|
|
||||||
canvasdata7:
|
|
||||||
type: text
|
|
||||||
description: >
|
|
||||||
The base64 encoded form of an image rendered on a canvas. The image is a system-ui font rendered normally.
|
|
||||||
lifetime: application
|
|
||||||
send_in_pings:
|
|
||||||
- user-characteristics
|
|
||||||
notification_emails:
|
|
||||||
- tom@mozilla.com
|
|
||||||
bugs:
|
|
||||||
- https://bugzilla.mozilla.org/show_bug.cgi?id=1879151
|
|
||||||
- https://bugzilla.mozilla.org/show_bug.cgi?id=1894958
|
|
||||||
data_reviews:
|
|
||||||
- https://bugzilla.mozilla.org/show_bug.cgi?id=xxx
|
|
||||||
expires: never
|
|
||||||
data_sensitivity:
|
|
||||||
# Text metrics are _required_ to be web_activity or highly_sensitive, so even though this
|
|
||||||
# is more like 'technical' (per the Data Review), I'm marking highly sensitive.
|
|
||||||
- highly_sensitive
|
|
||||||
|
|
||||||
canvasdata8:
|
|
||||||
type: text
|
|
||||||
description: >
|
|
||||||
The base64 encoded form of an image rendered on a canvas. The image is a system-ui font rendered with italics, rotation, and shadow-blur.
|
|
||||||
lifetime: application
|
|
||||||
send_in_pings:
|
|
||||||
- user-characteristics
|
|
||||||
notification_emails:
|
|
||||||
- tom@mozilla.com
|
|
||||||
bugs:
|
|
||||||
- https://bugzilla.mozilla.org/show_bug.cgi?id=1879151
|
|
||||||
- https://bugzilla.mozilla.org/show_bug.cgi?id=1894958
|
|
||||||
data_reviews:
|
|
||||||
- https://bugzilla.mozilla.org/show_bug.cgi?id=xxx
|
|
||||||
expires: never
|
|
||||||
data_sensitivity:
|
|
||||||
# Text metrics are _required_ to be web_activity or highly_sensitive, so even though this
|
|
||||||
# is more like 'technical' (per the Data Review), I'm marking highly sensitive.
|
|
||||||
- highly_sensitive
|
|
||||||
|
|
||||||
canvasdata9:
|
|
||||||
type: text
|
|
||||||
description: >
|
|
||||||
The base64 encoded form of an image rendered on a canvas. The image is a font shipped with Firefox rendered normally.
|
|
||||||
lifetime: application
|
|
||||||
send_in_pings:
|
|
||||||
- user-characteristics
|
|
||||||
notification_emails:
|
|
||||||
- tom@mozilla.com
|
|
||||||
bugs:
|
|
||||||
- https://bugzilla.mozilla.org/show_bug.cgi?id=1879151
|
|
||||||
- https://bugzilla.mozilla.org/show_bug.cgi?id=1894958
|
|
||||||
data_reviews:
|
|
||||||
- https://bugzilla.mozilla.org/show_bug.cgi?id=xxx
|
|
||||||
expires: never
|
|
||||||
data_sensitivity:
|
|
||||||
# Text metrics are _required_ to be web_activity or highly_sensitive, so even though this
|
|
||||||
# is more like 'technical' (per the Data Review), I'm marking highly sensitive.
|
|
||||||
- highly_sensitive
|
|
||||||
|
|
||||||
canvasdata10:
|
|
||||||
type: text
|
|
||||||
description: >
|
|
||||||
The base64 encoded form of an image rendered on a canvas. The image is a font shipped with Firefox rendered with italics, rotation, and shadow-blur.
|
|
||||||
lifetime: application
|
|
||||||
send_in_pings:
|
|
||||||
- user-characteristics
|
|
||||||
notification_emails:
|
|
||||||
- tom@mozilla.com
|
|
||||||
bugs:
|
|
||||||
- https://bugzilla.mozilla.org/show_bug.cgi?id=1879151
|
|
||||||
- https://bugzilla.mozilla.org/show_bug.cgi?id=1894958
|
|
||||||
data_reviews:
|
|
||||||
- https://bugzilla.mozilla.org/show_bug.cgi?id=xxx
|
|
||||||
expires: never
|
|
||||||
data_sensitivity:
|
|
||||||
# Text metrics are _required_ to be web_activity or highly_sensitive, so even though this
|
|
||||||
# is more like 'technical' (per the Data Review), I'm marking highly sensitive.
|
|
||||||
- highly_sensitive
|
|
||||||
|
|
||||||
canvasdata11_webgl:
|
|
||||||
type: text
|
|
||||||
description: >
|
|
||||||
The base64 encoded form of an image rendered on a WebGL canvas (instead of Canvas2D). IT is a RGB gradient cube.
|
|
||||||
lifetime: application
|
|
||||||
send_in_pings:
|
|
||||||
- user-characteristics
|
|
||||||
notification_emails:
|
|
||||||
- tom@mozilla.com
|
|
||||||
bugs:
|
|
||||||
- https://bugzilla.mozilla.org/show_bug.cgi?id=1879151
|
|
||||||
- https://bugzilla.mozilla.org/show_bug.cgi?id=1894958
|
|
||||||
data_reviews:
|
|
||||||
- https://bugzilla.mozilla.org/show_bug.cgi?id=xxx
|
|
||||||
expires: never
|
|
||||||
data_sensitivity:
|
|
||||||
# Text metrics are _required_ to be web_activity or highly_sensitive, so even though this
|
|
||||||
# is more like 'technical' (per the Data Review), I'm marking highly sensitive.
|
|
||||||
- highly_sensitive
|
|
||||||
|
|
||||||
canvasdata12_fingerprintjs1:
|
|
||||||
type: text
|
|
||||||
description: >
|
|
||||||
The base64 encoded form of an image rendered on a canvas, it is a copy of fingerprintjs' text canvas
|
|
||||||
lifetime: application
|
|
||||||
send_in_pings:
|
|
||||||
- user-characteristics
|
|
||||||
notification_emails:
|
|
||||||
- tom@mozilla.com
|
|
||||||
bugs:
|
|
||||||
- https://bugzilla.mozilla.org/show_bug.cgi?id=1879151
|
|
||||||
- https://bugzilla.mozilla.org/show_bug.cgi?id=1894958
|
|
||||||
data_reviews:
|
|
||||||
- https://bugzilla.mozilla.org/show_bug.cgi?id=xxx
|
|
||||||
expires: never
|
|
||||||
data_sensitivity:
|
|
||||||
# Text metrics are _required_ to be web_activity or highly_sensitive, so even though this
|
|
||||||
# is more like 'technical' (per the Data Review), I'm marking highly sensitive.
|
|
||||||
- highly_sensitive
|
|
||||||
|
|
||||||
canvasdata13_fingerprintjs2:
|
|
||||||
type: text
|
|
||||||
description: >
|
|
||||||
The base64 encoded form of an image rendered on a canvas, it is a copy of fingerprintjs' geometry canvas
|
|
||||||
lifetime: application
|
|
||||||
send_in_pings:
|
|
||||||
- user-characteristics
|
|
||||||
notification_emails:
|
|
||||||
- tom@mozilla.com
|
|
||||||
bugs:
|
|
||||||
- https://bugzilla.mozilla.org/show_bug.cgi?id=1879151
|
|
||||||
- https://bugzilla.mozilla.org/show_bug.cgi?id=1894958
|
|
||||||
data_reviews:
|
|
||||||
- https://bugzilla.mozilla.org/show_bug.cgi?id=xxx
|
|
||||||
expires: never
|
|
||||||
data_sensitivity:
|
|
||||||
# Text metrics are _required_ to be web_activity or highly_sensitive, so even though this
|
|
||||||
# is more like 'technical' (per the Data Review), I'm marking highly sensitive.
|
|
||||||
- highly_sensitive
|
|
||||||
|
|
||||||
font_size_monospace_modified:
|
font_size_monospace_modified:
|
||||||
type: quantity
|
type: quantity
|
||||||
unit: int
|
unit: int
|
||||||
|
|
|
||||||
|
|
@ -16,8 +16,13 @@ function promiseObserverNotification() {
|
||||||
GleanPings.userCharacteristics.testBeforeNextSubmit(_ => {
|
GleanPings.userCharacteristics.testBeforeNextSubmit(_ => {
|
||||||
submitted = true;
|
submitted = true;
|
||||||
|
|
||||||
// Did we assign a value we got out of about:fingerprintingprotection?
|
// Did we assign a value we got out of about:fingerprinting?
|
||||||
Assert.notEqual("", Glean.characteristics.canvasdata1.testGetValue());
|
// For now, we are sticking the test value in a random telemetry
|
||||||
|
// metric, but once we have a real metric, we'll update this
|
||||||
|
Assert.equal(
|
||||||
|
"Hello World",
|
||||||
|
Glean.characteristics.timezone.testGetValue()
|
||||||
|
);
|
||||||
});
|
});
|
||||||
GleanPings.userCharacteristics.submit();
|
GleanPings.userCharacteristics.submit();
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -3628,7 +3628,6 @@ SOFTWARE.
|
||||||
<li><code>third_party/rust/void</code></li>
|
<li><code>third_party/rust/void</code></li>
|
||||||
<li><code>js/src/zydis</code> (unless otherwise specified)</li>
|
<li><code>js/src/zydis</code> (unless otherwise specified)</li>
|
||||||
<li><code>js/src/vm/Float16.h</code>(the code contained in the half namespace)</li>
|
<li><code>js/src/vm/Float16.h</code>(the code contained in the half namespace)</li>
|
||||||
<li><code>toolkit/components/resistfingerprinting/content/gl-matrix.js</code></li>
|
|
||||||
</ul>
|
</ul>
|
||||||
See the individual LICENSE files or headers for copyright owners.</p>
|
See the individual LICENSE files or headers for copyright owners.</p>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -189,7 +189,6 @@ toolkit/components/normandy/vendor/
|
||||||
toolkit/components/passwordmgr/PasswordRulesParser.sys.mjs
|
toolkit/components/passwordmgr/PasswordRulesParser.sys.mjs
|
||||||
toolkit/components/protobuf/
|
toolkit/components/protobuf/
|
||||||
toolkit/components/reader/readability/
|
toolkit/components/reader/readability/
|
||||||
toolkit/components/resistfingerprinting/content/gl-matrix.js
|
|
||||||
toolkit/components/translation/cld2/
|
toolkit/components/translation/cld2/
|
||||||
toolkit/components/translations/bergamot-translator/thirdparty
|
toolkit/components/translations/bergamot-translator/thirdparty
|
||||||
toolkit/components/translations/bergamot-translator/bergamot-translator.js
|
toolkit/components/translations/bergamot-translator/bergamot-translator.js
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue