cassproject 1.5.37 → 1.5.39

package/README.md

@@ -39,7 +39,7 @@ Development unit tests presume you have a CaSS Repository running on `localhost:
  * Increment version number in package.json and yuidoc.json.
  * Update changelog.
  * `npm install`
- * `npm audit --production` and fix any audit issues.
+ * `npm audit` and fix any audit issues.
  * `npm test` - Must not fail any tests.
  * Document code coverage output by the previous step.
  * Commit changes to GitHub.
@@ -48,6 +48,18 @@ Development unit tests presume you have a CaSS Repository running on `localhost:
 
 # Changelog
 
+## 1.5.39
+* Removed axios due to incompatibility with http2 and security findings.
+* Now uses fetch for http/s traffic.
+* To use fetch with http2 compatibility or on node 16, `npm install undici` (node's native fetch library, but with more features)
+* Started investigating node 21 compatibility.
+
+## 1.5.38
+* Fixed issue with CTDL-ASN import.
+* Use of cassproject library with Vite.js now has appropriate mitigations in place. You will need to include the following libraries
+  * `"buffer": "^6.0.3"`
+  * `"stream": "npm:stream-browserify@^3.0.0"`
+
 ## 1.5.37
 * Can now search for and de-duplicate competencies on import.
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "cassproject",
-	"version": "1.5.37",
+	"version": "1.5.39",
 	"description": "Competency and Skills Service",
 	"main": "index.js",
 	"scripts": {
@@ -9,11 +9,11 @@
 		"multitest": "concurrently --kill-others --kill-others-on-fail \"npm run test15\" \"npm run test14\" \"npm run test13\" \"npm run test12\"",
 		"testCassTest": "npm run testkill && docker run -d --name cass-test -p80:80 -e CASS_LOOPBACK cass-test && wait-on http://localhost/api/ping && npm run testNode18 && npm run testNode18Fips && npm run testNode16 && npm run testNode15 && npm run testNode14 && npm run testNode13 && npm run testNode12 && npm run testCypressEdge && npm run testCypress && npm run testkill",
 		"testDevHttps": "npm run testkill && docker run -d --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 testNode16Https && npm run testNode15Https && npm run testNode14Https && npm run testNode13Https && npm run testNode12Https && npm run testCypressEdgeHttps && npm run testCypressHttps",
-		"test15HttpsFips": "npm run testkill && docker run -d --name cass-test -p443:443 -e CASS_LOOPBACK -e HTTPS=true cassproject/cass:1.5.35 && wait-on https://localhost/api/ping && concurrently --kill-others-on-fail \"npm run testCypressHttps\" \"npm run testNode20Https\" \"npm run testNode20HttpsFips\" \"npm run testNode20HttpsForceFips\" \"npm run testNode18Https\" \"npm run testNode18HttpsFips\" \"npm run testNode16Https\" && npm run testkill",
-		"test15Https11Fips": "npm run testkill && docker run -d --name cass-test -p443:443 -e CASS_LOOPBACK -e HTTPS=true -e HTTP2=false cassproject/cass:1.5.35 && wait-on https://localhost/api/ping && concurrently --kill-others-on-fail \"npm run testCypressHttps\" \"npm run testNode20Https\" \"npm run testNode20HttpsFips\" \"npm run testNode20HttpsForceFips\" \"npm run testNode18Https\" \"npm run testNode18HttpsFips\" \"npm run testNode16Https\" && npm run testkill",
+		"test15HttpsFips": "npm run testkill && docker run -d --name cass-test -p443:443 -e CASS_LOOPBACK -e HTTPS=true cassproject/cass:1.5.37 && wait-on https://localhost/api/ping && concurrently --kill-others-on-fail \"npm run testCypressHttps\" \"npm run testNode20Https\" \"npm run testNode20HttpsFips\" \"npm run testNode20HttpsForceFips\" \"npm run testNode18Https\" \"npm run testNode18HttpsFips\" \"npm run testNode16Https\" && npm run testkill",
+		"test15Https11Fips": "npm run testkill && docker run -d --name cass-test -p443:443 -e CASS_LOOPBACK -e HTTPS=true -e HTTP2=false cassproject/cass:1.5.37 && wait-on https://localhost/api/ping && concurrently --kill-others-on-fail \"npm run testCypressHttps\" \"npm run testNode20Https\" \"npm run testNode20HttpsFips\" \"npm run testNode20HttpsForceFips\" \"npm run testNode18Https\" \"npm run testNode18HttpsFips\" \"npm run testNode16Https\" && npm run testkill",
 		"test15Https": "npm run testkill && docker run -d --name cass-test -p443:443 -e CASS_LOOPBACK -e HTTPS=true cassproject/cass:1.5.32 && wait-on https://localhost/api/ping && concurrently --kill-others-on-fail \"npm run testCypressHttps\" \"npm run testNode20Https\" \"npm run testNode20HttpsFips\" \"npm run testNode18Https\" \"npm run testNode18HttpsFips\" \"npm run testNode16Https\" && npm run testkill",
 		"test15Https11": "npm run testkill && docker run -d --name cass-test -p443:443 -e CASS_LOOPBACK -e HTTPS=true -e HTTP2=false cassproject/cass:1.5.32 && wait-on https://localhost/api/ping && concurrently --kill-others-on-fail \"npm run testCypressHttps\" \"npm run testNode20Https\" \"npm run testNode20HttpsFips\" \"npm run testNode18Https\" \"npm run testNode18HttpsFips\" \"npm run testNode16Https\" && npm run testkill",
-		"test15Fips": "export CASS_LOOPBACK=http://localhost/api/|| set CASS_LOOPBACK=http://localhost/api/&& npm run testkill15 && docker run -d -e CASS_LOOPBACK --name cass-test15 -p80:80 cassproject/cass:1.5.35 && wait-on http://localhost/api/ping && concurrently --kill-others-on-fail \"npm run testCypress\" \"npm run testNode20\" \"npm run testNode20Fips\" \"npm run testNode20ForceFips\" \"npm run testNode18\" \"npm run testNode18Fips\" \"npm run testNode16\" && npm run testkill15",
+		"test15Fips": "export CASS_LOOPBACK=http://localhost/api/|| set CASS_LOOPBACK=http://localhost/api/&& npm run testkill15 && docker run -d -e CASS_LOOPBACK --name cass-test15 -p80:80 cassproject/cass:1.5.37 && wait-on http://localhost/api/ping && concurrently --kill-others-on-fail \"npm run testCypress\" \"npm run testNode20\" \"npm run testNode20Fips\" \"npm run testNode20ForceFips\" \"npm run testNode18\" \"npm run testNode18Fips\" \"npm run testNode16\" && npm run testkill15",
 		"test15": "export CASS_LOOPBACK=http://localhost/api/|| set CASS_LOOPBACK=http://localhost/api/&& npm run testkill15 && docker run -d -e CASS_LOOPBACK --name cass-test15 -p80:80 cassproject/cass:1.5.32 && wait-on http://localhost/api/ping && concurrently --kill-others-on-fail \"npm run testCypress\" \"npm run testNode20\" \"npm run testNode20Fips\" \"npm run testNode18\" \"npm run testNode18Fips\" \"npm run testNode16\" && npm run testkill15",
 		"test14": "npm run testkill14 && docker run -d -e CASS_LOOPBACK --name cass-test14 -p80:80 cassproject/cass:1.4.4 && wait-on http://localhost/api/ping && concurrently --kill-others-on-fail \"npm run testCypress\" \"npm run testNode16\" && npm run testkill14",
 		"test13": "npm run testkill13 && docker run -d -e CASS_LOOPBACK --name cass-test13 -p80:80 cassproject/cass:1.3.18 && wait-on http://localhost/api/ping && concurrently --kill-others-on-fail \"npm run testCypress\" \"npm run testNode16\" && npm run testkill13",
@@ -23,6 +23,7 @@
 		"testkill13": "docker kill cass-test13 | exit 0 && docker rm cass-test13 | exit 0",
 		"testkill12": "docker kill cass-test12 | exit 0 && docker rm cass-test12 | exit 0",
 		"testkill": "docker kill cass-test | exit 0 && docker rm cass-test | exit 0",
+		"testNode21Https": "docker build --progress plain -f docker/node21https -t npm-cass21https . & docker run -e CASS_LOOPBACK  --rm --network=\"host\" npm-cass21https",
 		"testNode20": "docker build --progress plain -f docker/node20 -t npm-cass20 . & docker run -e CASS_LOOPBACK --rm --network=\"host\" npm-cass20",
 		"testNode20Https": "docker build --progress plain -f docker/node20https -t npm-cass20https . & docker run -e CASS_LOOPBACK  --rm --network=\"host\" npm-cass20https",
 		"testNode20HttpsFips": "docker build --progress plain -f docker/node20httpsfips -t npm-cass20httpsfips . & docker run -e CASS_LOOPBACK  --rm --network=\"host\" npm-cass20httpsfips",
@@ -51,7 +52,8 @@
 		"mochaFips": "mocha -n 'force-fips' --timeout 15000 -b src/**/*.test.js",
 		"mocha:httpsNoHttp2": "export HTTP2=false|| set HTTP2=false&& mocha --timeout 15000 -b src/**/*.test.js",
 		"mocha:https": "mocha --timeout 15000 -b src/**/*.test.js",
-		"mocha:clientSideCertificates": "export CASS_LOOPBACK=https://localhost/api/|| set CASS_LOOPBACK=https://localhost/api/&& mocha --timeout 15000 -b src/**/*.test.js",
+		"mocha:clientSideCertificates": "export NODE_EXTRA_CA_CERTS=ca.crt|| set NODE_EXTRA_CA_CERTS=ca.crt&&export CASS_LOOPBACK=https://localhost/api/|| set CASS_LOOPBACK=https://localhost/api/&&export HTTP2=false|| set HTTP2=false&& mocha --timeout 15000 -b src/**/*.test.js",
+		"mocha:clientSideCertificatesDangerMouse": "export NODE_EXTRA_CA_CERTS=ca.crt|| set NODE_EXTRA_CA_CERTS=ca.crt&&export CASS_LOOPBACK=https://localhost/api/|| set CASS_LOOPBACK=https://localhost/api/&&export HTTP2=false|| set HTTP2=false&& mocha --timeout 15000 -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 300000 -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 300000 -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 300000 -b src/**/*.test.js",
@@ -75,7 +77,7 @@
 		"webpack:cypress": "cypress run --config-file cypressWebpack.config.js --headless --browser chrome",
 		"webpack:cypressHttps": "cypress run -e CASS_LOOPBACK=https://localhost/api/ --config-file cypressWebpack.config.js --headless --browser chrome",
 		"webpack:cypressEdge": "cypress run --config-file cypressWebpack.config.js --headless --browser edge",
-		"webpack:cypressEdgeHttps": "cypress run -e CASS_LOOPBACK=https://localhost/api/ --config-file cypressWebpack.config.js --headless --browser edge"
+		"webpack:cypressEdgeHttps": "cypress run -e CASS_LOOPBACK=https://localhost/api/ --config-file cypressWebpack.config.js --browser edge"
 	},
 	"contributors": [
 		{
@@ -104,11 +106,8 @@
 		}
 	],
 	"dependencies": {
-		"axios": "1.1.3",
 		"base64-arraybuffer": "^1.0.2",
 		"forge": "^2.3.0",
-		"form-data": "^4.0.0",
-		"http2-wrapper": "^2.2.0",
 		"jsonld": "^8.3.1",
 		"node-forge": "^1.3.1",
 		"papaparse": "^5.4.1",
@@ -139,24 +138,25 @@
 	},
 	"homepage": "https://github.com/cassproject/cass-npm#readme",
 	"devDependencies": {
-		"@babel/core": "^7.23.0",
-		"@babel/preset-env": "^7.22.20",
+		"@babel/core": "^7.23.2",
+		"@babel/preset-env": "^7.23.2",
 		"@cypress/browserify-preprocessor": "^3.0.2",
 		"@cypress/vite-dev-server": "^5.0.6",
 		"@cypress/webpack-preprocessor": "^6.0.0",
 		"babel-eslint": "^10.1.0",
 		"babel-plugin-transform-remove-strict-mode": "^0.0.2",
 		"chai": "^4.3.10",
-		"concurrently": "^8.2.1",
+		"concurrently": "^8.2.2",
 		"convert-hrtime": "^5.0.0",
-		"cypress": "^13.3.0",
-		"eslint": "^8.50.0",
+		"cypress": "^13.3.3",
+		"eslint": "^8.52.0",
 		"mocha": "^10.2.0",
 		"node-polyfill-webpack-plugin": "^2.0.1",
 		"nodemon": "^3.0.1",
 		"nyc": "^15.1.0",
 		"wait-on": "^7.0.1",
-		"webpack": "^5.88.2",
-		"webpack-cli": "^5.1.4"
+		"webpack": "^5.89.0",
+		"webpack-cli": "^5.1.4",
+		"wtfnode": "^0.9.1"
 	}
 }

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

@@ -27,7 +27,7 @@ let realCrypto = require('crypto');
  */
 module.exports = class EcAesCtrAsync {
 	static fipsOn(){		
-		if (process && process.env && process.env.FIPS)
+		if (typeof process !== 'undefined' && process && process.env && process.env.FIPS)
 		if (realCrypto.getFips() == 0)
 			try {
 				realCrypto.setFips(true);
@@ -39,7 +39,7 @@ module.exports = class EcAesCtrAsync {
 	}
 
 	static fipsOff(){	
-		if (process && process.env && process.env.FIPS)	
+		if (typeof process !== 'undefined' && process && process.env && process.env.FIPS)	
 		if (realCrypto.getFips() == 1)
 			try {
 				realCrypto.setFips(false);

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

@@ -198,7 +198,7 @@ module.exports = class EcRsaOaepAsync {
 			crypto === undefined ||
 			crypto.subtle == null ||
 			crypto.subtle === undefined || 
-			(process && process.env && process.env.FIPS)
+			(typeof process !== 'undefined' && process && process.env && process.env.FIPS)
 		) {
 			return EcRsaOaepAsyncWorker.sign(ppk, text, success, failure);
 		}

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

@@ -1,8 +1,3 @@
-const envHttp2 = process.env.HTTP2 != null ? process.env.HTTP2.trim() == 'true' : true;
-if (!envHttp2)
-{
-    global.axios = require("axios"); //Pre-empt http2 use.
-}
 const EcRemote = require("../remote/EcRemote.js");
 let EcFrameworkGraph = require("./EcFrameworkGraph.js");
 const EcFramework = require("../../../../org/cass/competency/EcFramework.js");
@@ -35,17 +30,9 @@ let assert = chai.assert;
 after(()=>EcRsaOaepAsyncWorker.teardown());
 
 let deleteById = async function (id) {
-    await EcRepository.get(
-        id,
-        function (p1) {
-            EcRepository._delete(p1, null, function (p1) {
-                console.log(p1);
-            });
-        },
-        function (p1) {
-            console.log(p1);
-        }
-    );
+    let p1 = await EcRepository.get(id);
+    if (p1 != null)
+        await EcRepository._delete(p1);
 };
 let failure = function (p1) {
     console.trace(p1);

package/src/com/eduworks/ec/promises/helpers.js

@@ -12,7 +12,7 @@ module.exports = {
     cassReturnAsPromise: function (o, success, failure, error) {
         let p = new Promise((resolve, reject) => {
             if (o === undefined || o == null) {
-                // console.trace(error);
+                //  console.trace(error);
                 reject(new Error(error));
             } else
                 resolve(o);

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

@@ -1,7 +1,7 @@
 require("../../../../org/cassproject/general/AuditLogger.js");
 
-global.axiosOptions = {};
-global.corsOrigins = [];
+let DEBUG = false;
+
 let isNode = false;    
 if (typeof process === 'object') {
   if (typeof process.versions === 'object') {
@@ -10,11 +10,24 @@ if (typeof process === 'object') {
     }
   }
 }
+if (isNode)
+{	
+	let undici = eval("require('undici');");
+	if (undici != null)
+	{
+		var {setGlobalDispatcher,Agent,fetch} = undici;
+		setGlobalDispatcher(new Agent({
+			allowH2: process.env.HTTP2 != null ? process.env.HTTP2.trim() == 'true' : true
+		}))
+	}
+}
+if (typeof window !== 'undefined' && window.fetch != null)
+	var fetch = window.fetch;
 
 if (isNode)
 {
 	try{
-		const dns = require('node:dns');
+		var dns = require('node:dns');
 		if (dns && dns.setDefaultResultOrder)
 		{
 			//Support for Node 18 using Docker containers with a network that doesn't support ipv6 loopback.
@@ -22,123 +35,12 @@ if (isNode)
 		}
 	} 
 	catch(ex){
-	}
-}
-
-global.httpOptions = [];
-global.http2Enabled = {};
-let axios = null;
-if (global.axios == null)
-{
-	let axiosModule = require("axios");
-	if (axiosModule.default != null) 
-		axiosModule = axiosModule.default;
-	global.axios = axios = axiosModule;
-	if (isNode)
-	{
-		let http2;
-		let https;
-		try {
-			http2 = require("http2-wrapper");
-			https = require("https");
-		} catch(e) {
-			global.auditLogger.report(global.auditLogger.LogCategory.NETWORK, global.auditLogger.Severity.ERROR, "EcRemoteInitHttp2", e);
-		}
-		function http2AdapterEnhancer(adapter) {
-			return async (config) => {
-				if (config.http2 && config.url.startsWith("https")) {
-					let req;
-					if (global.ca != null)
-						config.ca = global.ca;
-					config.transport = {
-						request: function request(options, handleResponse) {
-							if (global.ca != null)
-								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);
-					while (global.httpOptions.length > 0)
-					{
-						let options = global.httpOptions.pop();
-						if (global.ca != null)
-							options.cert = global.ca;
-						options.ALPNProtocols = ['h2', 'http/1.1'];
-						if (options.port == null || options.port == '')
-							options.port = 443;
-						if (options.host == null && options.hostname != null)
-							options.host = options.hostname;
-						let result = await http2.auto.resolveProtocol(options);
-						if (result.alpnProtocol == "http/1.1")
-							http2Enabled[options.hostname] = false;
-						else if (result.alpnProtocol == "h2")
-							http2Enabled[options.hostname] = true;
-					}
-
-					// Remove the axios action `socket.setKeepAlive` because the HTTP/2 sockets should not be directly manipulated
-					const listeners = req.listeners("socket");
-					if (listeners.length) req.removeListener("socket", listeners[0]);
-					return ret;
-				} else {
-					return adapter(config);
-				}
-			};
-		}
-		axiosOptions.http2 = true;
-		axiosOptions.adapter = http2AdapterEnhancer(axios.defaults.adapter);
-	}
-} else {
-	if (global.axios.default != null) 
-		global.axios = global.axios.default;
-	axios = global.axios;
-	if (isNode)
-	{
-		let https;
-		try {
-			https = require("https");
-		} catch(e) {
-			global.auditLogger.report(global.auditLogger.LogCategory.NETWORK, global.auditLogger.Severity.ERROR, "EcRemoteInitHttps", 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) {
-							if (global.ca != null)
-								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);
+		console.log(ex);
 	}
 }
 
 const { cassPromisify } = require("../promises/helpers");
 
-getAxiosOptions = function(url) {
-	let newOptions = Object.assign({}, axiosOptions);
-	if (corsOrigins.findIndex((x) => url.startsWith(x)) > -1)
-		newOptions.withCredentials = true;
-	return newOptions;
-}
-
 /**
  *  Wrapper to handle all remote web service invocations.
  *
@@ -243,6 +145,8 @@ module.exports = class EcRemote {
 		successCallback,
 		failureCallback
 	) {
+		if (DEBUG)
+			console.log("POST " + server + "" + (service || "") + " " + headers + fd);
 		let url = server;
 		if (!url.endsWith("/") && service != null && !("" == service)) {
 			url += "/";
@@ -251,42 +155,46 @@ module.exports = class EcRemote {
 			url += service;
 		}
 		url = EcRemote.upgradeHttpToHttps(url);
-		let postHeaders = null;
-		if (fd.getHeaders != null)
-		{
-			postHeaders = fd.getHeaders();
-			postHeaders["Content-Type"] = null;
-		}
-		 else
-		  	postHeaders = {
-		  		"Content-Type": null
-		  	}
-		if (fd.getLengthSync != null)
-			postHeaders["content-length"] = fd.getLengthSync();
-		if (headers !== undefined && headers != null)
-			for (let header in headers) postHeaders[header] = headers[header];
-
-		let p = axios.post(url, fd, {
-				...getAxiosOptions(url),
-				headers: postHeaders,
-				maxContentLength: Infinity,
-				maxBodyLength: Infinity
-			})
-			.then((response) => {
-				return response.data;
-			})
-			.catch((err) => {
-				if (err != null) {
-					global.auditLogger.report(global.auditLogger.LogCategory.NETWORK, global.auditLogger.Severity.ERROR, "EcRemotePostInner", err && err.response && err.response.request && err.response.request.socket ? err.response.request.socket.remoteAddress : '', url, postHeaders, err);
-					if (err.response != null) {
-						if (err.response.data != null)
-							throw err.response.data;
-						throw err;
-					}
-					throw err;
+		
+		let p = fetch(url, {
+			method: 'POST',
+			body: fd,
+			headers: headers || {},
+		}).then(async (response) => {
+			if (!response.ok) {
+				throw new Error(response.statusText);
+			}
+ 			const contentType = response.headers.get("content-type");
+			let result = null;
+			if (contentType && contentType.indexOf("application/json") !== -1) {
+				result = await response.json();
+			} else {
+				result = await response.text();
+				try{
+					result = JSON.parse(result);
+				}
+				catch(ex) {
+					// Text is not json
 				}
-				else global.auditLogger.report(global.auditLogger.LogCategory.NETWORK, global.auditLogger.Severity.ERROR, "EcRemotePostInner", "Internal error in Axios?");
-			});
+			}		
+			return result;
+		}).catch((err) => {
+			if (isNode && typeof dns !== 'undefined') {
+				dns.lookup(new URL(url).hostname, ((error, address) => {
+					if (error) {
+						global.auditLogger.report(global.auditLogger.LogCategory.NETWORK, global.auditLogger.Severity.ERROR, "DNSLookup", url, error);
+						global.auditLogger.report(global.auditLogger.LogCategory.NETWORK, global.auditLogger.Severity.ERROR, "EcRemotePostInner", url, headers, err);
+					} else {
+						global.auditLogger.report(global.auditLogger.LogCategory.NETWORK, global.auditLogger.Severity.ERROR, "EcRemotePostInner", address, url, headers, err);
+					}
+				}))
+			} else {
+				global.auditLogger.report(global.auditLogger.LogCategory.NETWORK, global.auditLogger.Severity.ERROR, "EcRemotePostInner", url, headers, err);
+			}
+			
+			throw err;
+		})
+
 		return cassPromisify(p, successCallback, failureCallback);
 	}
 	/**
@@ -319,25 +227,56 @@ module.exports = class EcRemote {
 	 *  @static
 	 */
 	static getExpectingString(server, service, success, failure) {
+		if (DEBUG)
+			console.log("GET " + server + "" + (service || ""));
 		let url = EcRemote.urlAppend(server, service);
 		url = EcRemote.upgradeHttpToHttps(url);
-		let p = axios
-			.get(url,getAxiosOptions(url))
-			.then((response) => {
-				global.auditLogger.report(global.auditLogger.LogCategory.NETWORK, global.auditLogger.Severity.INFO, "EcRemoteGetExpectString", response.request.socket ? response.request.socket.remoteAddress : '', url);
-				return response.data;
-			})
-			.catch((err) => {
-				global.auditLogger.report(global.auditLogger.LogCategory.NETWORK, global.auditLogger.Severity.ERROR, "EcRemoteGetExpectString", err && err.response && err.response.request && err.response.request.socket ? err.response.request.socket.remoteAddress : '', url, err);
-				if (err) {
-					if (err.response) {
-						if (err.response.data)
-							throw err.response.data;
-					}
-					throw err.response;
+		let p = fetch(url).then(async (response) => {
+			if (!response.ok) {
+				throw new Error(response.statusText);
+			}
+			const contentType = response.headers.get("content-type");
+			let result = null;
+			if (contentType && contentType.indexOf("application/json") !== -1) {
+				result = await response.json();
+			} else {
+				result = await response.text();
+				try{
+					result = JSON.parse(result);
+				}
+				catch(ex) {
+					// Text is not json
 				}
-				throw err;
-			});
+			}
+			if (isNode && typeof dns !== 'undefined') {
+				dns.lookup(new URL(url).hostname, ((error, address) => {
+					if (error) {
+						global.auditLogger.report(global.auditLogger.LogCategory.NETWORK, global.auditLogger.Severity.ERROR, "DNSLookup", url, error);
+						global.auditLogger.report(global.auditLogger.LogCategory.NETWORK, global.auditLogger.Severity.INFO, "EcRemoteGetExpectString", url);
+					} else {
+						global.auditLogger.report(global.auditLogger.LogCategory.NETWORK, global.auditLogger.Severity.INFO, "EcRemoteGetExpectString", address, url);
+					}
+				}))
+			} else {
+				global.auditLogger.report(global.auditLogger.LogCategory.NETWORK, global.auditLogger.Severity.INFO, "EcRemoteGetExpectString", url);
+			}
+			return result;
+	   }).catch((err) => {
+			if (isNode && typeof dns !== 'undefined') {
+				dns.lookup(new URL(url).hostname, ((error, address) => {
+					if (error) {
+						global.auditLogger.report(global.auditLogger.LogCategory.NETWORK, global.auditLogger.Severity.ERROR, "DNSLookup", url, error);
+						global.auditLogger.report(global.auditLogger.LogCategory.NETWORK, global.auditLogger.Severity.ERROR, "EcRemoteGetExpectString", url, err);
+					} else {
+						global.auditLogger.report(global.auditLogger.LogCategory.NETWORK, global.auditLogger.Severity.INFO, "EcRemoteGetExpectString", address, url, err);
+					}
+				}))
+			} else {
+				global.auditLogger.report(global.auditLogger.LogCategory.NETWORK, global.auditLogger.Severity.INFO, "EcRemoteGetExpectString", url, err);
+			}
+			throw err;
+		})
+
 		return cassPromisify(p, success, failure);
 	}
 	static urlAppend(server, service) {
@@ -364,26 +303,46 @@ module.exports = class EcRemote {
 	 *  @static
 	 */
 	static _delete(url, signatureSheet, success, failure) {
+		if (DEBUG)
+			console.log("DELETE " + url);
 		url = EcRemote.upgradeHttpToHttps(url);
-		let p = axios
-			.delete(url, {
-				...getAxiosOptions(url),
-				headers: { signatureSheet: signatureSheet }
-			})
-			.then((response) => {
-				return response.data;
-			})
-			.catch((err) => {
-				global.auditLogger.report(global.auditLogger.LogCategory.NETWORK, global.auditLogger.Severity.ERROR, "EcRemoteDelete", err && err.response && err.response.request && err.response.request.socket ? err.response.request.socket.remoteAddress : '', url, signatureSheet, err);
-				if (err) {
-					if (err.response) {
-						if (err.response.data)
-							throw err.response.data;
-					}
-					throw err.response;
+
+		let p = fetch(url, {
+			method: 'DELETE',
+			headers: { signatureSheet: signatureSheet }
+		}).then(async (response) => {
+			if (!response.ok) {
+				throw new Error(response.statusText);
+			}
+			const contentType = response.headers.get("content-type");
+			let result = null;
+			if (contentType && contentType.indexOf("application/json") !== -1) {
+				result = await response.json();
+			} else {
+				result = await response.text();
+				try{
+					result = JSON.parse(result);
+				}
+				catch(ex) {
+					// Text is not json
 				}
-				throw err;
-			});
+			}		
+			return result;
+		}).catch((err) => {
+			if (isNode && typeof dns !== 'undefined') {
+				dns.lookup(new URL(url).hostname, ((error, address) => {
+					if (error) {
+						global.auditLogger.report(global.auditLogger.LogCategory.NETWORK, global.auditLogger.Severity.ERROR, "DNSLookup", url, signatureSheet, error);
+						global.auditLogger.report(global.auditLogger.LogCategory.NETWORK, global.auditLogger.Severity.ERROR, "EcRemoteDelete", url, signatureSheet, err);
+					} else {
+						global.auditLogger.report(global.auditLogger.LogCategory.NETWORK, global.auditLogger.Severity.INFO, "EcRemoteDelete", address, url, signatureSheet, err);
+					}
+				}))
+			} else {
+				global.auditLogger.report(global.auditLogger.LogCategory.NETWORK, global.auditLogger.Severity.INFO, "EcRemoteDelete", url, signatureSheet, err);
+			}
+			throw err;
+		})
 		return cassPromisify(p, success, failure);
 	}
 	static upgradeHttpToHttps(url) {

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

@@ -153,6 +153,12 @@ module.exports = class CTDLASNCSVImport {
 						}
 						delete pretranslatedE["ceterms:CTID"];
 					}
+					// Skip competency if ctid is specified
+					if (skip && Array.isArray(skip) && skip.length > 0) {
+						if (skip.find((element) => element.ctid ? element.ctid.includes(pretranslatedE["ceterms:ctid"]) : element === pretranslatedE["ceterms:ctid"])) {
+							continue;
+						}
+					}
 					if (
 						pretranslatedE["@type"] ==
 						"ceasn:CompetencyFramework"
@@ -164,6 +170,18 @@ module.exports = class CTDLASNCSVImport {
 							endpoint,
 							repo
 						);
+						for (let each in translator) {
+							// Make replacements for skipped duplicates
+							if (skip && Array.isArray(skip) && skip.length > 0) {
+								skip.forEach((element) => {
+									if (typeof translator[each] === 'string' && element.ctid && element.replaceWith) {
+										if (translator[each].contains(element.ctid.replace('ce-', ''))) {
+											translator[each] = translator[each].replace(element.ctid.replace('ce-', ''), element.replaceWith.replace('ce-', ''));
+										}
+									}
+								});
+							}
+						}
 						for (let each in translator) {
 							if (terms[each]) {
 								translator[terms[each]] = translator[each];
@@ -246,6 +264,16 @@ module.exports = class CTDLASNCSVImport {
 						frameworkRows[f.shortId()] = e;
 						f["ceasn:hasChild"] = null;
 						f["ceasn:hasTopChild"] = null;
+						// Remove skipped competencies
+						if (skip && Array.isArray(skip) && skip.length > 0 && f.competency) {
+							skip.forEach((element) => {
+								const id = (element.ctid ? element.ctid : element).replace('ce-', '');								
+								const index = f.competency.findIndex((comp) => comp.includes(id));
+								if (index) {
+									f.competency.splice(index, 1);
+								}
+							});
+						}
 						frameworkArray.push(f);
 						f.competency = [];
 						f.relation = [];
@@ -259,6 +287,18 @@ module.exports = class CTDLASNCSVImport {
 							endpoint,
 							repo
 						);
+						for (let each in translator) {
+							// Make replacements for skipped duplicates
+							if (skip && Array.isArray(skip) && skip.length > 0) {
+								skip.forEach((element) => {
+									if (typeof translator[each] === 'string' && element.ctid && element.replaceWith) {
+										if (translator[each].contains(element.ctid.replace('ce-', ''))) {
+											translator[each] = translator[each].replace(element.ctid.replace('ce-', ''), element.replaceWith.replace('ce-', ''));
+										}
+									}
+								});
+							}
+						}
 						for (let each in translator) {
 							if (terms[each]) {
 								translator[terms[each]] = translator[each];

package/src/org/cassproject/ebac/identity/EcIdentityManager.js

@@ -440,7 +440,7 @@ module.exports = class EcIdentityManager {
 	 *  @static
 	 */
 	createSignature(duration, server, ppk, algorithm) {
-		if (process && process.env && process.env.FIPS == null && realCrypto.getFips && realCrypto.getFips() == 1)
+		if (typeof process !== 'undefined' && process && process.env && process.env.FIPS == null && realCrypto.getFips && realCrypto.getFips() == 1)
 		{
 			algorithm = "SHA-256";
 		}

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

@@ -1,4 +1,4 @@
-let FormData = require("form-data");
+
 const {cassPromisify} = require("../../../../../com/eduworks/ec/promises/helpers");
 const EcRemote = require("../../../../../com/eduworks/ec/remote/EcRemote");
 const EbacCredentialCommit = require("../../../../../com/eduworks/schema/ebac/EbacCredentialCommit");
@@ -35,7 +35,7 @@ require("../../../general/AuditLogger.js")
  */
 module.exports = class EcRemoteIdentityManager extends RemoteIdentityManagerInterface {
 	server = null;
-	global = null;
+	// global = null;
 	usernameWithSalt = null;
 	passwordWithSalt = null;
 	secretWithSalt = null;

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

@@ -38,7 +38,7 @@ module.exports = class OAuth2FileBasedRemoteIdentityManager extends
 	configuration = null;
 	oauthLoginResponse = null;
 	network = null;
-	global = null;
+	// global = null;
 	/**
 	 *  Returns true if the identity manager is global. Returns false if the identity manager is local to the server.
 	 *

package/src/org/cassproject/ebac/repository/EcRepository.js

@@ -1,9 +1,8 @@
-const envHttp2 = process.env.HTTP2 != null ? process.env.HTTP2.trim() == 'true' : true;
-if (!envHttp2)
+if (typeof process !== 'undefined' && process.version && process.version.startsWith("v16"))
 {
-    global.axios = require("axios"); //Pre-empt http2 use.
+	console.log("Loading polyfill for FormData.");
+	FormData = eval("require('undici').FormData");
 }
-let FormData = require("form-data");
 const EcObject = require("../../../../com/eduworks/ec/array/EcObject");
 const EcEncryptedValue = require("./EcEncryptedValue");
 const EcIdentityManager = require("../identity/EcIdentityManager");

package/src/org/cassproject/ebac/repository/EcRepository.test.js

@@ -1,3 +1,4 @@
+
 const EcRemote = require("../../../../com/eduworks/ec/remote/EcRemote.js");
 const EcFramework = require("../../../../org/cass/competency/EcFramework.js");
 const EcRepository = require("../../../../org/cassproject/ebac/repository/EcRepository.js");