spec-3nweb-server 1.8.6 → 1.8.7

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

@@ -0,0 +1,41 @@
+/*
+ Copyright (C) 2026 3NSoft Inc.
+ 
+ This program is free software: you can redistribute it and/or modify it under
+ the terms of the GNU General Public License as published by the Free Software
+ Foundation, either version 3 of the License, or (at your option) any later
+ version.
+ 
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ See the GNU General Public License for more details.
+ 
+ You should have received a copy of the GNU General Public License along with
+ this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+import { Response, Request } from 'express';
+import { base64urlSafe } from '../../lib-common/buffer-utils';
+import { attachByteDrainToRequest } from '../../lib-server/middleware/body-parsers';
+import { ErrorReply } from '../../lib-common/service-api/asmail/delivery';
+
+export function getObjIdFromParams(req: Request): {
+	objId: string; objIdParseErr?: string;
+} {
+	const objId = req.params.objId;
+	return ((!!objId && base64urlSafe.allCharsFromAlphabet(objId)) ?
+		{ objId } :
+		{ objId: undefined as any, objIdParseErr: "Bad object id" }
+	);
+}
+
+export function replyWithErr(status: number, msg: string, res: Response, reqToDrainBytesFrom?: Request): void {
+	if (reqToDrainBytesFrom) {
+		attachByteDrainToRequest(reqToDrainBytesFrom);
+	}
+	res.status(status).json({ error: msg } as ErrorReply);
+}
+
+
+Object.freeze(exports);

package/ts-code/asmail/routes/delivery/finalize-delivery.ts

@@ -19,6 +19,7 @@ import { RequestHandler } from 'express';
 import { SC as recipSC, MsgDelivery } from '../../resources/recipients';
 import { Request } from '../../resources/delivery-sessions';
 import { completion as api, ERR_SC } from '../../../lib-common/service-api/asmail/delivery';
+import { replyWithErr } from '../../resources/utils';
 
 export function finalizeDelivery(finDelivFunc: MsgDelivery['finalizeDelivery']): RequestHandler {
 	return async (req: Request, res, next) => {
@@ -35,10 +36,10 @@ export function finalizeDelivery(finDelivFunc: MsgDelivery['finalizeDelivery']):
 				next(err);
 			} else if (err === recipSC.USER_UNKNOWN) {
 				session.close();
-				res.status(ERR_SC.server).send("Recipient disappeared from the system.");
+				replyWithErr(ERR_SC.server, "Recipient disappeared from the system.", res);
 			} else if (err === recipSC.MSG_UNKNOWN) {
 				session.close();
-				res.status(ERR_SC.server).send("Message disappeared from the system.");
+				replyWithErr(ERR_SC.server, "Message disappeared from the system.", res);
 			} else {
 				next(new Error("Unhandled storage error code: "+err));
 			}

package/ts-code/asmail/routes/delivery/pre-flight.ts

@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2015 - 2017, 2025 3NSoft Inc.
+ Copyright (C) 2015 - 2017, 2025 - 2026 3NSoft Inc.
  
  This program is free software: you can redistribute it and/or modify it under
  the terms of the GNU General Public License as published by the Free Software
@@ -17,10 +17,11 @@
 
 import { RequestHandler, Response } from 'express';
 import { SC as recipSC, MsgDelivery } from '../../resources/recipients';
-import { preFlight as api, ERR_SC, ErrorReply } from '../../../lib-common/service-api/asmail/delivery';
+import { preFlight as api, ERR_SC } from '../../../lib-common/service-api/asmail/delivery';
 import { Request } from '../../resources/delivery-sessions';
 import { Redirect } from './start-session';
 import { checkAndTransformAddress } from '../../../lib-common/canonical-address';
+import { replyWithErr } from '../../resources/utils';
 
 /**
  * This creates a pre-flight route handler.
@@ -44,17 +45,16 @@ export function preFlight(
 	): Promise<void> {
 		const msgSize = await allowedMsgSizeFunc(recipient, sender, invitation);
 		if (msgSize > 0) {
-			res.status(api.SC.ok).json( <api.Reply> {
+			res.status(api.SC.ok).json({
 				maxMsgLength: msgSize
-			});
+			} as api.Reply);
 		} else if (msgSize === 0) {
-			res.status(api.SC.senderNotAllowed).json( <ErrorReply> {
-				error: `${sender ? sender : "Anonymous sender "} is not allowed to leave mail for ${recipient}`
-			});
+			replyWithErr(
+				api.SC.senderNotAllowed,
+				`${sender ? sender : "Anonymous sender "} is not allowed to leave mail for ${recipient}`, res
+			);
 		} else if (msgSize === -1) {
-			res.status(api.SC.inboxFull).json( <ErrorReply> {
-				error: `Mail box for ${recipient} is full.`
-			});
+			replyWithErr(api.SC.inboxFull, `Mail box for ${recipient} is full.`, res);
 		} else {
 			throw new Error(`Unrecognized code ${msgSize} for message size limits.`);
 		}
@@ -70,37 +70,25 @@ export function preFlight(
 
 		// already existing session indicates repeated call, which should be bounced off
 		if (session) {
-			res.status(ERR_SC.duplicateReq).json( <ErrorReply> {
-				error: "This protocol request has already been served."
-			});
-			return;
+			return replyWithErr(ERR_SC.duplicateReq, "This protocol request has already been served.", res);
 		}
 
 		// missing recipient makes a bad request
 		if (!recipient) {
-			res.status(ERR_SC.malformed).json( <ErrorReply> {
-				error: "Recipient is either missing in the request, or is malformed"
-			});
-			return;
+			return replyWithErr(ERR_SC.malformed, "Recipient is either missing in the request, or is malformed", res);
 		}
 
 		// if sender is given, we canonicalize the address
 		if (sender) {
 			sender = checkAndTransformAddress(sender);
 			if (!sender) {
-				res.status(ERR_SC.malformed).json( <ErrorReply> {
-					error: "Sender field is malformed"
-				});
-				return;
+				return replyWithErr(ERR_SC.malformed, "Sender field is malformed", res);
 			}
 		}
 
 		// check invitation field
 		if ((invitation !== undefined) && (typeof invitation !== 'string')) {
-			res.status(ERR_SC.malformed).json( <ErrorReply> {
-				error: "Inviation field is malformed"
-			});
-			return;
+			return replyWithErr(ERR_SC.malformed, "Inviation field is malformed", res);
 		}
 
 	 	try {
@@ -118,9 +106,7 @@ export function preFlight(
 			}
 		} catch (err) {
 			if (err === recipSC.USER_UNKNOWN) {
-				res.status(api.SC.unknownRecipient).json( <ErrorReply> {
-					error: `Recipient ${recipient} is unknown.`
-				});
+				replyWithErr(api.SC.unknownRecipient, `Recipient ${recipient} is unknown.`, res);
 			} else {
 				next(err);
 			}

package/ts-code/asmail/routes/delivery/provide-recipient-pubkey.ts

@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2015 - 2016, 2025 3NSoft Inc.
+ Copyright (C) 2015 - 2016, 2025 - 2026 3NSoft Inc.
  
  This program is free software: you can redistribute it and/or modify it under
  the terms of the GNU General Public License as published by the Free Software
@@ -19,6 +19,7 @@ import { RequestHandler } from 'express';
 import { SC as recipSC, MsgDelivery } from '../../resources/recipients';
 import { initPubKey as api, ERR_SC } from '../../../lib-common/service-api/asmail/delivery';
 import { Request } from '../../resources/delivery-sessions';
+import { replyWithErr } from '../../resources/utils';
 
 /**
  * This creates a get-init-pub-key route handler.
@@ -37,15 +38,14 @@ export function getRecipientPubKey(
 			if (certs) {
 				res.status(api.SC.ok).json(certs);
 			} else {
-				res.status(api.SC.pkeyNotRegistered).send('No public key registered for the recipient.');
+				replyWithErr(api.SC.pkeyNotRegistered, 'No public key registered for the recipient.', res);
 				session.close();
 			}
 		} catch (err) {
 			if (typeof err !== "string") {
 				next(err);
 			} else if (err === recipSC.USER_UNKNOWN) {
-				res.status(ERR_SC.server).send(
-					"Recipient disappeared from the system.");
+				replyWithErr(ERR_SC.server, "Recipient disappeared from the system.", res);
 				session.close();
 			} else {
 				next(new Error("Unhandled storage error code: "+err));

package/ts-code/asmail/routes/delivery/put-metadata.ts

@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2015 - 2016, 2025 3NSoft Inc.
+ Copyright (C) 2015 - 2016, 2025 - 2026 3NSoft Inc.
  
  This program is free software: you can redistribute it and/or modify it under
  the terms of the GNU General Public License as published by the Free Software
@@ -17,28 +17,23 @@
 
 import { RequestHandler } from 'express';
 import { SC as recipSC, MsgDelivery } from '../../resources/recipients';
-import { msgMeta as api, ERR_SC, ErrorReply } from '../../../lib-common/service-api/asmail/delivery';
+import { msgMeta as api, ERR_SC } from '../../../lib-common/service-api/asmail/delivery';
 import * as confUtil from '../../../lib-server/conf-util';
 import { Request } from '../../resources/delivery-sessions';
 import { base64urlSafe } from '../../../lib-common/buffer-utils';
+import { replyWithErr } from '../../resources/utils';
 
-function findProblemWithObjIds(ids: string[]): ErrorReply|undefined {
+function findProblemWithObjIds(ids: string[]): string|undefined {
 	if (!Array.isArray(ids)) {
-		return {
-			error: "Object ids are missing."
-		};
+		return "Object ids are missing.";
 	}
 	const checkedIds = new Set<string>();
 	for (const objId of ids) {
 		if (checkedIds.has(objId)) {
-			return {
-				error: "Duplication of object ids."
-			};
+			return "Duplication of object ids.";
 		}
 		if (!base64urlSafe.allCharsFromAlphabet(objId!)) {
-			return {
-				error: "Object id is invalid."
-			};
+			return "Object id is invalid.";
 		}
 		checkedIds.add(objId);
 	}
@@ -53,37 +48,33 @@ export function saveMetadata(
 
 	return async (req: Request, res, next) => {
 		const session = req.session;
-		const msgMeta: api.Request = req.body;
-		const recipient = session.params.recipient;
-		const objIds = msgMeta.objIds;
-
 		if (session.params.msgId) {
-			res.status(ERR_SC.duplicateReq).json( <ErrorReply> {
-				error: "This protocol request has already been served."
-			});
-			return;
+			return replyWithErr(ERR_SC.duplicateReq, "This protocol request has already been served.", res);
 		}
 
-		if (findProblemWithObjIds(objIds)) {
-			res.status(ERR_SC.malformed).json(findProblemWithObjIds(objIds));
-			return;
+		const recipient = session.params.recipient;
+		const msgMeta: api.Request = req.body;
+
+		const objIds = msgMeta.objIds;
+		const errWithWithObjIds = findProblemWithObjIds(objIds);
+		if (errWithWithObjIds) {
+			return replyWithErr(ERR_SC.malformed, errWithWithObjIds, res);
 		}
 
 		try {
-			const msgId = await setMsgStorageFunc(recipient, msgMeta,
-				session.params.sender, session.params.invite,
-				session.params.maxMsgLength);
+			const msgId = await setMsgStorageFunc(
+				recipient, msgMeta, session.params.sender, session.params.invite, session.params.maxMsgLength
+			);
 			session.params.msgId = msgId;
-			res.status(api.SC.ok).json( <api.Reply> {
+			res.status(api.SC.ok).json({
 				msgId,
 				maxChunkSize
-			});
+			} as api.Reply);
 		} catch (err) {
 			if ("string" !== typeof err) {
 				next(err);
 			} else if (err === recipSC.USER_UNKNOWN) {
-				res.status(ERR_SC.server).send(
-					"Recipient disappeared from the system.");
+				replyWithErr(ERR_SC.server, "Recipient disappeared from the system.", res);
 				session.close();
 			}
 		}

package/ts-code/asmail/routes/delivery/put-obj.ts

@@ -20,7 +20,7 @@ import { SC as recipSC, MsgDelivery, BIN_TYPE } from '../../resources/recipients
 import { msgObj as api, ERR_SC, HTTP_HEADER, PutObjFirstQueryOpts, PutObjSecondQueryOpts } from '../../../lib-common/service-api/asmail/delivery';
 import * as confUtil from '../../../lib-server/conf-util';
 import { Request } from '../../resources/delivery-sessions';
-import { attachByteDrainToRequest } from '../../../lib-server/middleware/body-parsers';
+import { getObjIdFromParams, replyWithErr } from '../../resources/utils';
 
 export function saveMsgObj(saveObjFunc: MsgDelivery['saveObj'], chunkLimit: string|number): RequestHandler {
 
@@ -29,11 +29,7 @@ export function saveMsgObj(saveObjFunc: MsgDelivery['saveObj'], chunkLimit: stri
 	return async (req: Request, res, next) => {
 
 		if (!req.is(BIN_TYPE)) {
-			attachByteDrainToRequest(req);
-			res.status(ERR_SC.wrongContentType).send(
-				`Content-Type must be ${BIN_TYPE} for this call.`
-			);
-			return;
+			return replyWithErr(ERR_SC.wrongContentType, `Content-Type must be ${BIN_TYPE} for this call.`, res, req);
 		}
 
 		const session = req.session;
@@ -41,51 +37,46 @@ export function saveMsgObj(saveObjFunc: MsgDelivery['saveObj'], chunkLimit: stri
 		const msgId = session.params.msgId;
 
 		if (!msgId) {
-			res.status(ERR_SC.earlyReq).send(
-				"Metadata has not been sent, yet."
-			);
-			return;
+			return replyWithErr(ERR_SC.earlyReq, "Metadata has not been sent, yet.", res, req);
 		}
 
-		const objId: string = req.params.objId;
+		const { objId, objIdParseErr } = getObjIdFromParams(req);
+		if (objIdParseErr) {
+			return replyWithErr(ERR_SC.malformed, objIdParseErr, res);
+		}
 
 		// get and check Content-Length, implicitly sending replies for bad length
 		let len = getContentLenOrSendError(req, res, maxChunkSize);
 		if (len === undefined) {
-			attachByteDrainToRequest(req);
 			return;
 		}
 
 		// extract and check query parameters
 		const opts = extractQueryOptions(req);
 		if (!opts) {
-			return replyToMalformed(req, "Bad query parameters", res);
+			return replyWithErr(ERR_SC.malformed, "Bad query parameters", res, req);
 		}
 
 		if (opts.fstReq) {
 			// check options versus chunk length
 			if (opts.fstReq.header > len) {
-				return replyToMalformed(req, "Bad query parameters", res);
+				return replyWithErr(ERR_SC.malformed, "Bad query parameters", res, req);
 			}
 		} else if (opts.sndReq) {
 			// check options versus chunk length
 			if ((len === 0) && !opts.sndReq.last) {
-				return replyToMalformed(req, "No segment bytes", res);
+				return replyWithErr(ERR_SC.malformed, "No segment bytes", res, req);
 			}
 		} else {
 			return next(new Error(`This place should not be reachable`));
 		}
 
 		// ensure that it is ok space-wise to save additional bytes
-		const allowedSpace =
-			(session.params.maxMsgLength - session.params.currentMsgLength);
+		const allowedSpace = (session.params.maxMsgLength - session.params.currentMsgLength);
 		if (len <= allowedSpace) {
 			session.params.currentMsgLength += len;
 		} else {
-			res.status(ERR_SC.contentTooLong).send(
-				"This request goes over the message limit."
-			);
-			return;
+			return replyWithErr(ERR_SC.contentTooLong, "This request goes over the message limit.", res, req);
 		}
 
 		try {
@@ -96,19 +87,19 @@ export function saveMsgObj(saveObjFunc: MsgDelivery['saveObj'], chunkLimit: stri
 			if ("string" !== typeof err) {
 				next(err);
 			} else if (err === recipSC.USER_UNKNOWN) {
-				res.status(ERR_SC.server).send("Recipient disappeared from the system.");
+				replyWithErr(ERR_SC.server, "Recipient disappeared from the system.", res);
 				session.close();
 			} else if (err === recipSC.OBJ_EXIST) {
-				res.status(api.SC.objAlreadyExists).send(`Object ${objId} already exists.`);
+				replyWithErr(api.SC.objAlreadyExists, `Object ${objId} already exists.`, res);
 			} else if (err === recipSC.MSG_UNKNOWN) {
-				res.status(ERR_SC.server).send("Message disappeared from the system.");
+				replyWithErr(ERR_SC.server, "Message disappeared from the system.", res);
 				session.close();
 			} else if (err === recipSC.OBJ_UNKNOWN) {
-				res.status(api.SC.unknownObj).send(`Object ${objId} is unknown.`);
+				replyWithErr(api.SC.unknownObj, `Object ${objId} is unknown.`, res);
 			} else if (err === recipSC.WRONG_OBJ_STATE) {
-				res.status(ERR_SC.malformed).send(`Object ${objId} is not in a different state.`);
+				replyWithErr(ERR_SC.malformed, `Object ${objId} is not in a different state.`, res);
 			} else if (err === recipSC.OBJ_FILE_INCOMPLETE) {
-				res.status(ERR_SC.objIncomplete).send(`Object ${objId} is not complete.`);
+				replyWithErr(ERR_SC.objIncomplete, `Object ${objId} is not complete.`, res);
 			} else {
 				next(new Error(`Unhandled storage error code: ${err}`));
 			}
@@ -149,18 +140,13 @@ function extractQueryOptions(req: Request): undefined|{
 function getContentLenOrSendError(req: Request, res: Response, maxChunkSize: number): number|undefined {
 	const contentLength = parseInt(req.get(HTTP_HEADER.contentLength)!);
 	if (isNaN(contentLength)) {
-		res.status(ERR_SC.contentLenMissing).send("Content-Length header is required with proper number.");
+		replyWithErr(ERR_SC.contentLenMissing, "Content-Length header is required with proper number.", res, req);
 	} else if (contentLength > maxChunkSize) {
-		res.status(ERR_SC.contentTooLong).send("Request body is too long.");
+		replyWithErr(ERR_SC.contentTooLong, "Request body is too long.", res, req);
 	} else {
 		return contentLength;
 	}
 	return;
 }
 
-function replyToMalformed(req: Request, msg: string, res: Response): void {
-	attachByteDrainToRequest(req);
-	res.status(ERR_SC.malformed).send(msg);
-}
-
 Object.freeze(exports);

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

@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2017, 2025 3NSoft Inc.
+ Copyright (C) 2017, 2025 - 2026 3NSoft Inc.
  
  This program is free software: you can redistribute it and/or modify it under
  the terms of the GNU General Public License as published by the Free Software
@@ -17,22 +17,19 @@
 
 import { RequestHandler, Response } from 'express';
 import { SC as recipSC, MsgDelivery } from '../../resources/recipients';
-import { sessionRestart as api, ERR_SC, ErrorReply } from '../../../lib-common/service-api/asmail/delivery';
+import { sessionRestart as api, ERR_SC } from '../../../lib-common/service-api/asmail/delivery';
 import { Request, GenerateSession, GetSessionForMsg } from '../../resources/delivery-sessions';
 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';
 
 /**
  * This creates a session restart route handler.
- * @param sessionGenFunc is a promise returning function that generates new
- * session objects.
- * @param sessionForMsgFunc is a function that promises existing session for
- * a known message in delivery.
- * @param incompleteMsgFunc is a function that promises parameters of a message
- * that is still in delivery.
- * @param redirectFunc is an optional function that returns a promise,
- * resolvable to
+ * @param sessionGenFunc is a promise returning function that generates new session objects.
+ * @param sessionForMsgFunc is a function that promises existing session for a known message in delivery.
+ * @param incompleteMsgFunc is a function that promises parameters of a message that is still in delivery.
+ * @param redirectFunc is an optional function that returns a promise, resolvable to
  * (1) string with URI for ASMail service, which is serving given recipient,
  * (2) undefined, if it is this server should service given recipient. 
  */
@@ -83,18 +80,12 @@ export function restartSession(
 
 		// missing recipient makes a bad request
 		if (!recipient) {
-			res.status(ERR_SC.malformed).json( <ErrorReply> {
-				error: "Recipient is either missing in the request, or is malformed"
-			});
-			return;
+			return replyWithErr(ERR_SC.malformed, "Recipient is either missing in the request, or is malformed", res);
 		}
 
 		// check message id
 		if (typeof msgId !== 'string') {
-			res.status(ERR_SC.malformed).json( <ErrorReply> {
-				error: "Message id is either missing, or is malformed"
-			});
-			return;
+			return replyWithErr(ERR_SC.malformed, "Message id is either missing, or is malformed", res);
 		}
 
 	 	try {
@@ -112,13 +103,9 @@ export function restartSession(
 			}
 		} catch (err) {
 			if (err === recipSC.USER_UNKNOWN) {
-				res.status(api.SC.unknownRecipient).json( <ErrorReply> {
-					error: `Recipient ${recipient} is unknown.`
-				});
+				replyWithErr(api.SC.unknownRecipient, `Recipient ${recipient} is unknown.`, res);
 			} else if (err === recipSC.MSG_UNKNOWN) {
-				res.status(api.SC.unknownMsg).json( <ErrorReply> {
-					error: `Recipient ${recipient} is unknown.`
-				});
+				replyWithErr(api.SC.unknownMsg, `Recipient ${recipient} is unknown.`, res);
 			} else {
 				next(err);
 			}

package/ts-code/asmail/routes/delivery/sender-authorization.ts

@@ -19,6 +19,7 @@ import { RequestHandler } from 'express';
 import { SignedLoad } from '../../../lib-common/jwkeys';
 import { authSender as api, ERR_SC } from '../../../lib-common/service-api/asmail/delivery';
 import { Request } from '../../resources/delivery-sessions';
+import { replyWithErr } from '../../resources/utils';
 
 export type IMidAuthorizer = (
 	rpDomain: string, sessionId: string, userId: string,
@@ -38,8 +39,7 @@ export function authorize(relyingPartyDomain: string, midAuthorizingFunc: IMidAu
 	return async (req: Request, res, next) => {
 
 		if (req.session.isAuthorized) {
-			res.status(ERR_SC.duplicateReq).send("This protocol request has already been served.");
-			return;
+			return replyWithErr(ERR_SC.duplicateReq, "This protocol request has already been served.", res);
 		}
 
 		const rb: api.Request = req.body;
@@ -49,13 +49,13 @@ export function authorize(relyingPartyDomain: string, midAuthorizingFunc: IMidAu
 		if (!sender) {
 			// This case must be rejected, because place for authorizing
 			// anonymous connection is at the session start.
-			res.status(api.SC.authFailed).send("Server is not accepting provided credentials.");
+			replyWithErr(api.SC.authFailed, "Server is not accepting provided credentials.", res);
 			req.session.close();
 			return;
 		}
 
 		if (!rb.assertion || !rb.userCert || !rb.provCert) {
-			res.status(ERR_SC.malformed).send("No credentials given.");
+			replyWithErr(ERR_SC.malformed, "No credentials given.", res);
 			req.session.close();
 			return;
 		}
@@ -68,7 +68,7 @@ export function authorize(relyingPartyDomain: string, midAuthorizingFunc: IMidAu
 				req.session.isAuthorized = true;
 				res.status(api.SC.ok).send();
 			} else {
-				res.status(api.SC.authFailed).send("Server is not accepting provided credentials.");
+				replyWithErr(api.SC.authFailed, "Server is not accepting provided credentials.", res);
 				req.session.close();
 			}
 		} catch (err) {

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

@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2015 - 2016, 2025 3NSoft Inc.
+ Copyright (C) 2015 - 2016, 2025 - 2026  3NSoft Inc.
  
  This program is free software: you can redistribute it and/or modify it under
  the terms of the GNU General Public License as published by the Free Software
@@ -18,8 +18,9 @@
 import { RequestHandler, Response } from 'express';
 import { GenerateSession, Request } from '../../resources/delivery-sessions';
 import { SC as recipSC, MsgDelivery } from '../../resources/recipients';
-import { sessionStart as api, ERR_SC, ErrorReply } from '../../../lib-common/service-api/asmail/delivery';
+import { sessionStart as api, ERR_SC } from '../../../lib-common/service-api/asmail/delivery';
 import { checkAndTransformAddress } from '../../../lib-common/canonical-address';
+import { replyWithErr } from '../../resources/utils';
 
 export type Redirect = (userId: string) => Promise<string>;
 
@@ -64,17 +65,14 @@ export function startSession(
 				maxMsgLength: msgSize
 			});
 		} else if (msgSize === 0) {
-			res.status(api.SC.senderNotAllowed).json( <ErrorReply> {
-				error: `${sender ? sender : "Anonymous sender "} is not allowed to leave mail for ${recipient}`
-			});
+			replyWithErr(
+				api.SC.senderNotAllowed,
+				`${sender ? sender : "Anonymous sender "} is not allowed to leave mail for ${recipient}`, res
+			);
 		} else if (msgSize === -1) {
-			res.status(api.SC.inboxFull).json( <ErrorReply> {
-				error: `Mail box for ${recipient} is full.`
-			});
+			replyWithErr(api.SC.inboxFull, `Mail box for ${recipient} is full.`, res);
 		} else {
-			throw new Error(
-				`Unrecognized code ${msgSize} for message size limits.`
-			);
+			throw new Error(`Unrecognized code ${msgSize} for message size limits.`);
 		}
 	}
 
@@ -88,17 +86,13 @@ export function startSession(
 
 		// already existing session indicates repeated call, which should be bounced off
 		if (session) {
-			res.status(ERR_SC.duplicateReq).json( <ErrorReply> {
-				error: "This protocol request has already been served."
-			});
+			replyWithErr(ERR_SC.duplicateReq, "This protocol request has already been served.", res);
 			return;
 		}
 
 		// missing recipient makes a bad request
 		if (!recipient) {
-			res.status(ERR_SC.malformed).json( <ErrorReply> {
-				error: "Recipient is either missing in the request, or is malformed"
-			});
+			replyWithErr(ERR_SC.malformed, "Recipient is either missing in the request, or is malformed", res);
 			return;
 		}
 
@@ -106,29 +100,22 @@ export function startSession(
 		if (sender) {
 			sender = checkAndTransformAddress(sender);
 			if (!sender) {
-				res.status(ERR_SC.malformed).json( <ErrorReply> {
-					error: "Sender field is malformed"
-				});
-				return;
+				return replyWithErr(ERR_SC.malformed, "Sender field is malformed", res);
 			}
 		}
 
 		// check invitation field
 		if ((invitation !== undefined) && (typeof invitation !== 'string')) {
-			res.status(ERR_SC.malformed).json( <ErrorReply> {
-				error: "Inviation field is malformed"
-			});
-			return;
+			return replyWithErr(ERR_SC.malformed, "Inviation field is malformed", res);
 		}
 
 		try {
 			if (redirectFunc) {
 				const redirectTo = await redirectFunc(recipient)
 				if (redirectTo) {
-					res.status(api.SC.redirect).json(
-						<api.RedirectReply> {
-							redirect: redirectTo
-						});
+					res.status(api.SC.redirect).json({
+						redirect: redirectTo
+					} as api.RedirectReply);
 				} else {
 					await serveRequestHere(recipient, sender, invitation, res);
 				}
@@ -137,9 +124,7 @@ export function startSession(
 			}
 		} catch (err) {
 			if (err === recipSC.USER_UNKNOWN) {
-				res.status(api.SC.unknownRecipient).json( <ErrorReply> {
-					error: `Recipient ${recipient} is unknown.`
-				});
+				replyWithErr(api.SC.unknownRecipient, `Recipient ${recipient} is unknown.`, res);
 			} else {
 				next(err);
 			}