zotero-plugin 5.0.19 → 5.0.20

package/bin/release.js

@@ -8382,7 +8382,7 @@ Expecting one of '${allowedValues.join("', '")}'`);
     "package.json"(exports, module) {
       module.exports = {
         name: "zotero-plugin",
-        version: "5.0.19",
+        version: "5.0.20",
         description: "Zotero plugin builder",
         homepage: "https://github.com/retorquere/zotero-plugin/wiki",
         bin: {
@@ -11984,9 +11984,11 @@ Expecting one of '${allowedValues.join("', '")}'`);
     const link = `[${build}](https://github.com/${owner}/${repo}/releases/download/${release.data.tag_name}/${pkg.name}-${version_default}.xpi)`;
     if (!options.tag) {
       reason = ` (${JSON.stringify(ContinuousIntegration.commit_message)})`;
-      reason += `
-
-Please test this build and send a new log. Install in Zotero by downloading ${link}, opening the Zotero "Tools" menu, selecting "Add-ons", open the gear menu in the top right, and select "Install Add-on From File...".`;
+      reason += [
+        "",
+        `Install in Zotero by downloading ${link}, opening the Zotero "Tools" menu, selecting "Add-ons", open the gear menu in the top right, and select "Install Add-on From File...".`,
+        "Please test this build and report back whether it fixes the issue, and if not, what the remaining problem is. In the latter case, please also send a new log."
+      ].join("\n\n");
     }
     const body = `:robot: this is your friendly neighborhood build bot announcing ${link}${reason}`;
     report(body);

package/debug-log.d.ts

@@ -9,7 +9,7 @@ declare class DebugLogSender {
     private get zotero();
     convertLegacy(): void;
     private element;
-    register(plugin: string, preferences?: string[]): void;
+    register(plugin: string, preferences?: string[], pem?: string): void;
     unregister(plugin: string): void;
     private alert;
     send(target: EventTarget): void;
@@ -17,6 +17,10 @@ declare class DebugLogSender {
     private preferences;
     private info;
     private rdf;
+    private publicKey;
+    private encrypt;
+    private arrayBufferToBase64;
+    private base64ToArrayBuffer;
 }
 export declare const DebugLog: DebugLogSender;
 export {};

package/debug-log.js

@@ -55,7 +55,7 @@ class DebugLogSender {
         }
         return elt;
     }
-    register(plugin, preferences = []) {
+    register(plugin, preferences = [], pem = '') {
         var _a, _b;
         this.convertLegacy();
         const label = 'Send debug log to bashupload.com';
@@ -75,6 +75,7 @@ class DebugLogSender {
                 label: plugin,
                 class: this.id.menuitem,
                 'data-preferences': JSON.stringify(preferences || []),
+                'data-pem': pem,
             }));
             menuitem.addEventListener('command', event => this.send(event.currentTarget));
         }
@@ -103,22 +104,30 @@ class DebugLogSender {
         const elt = target;
         const plugin = elt.getAttribute('label');
         const preferences = JSON.parse(elt.getAttribute('data-preferences'));
-        this.sendAsync(plugin, preferences).catch((err) => {
+        const pem = elt.getAttribute('data-pem');
+        this.sendAsync(plugin, preferences, pem).catch((err) => {
             this.alert('Debug log submission error', `${err}`); // eslint-disable-line @typescript-eslint/restrict-template-expressions
         });
     }
-    async sendAsync(plugin, preferences) {
+    async sendAsync(plugin, preferences, pem) {
         await this.zotero.Schema.schemaUpdatePromise;
         const files = {};
         const enc = new TextEncoder();
         const key = this.zotero.Utilities.generateObjectKey();
-        const log = [
+        let publicKey = pem ? await this.publicKey(pem) : null;
+        if (pem)
+            files[`${key}/pem.txt`] = enc.encode(pem);
+        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
         ].filter((txt) => txt).join('\n\n').trim();
+        if (publicKey)
+            log = await this.encrypt(publicKey, log);
         files[`${key}/debug.txt`] = enc.encode(log);
-        const rdf = await this.rdf();
+        let rdf = await this.rdf();
+        if (publicKey)
+            rdf = await this.encrypt(publicKey, rdf);
         if (rdf)
             files[`${key}/items.rdf`] = enc.encode(rdf);
         // do this runtime because Zotero is not defined at start for bootstrapped zoter6 plugins
@@ -210,5 +219,37 @@ class DebugLogSender {
             translation.translate(); // eslint-disable-line @typescript-eslint/no-unsafe-call
         });
     }
+    async publicKey(pem) {
+        const base64Key = pem
+            .replace('-----BEGIN PUBLIC KEY-----', '')
+            .replace('-----END PUBLIC KEY-----', '')
+            .replace(/\n/g, '');
+        const keyBuffer = this.base64ToArrayBuffer(base64Key);
+        return await crypto.subtle.importKey('spki', keyBuffer, { name: 'RSA-OAEP', hash: 'SHA-256' }, true, ['encrypt']);
+    }
+    async encrypt(publicKey, plaintext) {
+        const textEncoder = new TextEncoder();
+        const data = textEncoder.encode(plaintext);
+        const encrypted = await crypto.subtle.encrypt({ name: 'RSA-OAEP' }, publicKey, data);
+        return this.arrayBufferToBase64(encrypted);
+    }
+    arrayBufferToBase64(buffer) {
+        let binary = '';
+        const bytes = new Uint8Array(buffer);
+        const len = bytes.byteLength;
+        for (let i = 0; i < len; i++) {
+            binary += String.fromCharCode(bytes[i]);
+        }
+        return btoa(binary);
+    }
+    base64ToArrayBuffer(base64) {
+        const binaryString = atob(base64);
+        const len = binaryString.length;
+        const bytes = new Uint8Array(len);
+        for (let i = 0; i < len; i++) {
+            bytes[i] = binaryString.charCodeAt(i);
+        }
+        return bytes.buffer;
+    }
 }
 exports.DebugLog = new DebugLogSender();

package/package.json

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