cassproject 5.0.12 → 5.0.14

package/README.md

@@ -50,7 +50,6 @@ Development unit tests presume you have a CaSS Repository running on `localhost:
   * Update changelog using `npm run changelog`, and review the changes in `CHANGELOG.md`.
   * `npm install`
   * `npm audit` and fix any audit issues. Stop if `npm audit --omit=dev` has findings.
-  * Update CaSS server version if necessary in package.json
   * `npm test` - Must not fail any tests.
   * `npm run webpack:cypressFirefoxHttps` See if the firefox test case has changed.
   * Document code coverage output by the previous step.

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "cassproject",
-	"version": "5.0.12",
+	"version": "5.0.14",
 	"description": "Competency and Skills Service",
 	"main": "index.js",
 	"scripts": {
@@ -10,7 +10,7 @@
 		"multitest": "concurrently --kill-others-on-fail \"npm run test15\" \"npm run test14\" \"npm run test13\" \"npm run test12\"",
 		"testCassTest": "npm run testkill && docker run -d --platform linux/amd64 --network cass-net --name cass-test -p80:80 -e CASS_LOOPBACK cass-test && wait-on http://localhost/api/ping && npm run testNode18 && npm run testNode18Fips && npm run testCypressEdge && npm run testCypress && npm run testkill",
 		"testDevHttps": "npm run testkill && docker run -d --platform linux/amd64 --network cass-net --name cass-test -p443:80 -e CASS_LOOPBACK -e HTTPS=true cassproject/cass:dev && wait-on https://localhost/api/ping && npm run testNode18HttpsFips && npm run testNode18Https && npm run testCypressEdgeHttps && npm run testCypressHttps",
-		"test16HttpsFips": "export CASS_LOOPBACK=https://cass-testsf16/api/|| set CASS_LOOPBACK=https://cass-testsf16/api/&& npm run testkillsf16 && docker run -d --platform linux/amd64 --network cass-net --name cass-testsf16 -p450:443 -e CASS_LOOPBACK -e HTTPS=true cassproject/cass:1.6 && wait-on https://localhost:450/api/ping && concurrently --kill-others-on-fail \"npm run testCypressHttps\" \"npm run testNode24Https\" \"npm run testNode24HttpsFips\" \"npm run testNode24HttpsForceFips\" \"npm run testNode22Https\" \"npm run testNode22HttpsFips\" \"npm run testNode22HttpsForceFips\" \"npm run testNode20Https\" \"npm run testNode20HttpsFips\" \"npm run testNode20HttpsForceFips\" \"npm run testNode18Https\" && npm run testkillsf16",
+		"test16HttpsFips": "export CASS_LOOPBACK=https://cass-testsf16/api/|| set CASS_LOOPBACK=https://cass-testsf16/api/&& npm run testkillsf16 && docker run -d --platform linux/amd64 --network cass-net --name cass-testsf16 -p450:443 -e CASS_LOOPBACK -e HTTPS=true --pull always cassproject/cass:1.6 && wait-on https://localhost:450/api/ping && concurrently --kill-others-on-fail \"npm run testCypressHttps\" \"npm run testNode24Https\" \"npm run testNode24HttpsFips\" \"npm run testNode24HttpsForceFips\" \"npm run testNode22Https\" \"npm run testNode22HttpsFips\" \"npm run testNode22HttpsForceFips\" \"npm run testNode20Https\" \"npm run testNode20HttpsFips\" \"npm run testNode20HttpsForceFips\" \"npm run testNode18Https\" && npm run testkillsf16",
 		"test16Https11Fips": "export CASS_LOOPBACK=https://cass-testsf1116/api/|| set CASS_LOOPBACK=https://cass-testsf1116/api/&& npm run testkillsf1116 && docker run -d --platform linux/amd64 --network cass-net --name cass-testsf1116 -p449:443 -e CASS_LOOPBACK -e HTTPS=true -e HTTP2=false cassproject/cass:1.6 && wait-on https://localhost:449/api/ping && concurrently --kill-others-on-fail \"npm run testCypressHttps\" \"npm run testNode24Https\" \"npm run testNode24HttpsFips\" \"npm run testNode24HttpsForceFips\" \"npm run testNode22Https\" \"npm run testNode22HttpsFips\" \"npm run testNode22HttpsForceFips\" \"npm run testNode20Https\" \"npm run testNode20HttpsFips\" \"npm run testNode20HttpsForceFips\" \"npm run testNode18Https\" && npm run testkillsf1116",
 		"test16Https": "export CASS_LOOPBACK=https://cass-tests16/api/|| set CASS_LOOPBACK=https://cass-tests16/api/&& npm run testkills16 && docker run -d --platform linux/amd64 --network cass-net --name cass-tests16 -p448:443 -e CASS_LOOPBACK -e HTTPS=true cassproject/cass:1.6 && wait-on https://localhost:448/api/ping && concurrently --kill-others-on-fail \"npm run testCypressHttps\" \"npm run testNode24Https\" \"npm run testNode24HttpsFips\" \"npm run testNode22Https\" \"npm run testNode22HttpsFips\" \"npm run testNode20Https\" \"npm run testNode20HttpsFips\" \"npm run testNode18Https\" && npm run testkills16",
 		"test16HttpsNoFips": "export CASS_LOOPBACK=https://cass-tests16/api/|| set CASS_LOOPBACK=https://cass-tests16/api/&& npm run testkills16 && docker run -d --platform linux/amd64 --network cass-net --name cass-tests16 -p448:443 -e CASS_LOOPBACK -e HTTPS=true cassproject/cass:1.6 && wait-on https://localhost:448/api/ping && concurrently --kill-others-on-fail \"npm run testCypressHttps\" \"npm run testNode24Https\" \"npm run testNode22Https\" \"npm run testNode20Https\" \"npm run testNode18Https\" && npm run testkills16",
@@ -82,18 +82,18 @@
 		"autoindex": "nodemon index.js",
 		"autonyc": "nodemon --exec \"npm run nyc\"",
 		"nyc": "nyc --reporter lcov npm run mocha",
-		"mocha": "mocha --timeout 60000 -b src/**/*.test.js",
-		"mochaFips": "mocha -n 'force-fips' --timeout 60000 -b src/**/*.test.js",
-		"mocha:httpsNoHttp2": "export HTTP2=false|| set HTTP2=false&& mocha --timeout 60000 -b src/**/*.test.js",
-		"mocha:https": "export CASS_LOOPBACK=https://localhost/api/|| set CASS_LOOPBACK=https://localhost/api/&& mocha --timeout 60000 -b src/**/*.test.js",
-		"mocha:clientSideCertificates": "export NODE_EXTRA_CA_CERTS=ca.crt|| set NODE_EXTRA_CA_CERTS=ca.crt&&export HTTP2=false|| set HTTP2=false&& mocha --timeout 60000 -b src/**/*.test.js",
-		"mochaFips:clientSideCertificates": "export NODE_EXTRA_CA_CERTS=ca.crt|| set NODE_EXTRA_CA_CERTS=ca.crt&&export HTTP2=false|| set HTTP2=false&& mocha -n 'force-fips' --timeout 60000 -b src/**/*.test.js",
-		"mocha:clientSideCertificatesDangerMouse": "export NODE_EXTRA_CA_CERTS=ca.crt|| set NODE_EXTRA_CA_CERTS=ca.crt&&export HTTP2=false|| set HTTP2=false&& mocha --timeout 60000 -b src/**/*.test.js",
-		"mocha:custom": "export CASS_LOOPBACK=https://tides.eduworks.us/api/|| set CASS_LOOPBACK=https://tides.eduworks.us/api/&& export HTTP2=false|| set HTTP2=false&& mocha --timeout 600000 -b src/**/*.test.js",
-		"mocha:dev": "export CASS_LOOPBACK=https://dev.cassproject.org/api/|| set CASS_LOOPBACK=https://dev.cassproject.org/api/&& export HTTP2=false|| set HTTP2=false&& mocha --timeout 600000 -b src/**/*.test.js",
-		"mocha:demo": "export CASS_LOOPBACK=https://demo.cassproject.org/api/|| set CASS_LOOPBACK=https://demo.cassproject.org/api/&& export HTTP2=false|| set HTTP2=false&& mocha --timeout 600000 -b src/**/*.test.js",
-		"mochaGraph": "mocha --timeout 60000 -b src/com/eduworks/ec/graph/**/*.test.js",
-		"mochaCrypto": "mocha --timeout 60000 -b src/test/*Rsa*.test.js -b src/test/*Aes*.test.js -b src/test/*Crypto*.test.js",
+		"mocha": "mocha --exit --timeout 60000 -b src/**/*.test.js",
+		"mochaFips": "mocha --exit -n 'force-fips' --timeout 60000 -b src/**/*.test.js",
+		"mocha:httpsNoHttp2": "export HTTP2=false|| set HTTP2=false&& mocha --exit --timeout 60000 -b src/**/*.test.js",
+		"mocha:https": "export CASS_LOOPBACK=https://localhost/api/|| set CASS_LOOPBACK=https://localhost/api/&& mocha --exit --timeout 60000 -b src/**/*.test.js",
+		"mocha:clientSideCertificates": "export NODE_EXTRA_CA_CERTS=ca.crt|| set NODE_EXTRA_CA_CERTS=ca.crt&&export HTTP2=false|| set HTTP2=false&& mocha --exit --timeout 60000 -b src/**/*.test.js",
+		"mochaFips:clientSideCertificates": "export NODE_EXTRA_CA_CERTS=ca.crt|| set NODE_EXTRA_CA_CERTS=ca.crt&&export HTTP2=false|| set HTTP2=false&& mocha --exit -n 'force-fips' --timeout 60000 -b src/**/*.test.js",
+		"mocha:clientSideCertificatesDangerMouse": "export NODE_EXTRA_CA_CERTS=ca.crt|| set NODE_EXTRA_CA_CERTS=ca.crt&&export HTTP2=false|| set HTTP2=false&& mocha --exit --timeout 60000 -b src/**/*.test.js",
+		"mocha:custom": "export CASS_LOOPBACK=https://tides.eduworks.us/api/|| set CASS_LOOPBACK=https://tides.eduworks.us/api/&& export HTTP2=false|| set HTTP2=false&& mocha --exit --timeout 600000 -b src/**/*.test.js",
+		"mocha:dev": "export CASS_LOOPBACK=https://dev.cassproject.org/api/|| set CASS_LOOPBACK=https://dev.cassproject.org/api/&& export HTTP2=false|| set HTTP2=false&& mocha --exit --timeout 600000 -b src/**/*.test.js",
+		"mocha:demo": "export CASS_LOOPBACK=https://demo.cassproject.org/api/|| set CASS_LOOPBACK=https://demo.cassproject.org/api/&& export HTTP2=false|| set HTTP2=false&& mocha --exit --timeout 600000 -b src/**/*.test.js",
+		"mochaGraph": "mocha --exit --timeout 60000 -b src/com/eduworks/ec/graph/**/*.test.js",
+		"mochaCrypto": "mocha --exit --timeout 60000 -b src/test/*Rsa*.test.js -b src/test/*Aes*.test.js -b src/test/*Crypto*.test.js",
 		"automocha": "nodemon --exec \"npm run mocha\"",
 		"automochaGraph": "nodemon --exec \"npm run mochaGraph\"",
 		"automochaCrypto": "nodemon --exec \"npm run mochaCrypto\"",
@@ -142,7 +142,7 @@
 	"dependencies": {
 		"base64-arraybuffer": "^1.0.2",
 		"jsonld": "^9.0.0",
-		"node-forge": "^1.3.3",
+		"node-forge": "^1.4.0",
 		"papaparse": "^5.5.3",
 		"promise-worker": "^2.0.1",
 		"web-worker": "1.3.0"
@@ -172,17 +172,17 @@
 		"@cypress/webpack-preprocessor": "^7.0.2",
 		"chai": "^4.5.0",
 		"concurrently": "^9.2.1",
-		"cypress": "^15.10.0",
-		"cypress-fail-fast": "^7.1.1",
-		"eslint": "^10.0.1",
+		"cypress": "^15.13.1",
+		"cypress-fail-fast": "^8.1.0",
+		"eslint": "^10.2.0",
 		"fake-indexeddb": "^6.2.5",
 		"mocha": "^11.7.5",
 		"node-polyfill-webpack-plugin": "^4.1.0",
 		"nodemon": "^3.1.14",
-		"nyc": "^17.1.0",
-		"sinon": "^21.0.1",
-		"wait-on": "^9.0.4",
-		"webpack": "^5.105.2"
+		"nyc": "^18.0.0",
+		"sinon": "^21.1.2",
+		"wait-on": "^9.0.5",
+		"webpack": "^5.106.1"
 	},
 	"packageManager": "npm@11.3.0+sha512.96eb611483f49c55f7fa74df61b588de9e213f80a256728e6798ddc67176c7b07e4a1cfc7de8922422cbce02543714367037536955221fa451b0c4fefaf20c66"
 }

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

@@ -1,5 +1,7 @@
 const forge = require("node-forge");
 const realCrypto = require('crypto');
+const base64 = require("base64-arraybuffer");
+
 /**
  *  AES encryption tasks common across all variants of AES.
  *  @class EcAes
@@ -16,7 +18,13 @@ module.exports = class EcAes {
 	 */
 	static newSecret = function(i) {
 		if (i == null) throw new Error("Undefined secret length.");
-		return realCrypto.randomBytes(i).toString('base64');
+		let array = new Uint8Array(i);
+		if (typeof crypto !== "undefined" && crypto.getRandomValues) {
+			crypto.getRandomValues(array);
+		} else {
+			realCrypto.webcrypto.getRandomValues(array);
+		}
+		return base64.encode(array.buffer);
 	};
 	/**
 	 *  Generates a random Initialization Vector of length @i
@@ -27,6 +35,12 @@ module.exports = class EcAes {
 	 */
 	static newIv = function(i) {
 		if (i == null) throw new Error("Undefined iv length.");
-		return realCrypto.randomBytes(i).toString('base64');
+		let array = new Uint8Array(i);
+		if (typeof crypto !== "undefined" && crypto.getRandomValues) {
+			crypto.getRandomValues(array);
+		} else {
+			realCrypto.webcrypto.getRandomValues(array);
+		}
+		return base64.encode(array.buffer);
 	};
 };

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

@@ -19,13 +19,34 @@ module.exports = class EcAssertion extends Assertion {
 	async decrypt(eim) {
 		eim = eim || EcIdentityManager.default;
 		let a = new Assertion().copyFrom(this);
-		a.setSubject(await this.getSubject(eim));
-		a.setAgent(await this.getAgent(eim));
-		a.setAssertionDate(await this.getAssertionDate(eim));
-		a.setExpirationDate(await this.getExpirationDate(eim));
-		a.setEvidence(await this.getEvidences(eim));
-		a.setNegative(await this.getNegative(eim));
-		a.setDecayFunction(await this.getDecayFunction(eim));
+		let subject = this.getSubject(eim);
+		let agent = this.getAgent(eim);
+		let assertionDate = this.getAssertionDate(eim);
+		let expirationDate = this.getExpirationDate(eim);
+		let evidences = this.getEvidences(eim);
+		let negative = this.getNegative(eim);
+		let decayFunction = this.getDecayFunction(eim);
+		subject = await subject;
+		agent = await agent;
+		assertionDate = await assertionDate;
+		expirationDate = await expirationDate;
+		evidences = await evidences;
+		negative = await negative;
+		decayFunction = await decayFunction;
+		if (subject)
+			a.setSubject(subject);
+		if (agent)
+			a.setAgent(agent);
+		if (assertionDate)
+			a.setAssertionDate(assertionDate);
+		if (expirationDate)
+			a.setExpirationDate(expirationDate);
+		if (evidences)
+			a.setEvidence(evidences);
+		if (negative)
+			a.setNegative(negative);
+		if (decayFunction)
+			a.setDecayFunction(decayFunction);
 		a.setCompetency(this.competency);
 		a.setLevel(this.level);
 		a.setConfidence(this.confidence);

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

@@ -246,13 +246,13 @@ module.exports = class Assertion extends schema.CreativeWork {
 		success(this.decayFunction);
 	}
 	getNegative() {
-		return "true".equals(this.negative);
+		return "true".equals(this.negative) | this.negative === true;
 	}
 	setNegative(negativeB) {
 		this.negative = negativeB;
 	}
 	getNegativeAsync(success, failure) {
-		success("true".equals(this.negative));
+		success("true".equals(this.negative) | this.negative === true);
 	}
 	setCompetency(competencyUrl) {
 		this.competency = competencyUrl;