Bug 1824260 - Update outdated .jsm references. r=freaktechnik
Update outdated .jsm references in the tree. Depends on D204766 Differential Revision: https://phabricator.services.mozilla.com/D204769 --HG-- extra : rebase_source : cdf8c1367702bb00c51a750cc712e156db65d371 extra : amend_source : 5f2256fc97ae8f3de2086ffbe99acde9fdef0473
This commit is contained in:
Magnus Melin
Родитель
2615cd2059
Коммит
bf0cc3ae17
|
|
@ -166,7 +166,7 @@ module.exports = {
|
|||
"calendar/base/modules/calUtils.sys.mjs",
|
||||
"calendar/base/modules/utils/calDateTimeFormatter.sys.mjs",
|
||||
"calendar/base/modules/utils/calIteratorUtils.sys.mjs",
|
||||
"calendar/base/src/CalMetronome.jsm",
|
||||
"calendar/base/src/CalMetronome.sys.mjs",
|
||||
],
|
||||
excludedFiles: [".eslintrc.js"],
|
||||
extends: ["plugin:mozilla/valid-jsdoc"],
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
# Exclude everything by default, then include all the formats we support.
|
||||
*.*
|
||||
!*.js
|
||||
!*.jsm
|
||||
!*.json
|
||||
!*.mjs
|
||||
!*.jsx
|
||||
|
|
|
|||
|
|
@ -849,7 +849,7 @@ function calendarUpdateDeleteCommand(selectedItems) {
|
|||
* process for that browser.
|
||||
*/
|
||||
async function printCalendar() {
|
||||
// Ensure the printing of this file will be detected by calPrintUtils.jsm.
|
||||
// Ensure the printing of this file will be detected by calPrintUtils.sys.mjs.
|
||||
cal.print.ensureInitialized();
|
||||
|
||||
await PrintUtils.loadPrintBrowser("chrome://calendar/content/printing-template.html");
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
* file, you can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
/**
|
||||
* This file is loaded into the printing options page by calPrintUtils.jsm if
|
||||
* This file is loaded into the printing options page by calPrintUtils.sys.mjs if
|
||||
* we are printing the calendar. It injects a new form (from
|
||||
* calendar-tab-panels.inc.xhtml) for choosing the print output. It also
|
||||
* contains the javascript for the form.
|
||||
|
|
|
|||
|
|
@ -665,7 +665,7 @@ function promptOccurrenceModification(aItem, aNeedsFuture, aAction) {
|
|||
* @param {?Function} [observer] - The observer to call when complete.
|
||||
* @param {?object} [extResponse] - JS object with additional
|
||||
* parameters for sending itip messages (see also description of checkAndSend
|
||||
* in calItipUtils.jsm).
|
||||
* in calItipUtils.sys.mjs).
|
||||
*/
|
||||
async function doTransaction(action, item, calendar, oldItem, observer, extResponse = null) {
|
||||
// This is usually a user-initiated transaction, so make sure the calendar
|
||||
|
|
|
|||
|
|
@ -114,7 +114,7 @@
|
|||
</head>
|
||||
<body>
|
||||
<!-- This is what is printed when printing the calendar.
|
||||
It is filled dynamically by calPrintUtils.jsm. -->
|
||||
It is filled dynamically by calPrintUtils.sys.mjs. -->
|
||||
<div id="list-container"></div>
|
||||
<div id="month-container"></div>
|
||||
<div id="week-container"></div>
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ import { data } from "resource:///modules/calendar/utils/calDataUtils.sys.mjs";
|
|||
*/
|
||||
export const HashedArray = function () {
|
||||
this.clear();
|
||||
}; // even though it's defined in calUtils.jsm, import needs this
|
||||
}; // even though it's defined in calUtils.sys.mjs, import needs this
|
||||
|
||||
HashedArray.prototype = {
|
||||
mArray: null,
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
*/
|
||||
|
||||
// NOTE: This module should not be loaded directly, it is available when
|
||||
// including calUtils.jsm under the cal.acl namespace.
|
||||
// including calUtils.sys.mjs under the cal.acl namespace.
|
||||
|
||||
export var acl = {
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
*/
|
||||
|
||||
// NOTE: This module should not be loaded directly, it is available when
|
||||
// including calUtils.jsm under the cal.alarm namespace.
|
||||
// including calUtils.sys.mjs under the cal.alarm namespace.
|
||||
|
||||
const lazy = {};
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
*/
|
||||
|
||||
// NOTE: This module should not be loaded directly, it is available when
|
||||
// including calUtils.jsm under the cal.category namespace.
|
||||
// including calUtils.sys.mjs under the cal.category namespace.
|
||||
|
||||
const lazy = {};
|
||||
ChromeUtils.defineESModuleGetters(lazy, {
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
*/
|
||||
|
||||
// NOTE: This module should not be loaded directly, it is available when
|
||||
// including calUtils.jsm under the cal.data namespace.
|
||||
// including calUtils.sys.mjs under the cal.data namespace.
|
||||
|
||||
const lazy = {};
|
||||
ChromeUtils.defineESModuleGetters(lazy, {
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ var formatCache = new Map();
|
|||
*/
|
||||
|
||||
// NOTE: This module should not be loaded directly, it is available when
|
||||
// including calUtils.jsm under the cal.dtz.formatter namespace.
|
||||
// including calUtils.sys.mjs under the cal.dtz.formatter namespace.
|
||||
|
||||
export var formatter = {
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
*/
|
||||
|
||||
// NOTE: This module should not be loaded directly, it is available when
|
||||
// including calUtils.jsm under the cal.dtz namespace.
|
||||
// including calUtils.sys.mjs under the cal.dtz namespace.
|
||||
|
||||
const lazy = {};
|
||||
ChromeUtils.defineESModuleGetters(lazy, {
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
*/
|
||||
|
||||
// NOTE: This module should not be loaded directly, it is available when
|
||||
// including calUtils.jsm under the cal.email namespace.
|
||||
// including calUtils.sys.mjs under the cal.email namespace.
|
||||
|
||||
import { MailServices } from "resource:///modules/MailServices.sys.mjs";
|
||||
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ import { dtz } from "resource:///modules/calendar/utils/calDateTimeUtils.sys.mjs
|
|||
*/
|
||||
|
||||
// NOTE: This module should not be loaded directly, it is available when
|
||||
// including calUtils.jsm under the cal.item namespace.
|
||||
// including calUtils.sys.mjs under the cal.item namespace.
|
||||
|
||||
export var item = {
|
||||
ItemDiff: (function () {
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
*/
|
||||
|
||||
// NOTE: This module should not be loaded directly, it is available when
|
||||
// including calUtils.jsm under the cal.iterate namespace.
|
||||
// including calUtils.sys.mjs under the cal.iterate namespace.
|
||||
|
||||
const lazy = {};
|
||||
ChromeUtils.defineESModuleGetters(lazy, {
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
*/
|
||||
|
||||
// NOTE: This module should not be loaded directly, it is available when
|
||||
// including calUtils.jsm under the cal.itip namespace.
|
||||
// including calUtils.sys.mjs under the cal.itip namespace.
|
||||
|
||||
import { MailServices } from "resource:///modules/MailServices.sys.mjs";
|
||||
import { calendarDeactivator } from "resource:///modules/calendar/calCalendarDeactivator.sys.mjs";
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
*/
|
||||
|
||||
// NOTE: This module should not be loaded directly, it is available when
|
||||
// including calUtils.jsm under the cal.l10n namespace.
|
||||
// including calUtils.sys.mjs under the cal.l10n namespace.
|
||||
|
||||
/**
|
||||
* Gets the value of a string in a .properties file.
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
*/
|
||||
|
||||
// NOTE: This module should not be loaded directly, it is available when
|
||||
// including calUtils.jsm under the cal.print namespace.
|
||||
// including calUtils.sys.mjs under the cal.print namespace.
|
||||
|
||||
const lazy = {};
|
||||
ChromeUtils.defineESModuleGetters(lazy, {
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ import { cal } from "resource:///modules/calendar/calUtils.sys.mjs";
|
|||
*/
|
||||
|
||||
// NOTE: This module should not be loaded directly, it is available when
|
||||
// including calUtils.jsm under the cal.provider.detection namespace.
|
||||
// including calUtils.sys.mjs under the cal.provider.detection namespace.
|
||||
|
||||
/**
|
||||
* The base class marker for detection errors. Useful in instanceof checks.
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ import { MailServices } from "resource:///modules/MailServices.sys.mjs";
|
|||
*/
|
||||
|
||||
// NOTE: This module should not be loaded directly, it is available when
|
||||
// including calUtils.jsm under the cal.provider namespace.
|
||||
// including calUtils.sys.mjs under the cal.provider namespace.
|
||||
|
||||
const lazy = {};
|
||||
ChromeUtils.defineESModuleGetters(lazy, {
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
*/
|
||||
|
||||
// NOTE: This module should not be loaded directly, it is available when
|
||||
// including calUtils.jsm under the cal.unifinder namespace.
|
||||
// including calUtils.sys.mjs under the cal.unifinder namespace.
|
||||
|
||||
export var unifinder = {
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
*/
|
||||
|
||||
// NOTE: This module should not be loaded directly, it is available when
|
||||
// including calUtils.jsm under the cal.view namespace.
|
||||
// including calUtils.sys.mjs under the cal.view namespace.
|
||||
|
||||
import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
*/
|
||||
|
||||
// NOTE: This module should not be loaded directly, it is available when
|
||||
// including calUtils.jsm under the cal.window namespace.
|
||||
// including calUtils.sys.mjs under the cal.window namespace.
|
||||
|
||||
const lazy = {};
|
||||
ChromeUtils.defineLazyGetter(
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
*/
|
||||
|
||||
// NOTE: This module should not be loaded directly, it is available when
|
||||
// including calUtils.jsm under the cal.xml namespace.
|
||||
// including calUtils.sys.mjs under the cal.xml namespace.
|
||||
|
||||
export var xml = {
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -515,7 +515,7 @@ interface calICompositeCalendar : calICalendar
|
|||
* Make a more general nsIObserverService2 and friends to support
|
||||
* nsISupports data and use that instead?
|
||||
*
|
||||
* NOTE: When adding methods here, please also add them in calUtils.jsm's
|
||||
* NOTE: When adding methods here, please also add them in calUtils.sys.mjs's
|
||||
* createAdapter() method.
|
||||
*/
|
||||
[scriptable, uuid(2953c9b2-2c73-11d9-80b6-00045ace3b8d)]
|
||||
|
|
@ -557,7 +557,7 @@ interface calICompositeObserver : calIObserver
|
|||
* object is not going to get called back for either of these methods, having
|
||||
* them return NS_ERROR_NOT_IMPLEMENTED is reasonable.
|
||||
*
|
||||
* NOTE: When adding methods here, please also add them in calUtils.jsm's
|
||||
* NOTE: When adding methods here, please also add them in calUtils.sys.mjs's
|
||||
* createAdapter() method.
|
||||
*/
|
||||
[scriptable, uuid(ed3d87d8-2c77-11d9-8f5f-00045ace3b8d)]
|
||||
|
|
|
|||
|
|
@ -122,7 +122,7 @@ interface calICalendarManager : nsISupports
|
|||
/**
|
||||
* Observer to handle actions done by the calendar manager
|
||||
*
|
||||
* NOTE: When adding methods here, please also add them in calUtils.jsm's
|
||||
* NOTE: When adding methods here, please also add them in calUtils.sys.mjs's
|
||||
* createAdapter() method.
|
||||
*/
|
||||
[scriptable, uuid(383f36f1-e669-4ca4-be7f-06b43910f44a)]
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
/* For deactivating calendar, see calCalendarDeactivator.jsm. */
|
||||
/* For deactivating calendar, see calCalendarDeactivator.sys.mjs. */
|
||||
:root[calendar-deactivated] .hide-when-calendar-deactivated {
|
||||
display: none;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -273,7 +273,7 @@ export class CalItipEmailTransport {
|
|||
}
|
||||
case Ci.calIItipItem.NONE: {
|
||||
// we shouldn't get here, as we stopped processing in this case
|
||||
// earlier in checkAndSend in calItipUtils.jsm
|
||||
// earlier in checkAndSend in calItipUtils.sys.mjs
|
||||
cal.LOG("sendXpcomMail: Found NONE autoResponse type.");
|
||||
break;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1407,7 +1407,7 @@ CalDavCalendar.prototype = {
|
|||
|
||||
/**
|
||||
* @see nsIInterfaceRequestor
|
||||
* @see calProviderUtils.jsm
|
||||
* @see calProviderUtils.sys.mjs
|
||||
*/
|
||||
getInterface: cal.provider.InterfaceRequestor_getInterface,
|
||||
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ import { CalDavPropfindRequest } from "resource:///modules/caldav/CalDavRequest.
|
|||
import { CalDavDetectionSession } from "resource:///modules/caldav/CalDavSession.sys.mjs";
|
||||
|
||||
// NOTE: This module should not be loaded directly, it is available when
|
||||
// including calUtils.jsm under the cal.provider.caldav namespace.
|
||||
// including calUtils.sys.mjs under the cal.provider.caldav namespace.
|
||||
|
||||
/**
|
||||
* @implements {calICalendarProvider}
|
||||
|
|
|
|||
|
|
@ -746,7 +746,7 @@ export class CalICSCalendar extends cal.provider.BaseClass {
|
|||
|
||||
/**
|
||||
* @see nsIInterfaceRequestor
|
||||
* @see calProviderUtils.jsm
|
||||
* @see calProviderUtils.sys.mjs
|
||||
*/
|
||||
getInterface = cal.provider.InterfaceRequestor_getInterface;
|
||||
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ import {
|
|||
} from "resource:///modules/caldav/CalDavRequest.sys.mjs";
|
||||
|
||||
// NOTE: This module should not be loaded directly, it is available when
|
||||
// including calUtils.jsm under the cal.provider.ics namespace.
|
||||
// including calUtils.sys.mjs under the cal.provider.ics namespace.
|
||||
|
||||
/**
|
||||
* @implements {calICalendarProvider}
|
||||
|
|
|
|||
|
|
@ -169,7 +169,7 @@ CalStorageCalendar.prototype = {
|
|||
if (aTopic == "profile-change-teardown") {
|
||||
Services.obs.removeObserver(this, "profile-change-teardown");
|
||||
// Finalize the storage statements, but don't close the database.
|
||||
// CalStorageDatabase.jsm will take care of that while blocking profile-before-change.
|
||||
// CalStorageDatabase.sys.mjs will take care of that while blocking profile-before-change.
|
||||
this.mStatements?.finalize();
|
||||
}
|
||||
},
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ function run_test() {
|
|||
do_calendar_startup(run_next_test);
|
||||
}
|
||||
|
||||
// tests for calInvitationUtils.jsm
|
||||
// tests for calInvitationUtils.sys.mjs
|
||||
|
||||
// Make sure that the Europe/Berlin timezone and long datetime format is set.
|
||||
Services.prefs.setIntPref("calendar.date.format", 0);
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ ChromeUtils.defineESModuleGetters(this, {
|
|||
CalItipEmailTransport: "resource:///modules/CalItipEmailTransport.sys.mjs",
|
||||
});
|
||||
|
||||
// tests for calItipUtils.jsm
|
||||
// tests for calItipUtils.sys.mjs
|
||||
|
||||
do_get_profile();
|
||||
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ function run_test() {
|
|||
do_calendar_startup(run_next_test);
|
||||
}
|
||||
|
||||
// tests for calL10NUtils.jsm
|
||||
// tests for calL10NUtils.sys.mjs
|
||||
/* Incomplete - still missing test coverage for:
|
||||
* getAnyString
|
||||
* getString
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ function run_test() {
|
|||
do_calendar_startup(run_next_test);
|
||||
}
|
||||
|
||||
// tests for calRecurrenceUtils.jsm
|
||||
// tests for calRecurrenceUtils.sys.mjs
|
||||
/* Incomplete - still missing test coverage for:
|
||||
* recurrenceRule2String
|
||||
* splitRecurrenceRules
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ interface prplIUsernameSplit;
|
|||
/**
|
||||
* This must be implemented for every protocol.
|
||||
*
|
||||
* See jsProtoHelper.jsm for a base class.
|
||||
* See jsProtoHelper.sys.mjs for a base class.
|
||||
*/
|
||||
[scriptable, uuid(7d302db0-3813-4c51-8372-c7eb5fc9f3d3)]
|
||||
interface prplIProtocol: nsISupports {
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
|
|||
});
|
||||
|
||||
export function ircProtocol() {
|
||||
// ircCommands.jsm exports one variable: commands. Import this directly into
|
||||
// ircCommands.sys.mjs exports one variable: commands. Import this directly into
|
||||
// the protocol object.
|
||||
this.commands = ChromeUtils.importESModule(
|
||||
"resource:///modules/ircCommands.sys.mjs"
|
||||
|
|
|
|||
|
|
@ -153,7 +153,7 @@ function testRFC2812Messages() {
|
|||
run_next_test();
|
||||
}
|
||||
|
||||
// Unreal sends a couple of broken messages, see ircMessage in irc.jsm for a
|
||||
// Unreal sends a couple of broken messages, see ircMessage in irc.sys.mjs for a
|
||||
// description of what's wrong.
|
||||
function testBrokenUnrealMessages() {
|
||||
const messages = {
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ ChromeUtils.defineLazyGetter(lazy, "EVENT_TO_STRING", () => ({
|
|||
}));
|
||||
|
||||
// Commands from element that we're not yet supporting (including equivalents):
|
||||
// - /nick (no proper display name change support in matrix.jsm yet)
|
||||
// - /nick (no proper display name change support in matrix.sys.mjs yet)
|
||||
// - /myroomnick <display_name>
|
||||
// - /roomavatar [<mxc_url>]
|
||||
// - /myroomavatar [<mxc_url>]
|
||||
|
|
|
|||
|
|
@ -88,7 +88,7 @@ export function XMPPSession(
|
|||
}
|
||||
|
||||
XMPPSession.prototype = {
|
||||
/* for the socket.jsm helper */
|
||||
/* for the socket.sys.mjs helper */
|
||||
__proto__: Socket,
|
||||
connectTimeout: 60,
|
||||
readWriteTimeout: 300,
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@
|
|||
"recurseDepth": 10,
|
||||
"source": {
|
||||
"exclude": [
|
||||
"../calendar/extract/CalExtractParser.jsm",
|
||||
"../calendar/providers/caldav/modules/CalDavRequest.jsm",
|
||||
"../calendar/providers/caldav/modules/CalDavSession.jsm",
|
||||
"../calendar/providers/storage/CalStorageCachedItemModel.jsm",
|
||||
"../calendar/providers/storage/CalStorageDatabase.jsm",
|
||||
"../calendar/providers/storage/CalStorageItemModel.jsm",
|
||||
"../calendar/providers/storage/CalStorageStatements.jsm",
|
||||
"../calendar/extract/CalExtractParser.sys.mjs",
|
||||
"../calendar/providers/caldav/modules/CalDavRequest.sys.mjs",
|
||||
"../calendar/providers/caldav/modules/CalDavSession.sys.mjs",
|
||||
"../calendar/providers/storage/CalStorageCachedItemModel.sys.mjs",
|
||||
"../calendar/providers/storage/CalStorageDatabase.sys.mjs",
|
||||
"../calendar/providers/storage/CalStorageItemModel.sys.mjs",
|
||||
"../calendar/providers/storage/CalStorageStatements.sys.mjs",
|
||||
"../calendar/test/browser/browser_eventUndoRedo.js",
|
||||
"../calendar/test/browser/browser_taskUndoRedo.js",
|
||||
"../calendar/test/browser/browser_todayPane.js",
|
||||
|
|
|
|||
|
|
@ -126,7 +126,7 @@ From the DevTools console, you can send an immediate test ping:
|
|||
|
||||
```
|
||||
const { TelemetrySession } = ChromeUtils.import(
|
||||
"resource://gre/modules/TelemetrySession.jsm"
|
||||
"resource://gre/modules/TelemetrySession.sys.mjs"
|
||||
);
|
||||
TelemetrySession.testPing();
|
||||
```
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
|
||||
export class VCardChild extends JSWindowActorChild {
|
||||
handleEvent(event) {
|
||||
// This link comes from VCardMimeConverter.convertToHTML in VCardUtils.jsm.
|
||||
// This link comes from VCardMimeConverter.convertToHTML in VCardUtils.sys.mjs.
|
||||
if (event.target.classList.contains("moz-vcard-badge")) {
|
||||
if (event.button == 0) {
|
||||
// The href is a data:text/vcard URL.
|
||||
|
|
|
|||
|
|
@ -98,7 +98,7 @@ pref("app.update.notifyDuringDownload", false);
|
|||
// default value to migrate to the new location that this data is now stored
|
||||
// (which is in a file in the update directory). Because of this, this pref
|
||||
// should no longer be used directly. Instead, getAppUpdateAutoEnabled and
|
||||
// getAppUpdateAutoEnabled from UpdateUtils.jsm should be used.
|
||||
// getAppUpdateAutoEnabled from UpdateUtils.sys.mjs should be used.
|
||||
#ifndef XP_WIN
|
||||
pref("app.update.auto", true);
|
||||
#endif
|
||||
|
|
@ -192,7 +192,7 @@ pref("extensions.systemAddon.update.enabled", true); // See bug 1462160.
|
|||
|
||||
// Disable add-ons installed into the shared user and shared system areas by
|
||||
// default. This does not include the application directory. See the SCOPE
|
||||
// constants in AddonManager.jsm for values to use here
|
||||
// constants in AddonManager.sys.mjs for values to use here
|
||||
pref("extensions.autoDisableScopes", 15);
|
||||
|
||||
// Enable add-ons installed and owned by the application, like the default theme.
|
||||
|
|
@ -698,7 +698,7 @@ pref("font.size.monospace.el", 12);
|
|||
#endif
|
||||
|
||||
// Since different versions of Windows need different settings, we'll handle
|
||||
// this in MailMigrator.jsm.
|
||||
// this in MailMigrator.sys.mjs.
|
||||
|
||||
// Linux, in other words. Other OSes may wish to override.
|
||||
#ifdef UNIX_BUT_NOT_MAC
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
* the the view and controller.
|
||||
*
|
||||
* Because much of the work related to faceting is not UI-specific, we try and
|
||||
* push as much of it into mailnews/db/gloda/Facet.jsm. In some cases we may
|
||||
* push as much of it into mailnews/db/gloda/Facet.sys.mjs. In some cases we may
|
||||
* get it wrong and it may eventually want to migrate.
|
||||
*/
|
||||
|
||||
|
|
|
|||
|
|
@ -5,11 +5,11 @@ prefs =
|
|||
mail.winsearch.firstRunDone=true
|
||||
mailnews.start_page.override_url=about:blank
|
||||
mailnews.start_page.url=about:blank
|
||||
# To avoid overhead when running the browser normally, StartupRecorder.jsm will
|
||||
# To avoid overhead when running the browser normally, StartupRecorder.sys.mjs will
|
||||
# do almost nothing unless browser.startup.record is true.
|
||||
# gfx.canvas.willReadFrequently.enable is just an optimization, but needs to be
|
||||
# set during early startup to have an impact as a canvas will be used by
|
||||
# StartupRecorder.jsm
|
||||
# StartupRecorder.sys.mjs
|
||||
browser.startup.record=true
|
||||
gfx.canvas.willReadFrequently.enable=true
|
||||
# Skip migration work in MailMigrator for browser_startup.js since it isn't
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ const startupPhases = {
|
|||
// Anything loaded during app-startup must have a compelling reason
|
||||
// to run before we have even selected the user profile.
|
||||
// Consider loading your code after first paint instead,
|
||||
// eg. from MailGlue.jsm' _onFirstWindowLoaded method).
|
||||
// eg. from MailGlue.sys.mjs' _onFirstWindowLoaded method).
|
||||
"before profile selection": {
|
||||
allowlist: {
|
||||
modules: new Set([
|
||||
|
|
@ -47,14 +47,14 @@ const startupPhases = {
|
|||
"before opening first browser window": {
|
||||
denylist: {
|
||||
modules: new Set([
|
||||
"chrome://openpgp/content/modules/constants.jsm",
|
||||
"chrome://openpgp/content/modules/constants.sys.mjs",
|
||||
"resource:///modules/IMServices.sys.mjs",
|
||||
"resource:///modules/imXPCOMUtils.sys.mjs",
|
||||
"resource:///modules/jsProtoHelper.sys.mjs",
|
||||
"resource:///modules/logger.sys.mjs",
|
||||
"resource:///modules/MailNotificationManager.sys.mjs",
|
||||
"resource:///modules/MailNotificationService.sys.mjs",
|
||||
"resource:///modules/MsgIncomingServer.jsm",
|
||||
"resource:///modules/MsgIncomingServer.sys.mjs",
|
||||
]),
|
||||
services: new Set([
|
||||
"@mozilla.org/mail/notification-manager;1",
|
||||
|
|
@ -69,18 +69,18 @@ const startupPhases = {
|
|||
"before first paint": {
|
||||
denylist: {
|
||||
modules: new Set([
|
||||
"chrome://openpgp/content/BondOpenPGP.jsm",
|
||||
"chrome://openpgp/content/modules/core.jsm",
|
||||
"chrome://openpgp/content/BondOpenPGP.sys.mjs",
|
||||
"chrome://openpgp/content/modules/core.sys.mjs",
|
||||
"resource:///modules/index_im.sys.mjs",
|
||||
"resource:///modules/MsgDBCacheManager.jsm",
|
||||
"resource:///modules/PeriodicFilterManager.jsm",
|
||||
"resource:///modules/MsgDBCacheManager.sys.mjs",
|
||||
"resource:///modules/PeriodicFilterManager.sys.mjs",
|
||||
"resource://gre/modules/Blocklist.sys.mjs",
|
||||
"resource://gre/modules/NewTabUtils.sys.mjs",
|
||||
"resource://gre/modules/Sqlite.sys.mjs",
|
||||
// Bug 1660907: These core modules shouldn't really be being loaded
|
||||
// until sometime after first paint.
|
||||
// "resource://gre/modules/PlacesUtils.sys.mjs",
|
||||
// "resource://gre/modules/Preferences.jsm",
|
||||
// "resource://gre/modules/Preferences.sys.mjs",
|
||||
// These can probably be pushed back even further.
|
||||
]),
|
||||
services: new Set([
|
||||
|
|
@ -96,27 +96,27 @@ const startupPhases = {
|
|||
"before handling user events": {
|
||||
denylist: {
|
||||
modules: new Set([
|
||||
"resource:///modules/gloda/Everybody.jsm",
|
||||
"resource:///modules/gloda/Gloda.jsm",
|
||||
"resource:///modules/gloda/GlodaContent.jsm",
|
||||
"resource:///modules/gloda/GlodaDatabind.jsm",
|
||||
"resource:///modules/gloda/GlodaDataModel.jsm",
|
||||
"resource:///modules/gloda/GlodaDatastore.jsm",
|
||||
"resource:///modules/gloda/GlodaExplicitAttr.jsm",
|
||||
"resource:///modules/gloda/GlodaFundAttr.jsm",
|
||||
"resource:///modules/gloda/GlodaMsgIndexer.jsm",
|
||||
"resource:///modules/gloda/GlodaPublic.jsm",
|
||||
"resource:///modules/gloda/GlodaQueryClassFactory.jsm",
|
||||
"resource:///modules/gloda/GlodaUtils.jsm",
|
||||
"resource:///modules/gloda/IndexMsg.jsm",
|
||||
"resource:///modules/gloda/MimeMessage.jsm",
|
||||
"resource:///modules/gloda/NounFreetag.jsm",
|
||||
"resource:///modules/gloda/NounMimetype.jsm",
|
||||
"resource:///modules/gloda/NounTag.jsm",
|
||||
"resource:///modules/gloda/Everybody.sys.mjs",
|
||||
"resource:///modules/gloda/Gloda.sys.mjs",
|
||||
"resource:///modules/gloda/GlodaContent.sys.mjs",
|
||||
"resource:///modules/gloda/GlodaDatabind.sys.mjs",
|
||||
"resource:///modules/gloda/GlodaDataModel.sys.mjs",
|
||||
"resource:///modules/gloda/GlodaDatastore.sys.mjs",
|
||||
"resource:///modules/gloda/GlodaExplicitAttr.sys.mjs",
|
||||
"resource:///modules/gloda/GlodaFundAttr.sys.mjs",
|
||||
"resource:///modules/gloda/GlodaMsgIndexer.sys.mjs",
|
||||
"resource:///modules/gloda/GlodaPublic.sys.mjs",
|
||||
"resource:///modules/gloda/GlodaQueryClassFactory.sys.mjs",
|
||||
"resource:///modules/gloda/GlodaUtils.sys.mjs",
|
||||
"resource:///modules/gloda/IndexMsg.sys.mjs",
|
||||
"resource:///modules/gloda/MimeMessage.sys.mjs",
|
||||
"resource:///modules/gloda/NounFreetag.sys.mjs",
|
||||
"resource:///modules/gloda/NounMimetype.sys.mjs",
|
||||
"resource:///modules/gloda/NounTag.sys.mjs",
|
||||
"resource:///modules/index_im.sys.mjs",
|
||||
"resource:///modules/jsmime.jsm",
|
||||
"resource:///modules/jsmime.sys.mjs",
|
||||
"resource:///modules/MimeJSComponents.sys.mjs",
|
||||
"resource:///modules/mimeParser.jsm",
|
||||
"resource:///modules/mimeParser.sys.mjs",
|
||||
"resource://gre/modules/BookmarkHTMLUtils.sys.mjs",
|
||||
"resource://gre/modules/Bookmarks.sys.mjs",
|
||||
"resource://gre/modules/ContextualIdentityService.sys.mjs",
|
||||
|
|
@ -144,19 +144,19 @@ const startupPhases = {
|
|||
denylist: {
|
||||
modules: new Set([
|
||||
"resource:///modules/AddrBookManager.sys.mjs",
|
||||
"resource:///modules/DisplayNameUtils.jsm",
|
||||
"resource:///modules/gloda/Facet.jsm",
|
||||
"resource:///modules/gloda/GlodaMsgSearcher.jsm",
|
||||
"resource:///modules/gloda/SuffixTree.jsm",
|
||||
"resource:///modules/DisplayNameUtils.sys.mjs",
|
||||
"resource:///modules/gloda/Facet.sys.mjs",
|
||||
"resource:///modules/gloda/GlodaMsgSearcher.sys.mjs",
|
||||
"resource:///modules/gloda/SuffixTree.sys.mjs",
|
||||
"resource:///modules/GlodaAutoComplete.sys.mjs",
|
||||
"resource:///modules/ImapIncomingServer.jsm",
|
||||
"resource:///modules/ImapMessageMessageService.jsm",
|
||||
"resource:///modules/ImapMessageService.jsm",
|
||||
"resource:///modules/ImapIncomingServer.sys.mjs",
|
||||
"resource:///modules/ImapMessageMessageService.sys.mjs",
|
||||
"resource:///modules/ImapMessageService.sys.mjs",
|
||||
// Skipped due to the way ImapModuleLoader and registerProtocolHandler
|
||||
// works, uncomment once ImapModuleLoader is removed and imap-js becomes
|
||||
// the only IMAP implemention.
|
||||
// "resource:///modules/ImapProtocolHandler.jsm",
|
||||
"resource:///modules/ImapService.jsm",
|
||||
// "resource:///modules/ImapProtocolHandler.sys.mjs",
|
||||
"resource:///modules/ImapService.sys.mjs",
|
||||
"resource:///modules/NntpIncomingServer.sys.mjs",
|
||||
"resource:///modules/NntpMessageService.sys.mjs",
|
||||
"resource:///modules/NntpProtocolHandler.sys.mjs",
|
||||
|
|
@ -165,12 +165,12 @@ const startupPhases = {
|
|||
"resource:///modules/Pop3IncomingServer.sys.mjs",
|
||||
"resource:///modules/Pop3ProtocolHandler.sys.mjs",
|
||||
"resource:///modules/Pop3ProtocolInfo.sys.mjs",
|
||||
// "resource:///modules/Pop3Service.jsm",
|
||||
"resource:///modules/SmtpClient.jsm",
|
||||
// "resource:///modules/Pop3Service.sys.mjs",
|
||||
"resource:///modules/SmtpClient.sys.mjs",
|
||||
"resource:///modules/SMTPProtocolHandler.sys.mjs",
|
||||
"resource:///modules/SmtpServer.sys.mjs",
|
||||
"resource:///modules/SmtpService.sys.mjs",
|
||||
"resource:///modules/TemplateUtils.jsm",
|
||||
"resource:///modules/TemplateUtils.sys.mjs",
|
||||
"resource://gre/modules/AsyncPrefs.sys.mjs",
|
||||
"resource://gre/modules/LoginManagerContextMenu.sys.mjs",
|
||||
"resource://pdf.js/PdfStreamConverter.sys.mjs",
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# MailGlue.jsm
|
||||
# MailGlue.sys.mjs
|
||||
|
||||
# This component must restrict its registration for the app-startup category
|
||||
# to the specific list of apps that use it so it doesn't get loaded in xpcshell.
|
||||
|
|
|
|||
|
|
@ -263,7 +263,7 @@ const STARTUP_CRASHES_END_DELAY_MS = 30 * 1000;
|
|||
/**
|
||||
* Glue code that should be executed before any windows are opened. Any
|
||||
* window-independent helper methods (a la nsBrowserGlue.js) should go in
|
||||
* MailUtils.jsm instead.
|
||||
* MailUtils.sys.mjs instead.
|
||||
*/
|
||||
|
||||
export function MailGlue() {
|
||||
|
|
@ -1080,7 +1080,7 @@ function reportAccountSizes() {
|
|||
/**
|
||||
* Report addressbook count and contact count to telemetry, keyed by addressbook
|
||||
* type. Type is one of ["jsaddrbook", "jscarddav", "moz-abldapdirectory"], see
|
||||
* AddrBookManager.jsm for more details.
|
||||
* AddrBookManager.sys.mjs for more details.
|
||||
*
|
||||
* NOTE: We didn't use `dir.dirType` because it's just an integer, instead we
|
||||
* use the scheme of `dir.URI` as the type.
|
||||
|
|
|
|||
|
|
@ -109,7 +109,7 @@ StartupRecorder.prototype = {
|
|||
|
||||
// We can't ensure our observer will be called first or last, so the list of
|
||||
// topics we observe here should avoid the topics used to trigger things
|
||||
// during startup (eg. the topics observed by BrowserGlue.jsm).
|
||||
// during startup (eg. the topics observed by BrowserGlue.sys.mjs).
|
||||
let topics = [
|
||||
"profile-do-change", // This catches stuff loaded during app-startup
|
||||
"toplevel-window-ready", // Catches stuff from final-ui-startup
|
||||
|
|
|
|||
|
|
@ -115,7 +115,7 @@ function toFluentID(str) {
|
|||
.toLowerCase();
|
||||
}
|
||||
|
||||
// Each property in this object corresponds to a property in Troubleshoot.jsm's
|
||||
// Each property in this object corresponds to a property in Troubleshoot.sys.mjs's
|
||||
// snapshot data. Each function is passed its property's corresponding data,
|
||||
// and it's the function's job to update the page with it.
|
||||
var snapshotFormatters = {
|
||||
|
|
@ -623,7 +623,7 @@ var snapshotFormatters = {
|
|||
// graphics-failures-tbody tbody
|
||||
if ("failures" in data) {
|
||||
// If indices is there, it should be the same length as failures,
|
||||
// (see Troubleshoot.jsm) but we check anyway:
|
||||
// (see Troubleshoot.sys.mjs) but we check anyway:
|
||||
if ("indices" in data && data.failures.length == data.indices.length) {
|
||||
const combined = [];
|
||||
for (let i = 0; i < data.failures.length; i++) {
|
||||
|
|
|
|||
|
|
@ -3,8 +3,8 @@
|
|||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
/*
|
||||
* Tests for GuessConfig.sys.jsm
|
||||
/**
|
||||
* Tests for GuessConfig.sys.mjs
|
||||
*
|
||||
* Currently tested:
|
||||
* - getHostEntry function.
|
||||
|
|
@ -16,8 +16,6 @@
|
|||
* - Figure out what else to test.
|
||||
*/
|
||||
|
||||
// Globals
|
||||
|
||||
var { GuessConfig } = ChromeUtils.importESModule(
|
||||
"resource:///modules/accountcreation/GuessConfig.sys.mjs"
|
||||
);
|
||||
|
|
|
|||
|
|
@ -34,9 +34,9 @@ const isXpcshell = Services.env.exists("XPCSHELL_TEST_PROFILE_DIR");
|
|||
|
||||
ChromeUtils.defineLazyGetter(lazy, "log", () => {
|
||||
return console.createInstance({
|
||||
prefix: "Policies.jsm",
|
||||
prefix: "Policies",
|
||||
// tip: set maxLogLevel to "debug" and use log.debug() to create detailed
|
||||
// messages during development. See LOG_LEVELS in Console.jsm for details.
|
||||
// messages during development. See LOG_LEVELS in Console.sys.mjs for details.
|
||||
maxLogLevel: "Error",
|
||||
maxLogLevelPref: PREF_LOGLEVEL,
|
||||
});
|
||||
|
|
|
|||
|
|
@ -239,14 +239,14 @@ function generateErrors() {
|
|||
const consoleEvents = storage.getEvents();
|
||||
const prefixes = [
|
||||
"Enterprise Policies",
|
||||
"JsonSchemaValidator.jsm",
|
||||
"Policies.jsm",
|
||||
"GPOParser.jsm",
|
||||
"JsonSchemaValidator",
|
||||
"Policies",
|
||||
"WindowsGPOParser",
|
||||
"Enterprise Policies Child",
|
||||
"BookmarksPolicies.jsm",
|
||||
"ProxyPolicies.jsm",
|
||||
"BookmarksPolicies",
|
||||
"ProxyPolicies",
|
||||
"WebsiteFilter Policy",
|
||||
"macOSPoliciesParser.jsm",
|
||||
"macOSPoliciesParser",
|
||||
];
|
||||
|
||||
const new_cont = document.getElementById("errorsContent");
|
||||
|
|
|
|||
|
|
@ -8,9 +8,9 @@ const PREF_LOGLEVEL = "browser.policies.loglevel";
|
|||
|
||||
ChromeUtils.defineLazyGetter(lazy, "log", () => {
|
||||
return console.createInstance({
|
||||
prefix: "ProxyPolicies.jsm",
|
||||
prefix: "ProxyPolicies",
|
||||
// tip: set maxLogLevel to "debug" and use log.debug() to create detailed
|
||||
// messages during development. See LOG_LEVELS in Console.jsm for details.
|
||||
// messages during development. See LOG_LEVELS in Console.sys.mjs for details.
|
||||
maxLogLevel: "Error",
|
||||
maxLogLevelPref: PREF_LOGLEVEL,
|
||||
});
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ add_task(async function test_policies_sorted() {
|
|||
);
|
||||
checkArrayIsSorted(
|
||||
Object.keys(Policies),
|
||||
"Policies.jsm is alphabetically sorted."
|
||||
"Policies.sys.mjs is alphabetically sorted."
|
||||
);
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -2,10 +2,7 @@
|
|||
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
||||
* You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
|
||||
|
||||
const lazy = {};
|
||||
|
||||
ChromeUtils.defineLazyGetter(lazy, "makeRange", () => {
|
||||
const { ExtensionParent } = ChromeUtils.importESModule(
|
||||
"resource://gre/modules/ExtensionParent.sys.mjs"
|
||||
|
|
@ -16,10 +13,9 @@ ChromeUtils.defineLazyGetter(lazy, "makeRange", () => {
|
|||
|
||||
ChromeUtils.defineESModuleGetters(lazy, {
|
||||
Preferences: "resource://gre/modules/Preferences.sys.mjs",
|
||||
});
|
||||
|
||||
XPCOMUtils.defineLazyModuleGetters(lazy, {
|
||||
Sanitizer: "resource:///modules/Sanitizer.jsm",
|
||||
// TODO: Sanitizer.sys.mjs doesn't exist for Thunderbird.
|
||||
// If we start using BrowsingDataDelegate we need this too.
|
||||
Sanitizer: "resource:///modules/Sanitizer.sys.mjs",
|
||||
});
|
||||
|
||||
export class BrowsingDataDelegate {
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
module.exports = {
|
||||
globals: {
|
||||
// These are defined in the WebExtension script scopes by ExtensionCommon.jsm.
|
||||
// These are defined in the WebExtension script scopes by ExtensionCommon.sys.mjs.
|
||||
// From toolkit/components/extensions/.eslintrc.js.
|
||||
ExtensionAPI: true,
|
||||
ExtensionCommon: true,
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
module.exports = {
|
||||
globals: {
|
||||
// These are defined in the WebExtension script scopes by ExtensionCommon.jsm.
|
||||
// These are defined in the WebExtension script scopes by ExtensionCommon.sys.mjs.
|
||||
// From toolkit/components/extensions/.eslintrc.js.
|
||||
ExtensionAPI: true,
|
||||
ExtensionAPIPersistent: true,
|
||||
|
|
|
|||
|
|
@ -1365,7 +1365,7 @@ this.addressBook = class extends ExtensionAPIPersistent {
|
|||
} else {
|
||||
// Get the current vCardProperties, build a propertyMap and create
|
||||
// vCardParsed which allows to identify all currently exposed entries
|
||||
// based on the typeName used in VCardUtils.jsm (e.g. adr.work).
|
||||
// based on the typeName used in VCardUtils.sys.mjs (e.g. adr.work).
|
||||
const vCardProperties = vCardPropertiesFromCard(node.item);
|
||||
const vCardParsed = VCardUtils._parse(vCardProperties.entries);
|
||||
const propertyMap = vCardProperties.toPropertyMap();
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@
|
|||
/* global searchInitialized */
|
||||
|
||||
// Copy of browser/components/extensions/parent/ext-chrome-settings-overrides.js
|
||||
// minus HomePage.jsm (+ dependent ExtensionControlledPopup.sys.mjs and
|
||||
// ExtensionPermissions.jsm usage).
|
||||
// minus HomePage.sys.mjs (+ dependent ExtensionControlledPopup.sys.mjs and
|
||||
// ExtensionPermissions.sys.mjs usage).
|
||||
|
||||
"use strict";
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ var { AddonTestUtils } = ChromeUtils.importESModule(
|
|||
var { ExtensionTestUtils } = ChromeUtils.importESModule(
|
||||
"resource://testing-common/ExtensionXPCShellUtils.sys.mjs"
|
||||
);
|
||||
// ExtensionContent.jsm needs to know when it's running from xpcshell,
|
||||
// ExtensionContent.sys.mjs needs to know when it's running from xpcshell,
|
||||
// to use the right timeout for content scripts executed at document_idle.
|
||||
ExtensionTestUtils.mockAppInfo();
|
||||
|
||||
|
|
|
|||
|
|
@ -10,10 +10,10 @@ module.exports = {
|
|||
gChatTab: true,
|
||||
Services: true,
|
||||
|
||||
// chat/modules/imStatusUtils.jsm
|
||||
// chat/modules/imStatusUtils.sys.mjs
|
||||
Status: true,
|
||||
|
||||
// chat/modules/imTextboxUtils.jsm
|
||||
// chat/modules/imTextboxUtils.sys.mjs
|
||||
MessageFormat: true,
|
||||
TextboxSize: true,
|
||||
},
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@ ChromeUtils.defineLazyGetter(lazy, "MailFolder", () =>
|
|||
var gIMAccounts = {};
|
||||
|
||||
function GlodaIMConversation(aTitle, aTime, aPath, aContent) {
|
||||
// grokNounItem from Gloda.jsm puts automatically the values of all
|
||||
// grokNounItem from Gloda.sys.mjs puts automatically the values of all
|
||||
// JS properties in the jsonAttributes magic attribute, except if
|
||||
// they start with _, so we put the values in _-prefixed properties,
|
||||
// and have getters in the prototype.
|
||||
|
|
@ -180,7 +180,7 @@ var IMConversationNoun = {
|
|||
Gloda.defineNoun(IMConversationNoun);
|
||||
|
||||
// Needs to be set after calling defineNoun, otherwise it's replaced
|
||||
// by GlodaDatabind.jsm' implementation.
|
||||
// by GlodaDatabind.sys.mjs' implementation.
|
||||
IMConversationNoun.objFromRow = function (aRow) {
|
||||
// Row columns are:
|
||||
// 0 id
|
||||
|
|
@ -269,7 +269,7 @@ Gloda.defineAttribute({
|
|||
subjectNouns: [IMConversationNoun.id],
|
||||
objectNoun: GlodaConstants.NOUN_FULLTEXT,
|
||||
});
|
||||
// For Facet.jsm DateFaceter
|
||||
// For Facet.sys.mjs DateFaceter
|
||||
Gloda.defineAttribute({
|
||||
provider: WidgetProvider,
|
||||
extensionName: EXT_NAME,
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ var { MailViewConstants } = ChromeUtils.importESModule(
|
|||
"resource:///modules/MailViewManager.sys.mjs"
|
||||
);
|
||||
|
||||
// these constants are now authoritatively defined in MailViewManager.jsm (above)
|
||||
// these constants are now authoritatively defined in MailViewManager.sys.mjs (above)
|
||||
// tag views have kViewTagMarker + their key as value
|
||||
var kViewItemAll = MailViewConstants.kViewItemAll;
|
||||
var kViewItemUnread = MailViewConstants.kViewItemUnread;
|
||||
|
|
|
|||
|
|
@ -4,15 +4,14 @@
|
|||
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
|
||||
*/
|
||||
|
||||
import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
|
||||
|
||||
const lazy = {};
|
||||
|
||||
ChromeUtils.defineESModuleGetters(lazy, {
|
||||
EnigmailArmor: "chrome://openpgp/content/modules/armor.sys.mjs",
|
||||
EnigmailConstants: "chrome://openpgp/content/modules/constants.sys.mjs",
|
||||
EnigmailData: "chrome://openpgp/content/modules/data.sys.mjs",
|
||||
EnigmailDecryption: "chrome://openpgp/content/modules/decryption.sys.mjs",
|
||||
EnigmailFixExchangeMsg:
|
||||
"chrome://openpgp/content/modules/fixExchangeMsg.sys.mjs",
|
||||
EnigmailLog: "chrome://openpgp/content/modules/log.sys.mjs",
|
||||
EnigmailMime: "chrome://openpgp/content/modules/mime.sys.mjs",
|
||||
EnigmailStreams: "chrome://openpgp/content/modules/streams.sys.mjs",
|
||||
|
|
@ -21,11 +20,6 @@ ChromeUtils.defineESModuleGetters(lazy, {
|
|||
jsmime: "resource:///modules/jsmime.sys.mjs",
|
||||
});
|
||||
|
||||
XPCOMUtils.defineLazyModuleGetters(lazy, {
|
||||
EnigmailFixExchangeMsg:
|
||||
"chrome://openpgp/content/modules/fixExchangeMessage.jsm",
|
||||
});
|
||||
|
||||
ChromeUtils.defineLazyGetter(lazy, "l10n", () => {
|
||||
return new Localization(["messenger/openpgp/openpgp.ftl"], true);
|
||||
});
|
||||
|
|
@ -980,18 +974,12 @@ export class MimeTreeDecrypter {
|
|||
}
|
||||
|
||||
fixExchangeMessage(mimeTreePart) {
|
||||
lazy.EnigmailLog.DEBUG("MimeTree.sys.mjs: fixExchangeMessage()\n");
|
||||
|
||||
const msg = mimeTreeToString(mimeTreePart, true);
|
||||
|
||||
try {
|
||||
const fixedMsg = lazy.EnigmailFixExchangeMsg.getRepairedMessage(msg);
|
||||
const replacement = getMimeTree(fixedMsg, true);
|
||||
|
||||
for (const i in replacement) {
|
||||
mimeTreePart[i] = replacement[i];
|
||||
}
|
||||
} catch (ex) {}
|
||||
const fixedMsg = lazy.EnigmailFixExchangeMsg.getRepairedMessage(msg);
|
||||
const replacement = getMimeTree(fixedMsg, true);
|
||||
for (const i in replacement) {
|
||||
mimeTreePart[i] = replacement[i];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -272,7 +272,7 @@ function enableRNPLibJS() {
|
|||
// To do so, we require that the user has already unlocked
|
||||
// by entering the global primary password, if it is set.
|
||||
// Ensure that other repairing is done first, if necessary,
|
||||
// as handled by masterpass.jsm (OpenPGP automatic password).
|
||||
// as handled by masterpass.sys.mjs (OpenPGP automatic password).
|
||||
|
||||
// Note we have two failure scenarios, either a failure, or
|
||||
// retrieveOpenPGPPassword() returning null (that function
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@ export var EnigmailArmor = {
|
|||
indentStrObj
|
||||
) {
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"armor.jsm: Enigmail.locateArmoredBlock: " +
|
||||
"armor.sys.mjs: Enigmail.locateArmoredBlock: " +
|
||||
offset +
|
||||
", '" +
|
||||
indentStr +
|
||||
|
|
@ -140,7 +140,9 @@ export var EnigmailArmor = {
|
|||
if (matches && matches.length > 1) {
|
||||
blockType = matches[1];
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"armor.jsm: Enigmail.locateArmoredBlock: blockType=" + blockType + "\n"
|
||||
"armor.sys.mjs: Enigmail.locateArmoredBlock: blockType=" +
|
||||
blockType +
|
||||
"\n"
|
||||
);
|
||||
}
|
||||
|
||||
|
|
@ -204,14 +206,14 @@ export var EnigmailArmor = {
|
|||
}
|
||||
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"armor.jsm: locateArmorBlocks: Found " + blocks.length + " Blocks\n"
|
||||
"armor.sys.mjs: locateArmorBlocks: Found " + blocks.length + " Blocks\n"
|
||||
);
|
||||
return blocks;
|
||||
},
|
||||
|
||||
extractSignaturePart(signatureBlock, part) {
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"armor.jsm: Enigmail.extractSignaturePart: part=" + part + "\n"
|
||||
"armor.sys.mjs: Enigmail.extractSignaturePart: part=" + part + "\n"
|
||||
);
|
||||
|
||||
return searchBlankLine(signatureBlock, function (offset) {
|
||||
|
|
|
|||
|
|
@ -151,7 +151,7 @@ export var EnigmailConstants = {
|
|||
CARD_PIN_UNBLOCK: 2,
|
||||
CARD_ADMIN_PIN_CHANGE: 3,
|
||||
|
||||
/* Keyserver error codes (in keyserver.jsm) */
|
||||
/* Keyserver error codes (in keyserver.sys.mjs) */
|
||||
KEYSERVER_ERR_ABORTED: 1,
|
||||
KEYSERVER_ERR_SERVER_ERROR: 2,
|
||||
KEYSERVER_ERR_SECURITY_ERROR: 3,
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ export var EnigmailCore = {
|
|||
|
||||
initializeLogDirectory();
|
||||
|
||||
lazy.EnigmailLog.DEBUG("core.jsm: startup()\n");
|
||||
lazy.EnigmailLog.DEBUG("core.sys.mjs: startup()\n");
|
||||
|
||||
await lazy.PgpSqliteDb2.checkDatabaseStructure();
|
||||
|
||||
|
|
@ -53,7 +53,7 @@ function initializeLogDirectory() {
|
|||
lazy.EnigmailLog.setLogLevel(5);
|
||||
lazy.EnigmailLog.setLogDirectory(dir);
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"core.jsm: Logging debug output to " + dir + "/enigdbug.txt\n"
|
||||
"core.sys.mjs: Logging debug output to " + dir + "/enigdbug.txt\n"
|
||||
);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -131,7 +131,7 @@ export var EnigmailDecryption = {
|
|||
extraDetailsObj
|
||||
) {
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"decryption.jsm: decryptMessage(" +
|
||||
"decryption.sys.mjs: decryptMessage(" +
|
||||
cipherText.length +
|
||||
" bytes, " +
|
||||
uiFlags +
|
||||
|
|
@ -149,7 +149,7 @@ export var EnigmailDecryption = {
|
|||
var oldSignature = signatureObj.value;
|
||||
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"decryption.jsm: decryptMessage: oldSignature=" + oldSignature + "\n"
|
||||
"decryption.sys.mjs: decryptMessage: oldSignature=" + oldSignature + "\n"
|
||||
);
|
||||
|
||||
signatureObj.value = "";
|
||||
|
|
@ -211,7 +211,7 @@ export var EnigmailDecryption = {
|
|||
// HACK to better support messages from Outlook: if there are empty lines, drop them
|
||||
if (pgpBlock.search(/MESSAGE-----\r?\n\r?\nVersion/) >= 0) {
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"decryption.jsm: decryptMessage: apply Outlook empty line workaround\n"
|
||||
"decryption.sys.mjs: decryptMessage: apply Outlook empty line workaround\n"
|
||||
);
|
||||
pgpBlock = pgpBlock.replace(/\r?\n\r?\n/g, "\n");
|
||||
}
|
||||
|
|
@ -293,7 +293,7 @@ export var EnigmailDecryption = {
|
|||
const cApi = lazy.EnigmailCryptoAPI();
|
||||
const result = cApi.sync(cApi.decrypt(pgpBlock, options));
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"decryption.jsm: decryptMessage: decryption finished\n"
|
||||
"decryption.sys.mjs: decryptMessage: decryption finished\n"
|
||||
);
|
||||
if (!result) {
|
||||
console.warn("Decryption message finished with no result.");
|
||||
|
|
@ -399,7 +399,7 @@ export var EnigmailDecryption = {
|
|||
|
||||
statusFlagsObj.value |= EnigmailConstants.INLINE_KEY;
|
||||
EnigmailLog.DEBUG(
|
||||
"decryption.jsm: decryptMessage: innerKeyBlock found\n"
|
||||
"decryption.sys.mjs: decryptMessage: innerKeyBlock found\n"
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
@ -465,7 +465,7 @@ export var EnigmailDecryption = {
|
|||
},
|
||||
|
||||
inlineInnerVerification(parent, uiFlags, text, statusObject) {
|
||||
lazy.EnigmailLog.DEBUG("decryption.jsm: inlineInnerVerification()\n");
|
||||
lazy.EnigmailLog.DEBUG("decryption.sys.mjs: inlineInnerVerification()\n");
|
||||
|
||||
if (text && text.indexOf("-----BEGIN PGP SIGNED MESSAGE-----") === 0) {
|
||||
var status = newStatusObject();
|
||||
|
|
@ -528,7 +528,7 @@ export var EnigmailDecryption = {
|
|||
errorMsgObj
|
||||
) {
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"decryption.jsm: decryptAttachment(parent=" +
|
||||
"decryption.sys.mjs: decryptAttachment(parent=" +
|
||||
parent +
|
||||
", outFileName=" +
|
||||
outFile.path +
|
||||
|
|
|
|||
|
|
@ -58,7 +58,9 @@ export var EnigmailEncryption = {
|
|||
result.senderKeyIsExternal = false;
|
||||
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"encryption.jsm: getCryptParams: hashAlgorithm=" + hashAlgorithm + "\n"
|
||||
"encryption.sys.mjs: getCryptParams: hashAlgorithm=" +
|
||||
hashAlgorithm +
|
||||
"\n"
|
||||
);
|
||||
|
||||
try {
|
||||
|
|
@ -195,7 +197,7 @@ export var EnigmailEncryption = {
|
|||
*/
|
||||
determineInvSignReason(keyId) {
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"errorHandling.jsm: determineInvSignReason: keyId: " + keyId + "\n"
|
||||
"errorHandling.sys.mjs: determineInvSignReason: keyId: " + keyId + "\n"
|
||||
);
|
||||
|
||||
const key = lazy.EnigmailKeyRing.getKeyById(keyId);
|
||||
|
|
@ -222,7 +224,7 @@ export var EnigmailEncryption = {
|
|||
*/
|
||||
determineInvRcptReason(keyId) {
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"errorHandling.jsm: determineInvRcptReason: keyId: " + keyId + "\n"
|
||||
"errorHandling.sys.mjs: determineInvRcptReason: keyId: " + keyId + "\n"
|
||||
);
|
||||
|
||||
const key = lazy.EnigmailKeyRing.getKeyById(keyId);
|
||||
|
|
@ -252,7 +254,7 @@ export var EnigmailEncryption = {
|
|||
*/
|
||||
async determineOwnKeyUsability(sendFlags, fromKeyId, isExternalGnuPG) {
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"encryption.jsm: determineOwnKeyUsability: sendFlags=" +
|
||||
"encryption.sys.mjs: determineOwnKeyUsability: sendFlags=" +
|
||||
sendFlags +
|
||||
", sender=" +
|
||||
fromKeyId +
|
||||
|
|
@ -367,7 +369,7 @@ export var EnigmailEncryption = {
|
|||
errorMsgObj
|
||||
) {
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"encryption.jsm: encryptMessageStart: uiFlags=" +
|
||||
"encryption.sys.mjs: encryptMessageStart: uiFlags=" +
|
||||
uiFlags +
|
||||
", from " +
|
||||
fromMailAddr +
|
||||
|
|
@ -398,7 +400,7 @@ export var EnigmailEncryption = {
|
|||
|
||||
if (!sendFlags) {
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"encryption.jsm: encryptMessageStart: NO ENCRYPTION!\n"
|
||||
"encryption.sys.mjs: encryptMessageStart: NO ENCRYPTION!\n"
|
||||
);
|
||||
errorMsgObj.value = lazy.l10n.formatValueSync("not-required");
|
||||
return 0;
|
||||
|
|
|
|||
|
|
@ -34,7 +34,9 @@ var gNewMailListenerInitiated = false;
|
|||
const filterActionMoveDecrypt = {
|
||||
async applyAction(aMsgHdrs, aActionValue, aListener, aType, aMsgWindow) {
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"filters.jsm: filterActionMoveDecrypt: Move to: " + aActionValue + "\n"
|
||||
"filters.sys.mjs: filterActionMoveDecrypt: Move to: " +
|
||||
aActionValue +
|
||||
"\n"
|
||||
);
|
||||
|
||||
for (const msgHdr of aMsgHdrs) {
|
||||
|
|
@ -71,7 +73,9 @@ const filterActionMoveDecrypt = {
|
|||
const filterActionCopyDecrypt = {
|
||||
async applyAction(aMsgHdrs, aActionValue, aListener, aType, aMsgWindow) {
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"filters.jsm: filterActionCopyDecrypt: Copy to: " + aActionValue + "\n"
|
||||
"filters.sys.mjs: filterActionCopyDecrypt: Copy to: " +
|
||||
aActionValue +
|
||||
"\n"
|
||||
);
|
||||
|
||||
for (const msgHdr of aMsgHdrs) {
|
||||
|
|
@ -86,7 +90,7 @@ const filterActionCopyDecrypt = {
|
|||
|
||||
isValidForType(type, scope) {
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"filters.jsm: filterActionCopyDecrypt.isValidForType(" + type + ")\n"
|
||||
"filters.sys.mjs: filterActionCopyDecrypt.isValidForType(" + type + ")\n"
|
||||
);
|
||||
|
||||
const r = true;
|
||||
|
|
@ -95,7 +99,7 @@ const filterActionCopyDecrypt = {
|
|||
|
||||
validateActionValue(value, folder, type) {
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"filters.jsm: filterActionCopyDecrypt.validateActionValue(" +
|
||||
"filters.sys.mjs: filterActionCopyDecrypt.validateActionValue(" +
|
||||
value +
|
||||
")\n"
|
||||
);
|
||||
|
|
@ -118,13 +122,13 @@ const filterActionEncrypt = {
|
|||
lazy.EnigmailKeyRing.getAllKeys();
|
||||
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"filters.jsm: filterActionEncrypt: Encrypt to: " + aActionValue + "\n"
|
||||
"filters.sys.mjs: filterActionEncrypt: Encrypt to: " + aActionValue + "\n"
|
||||
);
|
||||
let keyObj = lazy.EnigmailKeyRing.getKeyById(aActionValue);
|
||||
|
||||
if (keyObj === null) {
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"filters.jsm: failed to find key by id: " + aActionValue + "\n"
|
||||
"filters.sys.mjs: failed to find key by id: " + aActionValue + "\n"
|
||||
);
|
||||
const keyId = lazy.EnigmailKeyRing.getValidKeyForRecipient(aActionValue);
|
||||
if (keyId) {
|
||||
|
|
@ -133,7 +137,7 @@ const filterActionEncrypt = {
|
|||
}
|
||||
|
||||
if (keyObj === null && aListener) {
|
||||
lazy.EnigmailLog.DEBUG("filters.jsm: no valid key - aborting\n");
|
||||
lazy.EnigmailLog.DEBUG("filters.sys.mjs: no valid key - aborting\n");
|
||||
|
||||
aListener.OnStartCopy();
|
||||
aListener.OnStopCopy(1);
|
||||
|
|
@ -142,7 +146,7 @@ const filterActionEncrypt = {
|
|||
}
|
||||
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"filters.jsm: key to encrypt to: " +
|
||||
"filters.sys.mjs: key to encrypt to: " +
|
||||
JSON.stringify(keyObj) +
|
||||
", userId: " +
|
||||
keyObj.userId +
|
||||
|
|
@ -177,7 +181,7 @@ const filterActionEncrypt = {
|
|||
lazy.EnigmailKeyRing.getAllKeys();
|
||||
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"filters.jsm: validateActionValue: Encrypt to: " + value + "\n"
|
||||
"filters.sys.mjs: validateActionValue: Encrypt to: " + value + "\n"
|
||||
);
|
||||
if (value === "") {
|
||||
return l10n.formatValueSync("filter-key-required");
|
||||
|
|
@ -187,7 +191,7 @@ const filterActionEncrypt = {
|
|||
|
||||
if (keyObj === null) {
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"filters.jsm: failed to find key by id. Looking for uid.\n"
|
||||
"filters.sys.mjs: failed to find key by id. Looking for uid.\n"
|
||||
);
|
||||
const keyId = lazy.EnigmailKeyRing.getValidKeyForRecipient(value);
|
||||
if (keyId) {
|
||||
|
|
@ -272,7 +276,7 @@ const filterTermPGPEncrypted = {
|
|||
data = lazy.NetUtil.readInputStreamToString(stream, messageSize);
|
||||
} catch (ex) {
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"filters.jsm: filterTermPGPEncrypted: failed to get data.\n"
|
||||
"filters.sys.mjs: filterTermPGPEncrypted: failed to get data.\n"
|
||||
);
|
||||
// If we don't know better to return false.
|
||||
stream.close();
|
||||
|
|
@ -304,7 +308,7 @@ const filterTermPGPEncrypted = {
|
|||
};
|
||||
|
||||
function initNewMailListener() {
|
||||
lazy.EnigmailLog.DEBUG("filters.jsm: initNewMailListener()\n");
|
||||
lazy.EnigmailLog.DEBUG("filters.sys.mjs: initNewMailListener()\n");
|
||||
|
||||
if (!gNewMailListenerInitiated) {
|
||||
const notificationService = Cc[
|
||||
|
|
@ -319,7 +323,7 @@ function initNewMailListener() {
|
|||
}
|
||||
|
||||
function shutdownNewMailListener() {
|
||||
lazy.EnigmailLog.DEBUG("filters.jsm: shutdownNewMailListener()\n");
|
||||
lazy.EnigmailLog.DEBUG("filters.sys.mjs: shutdownNewMailListener()\n");
|
||||
|
||||
if (gNewMailListenerInitiated) {
|
||||
const notificationService = Cc[
|
||||
|
|
@ -375,7 +379,7 @@ JsmimeEmitter.prototype = {
|
|||
|
||||
startPart(partNum, headers) {
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"filters.jsm: JsmimeEmitter.startPart: partNum=" + partNum + "\n"
|
||||
"filters.sys.mjs: JsmimeEmitter.startPart: partNum=" + partNum + "\n"
|
||||
);
|
||||
//this.stack.push(partNum);
|
||||
const newPart = this.createPartObj(partNum, headers, this.currentPart);
|
||||
|
|
@ -393,14 +397,16 @@ JsmimeEmitter.prototype = {
|
|||
|
||||
endPart(partNum) {
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"filters.jsm: JsmimeEmitter.startPart: partNum=" + partNum + "\n"
|
||||
"filters.sys.mjs: JsmimeEmitter.startPart: partNum=" + partNum + "\n"
|
||||
);
|
||||
this.currentPart = this.currentPart.parent;
|
||||
},
|
||||
|
||||
deliverPartData(partNum, data) {
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"filters.jsm: JsmimeEmitter.deliverPartData: partNum=" + partNum + "\n"
|
||||
"filters.sys.mjs: JsmimeEmitter.deliverPartData: partNum=" +
|
||||
partNum +
|
||||
"\n"
|
||||
);
|
||||
if (this.requireBody) {
|
||||
if (typeof data === "string") {
|
||||
|
|
@ -414,7 +420,7 @@ JsmimeEmitter.prototype = {
|
|||
};
|
||||
|
||||
function processIncomingMail(url, requireBody, aMsgHdr) {
|
||||
lazy.EnigmailLog.DEBUG("filters.jsm: processIncomingMail()\n");
|
||||
lazy.EnigmailLog.DEBUG("filters.sys.mjs: processIncomingMail()\n");
|
||||
|
||||
const inputStream = lazy.EnigmailStreams.newStringStreamListener(msgData => {
|
||||
const opt = {
|
||||
|
|
@ -432,7 +438,7 @@ function processIncomingMail(url, requireBody, aMsgHdr) {
|
|||
c.consumeMessage(e.getMimeTree(), msgData, aMsgHdr);
|
||||
} catch (ex) {
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"filters.jsm: processIncomingMail: exception: " +
|
||||
"filters.sys.mjs: processIncomingMail: exception: " +
|
||||
ex.toString() +
|
||||
"\n"
|
||||
);
|
||||
|
|
@ -446,7 +452,7 @@ function processIncomingMail(url, requireBody, aMsgHdr) {
|
|||
channel.asyncOpen(inputStream, null);
|
||||
} catch (e) {
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"filters.jsm: processIncomingMail: open stream exception " +
|
||||
"filters.sys.mjs: processIncomingMail: open stream exception " +
|
||||
e.toString() +
|
||||
"\n"
|
||||
);
|
||||
|
|
@ -496,7 +502,9 @@ function getRequireMessageProcessing(aMsgHdr) {
|
|||
}
|
||||
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"filters.jsm: getRequireMessageProcessing: author: " + aMsgHdr.author + "\n"
|
||||
"filters.sys.mjs: getRequireMessageProcessing: author: " +
|
||||
aMsgHdr.author +
|
||||
"\n"
|
||||
);
|
||||
|
||||
const u = lazy.EnigmailFuncs.getUrlFromUriSpec(
|
||||
|
|
@ -519,7 +527,7 @@ function getRequireMessageProcessing(aMsgHdr) {
|
|||
const newMailListener = {
|
||||
msgAdded(aMsgHdr) {
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"filters.jsm: newMailListener.msgAdded() - got new mail in " +
|
||||
"filters.sys.mjs: newMailListener.msgAdded() - got new mail in " +
|
||||
aMsgHdr.folder.prettiestName +
|
||||
"\n"
|
||||
);
|
||||
|
|
|
|||
|
|
@ -30,7 +30,9 @@ export var EnigmailFixExchangeMsg = {
|
|||
async fixExchangeMessage(hdr, brokenByApp, destFolderUri = null) {
|
||||
const msgUriSpec = hdr.folder.getUriForMsg(hdr);
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"fixExchangeMsg.jsm: fixExchangeMessage: msgUriSpec: " + msgUriSpec + "\n"
|
||||
"fixExchangeMsg.sys.mjs: fixExchangeMessage: msgUriSpec: " +
|
||||
msgUriSpec +
|
||||
"\n"
|
||||
);
|
||||
|
||||
this.hdr = hdr;
|
||||
|
|
@ -42,7 +44,7 @@ export var EnigmailFixExchangeMsg = {
|
|||
const fixedMsgData = await this.getMessageBody();
|
||||
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"fixExchangeMsg.jsm: fixExchangeMessage: got fixedMsgData\n"
|
||||
"fixExchangeMsg.sys.mjs: fixExchangeMessage: got fixedMsgData\n"
|
||||
);
|
||||
this.ensureExpectedStructure(fixedMsgData);
|
||||
return lazy.EnigmailPersistentCrypto.copyMessageToFolder(
|
||||
|
|
@ -55,7 +57,7 @@ export var EnigmailFixExchangeMsg = {
|
|||
},
|
||||
|
||||
getMessageBody() {
|
||||
lazy.EnigmailLog.DEBUG("fixExchangeMsg.jsm: getMessageBody:\n");
|
||||
lazy.EnigmailLog.DEBUG("fixExchangeMsg.sys.mjs: getMessageBody:\n");
|
||||
|
||||
var self = this;
|
||||
|
||||
|
|
@ -65,12 +67,12 @@ export var EnigmailFixExchangeMsg = {
|
|||
);
|
||||
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"fixExchangeMsg.jsm: getting data from URL " + url + "\n"
|
||||
"fixExchangeMsg.sys.mjs: getting data from URL " + url + "\n"
|
||||
);
|
||||
|
||||
const s = lazy.EnigmailStreams.newStringStreamListener(function (data) {
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"fixExchangeMsg.jsm: analyzeDecryptedData: got " +
|
||||
"fixExchangeMsg.sys.mjs: analyzeDecryptedData: got " +
|
||||
data.length +
|
||||
" bytes\n"
|
||||
);
|
||||
|
|
@ -95,7 +97,7 @@ export var EnigmailFixExchangeMsg = {
|
|||
channel.asyncOpen(s, null);
|
||||
} catch (e) {
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"fixExchangeMsg.jsm: getMessageBody: exception " + e + "\n"
|
||||
"fixExchangeMsg.sys.mjs: getMessageBody: exception " + e + "\n"
|
||||
);
|
||||
}
|
||||
});
|
||||
|
|
@ -136,7 +138,7 @@ export var EnigmailFixExchangeMsg = {
|
|||
break;
|
||||
default:
|
||||
lazy.EnigmailLog.ERROR(
|
||||
"fixExchangeMsg.jsm: getRepairedMessage: unknown appType " +
|
||||
"fixExchangeMsg.sys.mjs: getRepairedMessage: unknown appType " +
|
||||
this.brokenByApp +
|
||||
"\n"
|
||||
);
|
||||
|
|
@ -184,7 +186,7 @@ export var EnigmailFixExchangeMsg = {
|
|||
*/
|
||||
getFixedHeaderData(hdrLines) {
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"fixExchangeMsg.jsm: getFixedHeaderData: hdrLines[]:'" +
|
||||
"fixExchangeMsg.sys.mjs: getFixedHeaderData: hdrLines[]:'" +
|
||||
hdrLines.length +
|
||||
"'\n"
|
||||
);
|
||||
|
|
@ -242,7 +244,7 @@ export var EnigmailFixExchangeMsg = {
|
|||
*/
|
||||
getCorrectedExchangeBodyData(bodyData, boundary) {
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"fixExchangeMsg.jsm: getCorrectedExchangeBodyData: boundary='" +
|
||||
"fixExchangeMsg.sys.mjs: getCorrectedExchangeBodyData: boundary='" +
|
||||
boundary +
|
||||
"'\n"
|
||||
);
|
||||
|
|
@ -253,7 +255,7 @@ export var EnigmailFixExchangeMsg = {
|
|||
|
||||
if (match.index < 0) {
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"fixExchangeMsg.jsm: getCorrectedExchangeBodyData: did not find index of mime type to skip\n"
|
||||
"fixExchangeMsg.sys.mjs: getCorrectedExchangeBodyData: did not find index of mime type to skip\n"
|
||||
);
|
||||
return null;
|
||||
}
|
||||
|
|
@ -263,7 +265,7 @@ export var EnigmailFixExchangeMsg = {
|
|||
match = boundRx.exec(bodyData);
|
||||
if (match.index <= 0) {
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"fixExchangeMsg.jsm: getCorrectedExchangeBodyData: did not find boundary of PGP/MIME version identification\n"
|
||||
"fixExchangeMsg.sys.mjs: getCorrectedExchangeBodyData: did not find boundary of PGP/MIME version identification\n"
|
||||
);
|
||||
return null;
|
||||
}
|
||||
|
|
@ -278,7 +280,7 @@ export var EnigmailFixExchangeMsg = {
|
|||
) < 0
|
||||
) {
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"fixExchangeMsg.jsm: getCorrectedExchangeBodyData: first MIME part is not content-type text/plain or text/html\n"
|
||||
"fixExchangeMsg.sys.mjs: getCorrectedExchangeBodyData: first MIME part is not content-type text/plain or text/html\n"
|
||||
);
|
||||
return null;
|
||||
}
|
||||
|
|
@ -286,7 +288,7 @@ export var EnigmailFixExchangeMsg = {
|
|||
match = boundRx.exec(bodyData);
|
||||
if (match.index < 0) {
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"fixExchangeMsg.jsm: getCorrectedExchangeBodyData: did not find boundary of PGP/MIME encrypted data\n"
|
||||
"fixExchangeMsg.sys.mjs: getCorrectedExchangeBodyData: did not find boundary of PGP/MIME encrypted data\n"
|
||||
);
|
||||
return null;
|
||||
}
|
||||
|
|
@ -300,7 +302,7 @@ export var EnigmailFixExchangeMsg = {
|
|||
|
||||
if (!ct || ct.search(/application\/pgp-encrypted/i) < 0) {
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"fixExchangeMsg.jsm: getCorrectedExchangeBodyData: wrong content-type of version-identification\n"
|
||||
"fixExchangeMsg.sys.mjs: getCorrectedExchangeBodyData: wrong content-type of version-identification\n"
|
||||
);
|
||||
lazy.EnigmailLog.DEBUG(" ct = '" + ct + "'\n");
|
||||
return null;
|
||||
|
|
@ -310,7 +312,7 @@ export var EnigmailFixExchangeMsg = {
|
|||
ct = mimeHdr.extractHeader("content-type", false);
|
||||
if (!ct || ct.search(/application\/octet-stream/i) < 0) {
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"fixExchangeMsg.jsm: getCorrectedExchangeBodyData: wrong content-type of PGP/MIME data\n"
|
||||
"fixExchangeMsg.sys.mjs: getCorrectedExchangeBodyData: wrong content-type of PGP/MIME data\n"
|
||||
);
|
||||
lazy.EnigmailLog.DEBUG(" ct = '" + ct + "'\n");
|
||||
return null;
|
||||
|
|
@ -324,7 +326,7 @@ export var EnigmailFixExchangeMsg = {
|
|||
*/
|
||||
getCorrectediPGMailBodyData(bodyData, boundary) {
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"fixExchangeMsg.jsm: getCorrectediPGMailBodyData: boundary='" +
|
||||
"fixExchangeMsg.sys.mjs: getCorrectediPGMailBodyData: boundary='" +
|
||||
boundary +
|
||||
"'\n"
|
||||
);
|
||||
|
|
@ -335,7 +337,7 @@ export var EnigmailFixExchangeMsg = {
|
|||
|
||||
if (match.index < 0) {
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"fixExchangeMsg.jsm: getCorrectediPGMailBodyData: did not find index of mime type to skip\n"
|
||||
"fixExchangeMsg.sys.mjs: getCorrectediPGMailBodyData: did not find index of mime type to skip\n"
|
||||
);
|
||||
return null;
|
||||
}
|
||||
|
|
@ -344,7 +346,7 @@ export var EnigmailFixExchangeMsg = {
|
|||
match = boundRx.exec(bodyData);
|
||||
if (match.index <= 0) {
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"fixExchangeMsg.jsm: getCorrectediPGMailBodyData: did not find boundary of text/plain msg part\n"
|
||||
"fixExchangeMsg.sys.mjs: getCorrectediPGMailBodyData: did not find boundary of text/plain msg part\n"
|
||||
);
|
||||
return null;
|
||||
}
|
||||
|
|
@ -354,7 +356,7 @@ export var EnigmailFixExchangeMsg = {
|
|||
match = boundRx.exec(bodyData);
|
||||
if (match.index < 0) {
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"fixExchangeMsg.jsm: getCorrectediPGMailBodyData: did not find end boundary of PGP/MIME encrypted data\n"
|
||||
"fixExchangeMsg.sys.mjs: getCorrectediPGMailBodyData: did not find end boundary of PGP/MIME encrypted data\n"
|
||||
);
|
||||
return null;
|
||||
}
|
||||
|
|
@ -367,7 +369,7 @@ export var EnigmailFixExchangeMsg = {
|
|||
const ct = mimeHdr.extractHeader("content-type", false);
|
||||
if (!ct || ct.search(/application\/pgp-encrypted/i) < 0) {
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"fixExchangeMsg.jsm: getCorrectediPGMailBodyData: wrong content-type of PGP/MIME data\n"
|
||||
"fixExchangeMsg.sys.mjs: getCorrectediPGMailBodyData: wrong content-type of PGP/MIME data\n"
|
||||
);
|
||||
lazy.EnigmailLog.DEBUG(" ct = '" + ct + "'\n");
|
||||
return null;
|
||||
|
|
|
|||
|
|
@ -25,12 +25,9 @@ export var EnigmailFuncs = {
|
|||
*
|
||||
* @param {string} mailAddresses - Address list encdoded as specified
|
||||
* in RFC 2822, 3.4 separated by , or ;
|
||||
*
|
||||
* @returns {string} a list of pure email addresses separated by ","
|
||||
*/
|
||||
stripEmail(mailAddresses) {
|
||||
// EnigmailLog.DEBUG("funcs.jsm: stripEmail(): mailAddresses=" + mailAddresses + "\n");
|
||||
|
||||
const SIMPLE = "[^<>,]+"; // RegExp for a simple email address (e.g. a@b.c)
|
||||
const COMPLEX = "[^<>,]*<[^<>, ]+>"; // RegExp for an address containing <...> (e.g. Name <a@b.c>)
|
||||
const MatchAddr = new RegExp(
|
||||
|
|
@ -44,7 +41,7 @@ export var EnigmailFuncs = {
|
|||
qEnd = mailAddrs.indexOf('"', qStart + 1);
|
||||
if (qEnd < 0) {
|
||||
lazy.EnigmailLog.ERROR(
|
||||
"funcs.jsm: stripEmail: Unmatched quote in mail address: '" +
|
||||
"funcs.sys.mjs: stripEmail: Unmatched quote in mail address: '" +
|
||||
mailAddresses +
|
||||
"'\n"
|
||||
);
|
||||
|
|
@ -68,7 +65,7 @@ export var EnigmailFuncs = {
|
|||
// having two <..> <..> in one email, or things like <a@b.c,><d@e.f> is an error
|
||||
if (mailAddrs.search(MatchAddr) < 0) {
|
||||
lazy.EnigmailLog.ERROR(
|
||||
"funcs.jsm: stripEmail: Invalid <..> brackets in mail address: '" +
|
||||
"funcs.sys.mjs: stripEmail: Invalid <..> brackets in mail address: '" +
|
||||
mailAddresses +
|
||||
"'\n"
|
||||
);
|
||||
|
|
@ -128,7 +125,7 @@ export var EnigmailFuncs = {
|
|||
* @param {object} dummy - Anything.
|
||||
*/
|
||||
collapseAdvanced(obj, attribute, dummy) {
|
||||
lazy.EnigmailLog.DEBUG("funcs.jsm: collapseAdvanced:\n");
|
||||
lazy.EnigmailLog.DEBUG("funcs.sys.mjs: collapseAdvanced:\n");
|
||||
|
||||
var advancedUser = Services.prefs.getBoolPref("temp.openpgp.advancedUser");
|
||||
|
||||
|
|
@ -262,7 +259,6 @@ export var EnigmailFuncs = {
|
|||
lines.join("\n") +
|
||||
(isSignature ? "</div>" : "") +
|
||||
"</pre>";
|
||||
//EnigmailLog.DEBUG("funcs.jsm: r='"+r+"'\n");
|
||||
return r;
|
||||
},
|
||||
|
||||
|
|
@ -276,7 +272,7 @@ export var EnigmailFuncs = {
|
|||
*/
|
||||
getHeaderData(data) {
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"funcs.jsm: getHeaderData: " + data.substr(0, 100) + "\n"
|
||||
"funcs.sys.mjs: getHeaderData: " + data.substr(0, 100) + "\n"
|
||||
);
|
||||
var a = data.split(/\n/);
|
||||
var res = [];
|
||||
|
|
@ -293,7 +289,7 @@ export var EnigmailFuncs = {
|
|||
// m[2]: identifier / m[6]: data
|
||||
res[m[2].toLowerCase()] = m[6].replace(/\s*$/, "");
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"funcs.jsm: getHeaderData: " +
|
||||
"funcs.sys.mjs: getHeaderData: " +
|
||||
m[2].toLowerCase() +
|
||||
" = " +
|
||||
res[m[2].toLowerCase()] +
|
||||
|
|
|
|||
|
|
@ -156,7 +156,7 @@ export var EnigmailKey = {
|
|||
seckey,
|
||||
withPubKey = false
|
||||
) {
|
||||
lazy.EnigmailLog.DEBUG("key.jsm: getKeyListFromKeyBlock\n");
|
||||
lazy.EnigmailLog.DEBUG("key.sys.mjs: getKeyListFromKeyBlock\n");
|
||||
errorMsgObj.value = "";
|
||||
|
||||
const cacheEntry = this._keyListCache.get(keyBlockStr);
|
||||
|
|
|
|||
|
|
@ -481,7 +481,7 @@ class EnigmailKeyObj {
|
|||
*/
|
||||
getMinimalPubKey(emailAddr) {
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"keyObj.jsm: EnigmailKeyObj.getMinimalPubKey: " + this.keyId + "\n"
|
||||
"keyObj.sys.mjs: EnigmailKeyObj.getMinimalPubKey: " + this.keyId + "\n"
|
||||
);
|
||||
|
||||
if (emailAddr) {
|
||||
|
|
@ -565,7 +565,7 @@ class EnigmailKeyObj {
|
|||
*/
|
||||
getVirtualKeySize() {
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"keyObj.jsm: EnigmailKeyObj.getVirtualKeySize: " + this.keyId + "\n"
|
||||
"keyObj.sys.mjs: EnigmailKeyObj.getVirtualKeySize: " + this.keyId + "\n"
|
||||
);
|
||||
|
||||
switch (this.algoSym) {
|
||||
|
|
|
|||
|
|
@ -102,7 +102,7 @@ export var EnigmailKeyRing = {
|
|||
* @returns Object - found KeyObject or null if key not found
|
||||
*/
|
||||
getKeyById(keyId, noLoadKeys) {
|
||||
lazy.EnigmailLog.DEBUG("keyRing.jsm: getKeyById: " + keyId + "\n");
|
||||
lazy.EnigmailLog.DEBUG("keyRing.sys.mjs: getKeyById: " + keyId + "\n");
|
||||
|
||||
if (!keyId) {
|
||||
return null;
|
||||
|
|
@ -150,7 +150,9 @@ export var EnigmailKeyRing = {
|
|||
* @returns Array of KeyObjects with the found keys (array length is 0 if no key found)
|
||||
*/
|
||||
getKeysByEmail(email, onlyValidUid = true, allowExpired = false) {
|
||||
lazy.EnigmailLog.DEBUG("keyRing.jsm: getKeysByEmail: '" + email + "'\n");
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"keyRing.sys.mjs: getKeysByEmail: '" + email + "'\n"
|
||||
);
|
||||
|
||||
const res = [];
|
||||
if (!email) {
|
||||
|
|
@ -255,7 +257,7 @@ export var EnigmailKeyRing = {
|
|||
|
||||
async getAllSecretKeysByEmail(emailAddr, result, allowExpired) {
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"keyRing.jsm: getAllSecretKeysByEmail: '" + emailAddr + "'\n"
|
||||
"keyRing.sys.mjs: getAllSecretKeysByEmail: '" + emailAddr + "'\n"
|
||||
);
|
||||
const keyList = this.getKeysByEmail(emailAddr, true, true);
|
||||
|
||||
|
|
@ -323,7 +325,7 @@ export var EnigmailKeyRing = {
|
|||
*/
|
||||
getKeyListById(keyIdList) {
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"keyRing.jsm: getKeyListById: '" + keyIdList + "'\n"
|
||||
"keyRing.sys.mjs: getKeyListById: '" + keyIdList + "'\n"
|
||||
);
|
||||
let keyArr;
|
||||
if (typeof keyIdList === "string") {
|
||||
|
|
@ -404,7 +406,7 @@ export var EnigmailKeyRing = {
|
|||
importedKeysObj
|
||||
) {
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"keyRing.jsm: EnigmailKeyRing.importSecKeyFromFile: fileName=" +
|
||||
"keyRing.sys.mjs: EnigmailKeyRing.importSecKeyFromFile: fileName=" +
|
||||
inputFile.path +
|
||||
"\n"
|
||||
);
|
||||
|
|
@ -476,7 +478,7 @@ export var EnigmailKeyRing = {
|
|||
* no input or return values
|
||||
*/
|
||||
clearCache() {
|
||||
lazy.EnigmailLog.DEBUG("keyRing.jsm: EnigmailKeyRing.clearCache\n");
|
||||
lazy.EnigmailLog.DEBUG("keyRing.sys.mjs: EnigmailKeyRing.clearCache\n");
|
||||
gKeyListObj = {
|
||||
keyList: [],
|
||||
keySortList: [],
|
||||
|
|
@ -823,7 +825,7 @@ export var EnigmailKeyRing = {
|
|||
acceptance = null
|
||||
) {
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
`keyRing.jsm: EnigmailKeyRing.importKeyAsync('${keyId}', ${askToConfirm}, ${minimizeKey})\n`
|
||||
`keyRing.sys.mjs: EnigmailKeyRing.importKeyAsync('${keyId}', ${askToConfirm}, ${minimizeKey})\n`
|
||||
);
|
||||
|
||||
var pgpBlock;
|
||||
|
|
@ -1097,7 +1099,7 @@ export var EnigmailKeyRing = {
|
|||
passphrase,
|
||||
listener
|
||||
) {
|
||||
lazy.EnigmailLog.WRITE("keyRing.jsm: generateKey:\n");
|
||||
lazy.EnigmailLog.WRITE("keyRing.sys.mjs: generateKey:\n");
|
||||
throw new Error("Not implemented");
|
||||
},
|
||||
|
||||
|
|
@ -1225,7 +1227,9 @@ export var EnigmailKeyRing = {
|
|||
*/
|
||||
async getValidKeyForRecipient(emailAddr, details) {
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
'keyRing.jsm: getValidKeyForRecipient(): emailAddr="' + emailAddr + '"\n'
|
||||
'keyRing.sys.mjs: getValidKeyForRecipient(): emailAddr="' +
|
||||
emailAddr +
|
||||
'"\n'
|
||||
);
|
||||
const FULLTRUSTLEVEL = 2;
|
||||
|
||||
|
|
@ -1275,11 +1279,11 @@ export var EnigmailKeyRing = {
|
|||
emailAddr +
|
||||
"' found";
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"keyRing.jsm: getValidKeyForRecipient(): " + msg + "\n"
|
||||
"keyRing.sys.mjs: getValidKeyForRecipient(): " + msg + "\n"
|
||||
);
|
||||
} else {
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"keyRing.jsm: getValidKeyForRecipient(): key=" +
|
||||
"keyRing.sys.mjs: getValidKeyForRecipient(): key=" +
|
||||
foundKeyId +
|
||||
'" found\n'
|
||||
);
|
||||
|
|
@ -1480,7 +1484,7 @@ export var EnigmailKeyRing = {
|
|||
|
||||
async getMultValidKeysForOneRecipient(emailAddr, allowExpired = false) {
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
'keyRing.jsm: getMultValidKeysForOneRecipient(): emailAddr="' +
|
||||
'keyRing.sys.mjs: getMultValidKeysForOneRecipient(): emailAddr="' +
|
||||
emailAddr +
|
||||
'"\n'
|
||||
);
|
||||
|
|
@ -1592,7 +1596,9 @@ export var EnigmailKeyRing = {
|
|||
* @param keys: Array of String - key IDs or fingerprints
|
||||
*/
|
||||
updateKeys(keys) {
|
||||
lazy.EnigmailLog.DEBUG("keyRing.jsm: updateKeys(" + keys.join(",") + ")\n");
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"keyRing.sys.mjs: updateKeys(" + keys.join(",") + ")\n"
|
||||
);
|
||||
const uniqueKeys = [...new Set(keys)]; // make key IDs unique
|
||||
|
||||
deleteKeysFromCache(uniqueKeys);
|
||||
|
|
@ -2045,7 +2051,7 @@ function getSortFunction(type, keyListObj, sortDirection) {
|
|||
* no return value
|
||||
*/
|
||||
function loadKeyList(win, sortColumn, sortDirection, onlyKeys = null) {
|
||||
lazy.EnigmailLog.DEBUG("keyRing.jsm: loadKeyList( " + onlyKeys + ")\n");
|
||||
lazy.EnigmailLog.DEBUG("keyRing.sys.mjs: loadKeyList( " + onlyKeys + ")\n");
|
||||
|
||||
if (gLoadingKeys) {
|
||||
waitForKeyList();
|
||||
|
|
@ -2067,14 +2073,14 @@ function loadKeyList(win, sortColumn, sortDirection, onlyKeys = null) {
|
|||
gLoadingKeys = false;
|
||||
})
|
||||
.catch(e => {
|
||||
lazy.EnigmailLog.ERROR(`keyRing.jsm: loadKeyList: error ${e}
|
||||
lazy.EnigmailLog.ERROR(`keyRing.sys.mjs: loadKeyList: error ${e}
|
||||
`);
|
||||
gLoadingKeys = false;
|
||||
});
|
||||
waitForKeyList();
|
||||
} catch (ex) {
|
||||
lazy.EnigmailLog.ERROR(
|
||||
"keyRing.jsm: loadKeyList: exception: " + ex.toString()
|
||||
"keyRing.sys.mjs: loadKeyList: exception: " + ex.toString()
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
@ -2108,7 +2114,7 @@ function updateSortList() {
|
|||
|
||||
function deleteKeysFromCache(keyList) {
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"keyRing.jsm: deleteKeysFromCache(" + keyList.join(",") + ")\n"
|
||||
"keyRing.sys.mjs: deleteKeysFromCache(" + keyList.join(",") + ")\n"
|
||||
);
|
||||
|
||||
const deleted = [];
|
||||
|
|
@ -2143,7 +2149,7 @@ function createAndSortKeyList(
|
|||
sortDirection,
|
||||
resetKeyCache
|
||||
) {
|
||||
lazy.EnigmailLog.DEBUG("keyRing.jsm: createAndSortKeyList()\n");
|
||||
lazy.EnigmailLog.DEBUG("keyRing.sys.mjs: createAndSortKeyList()\n");
|
||||
|
||||
if (typeof sortColumn !== "string") {
|
||||
sortColumn = "userid";
|
||||
|
|
|
|||
|
|
@ -216,7 +216,7 @@ const accessHkpInternal = {
|
|||
*/
|
||||
async accessKeyServer(actionFlag, keyserver, keyId, listener) {
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
`keyserver.jsm: accessHkpInternal.accessKeyServer(${keyserver})\n`
|
||||
`keyserver.sys.mjs: accessHkpInternal.accessKeyServer(${keyserver})\n`
|
||||
);
|
||||
if (!keyserver) {
|
||||
throw new Error("accessKeyServer requires explicit keyserver parameter");
|
||||
|
|
@ -229,7 +229,7 @@ const accessHkpInternal = {
|
|||
if (listener && typeof listener === "object") {
|
||||
listener.onCancel = function () {
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
`keyserver.jsm: accessHkpInternal.accessKeyServer - onCancel() called\n`
|
||||
`keyserver.sys.mjs: accessHkpInternal.accessKeyServer - onCancel() called\n`
|
||||
);
|
||||
if (xmlReq) {
|
||||
xmlReq.abort();
|
||||
|
|
@ -251,14 +251,14 @@ const accessHkpInternal = {
|
|||
|
||||
xmlReq.onload = function () {
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"keyserver.jsm: accessHkpInternal: onload(): status=" +
|
||||
"keyserver.sys.mjs: accessHkpInternal: onload(): status=" +
|
||||
xmlReq.status +
|
||||
"\n"
|
||||
);
|
||||
switch (actionFlag) {
|
||||
case lazy.EnigmailConstants.UPLOAD_KEY:
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"keyserver.jsm: accessHkpInternal: onload: " +
|
||||
"keyserver.sys.mjs: accessHkpInternal: onload: " +
|
||||
xmlReq.responseText +
|
||||
"\n"
|
||||
);
|
||||
|
|
@ -291,7 +291,7 @@ const accessHkpInternal = {
|
|||
resolve(1);
|
||||
} else if (xmlReq.status >= 500) {
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"keyserver.jsm: accessHkpInternal: onload: " +
|
||||
"keyserver.sys.mjs: accessHkpInternal: onload: " +
|
||||
xmlReq.responseText +
|
||||
"\n"
|
||||
);
|
||||
|
|
@ -335,7 +335,7 @@ const accessHkpInternal = {
|
|||
|
||||
xmlReq.onerror = function (e) {
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"keyserver.jsm: accessHkpInternal.accessKeyServer: onerror: " +
|
||||
"keyserver.sys.mjs: accessHkpInternal.accessKeyServer: onerror: " +
|
||||
e +
|
||||
"\n"
|
||||
);
|
||||
|
|
@ -368,7 +368,7 @@ const accessHkpInternal = {
|
|||
|
||||
xmlReq.onloadend = function () {
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"keyserver.jsm: accessHkpInternal.accessKeyServer: loadEnd\n"
|
||||
"keyserver.sys.mjs: accessHkpInternal.accessKeyServer: loadEnd\n"
|
||||
);
|
||||
};
|
||||
|
||||
|
|
@ -379,7 +379,7 @@ const accessHkpInternal = {
|
|||
);
|
||||
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
`keyserver.jsm: accessHkpInternal.accessKeyServer: requesting ${url}\n`
|
||||
`keyserver.sys.mjs: accessHkpInternal.accessKeyServer: requesting ${url}\n`
|
||||
);
|
||||
xmlReq.open(method, url);
|
||||
xmlReq.setRequestHeader(
|
||||
|
|
@ -401,7 +401,7 @@ const accessHkpInternal = {
|
|||
*/
|
||||
async download(autoImport, keyIDs, keyserver, listener = null) {
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
`keyserver.jsm: accessHkpInternal.download(${keyIDs})\n`
|
||||
`keyserver.sys.mjs: accessHkpInternal.download(${keyIDs})\n`
|
||||
);
|
||||
const keyIdArr = keyIDs.split(/ +/);
|
||||
const retObj = {
|
||||
|
|
@ -464,7 +464,7 @@ const accessHkpInternal = {
|
|||
*/
|
||||
async upload(keyIDs, keyserver, listener = null) {
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
`keyserver.jsm: accessHkpInternal.upload(${keyIDs})\n`
|
||||
`keyserver.sys.mjs: accessHkpInternal.upload(${keyIDs})\n`
|
||||
);
|
||||
const keyIdArr = keyIDs.split(/ +/);
|
||||
let rv = false;
|
||||
|
|
@ -517,7 +517,7 @@ const accessHkpInternal = {
|
|||
*/
|
||||
async searchKeyserver(searchTerm, keyserver, listener = null) {
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
`keyserver.jsm: accessHkpInternal.search(${searchTerm})\n`
|
||||
`keyserver.sys.mjs: accessHkpInternal.search(${searchTerm})\n`
|
||||
);
|
||||
const retObj = {
|
||||
result: 0,
|
||||
|
|
@ -635,14 +635,16 @@ const accessKeyBase = {
|
|||
* @return: Promise<Number (Status-ID)>
|
||||
*/
|
||||
async accessKeyServer(actionFlag, keyId, listener) {
|
||||
lazy.EnigmailLog.DEBUG(`keyserver.jsm: accessKeyBase: accessKeyServer()\n`);
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
`keyserver.sys.mjs: accessKeyBase: accessKeyServer()\n`
|
||||
);
|
||||
|
||||
return new Promise((resolve, reject) => {
|
||||
let xmlReq = null;
|
||||
if (listener && typeof listener === "object") {
|
||||
listener.onCancel = function () {
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
`keyserver.jsm: accessKeyBase: accessKeyServer - onCancel() called\n`
|
||||
`keyserver.sys.mjs: accessKeyBase: accessKeyServer - onCancel() called\n`
|
||||
);
|
||||
if (xmlReq) {
|
||||
xmlReq.abort();
|
||||
|
|
@ -659,7 +661,7 @@ const accessKeyBase = {
|
|||
|
||||
xmlReq.onload = function () {
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"keyserver.jsm: onload(): status=" + xmlReq.status + "\n"
|
||||
"keyserver.sys.mjs: onload(): status=" + xmlReq.status + "\n"
|
||||
);
|
||||
switch (actionFlag) {
|
||||
case lazy.EnigmailConstants.SEARCH_KEY:
|
||||
|
|
@ -679,7 +681,7 @@ const accessKeyBase = {
|
|||
resolve(1);
|
||||
} else if (xmlReq.status >= 500) {
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"keyserver.jsm: onload: " + xmlReq.responseText + "\n"
|
||||
"keyserver.sys.mjs: onload: " + xmlReq.responseText + "\n"
|
||||
);
|
||||
reject(
|
||||
createError(lazy.EnigmailConstants.KEYSERVER_ERR_SERVER_ERROR)
|
||||
|
|
@ -736,7 +738,7 @@ const accessKeyBase = {
|
|||
|
||||
xmlReq.onerror = function (e) {
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"keyserver.jsm: accessKeyBase: onerror: " + e + "\n"
|
||||
"keyserver.sys.mjs: accessKeyBase: onerror: " + e + "\n"
|
||||
);
|
||||
const err = lazy.FeedUtils.createTCPErrorFromFailedXHR(e.target);
|
||||
switch (err.type) {
|
||||
|
|
@ -766,13 +768,13 @@ const accessKeyBase = {
|
|||
};
|
||||
|
||||
xmlReq.onloadend = function () {
|
||||
lazy.EnigmailLog.DEBUG("keyserver.jsm: accessKeyBase: loadEnd\n");
|
||||
lazy.EnigmailLog.DEBUG("keyserver.sys.mjs: accessKeyBase: loadEnd\n");
|
||||
};
|
||||
|
||||
const { url, method } = this.createRequestUrl(actionFlag, keyId);
|
||||
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
`keyserver.jsm: accessKeyBase: requesting ${url}\n`
|
||||
`keyserver.sys.mjs: accessKeyBase: requesting ${url}\n`
|
||||
);
|
||||
xmlReq.open(method, url);
|
||||
xmlReq.send("");
|
||||
|
|
@ -789,7 +791,7 @@ const accessKeyBase = {
|
|||
* @return: Promise<...>
|
||||
*/
|
||||
async download(autoImport, keyIDs, keyserver, listener = null) {
|
||||
lazy.EnigmailLog.DEBUG(`keyserver.jsm: accessKeyBase: download()\n`);
|
||||
lazy.EnigmailLog.DEBUG(`keyserver.sys.mjs: accessKeyBase: download()\n`);
|
||||
const keyIdArr = keyIDs.split(/ +/);
|
||||
const retObj = {
|
||||
result: 0,
|
||||
|
|
@ -843,7 +845,7 @@ const accessKeyBase = {
|
|||
|
||||
*/
|
||||
async searchKeyserver(searchTerm, keyserver, listener = null) {
|
||||
lazy.EnigmailLog.DEBUG(`keyserver.jsm: accessKeyBase: search()\n`);
|
||||
lazy.EnigmailLog.DEBUG(`keyserver.sys.mjs: accessKeyBase: search()\n`);
|
||||
const retObj = {
|
||||
result: 0,
|
||||
errorDetails: "",
|
||||
|
|
@ -897,7 +899,7 @@ const accessKeyBase = {
|
|||
},
|
||||
|
||||
refresh(keyServer, listener = null) {
|
||||
lazy.EnigmailLog.DEBUG(`keyserver.jsm: accessKeyBase: refresh()\n`);
|
||||
lazy.EnigmailLog.DEBUG(`keyserver.sys.mjs: accessKeyBase: refresh()\n`);
|
||||
const keyList = lazy.EnigmailKeyRing.getAllKeys()
|
||||
.keyList.map(keyObj => {
|
||||
return "0x" + keyObj.fpr;
|
||||
|
|
@ -1041,7 +1043,7 @@ const accessVksServer = {
|
|||
*/
|
||||
async accessKeyServer(actionFlag, keyserver, keyId, listener) {
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
`keyserver.jsm: accessVksServer.accessKeyServer(${keyserver})\n`
|
||||
`keyserver.sys.mjs: accessVksServer.accessKeyServer(${keyserver})\n`
|
||||
);
|
||||
if (keyserver === null) {
|
||||
keyserver = "keys.openpgp.org";
|
||||
|
|
@ -1055,7 +1057,7 @@ const accessVksServer = {
|
|||
if (listener && typeof listener === "object") {
|
||||
listener.onCancel = function () {
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
`keyserver.jsm: accessVksServer.accessKeyServer - onCancel() called\n`
|
||||
`keyserver.sys.mjs: accessVksServer.accessKeyServer - onCancel() called\n`
|
||||
);
|
||||
if (xmlReq) {
|
||||
xmlReq.abort();
|
||||
|
|
@ -1077,7 +1079,7 @@ const accessVksServer = {
|
|||
|
||||
xmlReq.onload = function () {
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"keyserver.jsm: accessVksServer.onload(): status=" +
|
||||
"keyserver.sys.mjs: accessVksServer.onload(): status=" +
|
||||
xmlReq.status +
|
||||
"\n"
|
||||
);
|
||||
|
|
@ -1085,7 +1087,7 @@ const accessVksServer = {
|
|||
case lazy.EnigmailConstants.UPLOAD_KEY:
|
||||
case lazy.EnigmailConstants.GET_CONFIRMATION_LINK:
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"keyserver.jsm: accessVksServer.onload: " +
|
||||
"keyserver.sys.mjs: accessVksServer.onload: " +
|
||||
xmlReq.responseText +
|
||||
"\n"
|
||||
);
|
||||
|
|
@ -1118,7 +1120,7 @@ const accessVksServer = {
|
|||
resolve(1);
|
||||
} else if (xmlReq.status >= 500) {
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"keyserver.jsm: accessVksServer.onload: " +
|
||||
"keyserver.sys.mjs: accessVksServer.onload: " +
|
||||
xmlReq.responseText +
|
||||
"\n"
|
||||
);
|
||||
|
|
@ -1159,7 +1161,9 @@ const accessVksServer = {
|
|||
|
||||
xmlReq.onerror = function (e) {
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"keyserver.jsm: accessVksServer.accessKeyServer: onerror: " + e + "\n"
|
||||
"keyserver.sys.mjs: accessVksServer.accessKeyServer: onerror: " +
|
||||
e +
|
||||
"\n"
|
||||
);
|
||||
const err = lazy.FeedUtils.createTCPErrorFromFailedXHR(e.target);
|
||||
switch (err.type) {
|
||||
|
|
@ -1190,7 +1194,7 @@ const accessVksServer = {
|
|||
|
||||
xmlReq.onloadend = function () {
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"keyserver.jsm: accessVksServer.accessKeyServer: loadEnd\n"
|
||||
"keyserver.sys.mjs: accessVksServer.accessKeyServer: loadEnd\n"
|
||||
);
|
||||
};
|
||||
|
||||
|
|
@ -1201,7 +1205,7 @@ const accessVksServer = {
|
|||
);
|
||||
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
`keyserver.jsm: accessVksServer.accessKeyServer: requesting ${method} for ${url}\n`
|
||||
`keyserver.sys.mjs: accessVksServer.accessKeyServer: requesting ${method} for ${url}\n`
|
||||
);
|
||||
xmlReq.open(method, url);
|
||||
xmlReq.setRequestHeader("Content-Type", contentType);
|
||||
|
|
@ -1220,7 +1224,7 @@ const accessVksServer = {
|
|||
*/
|
||||
async download(autoImport, keyIDs, keyserver, listener = null) {
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
`keyserver.jsm: accessVksServer.download(${keyIDs})\n`
|
||||
`keyserver.sys.mjs: accessVksServer.download(${keyIDs})\n`
|
||||
);
|
||||
const keyIdArr = keyIDs.split(/ +/);
|
||||
const retObj = {
|
||||
|
|
@ -1274,7 +1278,7 @@ const accessVksServer = {
|
|||
|
||||
async requestConfirmationLink(keyserver, jsonFragment) {
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
`keyserver.jsm: accessVksServer.requestConfirmationLink()\n`
|
||||
`keyserver.sys.mjs: accessVksServer.requestConfirmationLink()\n`
|
||||
);
|
||||
|
||||
const response = JSON.parse(jsonFragment);
|
||||
|
|
@ -1317,7 +1321,7 @@ const accessVksServer = {
|
|||
*/
|
||||
async upload(keyIDs, keyserver, listener = null) {
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
`keyserver.jsm: accessVksServer.upload(${keyIDs})\n`
|
||||
`keyserver.sys.mjs: accessVksServer.upload(${keyIDs})\n`
|
||||
);
|
||||
const keyIdArr = keyIDs.split(/ +/);
|
||||
let rv = false;
|
||||
|
|
@ -1381,7 +1385,7 @@ const accessVksServer = {
|
|||
*/
|
||||
async searchKeyserver(searchTerm, keyserver, listener = null) {
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
`keyserver.jsm: accessVksServer.search(${searchTerm})\n`
|
||||
`keyserver.sys.mjs: accessVksServer.search(${searchTerm})\n`
|
||||
);
|
||||
const retObj = {
|
||||
result: 0,
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ export var OpenPGPMasterpass = {
|
|||
Ci.nsISecretDecoderRing
|
||||
);
|
||||
} catch (ex) {
|
||||
lazy.EnigmailLog.writeException("masterpass.jsm", ex);
|
||||
lazy.EnigmailLog.writeException("masterpass.sys.mjs", ex);
|
||||
}
|
||||
}
|
||||
return this._sdr;
|
||||
|
|
@ -277,7 +277,7 @@ export var OpenPGPMasterpass = {
|
|||
|
||||
// This function may trigger password creation, if necessary
|
||||
async retrieveOpenPGPPassword() {
|
||||
lazy.EnigmailLog.DEBUG("masterpass.jsm: retrieveMasterPassword()\n");
|
||||
lazy.EnigmailLog.DEBUG("masterpass.sys.mjs: retrieveMasterPassword()\n");
|
||||
|
||||
await this.ensurePasswordIsCached();
|
||||
return this.cachedPassword;
|
||||
|
|
|
|||
|
|
@ -92,7 +92,7 @@ export var EnigmailMimeDecrypt = {
|
|||
// data is processed from libmime -> nsPgpMimeProxy
|
||||
|
||||
function MimeDecryptHandler() {
|
||||
lazy.EnigmailLog.DEBUG("mimeDecrypt.jsm: MimeDecryptHandler()\n"); // always log this one
|
||||
lazy.EnigmailLog.DEBUG("mimeDecrypt.sys.mjs: MimeDecryptHandler()\n"); // always log this one
|
||||
this.initOk = false;
|
||||
this.boundary = "";
|
||||
this.pipe = null;
|
||||
|
|
@ -126,12 +126,12 @@ MimeDecryptHandler.prototype = {
|
|||
|
||||
onStartRequest(request, uri) {
|
||||
lazy.EnigmailCore.init();
|
||||
lazy.EnigmailLog.DEBUG("mimeDecrypt.jsm: onStartRequest\n"); // always log this one
|
||||
lazy.EnigmailLog.DEBUG("mimeDecrypt.sys.mjs: onStartRequest\n"); // always log this one
|
||||
|
||||
++gNumProc;
|
||||
if (gNumProc > Services.prefs.getIntPref("temp.openpgp.maxNumProcesses")) {
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"mimeDecrypt.jsm: number of parallel requests above threshold - ignoring request\n"
|
||||
"mimeDecrypt.sys.mjs: number of parallel requests above threshold - ignoring request\n"
|
||||
);
|
||||
return;
|
||||
}
|
||||
|
|
@ -161,10 +161,10 @@ MimeDecryptHandler.prototype = {
|
|||
this.uri = mimeSvc.messageURI;
|
||||
if (this.uri) {
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"mimeDecrypt.jsm: onStartRequest: uri='" + this.uri.spec + "'\n"
|
||||
"mimeDecrypt.sys.mjs: onStartRequest: uri='" + this.uri.spec + "'\n"
|
||||
);
|
||||
} else {
|
||||
lazy.EnigmailLog.DEBUG("mimeDecrypt.jsm: onStartRequest: uri=null\n");
|
||||
lazy.EnigmailLog.DEBUG("mimeDecrypt.sys.mjs: onStartRequest: uri=null\n");
|
||||
}
|
||||
this.pipe = null;
|
||||
this.closePipe = false;
|
||||
|
|
@ -200,7 +200,7 @@ MimeDecryptHandler.prototype = {
|
|||
processData(data) {
|
||||
// detect MIME part boundary
|
||||
if (data.includes(this.boundary)) {
|
||||
LOCAL_DEBUG("mimeDecrypt.jsm: processData: found boundary\n");
|
||||
LOCAL_DEBUG("mimeDecrypt.sys.mjs: processData: found boundary\n");
|
||||
++this.mimePartCount;
|
||||
this.headerMode = 1;
|
||||
return;
|
||||
|
|
@ -294,13 +294,13 @@ MimeDecryptHandler.prototype = {
|
|||
*/
|
||||
cacheData(str) {
|
||||
if (gDebugLogLevel > 4) {
|
||||
LOCAL_DEBUG("mimeDecrypt.jsm: cacheData: " + str.length + "\n");
|
||||
LOCAL_DEBUG("mimeDecrypt.sys.mjs: cacheData: " + str.length + "\n");
|
||||
}
|
||||
this.outQueue += str;
|
||||
},
|
||||
|
||||
processBase64Message() {
|
||||
LOCAL_DEBUG("mimeDecrypt.jsm: processBase64Message\n");
|
||||
LOCAL_DEBUG("mimeDecrypt.sys.mjs: processBase64Message\n");
|
||||
|
||||
try {
|
||||
this.base64Cache = lazy.EnigmailData.decodeBase64(this.base64Cache);
|
||||
|
|
@ -344,7 +344,7 @@ MimeDecryptHandler.prototype = {
|
|||
},
|
||||
|
||||
onStopRequest(request, status, dummy) {
|
||||
LOCAL_DEBUG("mimeDecrypt.jsm: onStopRequest\n");
|
||||
LOCAL_DEBUG("mimeDecrypt.sys.mjs: onStopRequest\n");
|
||||
--gNumProc;
|
||||
if (!this.initOk) {
|
||||
return;
|
||||
|
|
@ -392,7 +392,7 @@ MimeDecryptHandler.prototype = {
|
|||
0
|
||||
) {
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"mimeDecrypt.jsm: onStopRequest: detected incoming message processing\n"
|
||||
"mimeDecrypt.sys.mjs: onStopRequest: detected incoming message processing\n"
|
||||
);
|
||||
return;
|
||||
}
|
||||
|
|
@ -423,7 +423,7 @@ MimeDecryptHandler.prototype = {
|
|||
|
||||
const spec = this.uri ? this.uri.spec : null;
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
`mimeDecrypt.jsm: checking MIME structure for ${this.mimePartNumber} / ${spec}\n`
|
||||
`mimeDecrypt.sys.mjs: checking MIME structure for ${this.mimePartNumber} / ${spec}\n`
|
||||
);
|
||||
|
||||
if (
|
||||
|
|
@ -449,7 +449,7 @@ MimeDecryptHandler.prototype = {
|
|||
// limit output to 100 times message size to avoid DoS attack
|
||||
const maxOutput = this.outQueue.length * 100;
|
||||
|
||||
lazy.EnigmailLog.DEBUG("mimeDecryp.jsm: starting decryption\n");
|
||||
lazy.EnigmailLog.DEBUG("mimeDecryp.sys.mjs: starting decryption\n");
|
||||
//EnigmailLog.DEBUG(this.outQueue + "\n");
|
||||
|
||||
const options = { maxOutputLength: maxOutput };
|
||||
|
|
@ -474,7 +474,7 @@ MimeDecryptHandler.prototype = {
|
|||
|
||||
const cApi = lazy.EnigmailCryptoAPI();
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"mimeDecrypt.jsm: got API: " + cApi.api_name + "\n"
|
||||
"mimeDecrypt.sys.mjs: got API: " + cApi.api_name + "\n"
|
||||
);
|
||||
|
||||
// The processing of a contained signed message must be able to
|
||||
|
|
@ -576,7 +576,7 @@ MimeDecryptHandler.prototype = {
|
|||
|
||||
this.decryptedData = "";
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"mimeDecrypt.jsm: onStopRequest: process terminated\n"
|
||||
"mimeDecrypt.sys.mjs: onStopRequest: process terminated\n"
|
||||
); // always log this one
|
||||
this.proc = null;
|
||||
} else {
|
||||
|
|
@ -595,18 +595,18 @@ MimeDecryptHandler.prototype = {
|
|||
* @param {nsIMsgOpenPGPSink} sink - The sink to use.
|
||||
*/
|
||||
displayStatus(sink) {
|
||||
lazy.EnigmailLog.DEBUG("mimeDecrypt.jsm: displayStatus()\n");
|
||||
lazy.EnigmailLog.DEBUG("mimeDecrypt.sys.mjs: displayStatus()\n");
|
||||
|
||||
if (this.exitCode === null || this.statusDisplayed) {
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"mimeDecrypt.jsm: displayStatus: nothing to display\n"
|
||||
"mimeDecrypt.sys.mjs: displayStatus: nothing to display\n"
|
||||
);
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"mimeDecrypt.jsm: displayStatus for uri " + this.uri?.spec + "\n"
|
||||
"mimeDecrypt.sys.mjs: displayStatus for uri " + this.uri?.spec + "\n"
|
||||
);
|
||||
if (sink && this.uri && !this.backgroundJob) {
|
||||
if (this.decryptedHeaders) {
|
||||
|
|
@ -646,15 +646,17 @@ MimeDecryptHandler.prototype = {
|
|||
} catch (ex) {
|
||||
console.warn("Displaying status failed!", ex);
|
||||
}
|
||||
LOCAL_DEBUG("mimeDecrypt.jsm: displayStatus done\n");
|
||||
LOCAL_DEBUG("mimeDecrypt.sys.mjs: displayStatus done\n");
|
||||
},
|
||||
|
||||
handleResult(exitCode) {
|
||||
LOCAL_DEBUG("mimeDecrypt.jsm: done: " + exitCode + "\n");
|
||||
LOCAL_DEBUG("mimeDecrypt.sys.mjs: done: " + exitCode + "\n");
|
||||
|
||||
if (gDebugLogLevel > 4) {
|
||||
LOCAL_DEBUG(
|
||||
"mimeDecrypt.jsm: done: decrypted data='" + this.decryptedData + "'\n"
|
||||
"mimeDecrypt.sys.mjs: done: decrypted data='" +
|
||||
this.decryptedData +
|
||||
"'\n"
|
||||
);
|
||||
}
|
||||
|
||||
|
|
@ -680,7 +682,7 @@ MimeDecryptHandler.prototype = {
|
|||
for (let j = 0; j < hdr.length; j++) {
|
||||
if (hdr[j].search(/^\s*content-type:\s+text\/(plain|html)/i) >= 0) {
|
||||
LOCAL_DEBUG(
|
||||
"mimeDecrypt.jsm: done: adding multipart/mixed around " +
|
||||
"mimeDecrypt.sys.mjs: done: adding multipart/mixed around " +
|
||||
hdr[j] +
|
||||
"\n"
|
||||
);
|
||||
|
|
@ -750,7 +752,7 @@ MimeDecryptHandler.prototype = {
|
|||
// return data to libMime
|
||||
returnData(mimeSvc, data) {
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"mimeDecrypt.jsm: returnData: " + data.length + " bytes\n"
|
||||
"mimeDecrypt.sys.mjs: returnData: " + data.length + " bytes\n"
|
||||
);
|
||||
|
||||
let proto = null;
|
||||
|
|
@ -765,7 +767,7 @@ MimeDecryptHandler.prototype = {
|
|||
) {
|
||||
try {
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"mimeDecrypt.jsm: returnData: using direct verification\n"
|
||||
"mimeDecrypt.sys.mjs: returnData: using direct verification\n"
|
||||
);
|
||||
mimeSvc.contentType = ct;
|
||||
mimeSvc.mimePart = mimeSvc.mimePart + ".1";
|
||||
|
|
|
|||
|
|
@ -89,7 +89,7 @@ PgpMimeEncrypt.prototype = {
|
|||
//statusStr: "",
|
||||
cryptoOutputLength: 0,
|
||||
cryptoOutput: "",
|
||||
hashAlgorithm: "SHA256", // TODO: coordinate with RNP.jsm
|
||||
hashAlgorithm: "SHA256", // TODO: coordinate with RNP.sys.mjs
|
||||
cryptoInputBuffer: "",
|
||||
outgoingMessageBuffer: "",
|
||||
mimeStructure: 0,
|
||||
|
|
@ -723,7 +723,7 @@ export var EnigmailMimeEncrypt = {
|
|||
Handler: PgpMimeEncrypt,
|
||||
|
||||
init() {
|
||||
lazy.EnigmailLog.DEBUG("mimeEncrypt.jsm: initModule()\n");
|
||||
lazy.EnigmailLog.DEBUG("mimeEncrypt.sys.mjs: initModule()\n");
|
||||
const nspr_log_modules = Services.env.get("NSPR_LOG_MODULES");
|
||||
const matches = nspr_log_modules.match(/mimeEncrypt:(\d+)/);
|
||||
|
||||
|
|
|
|||
|
|
@ -52,14 +52,14 @@ export var EnigmailVerify = {
|
|||
|
||||
setLastMsgUri(msgUriSpec) {
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"mimeVerify.jsm: setLastMsgUri: " + msgUriSpec + "\n"
|
||||
"mimeVerify.sys.mjs: setLastMsgUri: " + msgUriSpec + "\n"
|
||||
);
|
||||
this.lastMsgUri = msgUriSpec;
|
||||
},
|
||||
|
||||
newVerifier(protocol) {
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"mimeVerify.jsm: newVerifier: " + (protocol || "null") + "\n"
|
||||
"mimeVerify.sys.mjs: newVerifier: " + (protocol || "null") + "\n"
|
||||
);
|
||||
|
||||
const v = new MimeVerify(protocol);
|
||||
|
|
@ -79,7 +79,7 @@ export var EnigmailVerify = {
|
|||
* Sets the PGPMime content type handler as the registered handler.
|
||||
*/
|
||||
registerPGPMimeHandler() {
|
||||
lazy.EnigmailLog.DEBUG("mimeVerify.jsm: registerPGPMimeHandler\n");
|
||||
lazy.EnigmailLog.DEBUG("mimeVerify.sys.mjs: registerPGPMimeHandler\n");
|
||||
|
||||
if (this.currentCtHandler == EnigmailConstants.MIME_HANDLER_PGPMIME) {
|
||||
return;
|
||||
|
|
@ -101,7 +101,7 @@ export var EnigmailVerify = {
|
|||
* registered, S/MIME works.
|
||||
*/
|
||||
unregisterPGPMimeHandler() {
|
||||
lazy.EnigmailLog.DEBUG("mimeVerify.jsm: unregisterPGPMimeHandler\n");
|
||||
lazy.EnigmailLog.DEBUG("mimeVerify.sys.mjs: unregisterPGPMimeHandler\n");
|
||||
|
||||
const reg = Components.manager.QueryInterface(Ci.nsIComponentRegistrar);
|
||||
if (this.currentCtHandler == EnigmailConstants.MIME_HANDLER_PGPMIME) {
|
||||
|
|
@ -134,7 +134,7 @@ MimeVerify.prototype = {
|
|||
// Eat up CRLF's.
|
||||
contentTypeLine = contentTypeLine.replace(/[\r\n]/g, "");
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"mimeVerify.jsm: parseContentType: " + contentTypeLine + "\n"
|
||||
"mimeVerify.sys.mjs: parseContentType: " + contentTypeLine + "\n"
|
||||
);
|
||||
|
||||
const protoRx = RegExp(
|
||||
|
|
@ -147,7 +147,7 @@ MimeVerify.prototype = {
|
|||
contentTypeLine.search(protoRx) > 0
|
||||
) {
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"mimeVerify.jsm: parseContentType: found MIME signed message\n"
|
||||
"mimeVerify.sys.mjs: parseContentType: found MIME signed message\n"
|
||||
);
|
||||
this.foundMsg = true;
|
||||
const hdr = lazy.EnigmailFuncs.getHeaderData(contentTypeLine);
|
||||
|
|
@ -158,7 +158,7 @@ MimeVerify.prototype = {
|
|||
},
|
||||
|
||||
onStartRequest(request, uri) {
|
||||
lazy.EnigmailLog.DEBUG("mimeVerify.jsm: onStartRequest\n"); // always log this one
|
||||
lazy.EnigmailLog.DEBUG("mimeVerify.sys.mjs: onStartRequest\n"); // always log this one
|
||||
|
||||
this.mimeSvc = request.QueryInterface(Ci.nsIPgpMimeProxy);
|
||||
this.msgUriSpec = EnigmailVerify.lastMsgUri;
|
||||
|
|
@ -185,7 +185,9 @@ MimeVerify.prototype = {
|
|||
},
|
||||
|
||||
onDataAvailable(req, stream, offset, count) {
|
||||
lazy.EnigmailLog.DEBUG("mimeVerify.jsm: onDataAvailable: " + count + "\n");
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"mimeVerify.sys.mjs: onDataAvailable: " + count + "\n"
|
||||
);
|
||||
if (count > 0) {
|
||||
this.inStream.init(stream);
|
||||
var data = this.inStream.read(count);
|
||||
|
|
@ -194,7 +196,7 @@ MimeVerify.prototype = {
|
|||
},
|
||||
|
||||
onTextData(data) {
|
||||
lazy.EnigmailLog.DEBUG("mimeVerify.jsm: onTextData\n");
|
||||
lazy.EnigmailLog.DEBUG("mimeVerify.sys.mjs: onTextData\n");
|
||||
|
||||
this.dataCount += data.length;
|
||||
|
||||
|
|
@ -421,7 +423,7 @@ MimeVerify.prototype = {
|
|||
},
|
||||
|
||||
onStopRequest(request) {
|
||||
lazy.EnigmailLog.DEBUG("mimeVerify.jsm: onStopRequest\n");
|
||||
lazy.EnigmailLog.DEBUG("mimeVerify.sys.mjs: onStopRequest\n");
|
||||
|
||||
const mimeSvc = request.QueryInterface(Ci.nsIPgpMimeProxy);
|
||||
this.msgUriSpec = EnigmailVerify.lastMsgUri;
|
||||
|
|
@ -493,9 +495,9 @@ MimeVerify.prototype = {
|
|||
}
|
||||
}
|
||||
} catch (ex) {
|
||||
lazy.EnigmailLog.writeException("mimeVerify.jsm", ex);
|
||||
lazy.EnigmailLog.writeException("mimeVerify.sys.mjs", ex);
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"mimeVerify.jsm: error while processing " + this.msgUriSpec + "\n"
|
||||
"mimeVerify.sys.mjs: error while processing " + this.msgUriSpec + "\n"
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
@ -556,7 +558,7 @@ MimeVerify.prototype = {
|
|||
// return data to libMime
|
||||
returnData(data) {
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"mimeVerify.jsm: returnData: " + data.length + " bytes\n"
|
||||
"mimeVerify.sys.mjs: returnData: " + data.length + " bytes\n"
|
||||
);
|
||||
|
||||
const m = data.match(/^(content-type: +)([\w/]+)/im);
|
||||
|
|
@ -586,7 +588,7 @@ MimeVerify.prototype = {
|
|||
* @param {nsIMsgOpenPGPSink} sink
|
||||
*/
|
||||
displayStatus(sink) {
|
||||
lazy.EnigmailLog.DEBUG("mimeVerify.jsm: displayStatus\n");
|
||||
lazy.EnigmailLog.DEBUG("mimeVerify.sys.mjs: displayStatus\n");
|
||||
if (this.exitCode === null || this.statusDisplayed || this.backgroundJob) {
|
||||
return;
|
||||
}
|
||||
|
|
@ -595,7 +597,9 @@ MimeVerify.prototype = {
|
|||
return;
|
||||
}
|
||||
|
||||
lazy.EnigmailLog.DEBUG("mimeVerify.jsm: displayStatus displaying result\n");
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"mimeVerify.sys.mjs: displayStatus displaying result\n"
|
||||
);
|
||||
if (this.protectedHeaders) {
|
||||
sink.modifyMessageHeaders(
|
||||
this.uri.spec,
|
||||
|
|
|
|||
|
|
@ -115,7 +115,7 @@ export var EnigmailPersistentCrypto = {
|
|||
content,
|
||||
newMessageIdPrefix
|
||||
) {
|
||||
lazy.EnigmailLog.DEBUG("persistentCrypto.jsm: copyMessageToFolder()\n");
|
||||
lazy.EnigmailLog.DEBUG("persistentCrypto.sys.mjs: copyMessageToFolder()\n");
|
||||
return new Promise((resolve, reject) => {
|
||||
if (newMessageIdPrefix) {
|
||||
content = this.changeMessageId(content, newMessageIdPrefix);
|
||||
|
|
@ -166,7 +166,7 @@ export var EnigmailPersistentCrypto = {
|
|||
},
|
||||
SetMessageKey(key) {
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
`persistentCrypto.jsm: copyMessageToFolder: Result of CopyFileMessage() is new message with key ${key}\n`
|
||||
`persistentCrypto.sys.mjs: copyMessageToFolder: Result of CopyFileMessage() is new message with key ${key}\n`
|
||||
);
|
||||
newKey = key;
|
||||
},
|
||||
|
|
@ -181,7 +181,7 @@ export var EnigmailPersistentCrypto = {
|
|||
statusCode = status;
|
||||
if (statusCode !== 0) {
|
||||
lazy.EnigmailLog.ERROR(
|
||||
`persistentCrypto.jsm: ${statusCode} replacing message, folder="${msgFolder.name}", key=${originalMsgHdr.messageKey}/${newKey}\n`
|
||||
`persistentCrypto.sys.mjs: ${statusCode} replacing message, folder="${msgFolder.name}", key=${originalMsgHdr.messageKey}/${newKey}\n`
|
||||
);
|
||||
reject();
|
||||
return;
|
||||
|
|
@ -192,13 +192,13 @@ export var EnigmailPersistentCrypto = {
|
|||
} catch (ex) {}
|
||||
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"persistentCrypto.jsm: copyMessageToFolder: Triggering deletion from OnStopCopy()\n"
|
||||
"persistentCrypto.sys.mjs: copyMessageToFolder: Triggering deletion from OnStopCopy()\n"
|
||||
);
|
||||
this.applyFlags();
|
||||
|
||||
if (deleteOrigMsg) {
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
`persistentCrypto.jsm: copyMessageToFolder: Deleting old message with key ${originalMsgHdr.messageKey}\n`
|
||||
`persistentCrypto.sys.mjs: copyMessageToFolder: Deleting old message with key ${originalMsgHdr.messageKey}\n`
|
||||
);
|
||||
msgFolder.deleteMessages(
|
||||
[originalMsgHdr],
|
||||
|
|
@ -282,7 +282,7 @@ class CryptMessageIntoFolder extends MimeTreeDecrypter {
|
|||
const exitCodeObj = {};
|
||||
const statusFlagsObj = {};
|
||||
const errorMsgObj = {};
|
||||
lazy.EnigmailLog.DEBUG("persistentCrypto.jsm: Encrypting message.\n");
|
||||
lazy.EnigmailLog.DEBUG("persistentCrypto.sys.mjs: Encrypting message.\n");
|
||||
|
||||
const inputMsg = mimeTreeToString(mimeTree, false);
|
||||
|
||||
|
|
@ -303,7 +303,7 @@ class CryptMessageIntoFolder extends MimeTreeDecrypter {
|
|||
);
|
||||
} catch (ex) {
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"persistentCrypto.jsm: Encryption failed: " + ex + "\n"
|
||||
"persistentCrypto.sys.mjs: Encryption failed: " + ex + "\n"
|
||||
);
|
||||
return null;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
|
|||
|
||||
export var PgpSqliteDb2 = {
|
||||
openDatabase() {
|
||||
lazy.EnigmailLog.DEBUG("sqliteDb.jsm: PgpSqliteDb2 openDatabase()\n");
|
||||
lazy.EnigmailLog.DEBUG("sqliteDb.sys.mjs: PgpSqliteDb2 openDatabase()\n");
|
||||
return new Promise((resolve, reject) => {
|
||||
openDatabaseConn(
|
||||
"openpgp.sqlite",
|
||||
|
|
@ -30,7 +30,7 @@ export var PgpSqliteDb2 = {
|
|||
|
||||
async checkDatabaseStructure() {
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
`sqliteDb.jsm: PgpSqliteDb2 checkDatabaseStructure()\n`
|
||||
`sqliteDb.sys.mjs: PgpSqliteDb2 checkDatabaseStructure()\n`
|
||||
);
|
||||
let conn;
|
||||
try {
|
||||
|
|
@ -38,11 +38,11 @@ export var PgpSqliteDb2 = {
|
|||
await checkAcceptanceTable(conn);
|
||||
await conn.close();
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
`sqliteDb.jsm: PgpSqliteDb2 checkDatabaseStructure - success\n`
|
||||
`sqliteDb.sys.mjs: PgpSqliteDb2 checkDatabaseStructure - success\n`
|
||||
);
|
||||
} catch (ex) {
|
||||
lazy.EnigmailLog.ERROR(
|
||||
`sqliteDb.jsm: PgpSqliteDb2 checkDatabaseStructure: ERROR: ${ex}\n`
|
||||
`sqliteDb.sys.mjs: PgpSqliteDb2 checkDatabaseStructure: ERROR: ${ex}\n`
|
||||
);
|
||||
if (conn) {
|
||||
await conn.close();
|
||||
|
|
@ -397,7 +397,7 @@ export var PgpSqliteDb2 = {
|
|||
* which we should give up.
|
||||
*/
|
||||
function openDatabaseConn(filename, resolve, reject, waitms, maxtime) {
|
||||
lazy.EnigmailLog.DEBUG("sqliteDb.jsm: openDatabaseConn()\n");
|
||||
lazy.EnigmailLog.DEBUG("sqliteDb.sys.mjs: openDatabaseConn()\n");
|
||||
lazy.Sqlite.openConnection({
|
||||
path: filename,
|
||||
sharedMemoryCache: false,
|
||||
|
|
@ -421,13 +421,15 @@ async function checkAcceptanceTable(connection) {
|
|||
try {
|
||||
const exists = await connection.tableExists("acceptance_email");
|
||||
const exists2 = await connection.tableExists("acceptance_decision");
|
||||
lazy.EnigmailLog.DEBUG("sqliteDB.jsm: checkAcceptanceTable - success\n");
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"sqliteDB.sys.mjs: checkAcceptanceTable - success\n"
|
||||
);
|
||||
if (!exists || !exists2) {
|
||||
await createAcceptanceTable(connection);
|
||||
}
|
||||
} catch (error) {
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
`sqliteDB.jsm: checkAcceptanceTable - error ${error}\n`
|
||||
`sqliteDB.sys.mjs: checkAcceptanceTable - error ${error}\n`
|
||||
);
|
||||
throw error;
|
||||
}
|
||||
|
|
@ -436,7 +438,7 @@ async function checkAcceptanceTable(connection) {
|
|||
}
|
||||
|
||||
async function createAcceptanceTable(connection) {
|
||||
lazy.EnigmailLog.DEBUG("sqliteDB.jsm: createAcceptanceTable()\n");
|
||||
lazy.EnigmailLog.DEBUG("sqliteDB.sys.mjs: createAcceptanceTable()\n");
|
||||
|
||||
await connection.execute(
|
||||
"create table acceptance_email (" +
|
||||
|
|
@ -452,12 +454,12 @@ async function createAcceptanceTable(connection) {
|
|||
"unique(fpr));"
|
||||
);
|
||||
|
||||
lazy.EnigmailLog.DEBUG("sqliteDB.jsm: createAcceptanceTable - index1\n");
|
||||
lazy.EnigmailLog.DEBUG("sqliteDB.sys.mjs: createAcceptanceTable - index1\n");
|
||||
await connection.execute(
|
||||
"create unique index acceptance_email_i1 on acceptance_email(fpr, email);"
|
||||
);
|
||||
|
||||
lazy.EnigmailLog.DEBUG("sqliteDB.jsm: createAcceptanceTable - index2\n");
|
||||
lazy.EnigmailLog.DEBUG("sqliteDB.sys.mjs: createAcceptanceTable - index2\n");
|
||||
await connection.execute(
|
||||
"create unique index acceptance__decision_i1 on acceptance_decision(fpr);"
|
||||
);
|
||||
|
|
|
|||
|
|
@ -21,7 +21,9 @@ export var EnigmailURIs = {
|
|||
* @return null
|
||||
*/
|
||||
rememberEncryptedUri(uri) {
|
||||
lazy.EnigmailLog.DEBUG("uris.jsm: rememberEncryptedUri: uri=" + uri + "\n");
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"uris.sys.mjs: rememberEncryptedUri: uri=" + uri + "\n"
|
||||
);
|
||||
if (!encryptedUris.includes(uri)) {
|
||||
encryptedUris.push(uri);
|
||||
}
|
||||
|
|
@ -35,7 +37,9 @@ export var EnigmailURIs = {
|
|||
* @return null
|
||||
*/
|
||||
forgetEncryptedUri(uri) {
|
||||
lazy.EnigmailLog.DEBUG("uris.jsm: forgetEncryptedUri: uri=" + uri + "\n");
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"uris.sys.mjs: forgetEncryptedUri: uri=" + uri + "\n"
|
||||
);
|
||||
const pos = encryptedUris.indexOf(uri);
|
||||
if (pos >= 0) {
|
||||
encryptedUris.splice(pos, 1);
|
||||
|
|
@ -50,7 +54,7 @@ export var EnigmailURIs = {
|
|||
* @return: Boolean true if yes, false otherwise
|
||||
*/
|
||||
isEncryptedUri(uri) {
|
||||
lazy.EnigmailLog.DEBUG("uris.jsm: isEncryptedUri: uri=" + uri + "\n");
|
||||
lazy.EnigmailLog.DEBUG("uris.sys.mjs: isEncryptedUri: uri=" + uri + "\n");
|
||||
return encryptedUris.includes(uri);
|
||||
},
|
||||
|
||||
|
|
@ -77,7 +81,7 @@ export var EnigmailURIs = {
|
|||
}
|
||||
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"uris.jsm: msgIdentificationFromUrl: url.pathQueryRef=" +
|
||||
"uris.sys.mjs: msgIdentificationFromUrl: url.pathQueryRef=" +
|
||||
("path" in url ? url.path : url.pathQueryRef) +
|
||||
"\n"
|
||||
);
|
||||
|
|
@ -103,7 +107,7 @@ export var EnigmailURIs = {
|
|||
}
|
||||
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"uris.jsm: msgIdentificationFromUrl: msgNum=" +
|
||||
"uris.sys.mjs: msgIdentificationFromUrl: msgNum=" +
|
||||
msgNum +
|
||||
" / folder=" +
|
||||
msgFolder +
|
||||
|
|
|
|||
|
|
@ -91,7 +91,9 @@ export var EnigmailWindows = {
|
|||
* @return: the frame object or null if not found
|
||||
*/
|
||||
getFrame(win, frameName) {
|
||||
lazy.EnigmailLog.DEBUG("windows.jsm: getFrame: name=" + frameName + "\n");
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"windows.sys.mjs: getFrame: name=" + frameName + "\n"
|
||||
);
|
||||
for (var j = 0; j < win.frames.length; j++) {
|
||||
if (win.frames[j].name == frameName) {
|
||||
return win.frames[j];
|
||||
|
|
@ -326,7 +328,7 @@ export var EnigmailWindows = {
|
|||
*/
|
||||
downloadKeys(win, inputObj, resultObj) {
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"windows.jsm: downloadKeys: searchList=" + inputObj.searchList + "\n"
|
||||
"windows.sys.mjs: downloadKeys: searchList=" + inputObj.searchList + "\n"
|
||||
);
|
||||
|
||||
resultObj.importedKeys = 0;
|
||||
|
|
@ -457,7 +459,7 @@ export var EnigmailWindows = {
|
|||
},
|
||||
|
||||
shutdown(reason) {
|
||||
lazy.EnigmailLog.DEBUG("windows.jsm: shutdown()\n");
|
||||
lazy.EnigmailLog.DEBUG("windows.sys.mjs: shutdown()\n");
|
||||
|
||||
const tabs = Services.wm
|
||||
.getMostRecentWindow("mail:3pane")
|
||||
|
|
|
|||
|
|
@ -261,7 +261,7 @@ export var EnigmailWkdLookup = {
|
|||
let response;
|
||||
try {
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"wkdLookup.jsm: downloadKey: requesting " + url + "\n"
|
||||
"wkdLookup.sys.mjs: downloadKey: requesting " + url + "\n"
|
||||
);
|
||||
response = await fetch(url, {
|
||||
method: "GET",
|
||||
|
|
@ -284,7 +284,7 @@ export var EnigmailWkdLookup = {
|
|||
}
|
||||
} catch (ex) {
|
||||
lazy.EnigmailLog.DEBUG(
|
||||
"wkdLookup.jsm: downloadKey: error " + ex.toString() + "\n"
|
||||
"wkdLookup.sys.mjs: downloadKey: error " + ex.toString() + "\n"
|
||||
);
|
||||
return null;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
#####################################################################
|
||||
# Strings used within enigmailCommon.js and enigmailCommon.jsm
|
||||
# Strings used within enigmailCommon.js
|
||||
#####################################################################
|
||||
|
||||
### dlgYes=&Yes
|
||||
|
|
@ -182,7 +182,7 @@
|
|||
### prefEnigmail.oneKeyserverOnly=Error - you can only specify one keyserver for automatic downloading of missing OpenPGP keys.
|
||||
### acSetupMessage.desc=Transfer your key to another Autocrypt-enabled device. (<html:span class='enigmailLink' href='https://autocrypt.org'>What is Autocrypt</html:span>)
|
||||
|
||||
# Strings used in core.jsm
|
||||
# Strings used in core.sys.mjs
|
||||
# (said file also re-uses some strings from above)
|
||||
|
||||
### enterAdminPin=Please type in the ADMIN PIN of your SmartCard
|
||||
|
|
@ -289,7 +289,7 @@
|
|||
### keyserver.result.uploadOne=Successfully uploaded 1 key.
|
||||
### keyserver.result.uploadMany=Successfully uploaded %S keys.
|
||||
|
||||
# Strings in installGnuPG.jsm
|
||||
# Strings in installGnuPG.sys.mjs
|
||||
### installGnuPG.downloadFailed=An error occurred while trying to download GnuPG. Please check the console log for further details.
|
||||
### installGnuPG.installFailed=An error occurred while installing GnuPG. Please check the console log for further details.
|
||||
|
||||
|
|
@ -316,7 +316,7 @@
|
|||
### specifyExportFile=Specify file name for exporting
|
||||
### homedirParamNotSUpported=Additional parameters that configure paths such as --homedir and --keyring are not supported for exporting/restoring your settings. Please use alternative methods such as setting the environment variable GNUPGHOME.
|
||||
|
||||
#strings in gpgAgent.jsm
|
||||
#strings in gpgAgent.sys.mjs
|
||||
### gpghomedir.notexists=The directory '%S' containing your OpenPGP keys does not exist and cannot be created.
|
||||
### gpghomedir.notwritable=The directory '%S' containing your OpenPGP keys is not writable.
|
||||
### gpghomedir.notdirectory=The directory '%S' containing your OpenPGP keys is a file instead of a directory.
|
||||
|
|
@ -333,13 +333,13 @@
|
|||
### enigmail.acSetupPasswd.descEnterPasswd=Please enter the setup code that is displayed on the other device.
|
||||
### enigmail.acSetupPasswd.descCopyPasswd=Please enter the setup code below on your other device to proceed with the setup.
|
||||
|
||||
#strings in autocrypt.jsm
|
||||
#strings in autocrypt.sys.mjs
|
||||
|
||||
### autocrypt.setupMsg.subject=Autocrypt Setup Message
|
||||
### autocrypt.setupMsg.msgBody=To set up your new device for Autocrypt, please follow the instuctions that should be presented by your new device.
|
||||
### autocrypt.setupMsg.fileTxt=This is the Autocrypt setup file used to transfer settings and keys between clients. You can decrypt it using the setup code displayed on your old device, then import the key to your keyring.
|
||||
|
||||
#strings in gnupg-key.jsm
|
||||
#strings in gnupg-key.sys.mjs
|
||||
### import.secretKeyImportError=An error has occurred in GnuPG while importing secret keys. The import was not successful.
|
||||
|
||||
#strings in importSettings.js
|
||||
|
|
|
|||
|
|
@ -1878,7 +1878,7 @@ Enigmail.msg = {
|
|||
|
||||
// The encryption process for PGP/MIME messages follows "here". It's
|
||||
// called automatically from nsMsgCompose->sendMsg().
|
||||
// registration for this is done in core.jsm: startup()
|
||||
// registration for this is done in core.sys.mjs: startup()
|
||||
|
||||
return true;
|
||||
},
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ ChromeUtils.defineESModuleGetters(this, {
|
|||
PgpSqliteDb2: "chrome://openpgp/content/modules/sqliteDb.sys.mjs",
|
||||
// FIXME: using this creates a conflict with another file where this symbol
|
||||
// was imported with ChromeUtils instead of defined as lazy getter.
|
||||
// EnigmailWindows: "chrome://openpgp/content/modules/windows.jsm",
|
||||
// EnigmailWindows: "chrome://openpgp/content/modules/windows.sys.mjs",
|
||||
});
|
||||
var { EnigmailWindows } = ChromeUtils.importESModule(
|
||||
"chrome://openpgp/content/modules/windows.sys.mjs"
|
||||
|
|
|
|||
|
|
@ -447,7 +447,7 @@ key-verification = Verify the fingerprint of the key using a secure communicatio
|
|||
cannot-use-own-key-because = Unable to send the message, because there is a problem with your personal key. { $problem }
|
||||
window-locked = Compose window is locked; send cancelled
|
||||
|
||||
## Strings in keyserver.jsm
|
||||
## Strings in keyserver.sys.mjs
|
||||
|
||||
keyserver-error-aborted = Aborted
|
||||
keyserver-error-unknown = An unknown error occurred
|
||||
|
|
@ -458,7 +458,7 @@ keyserver-error-security-error = The keyserver does not support encrypted access
|
|||
keyserver-error-certificate-error = The keyserver’s certificate is not valid.
|
||||
keyserver-error-unsupported = The keyserver is not supported.
|
||||
|
||||
## Strings in mimeWkdHandler.jsm
|
||||
## Strings in mimeWkdHandler.sys.mjs
|
||||
|
||||
wkd-message-body-req =
|
||||
Your email provider processed your request to upload your public key to the OpenPGP Web Key Directory.
|
||||
|
|
@ -467,7 +467,7 @@ wkd-message-body-process =
|
|||
This is an email related to the automatic processing to upload your public key to the OpenPGP Web Key Directory.
|
||||
You do not need to take any manual action at this point.
|
||||
|
||||
## Strings in persistentCrypto.jsm
|
||||
## Strings in persistentCrypto.sys.mjs
|
||||
|
||||
# Variables:
|
||||
# $subject (String) - Subject of the message.
|
||||
|
|
@ -476,7 +476,7 @@ converter-decrypt-body-failed =
|
|||
{ $subject }.
|
||||
Do you want to retry with a different passphrase or do you want to skip the message?
|
||||
|
||||
## Strings filters.jsm
|
||||
## Strings filters.sys.mjs
|
||||
|
||||
filter-folder-required = You must select a target folder.
|
||||
filter-decrypt-move-warn-experimental =
|
||||
|
|
@ -493,7 +493,7 @@ filter-warn-key-not-secret =
|
|||
Warning - the filter action “Encrypt to key” replaces the recipients.
|
||||
If you do not have the secret key for ‘{ $desc }’ you will no longer be able to read the emails.
|
||||
|
||||
## Strings filtersWrapper.jsm
|
||||
## Strings filtersWrapper.sys.mjs
|
||||
|
||||
filter-decrypt-move-label = Decrypt permanently (OpenPGP)
|
||||
filter-decrypt-copy-label = Create decrypted Copy (OpenPGP)
|
||||
|
|
@ -562,7 +562,7 @@ openpgp-export-public-fail = <b>Unable to export the selected public key!</b>
|
|||
openpgp-export-secret-success = <b>Secret Key successfully exported!</b>
|
||||
openpgp-export-secret-fail = <b>Unable to export the selected secret key!</b>
|
||||
|
||||
## Strings in keyObj.jsm
|
||||
## Strings in keyObj.sys.mjs
|
||||
## Variables:
|
||||
## $userId (String) - The name and/or email address that is mentioned in the key's information.
|
||||
## $keyId (String) - Key id for the key entry.
|
||||
|
|
@ -577,12 +577,12 @@ key-ring-sign-sub-keys-expired = All signing-subkeys of key { $userId } (key ID
|
|||
key-ring-enc-sub-keys-revoked = All encryption subkeys of key { $userId } (key ID { $keyId }) are revoked.
|
||||
key-ring-enc-sub-keys-expired = All encryption subkeys of key { $userId } (key ID { $keyId }) have expired.
|
||||
|
||||
## Strings in gnupg-keylist.jsm
|
||||
## Strings in gnupg-keylist.sys.mjs
|
||||
|
||||
keyring-photo = Photo
|
||||
user-att-photo = User attribute (JPEG image)
|
||||
|
||||
## Strings in key.jsm
|
||||
## Strings in key.sys.mjs
|
||||
|
||||
already-revoked = This key has already been revoked.
|
||||
|
||||
|
|
@ -610,7 +610,7 @@ after-revoke-info =
|
|||
As soon as the software used by other people learns about the revocation, it will stop using your old key.
|
||||
If you are using a new key for the same email address, and you attach the new public key to emails you send, then information about your revoked old key will be automatically included.
|
||||
|
||||
## Strings in keyRing.jsm & decryption.jsm
|
||||
## Strings in keyRing.sys.mjs & decryption.sys.mjs
|
||||
|
||||
key-man-button-import = &Import
|
||||
|
||||
|
|
@ -626,7 +626,7 @@ delete-key-in-use-description = Unable to proceed! The Key you selected for dele
|
|||
|
||||
revoke-key-in-use-description = Unable to proceed! The Key you selected for revocation is currently being used by this identity. Select a different key, or select none, and try again.
|
||||
|
||||
## Strings used in errorHandling.jsm
|
||||
## Strings used in errorHandling.sys.mjs
|
||||
|
||||
# Variables:
|
||||
# $keySpec (String) - Email address.
|
||||
|
|
@ -636,20 +636,20 @@ key-error-key-id-not-found = The configured key ID ‘{ $keySpec }’ cannot be
|
|||
# $keySpec (String) - Key id.
|
||||
key-error-not-accepted-as-personal = You have not confirmed that the key with ID ‘{ $keySpec }’ is your personal key.
|
||||
|
||||
## Strings used in enigmailKeyManager.js & windows.jsm
|
||||
## Strings used in enigmailKeyManager.js & windows.sys.mjs
|
||||
|
||||
need-online = The function you have selected is not available in offline mode. Please go online and try again.
|
||||
|
||||
## Strings used in keyRing.jsm & keyLookupHelper.jsm
|
||||
## Strings used in keyRing.sys.mjs & keyLookupHelper.sys.mjs
|
||||
|
||||
no-key-found2 = We couldn’t find any usable key matching the specified search criteria.
|
||||
no-update-found = You already have the keys that were discovered online.
|
||||
|
||||
## Strings used in keyRing.jsm & GnuPGCryptoAPI.jsm
|
||||
## Strings used in keyRing.sys.mjs & GnuPGCryptoAPI.sys.mjs
|
||||
|
||||
fail-key-extract = Error - key extraction command failed
|
||||
|
||||
## Strings used in keyRing.jsm
|
||||
## Strings used in keyRing.sys.mjs
|
||||
|
||||
fail-cancel = Error - Key receive cancelled by user
|
||||
not-first-block = Error - First OpenPGP block not public key block
|
||||
|
|
@ -661,7 +661,7 @@ file-write-failed = Failed to write to file { $output }
|
|||
no-pgp-block = Error - No valid armored OpenPGP data block found
|
||||
confirm-permissive-import = Import failed. The key you are trying to import might be corrupt or use unknown attributes. Would you like to attempt to import the parts that are correct? This might result in the import of incomplete and unusable keys.
|
||||
|
||||
## Strings used in trust.jsm
|
||||
## Strings used in trust.sys.mjs
|
||||
|
||||
key-valid-unknown = unknown
|
||||
key-valid-invalid = invalid
|
||||
|
|
@ -777,7 +777,7 @@ cannot-send-sig-because-no-own-key = Cannot digitally sign this message, because
|
|||
# $key (String) - Sender email address.
|
||||
cannot-send-enc-because-no-own-key = Cannot send this message encrypted, because you haven’t yet configured end-to-end encryption for <{ $key }>
|
||||
|
||||
## Strings used in decryption.jsm
|
||||
## Strings used in decryption.sys.mjs
|
||||
|
||||
# Variables:
|
||||
# $key (String) - Newline separated list of a tab character then name and/or email address mentioned in the key followed by the key id in parenthesis.
|
||||
|
|
@ -800,11 +800,11 @@ attachment-pgp-key =
|
|||
Click ‘Import’ to import the keys contained or ‘View’ to view the file contents in a browser window
|
||||
dlg-button-view = &View
|
||||
|
||||
## Strings used in encryption.jsm
|
||||
## Strings used in encryption.sys.mjs
|
||||
|
||||
not-required = Error - no encryption required
|
||||
|
||||
## Strings used in windows.jsm
|
||||
## Strings used in windows.sys.mjs
|
||||
|
||||
no-photo-available = No Photo available
|
||||
# Variables:
|
||||
|
|
@ -812,7 +812,7 @@ no-photo-available = No Photo available
|
|||
error-photo-path-not-readable = Photo path ‘{ $photo }’ is not readable
|
||||
debug-log-title = OpenPGP Debug Log
|
||||
|
||||
## Strings used in dialog.jsm
|
||||
## Strings used in dialog.sys.mjs
|
||||
|
||||
dlg-button-ok = &OK
|
||||
dlg-button-close = &Close
|
||||
|
|
@ -821,7 +821,7 @@ dlg-no-prompt = Do not show me this dialog again
|
|||
enig-prompt = OpenPGP Prompt
|
||||
enig-confirm = OpenPGP Confirmation
|
||||
|
||||
## Strings used in persistentCrypto.jsm
|
||||
## Strings used in persistentCrypto.sys.mjs
|
||||
|
||||
dlg-button-retry = &Retry
|
||||
dlg-button-skip = &Skip
|
||||
|
|
|
|||
|
|
@ -1396,7 +1396,7 @@ EventEmitter.decorate(ExtensionsUI);
|
|||
* by assigning to innerHTML. Fluent can probably replace this when
|
||||
* it is in use everywhere.
|
||||
*
|
||||
* Lifted from BrowserUIUtils.jsm.
|
||||
* Lifted from BrowserUIUtils.sys.mjs.
|
||||
*
|
||||
* @param {Document} doc
|
||||
* @param {string} msg
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
/** This file is a semi-fork of PopupNotifications.jsm */
|
||||
/** This file is a semi-fork of PopupNotifications.sys.mjs */
|
||||
|
||||
const NOTIFICATION_EVENT_DISMISSED = "dismissed";
|
||||
const NOTIFICATION_EVENT_REMOVED = "removed";
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@ export var MailE10SUtils = {
|
|||
/**
|
||||
* Force `browser` to be a remote/local browser.
|
||||
*
|
||||
* @see E10SUtils.jsm for remote types.
|
||||
* @see E10SUtils.sys.mjs for remote types.
|
||||
*
|
||||
* @param {nsIBrowser} browser - the browser to enforce the remoteness of.
|
||||
* @param {string} remoteType - the remoteness to enforce.
|
||||
|
|
|
|||
|
|
@ -415,7 +415,7 @@ export var PluralForm = {
|
|||
* Error message to log or an array of strings to concat
|
||||
*/
|
||||
function log(aMsg) {
|
||||
const msg = "PluralForm.jsm: " + (aMsg.join ? aMsg.join("") : aMsg);
|
||||
const msg = "PluralForm.sys.mjs: " + (aMsg.join ? aMsg.join("") : aMsg);
|
||||
Services.console.logStringMessage(msg);
|
||||
dump(msg + "\n");
|
||||
}
|
||||
|
|
|
|||
|
|
@ -994,7 +994,7 @@ export var MessageTextFilter = {
|
|||
* to put a quote at the end of the string. (This is important because we
|
||||
* update using a timer and this results in stable behavior.)
|
||||
*
|
||||
* This code is cloned from gloda's GlodaMsgSearcher.jsm and known good (enough :).
|
||||
* This code is cloned from gloda's GlodaMsgSearcher.sys.mjs and known good (enough :).
|
||||
* I did change the friendless quote situation, though.
|
||||
*
|
||||
* @param aSearchString The phrase to parse up.
|
||||
|
|
|
|||
Некоторые файлы не были показаны из-за слишком большого количества измененных файлов Показать больше
Загрузка…
Ссылка в новой задаче