Origin matching.

cassproject · Sep 23, 2024 · 3a566b3 · 3a566b3
1 parent 56a7181
commit 3a566b3
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 11 deletions.
diff --git a/src/com/eduworks/ec/crypto/EcAesCtrAsyncWorker.js b/src/com/eduworks/ec/crypto/EcAesCtrAsyncWorker.js
@@ -43,7 +43,8 @@ module.exports = class EcAesCtrAsyncWorker {
 		o["iv"] = iv;
 		o["text"] = forge.util.encodeUtf8(plaintext);
 		o["cmd"] = "encryptAesCtr";
-		return EcRsaOaepAsyncWorker.w[worker].postMessage(o,'cassproject');
+		o["origin"] = "cassproject";
+		return EcRsaOaepAsyncWorker.w[worker].postMessage(o, 'cassproject');
 	}
 	/**
 	 *  Asynchronous form of {{#crossLink
@@ -82,6 +83,7 @@ module.exports = class EcAesCtrAsyncWorker {
 		o["iv"] = iv;
 		o["text"] = ciphertext;
 		o["cmd"] = "decryptAesCtr";
+		o["origin"] = "cassproject";
 		let p = EcRsaOaepAsyncWorker.w[worker].postMessage(o,'cassproject');
 		p = p.then((decrypted) => {
 			return forge.util.decodeUtf8(decrypted);

diff --git a/src/com/eduworks/ec/crypto/EcRsaOaepAsyncWorker.js b/src/com/eduworks/ec/crypto/EcRsaOaepAsyncWorker.js
@@ -105,6 +105,7 @@ module.exports = class EcRsaOaepAsyncWorker {
 		o["pk"] = pk.toPem();
 		o["text"] = plaintext;
 		o["cmd"] = "encryptRsaOaep";
+		o["origin"] = "cassproject";
 
 		let p = this.w[worker].postMessage(o, 'cassproject');
 		return cassPromisify(p, success, failure);
@@ -144,6 +145,7 @@ module.exports = class EcRsaOaepAsyncWorker {
 		o["ppk"] = ppk.toPem();
 		o["text"] = ciphertext;
 		o["cmd"] = "decryptRsaOaep";
+		o["origin"] = "cassproject";
 		let p = this.w[worker].postMessage(o, 'cassproject'); 
 		p = p.then(function (decrypted) {
 			return forge.util.decodeUtf8(decrypted);
@@ -184,6 +186,7 @@ module.exports = class EcRsaOaepAsyncWorker {
 		o["ppk"] = ppk.toPem();
 		o["text"] = forge.util.encodeUtf8(text);
 		o["cmd"] = "signRsaOaep";
+		o["origin"] = "cassproject";
 		let p = this.w[worker].postMessage(o, 'cassproject');
 		return cassPromisify(p, success, failure);
 	}
@@ -215,6 +218,7 @@ module.exports = class EcRsaOaepAsyncWorker {
 		o["ppk"] = ppk.toPem();
 		o["text"] = forge.util.encodeUtf8(text);
 		o["cmd"] = "signSha256RsaOaep";
+		o["origin"] = "cassproject";
 		let p = this.w[worker].postMessage(o,'cassproject');
 		return cassPromisify(p, success, failure);
 	};
@@ -247,6 +251,7 @@ module.exports = class EcRsaOaepAsyncWorker {
 		o["text"] = forge.util.encodeUtf8(text);
 		o["signature"] = signature;
 		o["cmd"] = "verifyRsaOaep";
+		o["origin"] = "cassproject";
 		let p = this.w[worker].postMessage(o, 'cassproject');
 		return cassPromisify(p, success, failure);
 	}
@@ -279,6 +284,7 @@ module.exports = class EcRsaOaepAsyncWorker {
 		o["text"] = forge.util.encodeUtf8(text);
 		o["signature"] = signature;
 		o["cmd"] = "verifyRsaOaepSha256";
+		o["origin"] = "cassproject";
 		let p = this.w[worker].postMessage(o, 'cassproject');
 		return cassPromisify(p, success, failure);
 	}

diff --git a/src/com/eduworks/ec/crypto/forgeAsync.js b/src/com/eduworks/ec/crypto/forgeAsync.js
diff --git a/src/com/eduworks/ec/crypto/forgeAsyncNode.js b/src/com/eduworks/ec/crypto/forgeAsyncNode.js
@@ -54,7 +54,7 @@ function registerPromiseWorker(callback) {
   }
 
   function onIncomingMessage(e) {
-    if (e.origin != 'cassproject') return;
+    if (e.origin != 'cassproject' && e.data?.origin != 'cassproject' && e.data?.[1]?.origin != 'cassproject') { console.log("Origin does not match.", e.origin);return;}
 
     var payload = e.data
     if (!Array.isArray(payload) || payload.length !== 2) {
@@ -108,7 +108,4 @@ registerPromiseWorker(function (e) {
       error: ex.message
     };
   }
-});
-
-self.addEventListener('message', function (e) {
-}, false);
+});