Merge pull request #20404 from mozilla/revert-20031-telemetry_signature_certificate
Revert "Add some telemetry in order to know what are the certificates used in pdfs (bug 1973573)"
This commit is contained in:
commit
c696648826
@ -1167,49 +1167,6 @@ class PDFDocument {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
#collectSignatureCertificates(
|
|
||||||
fields,
|
|
||||||
collectedSignatureCertificates,
|
|
||||||
visited = new RefSet()
|
|
||||||
) {
|
|
||||||
if (!Array.isArray(fields)) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
for (let field of fields) {
|
|
||||||
if (field instanceof Ref) {
|
|
||||||
if (visited.has(field)) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
visited.put(field);
|
|
||||||
}
|
|
||||||
field = this.xref.fetchIfRef(field);
|
|
||||||
if (!(field instanceof Dict)) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
if (field.has("Kids")) {
|
|
||||||
this.#collectSignatureCertificates(
|
|
||||||
field.get("Kids"),
|
|
||||||
collectedSignatureCertificates,
|
|
||||||
visited
|
|
||||||
);
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
const isSignature = isName(field.get("FT"), "Sig");
|
|
||||||
if (!isSignature) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
const value = field.get("V");
|
|
||||||
if (!(value instanceof Dict)) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
const subFilter = value.get("SubFilter");
|
|
||||||
if (!(subFilter instanceof Name)) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
collectedSignatureCertificates.add(subFilter.name);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
get _xfaStreams() {
|
get _xfaStreams() {
|
||||||
const { acroForm } = this.catalog;
|
const { acroForm } = this.catalog;
|
||||||
if (!acroForm) {
|
if (!acroForm) {
|
||||||
@ -1525,20 +1482,6 @@ class PDFDocument {
|
|||||||
// specification).
|
// specification).
|
||||||
const sigFlags = acroForm.get("SigFlags");
|
const sigFlags = acroForm.get("SigFlags");
|
||||||
const hasSignatures = !!(sigFlags & 0x1);
|
const hasSignatures = !!(sigFlags & 0x1);
|
||||||
if (typeof PDFJSDev !== "undefined" && PDFJSDev.test("MOZCENTRAL")) {
|
|
||||||
if (hasSignatures) {
|
|
||||||
const collectedSignatureCertificates = new Set();
|
|
||||||
this.#collectSignatureCertificates(
|
|
||||||
fields,
|
|
||||||
collectedSignatureCertificates
|
|
||||||
);
|
|
||||||
if (collectedSignatureCertificates.size > 0) {
|
|
||||||
formInfo.collectedSignatureCertificates = Array.from(
|
|
||||||
collectedSignatureCertificates
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
const hasOnlyDocumentSignatures =
|
const hasOnlyDocumentSignatures =
|
||||||
hasSignatures && this.#hasOnlyDocumentSignatures(fields);
|
hasSignatures && this.#hasOnlyDocumentSignatures(fields);
|
||||||
formInfo.hasAcroForm = hasFields && !hasOnlyDocumentSignatures;
|
formInfo.hasAcroForm = hasFields && !hasOnlyDocumentSignatures;
|
||||||
@ -1566,11 +1509,6 @@ class PDFDocument {
|
|||||||
IsSignaturesPresent: formInfo.hasSignatures,
|
IsSignaturesPresent: formInfo.hasSignatures,
|
||||||
};
|
};
|
||||||
|
|
||||||
if (typeof PDFJSDev !== "undefined" && PDFJSDev.test("MOZCENTRAL")) {
|
|
||||||
docInfo.collectedSignatureCertificates =
|
|
||||||
formInfo.collectedSignatureCertificates ?? null;
|
|
||||||
}
|
|
||||||
|
|
||||||
let infoDict;
|
let infoDict;
|
||||||
try {
|
try {
|
||||||
infoDict = xref.trailer.get("Info");
|
infoDict = xref.trailer.get("Info");
|
||||||
|
|||||||
@ -1725,13 +1725,6 @@ const PDFViewerApplication = {
|
|||||||
if (pdfDocument !== this.pdfDocument) {
|
if (pdfDocument !== this.pdfDocument) {
|
||||||
return; // The document was closed while the metadata resolved.
|
return; // The document was closed while the metadata resolved.
|
||||||
}
|
}
|
||||||
if (info.collectedSignatureCertificates) {
|
|
||||||
this.externalServices.reportTelemetry({
|
|
||||||
type: "signatureCertificates",
|
|
||||||
data: info.collectedSignatureCertificates,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
this.documentInfo = info;
|
this.documentInfo = info;
|
||||||
this.metadata = metadata;
|
this.metadata = metadata;
|
||||||
this._contentDispositionFilename ??= contentDispositionFilename;
|
this._contentDispositionFilename ??= contentDispositionFilename;
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user