cassproject 1.5.7 → 1.5.8

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "cassproject",
-	"version": "1.5.7",
+	"version": "1.5.8",
 	"description": "Competency and Skills Service",
 	"main": "index.js",
 	"scripts": {
@@ -71,11 +71,11 @@
 		}
 	],
 	"dependencies": {
-		"axios": "^0.26.1",
+		"axios": "^0.27.2",
 		"base64-arraybuffer": "^1.0.2",
 		"forge": "^2.3.0",
 		"form-data": "^4.0.0",
-		"http2-wrapper": "^2.1.10",
+		"http2-wrapper": "^2.1.11",
 		"jsonld": "^5.2.0",
 		"node-forge": "^1.3.1",
 		"papaparse": "^5.3.2",
@@ -106,22 +106,23 @@
 	},
 	"homepage": "https://github.com/cassproject/cass-npm#readme",
 	"devDependencies": {
-		"@babel/core": "^7.17.9",
-		"@babel/preset-env": "^7.16.11",
+		"@babel/core": "^7.17.10",
+		"@babel/preset-env": "^7.17.10",
 		"@cypress/browserify-preprocessor": "^3.0.2",
+		"@cypress/vite-dev-server": "^2.2.3",
 		"@cypress/webpack-preprocessor": "^5.11.1",
 		"babel-eslint": "^10.1.0",
-		"babel-loader": "^8.2.4",
+		"babel-loader": "^8.2.5",
 		"babel-plugin-transform-remove-strict-mode": "^0.0.2",
 		"chai": "^4.3.6",
 		"convert-hrtime": "^5.0.0",
-		"cypress": "^9.5.4",
-		"eslint": "^8.13.0",
-		"mocha": "^9.2.2",
+		"cypress": "^9.6.1",
+		"eslint": "^8.15.0",
+		"mocha": "^10.0.0",
 		"node-polyfill-webpack-plugin": "^1.1.4",
-		"nodemon": "^2.0.15",
+		"nodemon": "^2.0.16",
 		"wait-on": "^6.0.1",
-		"webpack": "^5.72.0",
+		"webpack": "^5.72.1",
 		"webpack-cli": "^4.9.2"
 	}
 }

package/src/com/eduworks/ec/crypto/EcRsaOaepAsyncWorker.js

@@ -44,19 +44,29 @@ module.exports = class EcRsaOaepAsyncWorker {
 	}
 	static createWorker(index) {
 		let wkr = null;
+		let me = this;
 		try {
 			wkr = new Worker(url.pathToFileURL(path.resolve(__dirname, 'forgeAsync.js')));
 		} catch (e) {
 			console.trace(e);
 			try {
 				wkr = new Worker(path.resolve(__dirname, 'forgeAsync.js'));
+				wkr.onerror = function(event) {
+					wkr = null;
+					console.log(event);
+					wkr = new Worker(path.resolve(__dirname, 'cass-editor/forgeAsync.js'));
+					if (wkr != null) {
+						// replace errored worker at index
+						me.w[index] = (new PromiseWorker(wkr));
+					}
+				}
 			} catch (e) {
 				console.trace(e);
 				// Eat quietly.
 			}
 		}
 		if (wkr != null)
-			this.w.push(new PromiseWorker(wkr));
+			this.w[index] = (new PromiseWorker(wkr));
 	}
 	/**
 	 *  Asynchronous form of {{#crossLink

package/src/com/eduworks/ec/graph/EcFrameworkGraph.js

@@ -73,7 +73,8 @@ module.exports = class EcFrameworkGraph extends EcDirectedGraph {
 					failure, this.eim
 				);
 			}).catch((err) => {
-				failure;
+				if (failure != null) 
+					failure(err);
 			});
 	}
 	async handleCacheElement(d, framework) {

package/src/com/eduworks/ec/graph/EcFrameworkGraph.test.js

@@ -873,6 +873,7 @@ describe("EcFrameworkGraph", () => {
             });
             return result;
         }).catch((err) => {
+            console.error(err);
             assert.fail(err);
         }).finally(async () => {
             await deleteById(f.shortId());

package/src/com/eduworks/ec/remote/EcRemote.js

@@ -29,15 +29,16 @@ if (global.axios == null)
 					let req;
 					config.transport = {
 						request: function request(options, handleResponse) {
-						if (http2Enabled[options.hostname])
-							req = http2.request(options, handleResponse);
-						else
-						{
-							req = https.request(options, handleResponse);
-							if (http2Enabled[options.hostname] == null)					
-								global.httpOptions.push(options);
-						}
-						return req;
+							options.ca = global.ca;
+							if (http2Enabled[options.hostname])
+								req = http2.request(options, handleResponse);
+							else
+							{
+								req = https.request(options, handleResponse);
+								if (http2Enabled[options.hostname] == null)					
+									global.httpOptions.push(options);
+							}
+							return req;
 						},
 					};
 					const ret = adapter(config);
@@ -66,7 +67,37 @@ if (global.axios == null)
 		axiosOptions.http2 = true;
 		axiosOptions.adapter = http2AdapterEnhancer(axios.defaults.adapter);
 	}
+} else {
+	if (isNode)
+	{
+		let https;
+		try {
+			https = require("https");
+		} catch(e) {
+			console.log(e);
+		}
+		function httpsAdapterEnhancer(adapter) {
+			return async (config) => {
+				if (process.env.HTTPS != null ? process.env.HTTPS.trim() == 'true' : false && config.url.startsWith("https")) {
+					let req;
+					config.transport = {
+						request: function request(options, handleResponse) {
+							options.ca = global.ca;
+							req = https.request(options, handleResponse);
+						return req;
+						},
+					};
+					const ret = adapter(config);
+					return ret;
+				} else {
+					return adapter(config);
+				}
+			};
+		}
+		axiosOptions.adapter = httpsAdapterEnhancer(axios.defaults.adapter);
+	}
 }
+
 const { cassPromisify } = require("../promises/helpers");
 
 /**

package/src/org/cass/importer/CTDLASNCSVImport.js

@@ -170,6 +170,22 @@ module.exports = class CTDLASNCSVImport {
 							}
 							f["ceasn:educationLevelType"] = val;
 						}
+						if (f["ceasn:publicationStatusType"] != null) {
+							let val = f["ceasn:publicationStatusType"];
+							if (!EcArray.isArray(val)) {
+								val = [val];
+							}
+							for (let i = val.length-1; i >=0; i--) {
+								if (!val[i].startsWith('http')) {
+									if (val[i] === "Deprecated" || val[i] === "Published" || val[i] === "Draft" ) {
+										val[i] = "http://credreg.net/ctdlasn/vocabs/publicationStatus/" + val[i];
+									} else {
+										val.splice(i, 1);
+									}
+								}
+							}
+							f["ceasn:publicationStatusType"] = val;
+						}
 						frameworks[f.shortId()] = f;
 						frameworkRows[f.shortId()] = e;
 						f["ceasn:hasChild"] = null;
@@ -331,6 +347,22 @@ module.exports = class CTDLASNCSVImport {
 							}
 							f["ceasn:educationLevelType"] = val;
 						}
+						if (f["ceasn:publicationStatusType"] != null) {
+							let val = f["ceasn:publicationStatusType"];
+							if (!EcArray.isArray(val)) {
+								val = [val];
+							}
+							for (let i = val.length-1; i >=0; i--) {
+								if (!val[i].startsWith('http')) {
+									if (val[i] === "Deprecated" || val[i] === "Published" || val[i] === "Draft" ) {
+										val[i] = "http://credreg.net/ctdlasn/vocabs/publicationStatus/" + val[i];
+									} else {
+										val.splice(i, 1);
+									}
+								}
+							}
+							f["ceasn:publicationStatusType"] = val;
+						}
 						if (e["ceasn:isChildOf"] != null) {
 							CTDLASNCSVImport.createEachRelation(
 								e,
@@ -639,6 +671,22 @@ module.exports = class CTDLASNCSVImport {
 							}
 							f["ceasn:educationLevelType"] = val;
 						}
+						if (f["ceasn:publicationStatusType"] != null) {
+							let val = f["ceasn:publicationStatusType"];
+							if (!EcArray.isArray(val)) {
+								val = [val];
+							}
+							for (let i = val.length-1; i >=0; i--) {
+								if (!val[i].startsWith('http')) {
+									if (val[i] === "Deprecated" || val[i] === "Published" || val[i] === "Draft" ) {
+										val[i] = "http://credreg.net/ctdlasn/vocabs/publicationStatus/" + val[i];
+									} else {
+										val.splice(i, 1);
+									}
+								}
+							}
+							f["ceasn:publicationStatusType"] = val;
+						}
 						if (e["ceasn:broadAlignment"] != null) {
 							CTDLASNCSVImport.createRelations(
 								e,
@@ -825,6 +873,20 @@ module.exports = class CTDLASNCSVImport {
 								var thisVal = thisKey[i].trim();
 								thisKey[i] = thisVal;
 							}
+							if (typeof thisKey[i] == "string" &&
+								thisKey[i].startsWith("ce-") &&
+								key != "ceterms:ctid"
+							) {
+								var id = CTDLASNCSVImport.getIdFromCtid(
+									thisKey[i],
+									endpoint,
+									repo,
+									context,
+									type,
+									key
+								);
+								thisKey[i] = id;
+							}
 						}
 					} else if (
 						thisKey.startsWith("ce-") &&

package/src/org/cass/profile/EcAssertion.js

@@ -61,12 +61,15 @@ module.exports = class EcAssertion extends Assertion {
 	async setSubject(pk) {
 		var owners = [];
 		var readers = null;
-		if (this.reader == null) readers = [];
-		else readers = JSON.parse(JSON.stringify(this.reader));
+		if (this.reader == null) 
+			readers = [];
+		else 
+			readers = JSON.parse(JSON.stringify(this.reader));
 		if (this.subject != null) {
-			if (this.subject.owner != null) owners.concat(this.subject.owner);
+			if (this.subject.owner != null) 
+				owners = owners.concat(this.subject.owner);
 			if (this.subject.reader != null)
-				readers.concat(this.subject.reader);
+				readers = readers.concat(this.subject.reader);
 		}
 		if (this.owner != null) owners = owners.concat(this.owner);
 		readers.push(pk.toPem());
@@ -82,12 +85,15 @@ module.exports = class EcAssertion extends Assertion {
 		var me = this;
 		var owners = [];
 		var readers = null;
-		if (this.reader == null) readers = [];
-		else readers = JSON.parse(JSON.stringify(this.reader));
+		if (this.reader == null) 
+			readers = [];
+		else 
+			readers = JSON.parse(JSON.stringify(this.reader));
 		if (this.subject != null) {
-			if (this.subject.owner != null) owners.concat(this.subject.owner);
+			if (this.subject.owner != null) 
+				owners = owners.concat(this.subject.owner);
 			if (this.subject.reader != null)
-				readers.concat(this.subject.reader);
+				readers = readers.concat(this.subject.reader);
 		}
 		if (this.owner != null) owners = owners.concat(this.owner);
 		readers.push(pk.toPem());

package/src/org/cassproject/ebac/identity/remote/EcRemoteIdentityManager.js

@@ -351,26 +351,57 @@ module.exports = class EcRemoteIdentityManager extends RemoteIdentityManagerInte
 					var cs = arg0;
 					me.pad = cs.pad;
 					me.token = cs.token;
+					var shouldCommit = false;
 					if (cs.credentials != null)
 						for (var i = 0; i < cs.credentials.length; i++) {
 							var c = cs.credentials[i];
-							var identity = await EcIdentity.fromCredential(
+							let identity = null;
+							identity = await EcIdentity.fromCredential(
 								c,
 								me.secretWithSalt,
 								me.server
 							);
+							if (identity.ppk == null)
+							{						
+								//Try alternate method of getting credential.
+								let newSecretWithSalt = forge.util.encode64(forge.pkcs5.pbkdf2('',this.secretSalt,this.secretIterations,32));								
+								identity = await EcIdentity.fromCredential(
+									c,
+									newSecretWithSalt,
+									me.server
+								);
+								shouldCommit = true;
+							}
+							if (identity.ppk == null)
+								throw new Error("Could not retreive encrypted ppks from credential packet.")
 							eim.addIdentity(identity);
 						}
 					if (cs.contacts != null)
 						for (var i = 0; i < cs.contacts.length; i++) {
 							var c = cs.contacts[i];
-							var identity = await EcContact.fromEncryptedContact(
+							let identity = null;
+							identity = await EcContact.fromEncryptedContact(
 								c,
 								me.secretWithSalt,
 								me.server
 							);
+							if (identity.ppk == null)
+							{					
+								//Try alternate method of getting contact.
+								let newSecretWithSalt = forge.util.encode64(forge.pkcs5.pbkdf2('',this.secretSalt,this.secretIterations,32));								
+								identity = await EcContact.fromEncryptedContact(
+									c,
+									newSecretWithSalt,
+									me.server
+								);
+								shouldCommit = true;
+							}					
+							if (identity.ppk == null)
+								throw new Error("Could not retreive encrypted pks from credential packet.")		
 							eim.addContact(identity);
 						}
+						if (shouldCommit)
+							await me.commit(null,null,eim);
 					return eim;
 				},
 				function (arg0) {
@@ -503,8 +534,7 @@ module.exports = class EcRemoteIdentityManager extends RemoteIdentityManagerInte
 	 */
 	splicePasswords(passwords) {
 		var passwordSplice = "";
-		// eslint-disable-next-line for-direction
-		for (var charIndex = 0; charIndex > 0; charIndex++) {
+		for (var charIndex = 0; true; charIndex++) {
 			var foundAny = false;
 			for (
 				var passwordIndex = 0;

package/src/org/cassproject/ebac/identity/remote/EcRemoteIdentityManager.test.js

@@ -0,0 +1,21 @@
+let chai = require("chai");
+const EcAes = require("../../../../../com/eduworks/ec/crypto/EcAes");
+const EcPpk = require("../../../../../com/eduworks/ec/crypto/EcPpk");
+const EcIdentity = require("../EcIdentity");
+const EcIdentityManager = require("../EcIdentityManager");
+const EcRemoteIdentityManager = require("./EcRemoteIdentityManager");
+
+var should = chai.should();
+var expect = chai.expect;
+var assert = chai.assert;
+
+describe("EcRemoteIdentityManager", () => {    
+    it('splicePasswords', async () => {
+        let rim= new EcRemoteIdentityManager();
+        assert.equal(rim.splicePasswords(["abc","123"]),"a1b2c3");
+        assert.equal(rim.splicePasswords(["abcde","123"]),"a1b2c3de");
+        assert.equal(rim.splicePasswords(["abc","12345"]),"a1b2c345");
+        assert.equal(rim.splicePasswords(["","123"]),"123");
+        assert.equal(rim.splicePasswords(["abc",""]),"abc");
+    });
+});

package/src/org/cassproject/schema/cass/profile/Assertion.js

@@ -119,9 +119,10 @@ module.exports = class Assertion extends schema.CreativeWork {
 		var readers = this.reader;
 		if (readers == null) readers = [];
 		if (this.subject != null) {
-			if (this.subject.owner != null) owners.concat(this.subject.owner);
+			if (this.subject.owner != null) 
+				owners = owners.concat(this.subject.owner);
 			if (this.subject.reader != null)
-				readers.concat(this.subject.reader);
+				readers = readers.concat(this.subject.reader);
 		}
 		if (this.owner != null) owners = owners.concat(this.owner);
 		readers.push(pk.toPem());