cassproject 5.0.22 → 5.0.23

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

@@ -115,64 +115,63 @@ module.exports = class EcRemoteIdentityManager extends RemoteIdentityManagerInte
 	 *  @method configureFromServer
 	 */
 	async configureFromServer(success, failure) {
-		let me = this;
 		return cassPromisify(
 			EcRemote.getExpectingObject(
 				this.server,
 				"sky/id/salts",
-				function (p1) {
-					me.usernameSalt = p1["usernameSalt"];
-					if (me.usernameSalt.length < 16) {
+				(p1) => {
+					this.usernameSalt = p1["usernameSalt"];
+					if (this.usernameSalt.length < 16) {
 						throw new Error("Insufficient length on Username Salt");
 					}
-					me.usernameIterations = Math.trunc(
+					this.usernameIterations = Math.trunc(
 						p1["usernameIterations"]
 					);
-					if (me.usernameIterations < 1000) {
+					if (this.usernameIterations < 1000) {
 						throw new Error(
 							"Insufficient iterations on Username Hash"
 						);
 					}
-					me.usernameWidth = Math.trunc(p1["usernameLength"]);
-					if (me.usernameWidth != 64) {
+					this.usernameWidth = Math.trunc(p1["usernameLength"]);
+					if (this.usernameWidth != 64) {
 						throw new Error(
 							"Username Hash required to be length 64."
 						);
 					}
-					me.passwordSalt = p1["passwordSalt"];
-					if (me.passwordSalt.length < 16) {
+					this.passwordSalt = p1["passwordSalt"];
+					if (this.passwordSalt.length < 16) {
 						throw new Error("Insufficient length on Password Salt");
 					}
-					me.passwordIterations = Math.trunc(
+					this.passwordIterations = Math.trunc(
 						p1["passwordIterations"]
 					);
-					if (me.passwordIterations < 1000) {
+					if (this.passwordIterations < 1000) {
 						throw new Error(
 							"Insufficient iterations on Password Hash"
 						);
 					}
-					me.passwordWidth = Math.trunc(p1["passwordLength"]);
-					if (me.passwordWidth != 64) {
+					this.passwordWidth = Math.trunc(p1["passwordLength"]);
+					if (this.passwordWidth != 64) {
 						throw new Error(
 							"Password Hash required to be length 64."
 						);
 					}
-					me.secretSalt = p1["secretSalt"];
-					if (me.secretSalt.length < 16) {
+					this.secretSalt = p1["secretSalt"];
+					if (this.secretSalt.length < 16) {
 						throw new Error("Insufficient length on Secret Salt");
 					}
-					me.secretIterations = Math.trunc(p1["secretIterations"]);
-					if (me.secretIterations < 1000) {
+					this.secretIterations = Math.trunc(p1["secretIterations"]);
+					if (this.secretIterations < 1000) {
 						throw new Error(
 							"Insufficient iterations on Secret Hash"
 						);
 					}
-					me.signatureSheetHashAlgorithm = p1["signatureSheetHashAlgorithm"];
-					me.configured = true;
+					this.signatureSheetHashAlgorithm = p1["signatureSheetHashAlgorithm"];
+					this.configured = true;
 					return p1;
 				},
-				function (p1) {
-					me.configured = false;
+				(p1) => {
+					this.configured = false;
 					throw new Error(p1);
 				}
 			),
@@ -344,7 +343,6 @@ module.exports = class EcRemoteIdentityManager extends RemoteIdentityManagerInte
 		r.password = this.passwordWithSalt;
 		let fd = new FormData();
 		fd.append("credentialRequest", r.toJson());
-		let me = this;
 		return cassPromisify(
 			EcRemote.postExpectingObject(
 				this.server,
@@ -353,32 +351,31 @@ module.exports = class EcRemoteIdentityManager extends RemoteIdentityManagerInte
 				async (arg0) => {
 					let eim = new EcIdentityManager();
 					let cs = arg0;
-					me.pad = cs.pad;
-					me.token = cs.token;
+					this.pad = cs.pad;
+					this.token = cs.token;
 					let shouldCommit = false;
 					if (cs.credentials != null)
-						for (let i = 0; i < cs.credentials.length; i++) {
-							let c = cs.credentials[i];
+						for (const c of cs.credentials) {
 							let identity = null;
 							try{
 								identity = await EcIdentity.fromCredential(
 									c,
-									me.secretWithSalt,
-									me.server
+									this.secretWithSalt,
+									this.server
 								);
-							} 
+							}
 							catch(ex)
 							{
 								global.auditLogger.report(global.auditLogger.LogCategory.SYSTEM, global.auditLogger.Severity.ERROR, "EcRemoIdenManaFetch", ex);
 							}
-							if (identity == null || identity.ppk == null)
-							{						
+							if (identity?.ppk == null)
+							{
 								//Try alternate method of getting credential.
-								let newSecretWithSalt = forge.util.encode64(forge.pkcs5.pbkdf2('',this.secretSalt,this.secretIterations,32));								
+								let newSecretWithSalt = forge.util.encode64(forge.pkcs5.pbkdf2('',this.secretSalt,this.secretIterations,32));
 								identity = await EcIdentity.fromCredential(
 									c,
 									newSecretWithSalt,
-									me.server
+									this.server
 								);
 								shouldCommit = true;
 							}
@@ -388,37 +385,36 @@ module.exports = class EcRemoteIdentityManager extends RemoteIdentityManagerInte
 							eim.addIdentity(identity);
 						}
 					if (cs.contacts != null)
-						for (let i = 0; i < cs.contacts.length; i++) {
-							let c = cs.contacts[i];
+						for (const c of cs.contacts) {
 							let identity = null;
 							try{
-								identity = await EcContact.fromEncryptedContact(
+								identity = EcContact.fromEncryptedContact(
 									c,
-									me.secretWithSalt,
-									me.server
+									this.secretWithSalt,
+									this.server
 								);
-							} 
+							}
 							catch(ex)
 							{
 								global.auditLogger.report(global.auditLogger.LogCategory.SYSTEM, global.auditLogger.Severity.ERROR, "EcRemoIdenManaFetch", ex);
 							}
-							if (identity == null || identity.pk == null)
-							{					
+							if (identity?.pk == null)
+							{
 								//Try alternate method of getting contact.
-								let newSecretWithSalt = forge.util.encode64(forge.pkcs5.pbkdf2('',this.secretSalt,this.secretIterations,32));								
-								identity = await EcContact.fromEncryptedContact(
+								let newSecretWithSalt = forge.util.encode64(forge.pkcs5.pbkdf2('',this.secretSalt,this.secretIterations,32));
+								identity = EcContact.fromEncryptedContact(
 									c,
 									newSecretWithSalt,
-									me.server
+									this.server
 								);
 								shouldCommit = true;
-							}					
+							}
 							if (identity.pk == null)
-								throw new Error("Could not retreive encrypted pks from credential packet.")		
+								throw new Error("Could not retreive encrypted pks from credential packet.")
 							eim.addContact(identity);
 						}
-						if (shouldCommit)
-							await me.commit(null,null,eim);
+					if (shouldCommit)
+						await this.commit(null,null,eim);
 					return eim;
 				},
 				function (arg0) {
@@ -490,14 +486,12 @@ module.exports = class EcRemoteIdentityManager extends RemoteIdentityManagerInte
 		}
 		let credentials = [];
 		let contacts = [];
-		for (let i = 0; i < eim.ids.length; i++) {
-			let id = eim.ids[i];
+		for (const id of eim.ids) {
 			if (id.source != null && id.source != this.server) continue;
 			id.source = this.server;
 			credentials.push(await id.toCredential(this.secretWithSalt));
 		}
-		for (let i = 0; i < eim.contacts.length; i++) {
-			let id = eim.contacts[i];
+		for (const id of eim.contacts) {
 			if (id.source != null && id.source != this.server) continue;
 			id.source = this.server;
 			contacts.push(await id.toEncryptedContact(this.secretWithSalt));
@@ -511,7 +505,6 @@ module.exports = class EcRemoteIdentityManager extends RemoteIdentityManagerInte
 		commit.credentials.contacts = contacts;
 		let fd = new FormData();
 		fd.append("credentialCommit", commit.toJson());
-		let me = this;
 		return cassPromisify(
 			eim.signatureSheet(
 				60000,
@@ -519,7 +512,7 @@ module.exports = class EcRemoteIdentityManager extends RemoteIdentityManagerInte
 				async (p1) => {
 					fd.append("signatureSheet", p1);
 					return await EcRemote.postExpectingString(
-						me.server,
+						this.server,
 						service,
 						fd,
 						function (arg0) {
@@ -553,13 +546,9 @@ module.exports = class EcRemoteIdentityManager extends RemoteIdentityManagerInte
 		let passwordSplice = "";
 		for (let charIndex = 0; true; charIndex++) {
 			let foundAny = false;
-			for (
-				let passwordIndex = 0;
-				passwordIndex < passwords.length;
-				passwordIndex++
-			) {
-				if (charIndex >= passwords[passwordIndex].length) continue;
-				passwordSplice += passwords[passwordIndex].charAt(charIndex);
+			for (const password of passwords) {
+				if (charIndex >= password.length) continue;
+				passwordSplice += password.charAt(charIndex);
 				foundAny = true;
 			}
 			if (!foundAny) break;

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

@@ -14,22 +14,21 @@ module.exports = class OAuth2FileBasedRemoteIdentityManager extends
 	 */
 	constructor() {
 		super();
-		let me = this;
 		EcRemote.getExpectingObject(
 			"",
 			"hello.json",
-			function(o) {
+			(o) => {
 				try {
-					me.configuration = JSON.parse(JSON.stringify(o));
+					this.configuration = structuredClone(o);
 					hello.init(o);
-					me.oauthEnabled = true;
+					this.oauthEnabled = true;
 					initialized();
-				} catch (ex) {
-					me.oauthEnabled = false;
+				} catch (ex) { // NOSONAR - hello.js missing, a bad configuration or no initialized() hook: run without OAuth.
+					this.oauthEnabled = false;
 				}
 			},
-			function(s) {
-				me.oauthEnabled = false;
+			(s) => {
+				this.oauthEnabled = false;
 			}
 		);
 	}
@@ -94,36 +93,34 @@ module.exports = class OAuth2FileBasedRemoteIdentityManager extends
 		let o = {};
 		o["scope"] = this.configuration[this.server + "Scope"];
 		o["display"] = "page";
-		let me = this;
-		hello.on("auth.login", function(o) {
-			me.oauthLoginResponse = o;
-			me.network = me.oauthLoginResponse["network"];
+		hello.on("auth.login", (o) => {
+			this.oauthLoginResponse = o;
+			this.network = this.oauthLoginResponse["network"];
 			hello
-				.api(me.network + "/me/folders", "get", {})
-				.then(function(folderResponse) {
+				.api(this.network + "/me/folders", "get", {})
+				.then((folderResponse) => {
 					let folders = folderResponse["data"];
 					let foundIdentities = false;
 					let foundContacts = false;
-					for (let i = 0; i < folders.length; i++) {
-						let d = folders[i];
+					for (const d of folders) {
 						let name = d["name"];
 						let id = d["id"];
 						if (name == "CASS Identities") {
 							foundIdentities = true;
-							me.hookIdentityManagerIdentities(id);
-							me.readIdentityFiles(id, success, failure);
+							this.hookIdentityManagerIdentities(id);
+							this.readIdentityFiles(id, success, failure);
 						}
 						if (name == "CASS Contacts") {
 							foundContacts = true;
-							me.hookIdentityManagerContacts(id);
-							me.readContactFiles(id, success, failure);
+							this.hookIdentityManagerContacts(id);
+							this.readContactFiles(id, success, failure);
 						}
 					}
 					if (!foundIdentities) {
-						me.createIdentityFolder(success);
+						this.createIdentityFolder(success);
 					}
 					if (!foundContacts) {
-						me.createContactFolder();
+						this.createContactFolder();
 					}
 				})
 				.fail(failure);
@@ -131,31 +128,28 @@ module.exports = class OAuth2FileBasedRemoteIdentityManager extends
 		hello.login(this.server, o).fail(failure);
 	}
 	createContactFolder() {
-		let me = this;
 		let o = {};
 		o["name"] = "CASS Contacts";
-		hello.api(me.network + "/me/folders", "post", o).then(function(r) {
-			me.hookIdentityManagerContacts(r["id"]);
+		hello.api(this.network + "/me/folders", "post", o).then((r) => {
+			this.hookIdentityManagerContacts(r["id"]);
 		});
 	}
 	createIdentityFolder(success) {
-		let me = this;
 		let o = {};
 		o["name"] = "CASS Identities";
-		hello.api(me.network + "/me/folders", "post", o).then(function(r) {
-			me.hookIdentityManagerIdentities(r["id"]);
+		hello.api(this.network + "/me/folders", "post", o).then((r) => {
+			this.hookIdentityManagerIdentities(r["id"]);
 			success(r);
 		});
 	}
 	writeIdentityFiles(folderId, success, eim) {
 		if (eim === undefined || eim == null)
 			eim = EcIdentityManager.default;
-		let me = this;
 		let helper = new EcAsyncHelper();
 		helper.each(
 			eim.ids,
-			function(identity, callback0) {
-				me.writeIdentityFile(folderId, identity, callback0);
+			(identity, callback0) => {
+				this.writeIdentityFile(folderId, identity, callback0);
 			},
 			function(strings) {
 				success(strings);
@@ -189,8 +183,8 @@ module.exports = class OAuth2FileBasedRemoteIdentityManager extends
 	writeContactFiles(folderId, eim) {
 		if (eim === undefined || eim == null)
 			eim = EcIdentityManager.default;
-		for (let i = 0; i < eim.contacts.length; i++) {
-			this.writeContactFile(folderId, eim.contacts[i]);
+		for (const contact of eim.contacts) {
+			this.writeContactFile(folderId, contact);
 		}
 	}
 	writeContactFile(folderId, contact) {
@@ -217,27 +211,26 @@ module.exports = class OAuth2FileBasedRemoteIdentityManager extends
 			});
 	}
 	readIdentityFiles(folderId, success, failure, eim) {
-		let me = this;
 		let o = {};
 		o["parent"] = folderId;
 		if (eim === undefined || eim == null)
 			eim = EcIdentityManager.default;
 		hello
 			.api(this.network + "/me/files", "get", o)
-			.then(function(folderResponse) {
+			.then((folderResponse) => {
 				let files = folderResponse["data"];
 				let h = new EcAsyncHelper();
 				h.each(
 					files,
-					function(d, callback0) {
-						let name = d["name"].replace("\\.pem", "");
+					(d, callback0) => {
+						let name = d["name"].replace(String.raw`\.pem`, "");
 						let id = d["id"];
 						let directLink = d["downloadUrl"];
 						EcRemote.getExpectingString(
 							"",
 							directLink +
 								"&access_token=" +
-								hello.getAuthResponse(me.network)[
+								hello.getAuthResponse(this.network)[
 									"access_token"
 								],
 							function(s) {
@@ -259,27 +252,26 @@ module.exports = class OAuth2FileBasedRemoteIdentityManager extends
 			});
 	}
 	readContactFiles(folderId, success, failure, eim) {
-		let me = this;
 		let o = {};
 		o["parent"] = folderId;
 		if (eim === undefined || eim == null)
 			eim = EcIdentityManager.default;
 		hello
 			.api(this.network + "/me/files", "get", o)
-			.then(function(folderResponse) {
+			.then((folderResponse) => {
 				let files = folderResponse["data"];
 				let h = new EcAsyncHelper();
 				h.each(
 					files,
-					function(d, callback0) {
-						let name = d["name"].replace("\\.pem", "");
+					(d, callback0) => {
+						let name = d["name"].replace(String.raw`\.pem`, "");
 						let id = d["id"];
 						let directLink = d["downloadUrl"];
 						EcRemote.getExpectingString(
 							"",
 							directLink +
 								"&access_token=" +
-								hello.getAuthResponse(me.network)[
+								hello.getAuthResponse(this.network)[
 									"access_token"
 								],
 							function(s) {
@@ -303,17 +295,15 @@ module.exports = class OAuth2FileBasedRemoteIdentityManager extends
 	hookIdentityManagerIdentities(folderId, eim) {
 		if (eim === undefined || eim == null)
 			eim = EcIdentityManager.default;
-		let me = this;
-		eim.onIdentityChanged = function(identity) {
-			me.writeIdentityFile(folderId, identity, null);
+		eim.onIdentityChanged = (identity) => {
+			this.writeIdentityFile(folderId, identity, null);
 		};
 	}
 	hookIdentityManagerContacts(folderId, eim) {
 		if (eim === undefined || eim == null)
 			eim = EcIdentityManager.default;
-		let me = this;
-		eim.onContactChanged = function(contact) {
-			me.writeContactFile(folderId, contact);
+		eim.onContactChanged = (contact) => {
+			this.writeContactFile(folderId, contact);
 		};
 	}
 	/**
@@ -325,23 +315,21 @@ module.exports = class OAuth2FileBasedRemoteIdentityManager extends
 	 *  @method commit
 	 */
 	commit(success, failure) {
-		let me = this;
 		let apio = {};
 		apio["network"] = this.network;
 		if (hello.getAuthResponse(this.server))
 			hello
-				.api(me.network + "/me/folders", "get", apio)
-				.then(function(folderResponse) {
+				.api(this.network + "/me/folders", "get", apio)
+				.then((folderResponse) => {
 					let folders = folderResponse["data"];
-					for (let i = 0; i < folders.length; i++) {
-						let d = folders[i];
+					for (const d of folders) {
 						let name = d["name"];
 						let id = d["id"];
 						if (name == "CASS Identities") {
-							me.writeIdentityFiles(id, success);
+							this.writeIdentityFiles(id, success);
 						}
 						if (name == "CASS Contacts") {
-							me.writeContactFiles(id);
+							this.writeContactFiles(id);
 						}
 					}
 				})
@@ -351,36 +339,34 @@ module.exports = class OAuth2FileBasedRemoteIdentityManager extends
 	create(success, failure) {
 		let o = {};
 		o["scope"] = this.configuration[this.server + "Scope"];
-		let me = this;
-		hello.on("auth.login", function(o) {
-			me.oauthLoginResponse = o;
-			me.network = me.oauthLoginResponse["network"];
+		hello.on("auth.login", (o) => {
+			this.oauthLoginResponse = o;
+			this.network = this.oauthLoginResponse["network"];
 			hello
-				.api(me.network + "/me/folders", "get", {})
-				.then(function(folderResponse) {
+				.api(this.network + "/me/folders", "get", {})
+				.then((folderResponse) => {
 					let folders = folderResponse["data"];
 					let foundIdentities = false;
 					let foundContacts = false;
-					for (let i = 0; i < folders.length; i++) {
-						let d = folders[i];
+					for (const d of folders) {
 						let name = d["name"];
 						let id = d["id"];
 						if (name == "CASS Identities") {
 							foundIdentities = true;
-							me.hookIdentityManagerIdentities(id);
-							me.readIdentityFiles(id, success, failure);
+							this.hookIdentityManagerIdentities(id);
+							this.readIdentityFiles(id, success, failure);
 						}
 						if (name == "CASS Contacts") {
 							foundContacts = true;
-							me.hookIdentityManagerContacts(id);
-							me.readContactFiles(id, success, failure);
+							this.hookIdentityManagerContacts(id);
+							this.readContactFiles(id, success, failure);
 						}
 					}
 					if (!foundIdentities) {
-						me.createIdentityFolder(success);
+						this.createIdentityFolder(success);
 					}
 					if (!foundContacts) {
-						me.createContactFolder();
+						this.createContactFolder();
 					}
 				})
 				.fail(failure);

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

@@ -9,13 +9,13 @@ module.exports = class RemoteIdentityManagerInterface {
 		secretSalt,
 		secretIterations
 	) {}
-	configureFromServer(success, failure) {/*Do nothing.*/}
+	async configureFromServer(success, failure) {/*Do nothing.*/}
 	isGlobal() {/*Do nothing.*/ }
 	clear() {/*Do nothing.*/ }
 	setDefaultIdentityManagementServer(server) {/*Do nothing.*/ }
 	startLogin(username, password) {/*Do nothing.*/ }
 	changePassword(username, oldPassword, newPassword) {/*Do nothing.*/ }
 	fetch(success, failure) {/*Do nothing.*/ }
-	commit(success, failure) {/*Do nothing.*/ }
-	create(success, failure) {/*Do nothing.*/ }
+	async commit(success, failure) {/*Do nothing.*/ }
+	async create(success, failure) {/*Do nothing.*/ }
 };