zotero-plugin 5.0.23 → 5.0.25

package/bin/keypair

@@ -2,6 +2,24 @@
 
 from cryptography.hazmat.primitives.asymmetric import rsa
 from cryptography.hazmat.primitives import serialization
+import sys, os
+
+script_name = os.path.basename(sys.argv[0])
+if len(sys.argv) != 2:
+  print(f'Usage: {script_name} <directory>')
+  sys.exit(1)
+
+target = sys.argv[1]
+if not os.path.isdir(target):
+    print(f'Error: {target} is not a directory.')
+    sys.exit(1)
+
+valid_files = {'public.pem', 'private.pem'}
+all_files = set(os.listdir(target))
+
+if not all_files.issubset(valid_files):
+  print(f'Error: Directory contains invalid files: {all_files - valid_files}')
+  sys.exit(1)
 
 private_key = rsa.generate_private_key(public_exponent=65537, key_size=2048)
 private_pem = private_key.private_bytes(
@@ -9,12 +27,13 @@ private_pem = private_key.private_bytes(
   format=serialization.PrivateFormat.PKCS8,
   encryption_algorithm=serialization.NoEncryption()
 )
+with open(os.path.join(target, 'private.pem'), 'w') as f:
+  f.write(private_pem.decode('utf-8'))
 
 public_key = private_key.public_key()
 public_pem = public_key.public_bytes(
   encoding=serialization.Encoding.PEM,
   format=serialization.PublicFormat.SubjectPublicKeyInfo
 )
-
-print(private_pem.decode('utf-8'))
-print(public_pem.decode('utf-8'))
+with open(os.path.join(target, 'public.pem'), 'w') as f:
+  f.write(public_pem.decode('utf-8'))

package/bin/release.js

@@ -8448,7 +8448,7 @@ Expecting one of '${allowedValues.join("', '")}'`);
     "package.json"(exports, module) {
       module.exports = {
         name: "zotero-plugin",
-        version: "5.0.23",
+        version: "5.0.25",
         description: "Zotero plugin builder",
         homepage: "https://github.com/retorquere/zotero-plugin/wiki",
         bin: {

package/debug-log.d.ts

@@ -1,17 +1,13 @@
 declare class DebugLogSender {
-    private $zotero;
     id: {
         menu: string;
         menupopup: string;
         menuitem: string;
     };
     debugEnabledAtStart: boolean;
-    private get zotero();
-    convertLegacy(): void;
     private element;
     register(plugin: string, preferences?: string[], pubkey?: string): void;
     unregister(plugin: string): void;
-    private alert;
     send(target: EventTarget): void;
     private sendAsync;
     private preferences;

package/debug-log.js

@@ -15,41 +15,10 @@ class DebugLogSender {
             ? (Zotero.Prefs.get('debug.store') || Zotero.Debug.enabled)
             : null;
     }
-    get zotero() {
-        if (typeof Zotero !== 'undefined')
-            return Zotero;
-        if (!this.$zotero) {
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
-            if (typeof Services === 'undefined')
-                Services = ChromeUtils.import('resource://gre/modules/Services.jsm').Services;
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
-            const windows = Services.wm.getEnumerator('navigator:browser');
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
-            while (!this.$zotero && windows.hasMoreElements()) {
-                // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
-                this.$zotero = windows.getNext().Zotero;
-            }
-        }
-        return this.$zotero;
-    }
-    convertLegacy() {
-        var _a, _b;
-        if (!this.zotero.DebugLogSender)
-            return;
-        const plugins = this.zotero.DebugLogSender.plugins || {};
-        delete this.zotero.DebugLogSender;
-        const doc = (_a = this.zotero.getMainWindow()) === null || _a === void 0 ? void 0 : _a.document;
-        if (doc) {
-            (_b = doc.querySelector('menuitem#debug-log-menu')) === null || _b === void 0 ? void 0 : _b.remove();
-            for (const [plugin, preferences] of Object.entries(plugins)) {
-                this.register(plugin, preferences);
-            }
-        }
-    }
     element(name, attrs = {}) {
-        const doc = this.zotero.getMainWindow().document;
+        const doc = Zotero.getMainWindow().document;
         // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call
-        const elt = doc[this.zotero.platformMajorVersion >= 102 ? 'createXULElement' : 'createElement'](name);
+        const elt = doc[Zotero.platformMajorVersion >= 102 ? 'createXULElement' : 'createElement'](name);
         for (const [k, v] of Object.entries(attrs)) {
             elt.setAttribute(k, v);
         }
@@ -57,9 +26,8 @@ class DebugLogSender {
     }
     register(plugin, preferences = [], pubkey = '') {
         var _a, _b;
-        this.convertLegacy();
-        const label = 'Send debug log to bashupload.com';
-        const doc = (_a = this.zotero.getMainWindow()) === null || _a === void 0 ? void 0 : _a.document;
+        const label = 'Send debug log to 0x0';
+        const doc = (_a = Zotero.getMainWindow()) === null || _a === void 0 ? void 0 : _a.document;
         if (doc) {
             let menupopup = doc.querySelector(`#${this.id.menupopup}`);
             if (menupopup) {
@@ -82,7 +50,7 @@ class DebugLogSender {
     }
     unregister(plugin) {
         var _a, _b, _c;
-        const doc = (_a = this.zotero.getMainWindow()) === null || _a === void 0 ? void 0 : _a.document;
+        const doc = (_a = Zotero.getMainWindow()) === null || _a === void 0 ? void 0 : _a.document;
         if (doc) {
             (_b = doc.querySelector(`.debug-log-sender[label=${JSON.stringify(plugin)}]`)) === null || _b === void 0 ? void 0 : _b.remove();
             const menupopup = doc.querySelector('#debug-log-sender-menupopup');
@@ -90,34 +58,24 @@ class DebugLogSender {
                 (_c = doc.querySelector('#debug-log-sender-menu')) === null || _c === void 0 ? void 0 : _c.remove();
         }
     }
-    alert(title, body) {
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-        const ps = this.zotero.platformMajorVersion >= 102
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-            ? Services.prompt
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
-            : Components.classes['@mozilla.org/embedcomp/prompt-service;1'].getService(Components.interfaces.nsIPromptService);
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call
-        ps.alert(null, title, body);
-    }
     send(target) {
         const elt = target;
         const plugin = elt.getAttribute('label');
         const preferences = JSON.parse(elt.getAttribute('data-preferences'));
         const pubkey = elt.getAttribute('data-pubkey');
         this.sendAsync(plugin, preferences, pubkey).catch((err) => {
-            this.alert('Debug log submission error', `${err}`); // eslint-disable-line @typescript-eslint/restrict-template-expressions
+            Services.prompt.alert(null, 'Debug log submission error', `${err}`); // eslint-disable-line @typescript-eslint/restrict-template-expressions
         });
     }
-    async sendAsync(plugin, preferences, pubkey = null) {
-        await this.zotero.Schema.schemaUpdatePromise;
+    async sendAsync(plugin, preferences, pubkey) {
+        await Zotero.Schema.schemaUpdatePromise;
         const files = {};
         const enc = new TextEncoder();
-        const key = this.zotero.Utilities.generateObjectKey();
+        const key = Zotero.Utilities.generateObjectKey();
         let log = [
             await this.info(preferences),
-            this.zotero.getErrors(true).join('\n\n'),
-            this.zotero.Debug.getConsoleViewerOutput().slice(-250000).join('\n'), // eslint-disable-line no-magic-numbers
+            Zotero.getErrors(true).join('\n\n'),
+            Zotero.Debug.getConsoleViewerOutput().slice(-250000).join('\n'), // eslint-disable-line no-magic-numbers
         ].filter((txt) => txt).join('\n\n').trim();
         files[`${key}/debug.txt`] = enc.encode(log);
         let rdf = await this.rdf();
@@ -125,26 +83,34 @@ class DebugLogSender {
             files[`${key}/items.rdf`] = enc.encode(rdf);
         // do this runtime because Zotero is not defined at start for bootstrapped zoter6 plugins
         // eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
-        if (typeof FormData === 'undefined' && this.zotero.platformMajorVersion >= 102)
+        if (typeof FormData === 'undefined' && Zotero.platformMajorVersion >= 102)
             Components.utils.importGlobalProperties(['FormData']);
         // eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
-        let zip = new Uint8Array(UZip.encode(files));
-        /*
+        const zip = new Uint8Array(UZip.encode(files));
+        let blob;
         if (pubkey) {
-          const publicKey = await openpgp.readKey({ armoredKey: pubkey })
-          const encrypted = await openpgp.encrypt({
-            message: await openpgp.createMessage({ binary: zip }),
-            encryptionKeys: publicKey,
-          })
-          zip = encrypted
+            try {
+                const subtle = Zotero.getMainWindow().crypto.subtle;
+                const pem = pubkey
+                    .replace('-----BEGIN PUBLIC KEY-----', '')
+                    .replace('-----END PUBLIC KEY-----', '')
+                    .replace(/\s/g, '');
+                const keyBuffer = Uint8Array.from(atob(pem), c => c.charCodeAt(0)).buffer;
+                const publicKey = await subtle.importKey('spki', keyBuffer, { name: 'RSA-OAEP', hash: 'SHA-256' }, true, ['encrypt']);
+                const encrypted = await subtle.encrypt({ name: 'RSA-OAEP' }, publicKey, zip);
+                blob = new Blob([encrypted], { type: 'application/octet-stream' });
+            }
+            catch (err) {
+                Services.prompt.alert(null, `Log encryption for ${plugin} failed`, err.message);
+            }
         }
-        */
-        const blob = new Blob([zip], { type: 'application/zip' });
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
+        if (!blob)
+            blob = new Blob([zip], { type: 'application/zip' });
         const formData = new FormData();
         formData.append('file', blob, `${key}.zip`);
+        formData.append('expire', `${7 * 24}`);
         try {
-            const response = await fetch(`https://bashupload.com/${key}.zip`, {
+            const response = await fetch('https://0x0.st', {
                 method: 'POST',
                 body: formData,
                 headers: {
@@ -152,13 +118,13 @@ class DebugLogSender {
                 },
             });
             const body = await response.text();
-            const id = body.match(/https:[/][/]bashupload.com[/]([A-Z0-9]+)[/][A-Z0-9]+[.]zip/i);
+            const id = body.match(/https:\/\/0x0.st\/([A-Z0-9]+)\.zip/i);
             if (!id)
                 throw new Error(body);
-            this.alert(`Debug log ID for ${plugin}`, `${key}-buc-${id[1]}. If you sent this log in error, visit ${id[0]} and it will be automatically removed.`);
+            Services.prompt.alert(null, `Debug log ID for ${plugin}`, `${key}-0x0-${id[1]}`);
         }
         catch (err) {
-            this.alert(`Could not post debug log for ${plugin}`, err.message);
+            Services.prompt.alert(null, `Could not post debug log for ${plugin}`, err.message);
         }
     }
     preferences(preferences) {
@@ -177,7 +143,7 @@ class DebugLogSender {
             }
         }
         for (const pref of names.sort()) {
-            prefs[pref] = this.zotero.Prefs.get(pref, true);
+            prefs[pref] = Zotero.Prefs.get(pref, true);
         }
         return prefs;
     }
@@ -186,16 +152,16 @@ class DebugLogSender {
         let info = '';
         // eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-assignment
         const appInfo = Components.classes['@mozilla.org/xre/app-info;1'].getService(Components.interfaces.nsIXULAppInfo);
-        info += `Application: ${appInfo.name} ${appInfo.version} ${this.zotero.locale}\n`;
+        info += `Application: ${appInfo.name} ${appInfo.version} ${Zotero.locale}\n`;
         const platform = ['Win', 'Mac', 'Linux'].find(p => Zotero[`is${p}`]) || 'Unknown';
-        const arch = this.zotero.oscpu || this.zotero.arch;
+        const arch = Zotero.oscpu || Zotero.arch;
         info += `Platform: ${platform} ${arch}\n`;
-        const addons = await this.zotero.getInstalledExtensions();
+        const addons = await Zotero.getInstalledExtensions();
         if (addons.length) {
             info += 'Addons:\n' + addons.map((addon) => `  ${addon}\n`).join(''); // eslint-disable-line prefer-template
         }
         info += `Debug logging on at Zotero start: ${this.debugEnabledAtStart}\n`;
-        info += `Debug logging on at log submit: ${this.zotero.Prefs.get('debug.store') || this.zotero.Debug.enabled}\n`;
+        info += `Debug logging on at log submit: ${Zotero.Prefs.get('debug.store') || Zotero.Debug.enabled}\n`;
         for (const [pref, value] of Object.entries(this.preferences(preferences))) {
             info += `${pref} = ${JSON.stringify(value)}\n`;
         }
@@ -204,11 +170,11 @@ class DebugLogSender {
     rdf() {
         return new Promise((resolve, reject) => {
             // eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-assignment
-            const items = this.zotero.getActiveZoteroPane().getSelectedItems();
+            const items = Zotero.getActiveZoteroPane().getSelectedItems();
             if (items.length === 0)
                 return resolve('');
             // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call
-            const translation = new this.zotero.Translate.Export();
+            const translation = new Zotero.Translate.Export();
             translation.setItems(items);
             translation.setTranslator('14763d24-8ba0-45df-8f52-b8d1108e7ac9'); // rdf
             translation.setHandler('done', (obj, success) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zotero-plugin",
-  "version": "5.0.23",
+  "version": "5.0.25",
   "description": "Zotero plugin builder",
   "homepage": "https://github.com/retorquere/zotero-plugin/wiki",
   "bin": {