spec-3nweb-server 1.8.10 → 1.8.12

package/.gitlab-ci-linux.yml

@@ -6,7 +6,7 @@
 build for linux:
   extends: build
   rules: [ { when: on_success } ]
-  image: node-22
+  image: node-24
 
 
 test on linux:
@@ -14,7 +14,7 @@ test on linux:
   rules: [ { when: on_success } ]
   needs:
     - build for linux
-  image: node-22
+  image: node-24
 
 
 pack for linux:
@@ -23,7 +23,7 @@ pack for linux:
   needs:
     - build for linux
     - test on linux
-  image: node-22
+  image: node-24
 
 
 pack mock for linux:
@@ -32,7 +32,7 @@ pack mock for linux:
   needs:
     - build for linux
     - test on linux
-  image: node-22
+  image: node-24
 
 
 # pack deb:
@@ -41,10 +41,23 @@ pack mock for linux:
 #   needs:
 #     - build for linux
 #     - test on linux
-#   image: node-16
+#   image: node-24
 #   script:
 #     - npm run pack-deb
 #   artifacts:
 #     paths:
 #       - 3nweb-*.deb
 #     expire_in: 3d
+
+
+publish to npm:
+  stage: publish
+  rules:
+    - if: '$CI_COMMIT_BRANCH == "master"'
+      when: manual
+  needs:
+    - build for linux
+    - test on linux
+  image: node-24
+  script:
+    - bash publish-task.sh $NPM_PUBLISH_TOKEN

package/.gitlab-ci.yml

@@ -47,16 +47,6 @@ pack mock:
     - npm run clear-for-packing-mock
 
 
-publish to npm:
-  stage: publish
-  rules:
-    - if: '$CI_COMMIT_BRANCH == "master"'
-      when: manual
-  image: node-22
-  script:
-    - bash publish-task.sh $NPM_PUBLISH_TOKEN
-
-
 include:
   - .gitlab-ci-linux.yml
   - .gitlab-ci-windows.yml

package/build/3nstorage/routes/owner/param-getter.js

@@ -20,9 +20,6 @@ exports.getParam = void 0;
 const users_1 = require("../../resources/users");
 const owner_1 = require("../../../lib-common/service-api/3nstorage/owner");
 function getParam(paramGetter) {
-    if ('function' !== typeof paramGetter) {
-        throw new TypeError("Given argument 'paramGetter' must be function, but is not.");
-    }
     return async (req, res, next) => {
         const session = req.session;
         const userId = session.params.userId;
@@ -32,7 +29,7 @@ function getParam(paramGetter) {
         }
         catch (err) {
             if (err === users_1.SC.USER_UNKNOWN) {
-                res.status(owner_1.ERR_SC.server).send("Recipient disappeared from the system.");
+                res.status(owner_1.ERR_SC.server).send("User disappeared from the system.");
                 session.close();
             }
             else {

package/build/3nstorage/routes/owner/session-params.js

@@ -35,7 +35,7 @@ function sessionParams(maxChunk) {
                 next(err);
             }
             else if (err === users_1.SC.USER_UNKNOWN) {
-                res.status(owner_1.ERR_SC.server).send("Recipient disappeared from the system.");
+                res.status(owner_1.ERR_SC.server).send("User disappeared from the system.");
                 req.session.close();
             }
             else {

package/build/asmail/resources/utils.d.ts

@@ -3,4 +3,8 @@ export declare function getObjIdFromParams(req: Request): {
     objId: string;
     objIdParseErr?: string;
 };
+export declare function getMsgIdFromParams(req: Request): {
+    msgId: string;
+    msgIdParseErr?: string;
+};
 export declare function replyWithErr(status: number, msg: string, res: Response, reqToDrainBytesFrom?: Request): void;

package/build/asmail/resources/utils.js

@@ -16,7 +16,7 @@
  this program. If not, see <http://www.gnu.org/licenses/>.
 */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.replyWithErr = exports.getObjIdFromParams = void 0;
+exports.replyWithErr = exports.getMsgIdFromParams = exports.getObjIdFromParams = void 0;
 const buffer_utils_1 = require("../../lib-common/buffer-utils");
 const body_parsers_1 = require("../../lib-server/middleware/body-parsers");
 function getObjIdFromParams(req) {
@@ -26,6 +26,13 @@ function getObjIdFromParams(req) {
         { objId: undefined, objIdParseErr: "Bad object id" });
 }
 exports.getObjIdFromParams = getObjIdFromParams;
+function getMsgIdFromParams(req) {
+    const msgId = req.params.msgId;
+    return ((!!msgId && buffer_utils_1.base64urlSafe.allCharsFromAlphabet(msgId)) ?
+        { msgId } :
+        { msgId: undefined, msgIdParseErr: "Bad message id" });
+}
+exports.getMsgIdFromParams = getMsgIdFromParams;
 function replyWithErr(status, msg, res, reqToDrainBytesFrom) {
     if (reqToDrainBytesFrom) {
         (0, body_parsers_1.attachByteDrainToRequest)(reqToDrainBytesFrom);

package/build/asmail/routes/delivery/restart-session.js

@@ -22,6 +22,7 @@ const delivery_1 = require("../../../lib-common/service-api/asmail/delivery");
 const canonical_address_1 = require("../../../lib-common/canonical-address");
 const confUtil = require("../../../lib-server/conf-util");
 const utils_1 = require("../../resources/utils");
+const buffer_utils_1 = require("../../../lib-common/buffer-utils");
 /**
  * This creates a session restart route handler.
  * @param sessionGenFunc is a promise returning function that generates new session objects.
@@ -69,7 +70,8 @@ function restartSession(sessionGenFunc, sessionForMsgFunc, incompleteMsgFunc, ma
             return (0, utils_1.replyWithErr)(delivery_1.ERR_SC.malformed, "Recipient is either missing in the request, or is malformed", res);
         }
         // check message id
-        if (typeof msgId !== 'string') {
+        if ((typeof msgId !== 'string') || !msgId || !buffer_utils_1.base64urlSafe.allCharsFromAlphabet(msgId)) {
+            console.log(`msgId ->`, msgId, '\n', `!base64urlSafe.allCharsFromAlphabet(msgId) ->`, !buffer_utils_1.base64urlSafe.allCharsFromAlphabet(msgId));
             return (0, utils_1.replyWithErr)(delivery_1.ERR_SC.malformed, "Message id is either missing, or is malformed", res);
         }
         try {

package/build/asmail/routes/retrieval/get-message-meta.js

@@ -23,7 +23,10 @@ const utils_1 = require("../../resources/utils");
 function getMsgMeta(getMsgMetaFunc) {
     return async (req, res, next) => {
         const userId = req.session.params.userId;
-        const msgId = req.params.msgId;
+        const { msgId, msgIdParseErr } = (0, utils_1.getMsgIdFromParams)(req);
+        if (msgIdParseErr) {
+            return (0, utils_1.replyWithErr)(retrieval_1.ERR_SC.malformed, msgIdParseErr, res, req);
+        }
         try {
             const meta = await getMsgMetaFunc(userId, msgId);
             res.status(retrieval_1.msgMetadata.SC.ok).json(meta);

package/build/asmail/routes/retrieval/get-message-obj.js

@@ -41,7 +41,10 @@ function extractQueryOptions(req) {
 function getMsgObj(getMsgObjFunc) {
     return async (req, res, next) => {
         const userId = req.session.params.userId;
-        const msgId = req.params.msgId;
+        const { msgId, msgIdParseErr } = (0, utils_1.getMsgIdFromParams)(req);
+        if (msgIdParseErr) {
+            return (0, utils_1.replyWithErr)(retrieval_1.ERR_SC.malformed, msgIdParseErr, res, req);
+        }
         const { objId, objIdParseErr } = (0, utils_1.getObjIdFromParams)(req);
         if (objIdParseErr) {
             return (0, utils_1.replyWithErr)(retrieval_1.ERR_SC.malformed, objIdParseErr, res);

package/build/asmail/routes/retrieval/remove-message.js

@@ -23,7 +23,10 @@ const utils_1 = require("../../resources/utils");
 function deleteMsg(delMsgFunc) {
     return async (req, res, next) => {
         const userId = req.session.params.userId;
-        const msgId = req.params.msgId;
+        const { msgId, msgIdParseErr } = (0, utils_1.getMsgIdFromParams)(req);
+        if (msgIdParseErr) {
+            return (0, utils_1.replyWithErr)(retrieval_1.ERR_SC.malformed, msgIdParseErr, res, req);
+        }
         try {
             await delMsgFunc(userId, msgId);
             res.status(retrieval_1.rmMsg.SC.ok).send();

package/build/mock/run-in-proc.js

@@ -34,13 +34,15 @@ function setTestCertsAndDNS(domains, thisSrvLoc) {
     https.globalAgent.options.ca = tls_options_1.sslOpts.cert;
     // inject dns mock
     const dnsRecs = {};
+    const reportAddress = `report@${thisSrvLoc.includes(':') ? thisSrvLoc.substring(0, thisSrvLoc.indexOf(':')) : thisSrvLoc}`;
     for (const domain of domains) {
         dnsRecs[domain] = [
             ['asmail', '=', `${thisSrvLoc}/asmail`],
             [
                 'mailerid=', `${thisSrvLoc}/mailerid`,
                 `3nstorage=${thisSrvLoc}/3nstorage`
-            ] // two 3NWeb records in one DNS TXT record
+            ],
+            [`report=${reportAddress}`]
             // XXX add other life-like records
         ];
     }

package/build/tests/libs-for-tests/mailerid.js

@@ -24,7 +24,6 @@ const provisioning_1 = require("../../lib-common/service-api/mailer-id/provision
 const mid_sigs_NaCl_Ed_1 = require("../../lib-common/mid-sigs-NaCl-Ed");
 const pkl_1 = require("./pkl");
 const random_node_1 = require("../../lib-common/random-node");
-const url_1 = require("url");
 async function getMidData(midUrl) {
     let reqOpts = {
         url: midUrl,
@@ -97,7 +96,7 @@ async function doMailerIdLogin(loginUrl, user) {
         responseType: 'json',
         sessionId
     };
-    let serviceDomain = (0, url_1.parse)(loginUrl).hostname;
+    let serviceDomain = (new URL(loginUrl)).hostname;
     if (!serviceDomain) {
         throw new Error(`Cannot parse hostname from login url ${loginUrl}`);
     }

package/build/tests/protocols/asmail/delivery/specs/restart-session.js

@@ -63,7 +63,7 @@ exports.specs.definition = (setup) => (() => {
     (0, async_jasmine_1.itAsync)(`returns error status when message is not known in delivery`, async () => {
         const req = {
             recipient: user2.id,
-            msgId: 'unknown message'
+            msgId: 'unknown_message'
         };
         const rep = await (0, xhr_utils_1.doJsonRequest)(reqOpts, req);
         expect(rep.status).withContext('status for unknown message').toBe(delivery_1.sessionRestart.SC.unknownMsg);

package/build/tests/protocols/asmail/delivery/test-utils.js

@@ -36,8 +36,7 @@ exports.msg = {
     msgObjs: [exports.obj1, exports.obj2]
 };
 async function startSessionAndSendMsgObjs(deliveryUrl, recipient, msg) {
-    const sessInfo = await (0, asmail_1.startMsgDelivery)(deliveryUrl, { recipient }, { pid: msg.cryptoMeta.pid,
-        objIds: [msg.msgObjs[0].objId, msg.msgObjs[1].objId] });
+    const sessInfo = await (0, asmail_1.startMsgDelivery)(deliveryUrl, { recipient }, { pid: msg.cryptoMeta.pid, objIds: [msg.msgObjs[0].objId, msg.msgObjs[1].objId] });
     await (0, asmail_1.sendMsgObj)(deliveryUrl, sessInfo.sessionId, msg.msgObjs[0], sessInfo.maxChunkSize);
     await (0, asmail_1.sendMsgObj)(deliveryUrl, sessInfo.sessionId, msg.msgObjs[1], sessInfo.maxChunkSize);
     return sessInfo;

package/build/tests/shared-checks/check-mid-login.js

@@ -71,7 +71,7 @@ function midLoginSpecs(loginUrl, user) {
                 responseType: 'json',
                 sessionId
             };
-            const serviceDomain = (0, url_1.parse)(loginUrl()).hostname;
+            const serviceDomain = (new URL(loginUrl())).hostname;
             if (!serviceDomain) {
                 throw new Error(`Cannot get hostname from ${loginUrl()}`);
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "spec-3nweb-server",
-  "version": "1.8.10",
+  "version": "1.8.12",
   "description": "3NWeb spec server.",
   "main": "build/lib.js",
   "types": "build/lib.d.ts",

package/ts-code/3nstorage/routes/owner/archive-obj-version.ts

@@ -30,6 +30,7 @@ export function archiveCurrentObjVersion(
 	return async (req: Request, res, next) => {
 
 		const userId = req.session.params.userId;
+
 		const { objId, objIdParseErr } = getObjIdFromParams(root, req);
 		if (objIdParseErr) {
 			return replyWithErr(ERR_SC.malformed, objIdParseErr, res);

package/ts-code/3nstorage/routes/owner/cancel-trans.ts

@@ -28,6 +28,7 @@ export function cancelTransaction(
 	return async (req: Request, res, next) => {
 
 		const userId = req.session.params.userId;
+
 		const { objId, objIdParseErr } = getObjIdFromParams(root, req);
 		if (objIdParseErr) {
 			return replyWithErr(ERR_SC.malformed, objIdParseErr, res);

package/ts-code/3nstorage/routes/owner/delete-obj.ts

@@ -33,6 +33,7 @@ function deleteObj(
 	return async (req: Request, res, next) => {
 
 		const userId = req.session.params.userId;
+
 		const { objId, objIdParseErr } = getObjIdFromParams(root, req);
 		if (objIdParseErr) {
 			return replyWithErr(ERR_SC.malformed, objIdParseErr, res);

package/ts-code/3nstorage/routes/owner/get-archived-obj-ver.ts

@@ -56,6 +56,7 @@ export function getArchivedObjVersion(
 	return async (req: Request, res, next) => {
 		
 		const userId = req.session.params.userId;
+
 		const { objId, objIdParseErr } = getObjIdFromParams(root, req);
 		if (objIdParseErr) {
 			return replyWithErr(ERR_SC.malformed, objIdParseErr, res);

package/ts-code/3nstorage/routes/owner/get-current-obj.ts

@@ -63,6 +63,7 @@ export function getCurrentObj(
 	return async (req: Request, res, next) => {
 		
 		const userId = req.session.params.userId;
+
 		const { objId, objIdParseErr } = getObjIdFromParams(root, req);
 		if (objIdParseErr) {
 			return replyWithErr(ERR_SC.malformed, objIdParseErr, res);

package/ts-code/3nstorage/routes/owner/get-obj-status.ts

@@ -28,6 +28,7 @@ export function getObjStatus(
 	return async (req: Request, res, next) => {
 
 		const userId = req.session.params.userId;
+
 		const { objId, objIdParseErr } = getObjIdFromParams(root, req);
 		if (objIdParseErr) {
 			return replyWithErr(ERR_SC.malformed, objIdParseErr, res);

package/ts-code/3nstorage/routes/owner/param-getter.ts

@@ -24,9 +24,6 @@ export function getParam<T>(
 	paramGetter: (userId: string) => Promise<T>
 ): RequestHandler {
 	
-	if ('function' !== typeof paramGetter) { throw new TypeError(
-			"Given argument 'paramGetter' must be function, but is not."); }
-	
 	return async (req: Request, res, next) => {
 		
 		const session = req.session;
@@ -37,8 +34,7 @@ export function getParam<T>(
 			res.status(PARAM_SC.ok).json(value);
 		} catch (err) {
 			if (err === storeSC.USER_UNKNOWN) {
-				res.status(ERR_SC.server).send(
-					"Recipient disappeared from the system.");
+				res.status(ERR_SC.server).send("User disappeared from the system.");
 				session.close();
 			} else {
 				next(err);

package/ts-code/3nstorage/routes/owner/put-current-obj.ts

@@ -47,6 +47,7 @@ export function saveCurrentObj(
 		}
 	
 		const userId = req.session.params.userId;
+
 		const { objId, objIdParseErr } = getObjIdFromParams(root, req);
 		if (objIdParseErr) {
 			return replyWithErr(ERR_SC.malformed, objIdParseErr, res, req);

package/ts-code/3nstorage/routes/owner/session-params.ts

@@ -37,7 +37,7 @@ export function sessionParams(maxChunk: number|string): RequestHandler {
 			if ("string" !== typeof err) {
 				next(err);
 			} else if (err === storeSC.USER_UNKNOWN) {
-				res.status(ERR_SC.server).send("Recipient disappeared from the system.");
+				res.status(ERR_SC.server).send("User disappeared from the system.");
 				req.session.close();
 			} else {
 				next(new Error("Unhandled storage error code: "+err));

package/ts-code/asmail/resources/utils.ts

@@ -30,6 +30,16 @@ export function getObjIdFromParams(req: Request): {
 	);
 }
 
+export function getMsgIdFromParams(req: Request): {
+	msgId: string; msgIdParseErr?: string;
+} {
+	const msgId = req.params.msgId;
+	return ((!!msgId && base64urlSafe.allCharsFromAlphabet(msgId)) ?
+		{ msgId } :
+		{ msgId: undefined as any, msgIdParseErr: "Bad message id" }
+	);
+}
+
 export function replyWithErr(status: number, msg: string, res: Response, reqToDrainBytesFrom?: Request): void {
 	if (reqToDrainBytesFrom) {
 		attachByteDrainToRequest(reqToDrainBytesFrom);

package/ts-code/asmail/routes/delivery/restart-session.ts

@@ -23,6 +23,7 @@ import { Redirect } from './start-session';
 import { checkAndTransformAddress } from '../../../lib-common/canonical-address';
 import * as confUtil from '../../../lib-server/conf-util';
 import { replyWithErr } from '../../resources/utils';
+import { base64urlSafe } from '../../../lib-common/buffer-utils';
 
 /**
  * This creates a session restart route handler.
@@ -84,7 +85,11 @@ export function restartSession(
 		}
 
 		// check message id
-		if (typeof msgId !== 'string') {
+		if ((typeof msgId !== 'string') || !msgId || !base64urlSafe.allCharsFromAlphabet(msgId)) {
+			console.log(
+				`msgId ->`, msgId, '\n',
+				`!base64urlSafe.allCharsFromAlphabet(msgId) ->`, !base64urlSafe.allCharsFromAlphabet(msgId)
+			);
 			return replyWithErr(ERR_SC.malformed, "Message id is either missing, or is malformed", res);
 		}
 

package/ts-code/asmail/routes/retrieval/get-message-meta.ts

@@ -19,14 +19,18 @@ import { RequestHandler } from 'express';
 import { SC as recipSC, MsgRetrieval } from '../../resources/recipients';
 import { msgMetadata as api, ERR_SC } from '../../../lib-common/service-api/asmail/retrieval';
 import { Request } from '../../resources/sessions';
-import { replyWithErr } from '../../resources/utils';
+import { getMsgIdFromParams, replyWithErr } from '../../resources/utils';
 
 export function getMsgMeta(
 	getMsgMetaFunc: MsgRetrieval['getMsgMeta']
 ): RequestHandler {
 	return async (req: Request, res, next) => {
 		const userId = req.session.params.userId;
-		const msgId: string = req.params.msgId;
+
+		const { msgId, msgIdParseErr } = getMsgIdFromParams(req);
+		if (msgIdParseErr) {
+			return replyWithErr(ERR_SC.malformed, msgIdParseErr, res, req);
+		}
 
 		try {
 			const meta = await getMsgMetaFunc(userId, msgId);

package/ts-code/asmail/routes/retrieval/get-message-obj.ts

@@ -21,7 +21,7 @@ import { GetObjQueryOpts, ERR_SC, msgObj as api, HTTP_HEADER } from '../../../li
 import { Request } from '../../resources/sessions';
 import { errWithCause } from '../../../lib-common/exceptions/error';
 import { EMPTY_BUFFER } from '../../../lib-common/buffer-utils';
-import { getObjIdFromParams, replyWithErr } from '../../resources/utils';
+import { getMsgIdFromParams, getObjIdFromParams, replyWithErr } from '../../resources/utils';
 
 function extractQueryOptions(req: Request): undefined|{
 	header: boolean; limit: number|undefined; ofs: number;
@@ -52,7 +52,11 @@ export function getMsgObj(
 	return async (req: Request, res, next) => {
 
 		const userId = req.session.params.userId;
-		const msgId: string = req.params.msgId;
+
+		const { msgId, msgIdParseErr } = getMsgIdFromParams(req);
+		if (msgIdParseErr) {
+			return replyWithErr(ERR_SC.malformed, msgIdParseErr, res, req);
+		}
 
 		const { objId, objIdParseErr } = getObjIdFromParams(req);
 		if (objIdParseErr) {

package/ts-code/asmail/routes/retrieval/remove-message.ts

@@ -19,12 +19,16 @@ import { RequestHandler } from 'express';
 import { SC as recipSC, MsgRetrieval } from '../../resources/recipients';
 import { rmMsg as api, ERR_SC } from '../../../lib-common/service-api/asmail/retrieval';
 import { Request } from '../../resources/sessions';
-import { replyWithErr } from '../../resources/utils';
+import { getMsgIdFromParams, replyWithErr } from '../../resources/utils';
 
 export function deleteMsg(delMsgFunc: MsgRetrieval['deleteMsg']): RequestHandler {
 	return async (req: Request, res, next) => {
 		const userId = req.session.params.userId;
-		const msgId: string = req.params.msgId;
+
+		const { msgId, msgIdParseErr } = getMsgIdFromParams(req);
+		if (msgIdParseErr) {
+			return replyWithErr(ERR_SC.malformed, msgIdParseErr, res, req);
+		}
 
 		try {
 			await delMsgFunc(userId, msgId);

package/ts-code/mock/run-in-proc.ts

@@ -37,13 +37,17 @@ export function setTestCertsAndDNS(
 
 	// inject dns mock
 	const dnsRecs: DnsTxtRecords = {};
+	const reportAddress = `report@${
+		thisSrvLoc.includes(':') ? thisSrvLoc.substring(0, thisSrvLoc.indexOf(':')) : thisSrvLoc
+	}`;
 	for (const domain of domains) {
 		dnsRecs[domain] = [
 			[ 'asmail', '=', `${thisSrvLoc}/asmail` ],	// one record in DNS TXT
 			[
 				'mailerid=', `${thisSrvLoc}/mailerid`,
 				`3nstorage=${thisSrvLoc}/3nstorage`
-			]	// two 3NWeb records in one DNS TXT record
+			],	// two 3NWeb records in one DNS TXT record
+			[ `report=${reportAddress}` ]
 			// XXX add other life-like records
 		];
 	}

package/ts-code/tests/libs-for-tests/mailerid.ts

@@ -25,7 +25,6 @@ import { certify as certApi }
 import { user as midUser }	from '../../lib-common/mid-sigs-NaCl-Ed';
 import { doPubKeyLogin, User } from './pkl';
 import { bytesSync as randomBytes } from '../../lib-common/random-node';
-import { parse as parseUrl } from 'url';
 
 export { User } from './pkl';
 
@@ -106,7 +105,7 @@ export async function doMailerIdLogin(loginUrl: string, user: User):
 		responseType: 'json',
 		sessionId
 	};
-	let serviceDomain = parseUrl(loginUrl).hostname;
+	let serviceDomain = (new URL(loginUrl)).hostname;
 	if (!serviceDomain) { throw new Error(
 		`Cannot parse hostname from login url ${loginUrl}`); }
 	let req: authSession.Request = {

package/ts-code/tests/libs-for-tests/pkl.ts

@@ -23,7 +23,7 @@ import { makeSessionEncryptor, SessionEncryptor }
 	from '../../lib-common/session-encryptor';
 import { doJsonRequest, RequestOpts, doBinaryRequest }
 	from './xhr-utils';
-import { parse as parseUrl, resolve as resolveUrl } from 'url';
+import { resolve as resolveUrl } from 'url';
 import { bytesEqual } from './bytes-equal';
 
 export interface User {

package/ts-code/tests/protocols/asmail/delivery/specs/restart-session.ts

@@ -36,8 +36,7 @@ specs.definition = (setup: () => TestSetup) => (() => {
 	beforeAllAsync(async () => {
 		user2 = setup().user2;
 		const deliveryUrl = await setup().asmailServer.getDeliveryUrl();
-		initialSession = await startSessionAndSendMsgObjs(
-			deliveryUrl, user2.id, msg);
+		initialSession = await startSessionAndSendMsgObjs(deliveryUrl, user2.id, msg);
 		reqOpts = {
 			url: resolveUrl(deliveryUrl, api.URL_END),
 			method: 'POST',
@@ -74,7 +73,7 @@ specs.definition = (setup: () => TestSetup) => (() => {
 			async () => {
 		const req: api.Request = {
 			recipient: user2.id,
-			msgId: 'unknown message'
+			msgId: 'unknown_message'
 		};
 		const rep = await doJsonRequest<api.Reply>(reqOpts, req);
 		expect(rep.status).withContext('status for unknown message').toBe(api.SC.unknownMsg);

package/ts-code/tests/protocols/asmail/delivery/test-utils.ts

@@ -50,14 +50,13 @@ export const msg: Msg = {
 
 export async function startSessionAndSendMsgObjs(deliveryUrl: string,
 		recipient: string, msg: Msg): Promise<DeliveryInfo> {
-	const sessInfo = await startMsgDelivery(deliveryUrl,
+	const sessInfo = await startMsgDelivery(
+		deliveryUrl,
 		{ recipient },
-		{ pid: msg.cryptoMeta.pid,
-			objIds: [ msg.msgObjs[0].objId, msg.msgObjs[1].objId ] });
-	await sendMsgObj(deliveryUrl, sessInfo.sessionId, msg.msgObjs[0],
-		sessInfo.maxChunkSize);
-	await sendMsgObj(deliveryUrl, sessInfo.sessionId, msg.msgObjs[1],
-		sessInfo.maxChunkSize);
+		{ pid: msg.cryptoMeta.pid, objIds: [ msg.msgObjs[0].objId, msg.msgObjs[1].objId ] }
+	);
+	await sendMsgObj(deliveryUrl, sessInfo.sessionId, msg.msgObjs[0], sessInfo.maxChunkSize);
+	await sendMsgObj(deliveryUrl, sessInfo.sessionId, msg.msgObjs[1], sessInfo.maxChunkSize);
 	return sessInfo;
 }
 

package/ts-code/tests/shared-checks/check-mid-login.ts

@@ -22,7 +22,7 @@ import { startMidSession, provisionMidSigner, User } from '../libs-for-tests/mai
 import { expectNonAcceptanceOfBadJsonRequest, expectNonAcceptanceOfBadSessionId } from './requests';
 import * as mid from '../../lib-common/mid-sigs-NaCl-Ed';
 import { bytesSync as randomBytes } from '../../lib-common/random-node';
-import { parse as parseUrl, resolve as resolveUrl } from 'url';
+import { resolve as resolveUrl } from 'url';
 
 export function midLoginSpecs(
 	loginUrl: () => string,
@@ -86,7 +86,7 @@ export function midLoginSpecs(
 				sessionId
 			};
 			
-			const serviceDomain = parseUrl(loginUrl()).hostname;
+			const serviceDomain = (new URL(loginUrl())).hostname;
 			if (!serviceDomain) { throw new Error(
 				`Cannot get hostname from ${loginUrl()}`); }
 			const req: authSession.Request = {