zotero-plugin 5.0.25 → 5.0.26

package/bin/keypair

@@ -2,24 +2,53 @@
 
 from cryptography.hazmat.primitives.asymmetric import rsa
 from cryptography.hazmat.primitives import serialization
-import sys, os
+import sys, os, subprocess
 
 script_name = os.path.basename(sys.argv[0])
-if len(sys.argv) != 2:
-  print(f'Usage: {script_name} <directory>')
+if len(sys.argv) != 3:
+  print(f'Usage: {script_name} <private key> <public key>')
   sys.exit(1)
 
-target = sys.argv[1]
-if not os.path.isdir(target):
-    print(f'Error: {target} is not a directory.')
+script_name, private_key_file, public_key_file = sys.argv
+
+def controlled(file_path):
+  created_file = False
+
+  try:
+    if not os.path.exists(file_path):
+      os.makedirs(os.path.dirname(os.path.abspath(file_path)), exist_ok=True)
+      open(file_path, 'a').close()
+      created_file = True
+
+    result = subprocess.run(
+        ['git', 'check-ignore', '--quiet', file_path],
+        cwd=os.path.dirname(os.path.abspath(file_path)),
+        check=False
+    )
+
+    return result.returncode != 0
+
+  except FileNotFoundError:
+    print("Git is not installed or not in the system's PATH.")
     sys.exit(1)
 
-valid_files = {'public.pem', 'private.pem'}
-all_files = set(os.listdir(target))
+  except subprocess.CalledProcessError as e:
+    print(f'Error checking ignore status: {e}')
+    sys.exit(1)
 
-if not all_files.issubset(valid_files):
-  print(f'Error: Directory contains invalid files: {all_files - valid_files}')
-  sys.exit(1)
+  finally:
+    if created_file and os.path.exists(file_path):
+      os.remove(file_path)
+def check_name(kind, file_path):
+  if os.path.basename(file_path) != f'{kind}.pem':
+    print(f'The {kind} key file must be named {kind}.pem')
+    sys.exit(1)
+
+  if (kind == 'private') == controlled(file_path):
+    print(f'The {kind} key file must {"not " if kind == "private" else ""}be under source control')
+    sys.exit(1)
+check_name('private', private_key_file)
+check_name('public', public_key_file)
 
 private_key = rsa.generate_private_key(public_exponent=65537, key_size=2048)
 private_pem = private_key.private_bytes(
@@ -27,7 +56,8 @@ 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:
+with open(os.path.join(private_key_file), 'w') as f:
+  print('creating private key', private_key_file)
   f.write(private_pem.decode('utf-8'))
 
 public_key = private_key.public_key()
@@ -35,5 +65,6 @@ public_pem = public_key.public_bytes(
   encoding=serialization.Encoding.PEM,
   format=serialization.PublicFormat.SubjectPublicKeyInfo
 )
-with open(os.path.join(target, 'public.pem'), 'w') as f:
+with open(os.path.join(public_key_file), 'w') as f:
+  print('creating public key', public_key_file)
   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.25",
+        version: "5.0.26",
         description: "Zotero plugin builder",
         homepage: "https://github.com/retorquere/zotero-plugin/wiki",
         bin: {

package/package.json

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