spec-3nweb-server 1.7.0 → 1.7.5

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

@@ -5,15 +5,15 @@ import * as configApi from '../../lib-common/service-api/asmail/config';
 import * as retrievalApi from '../../lib-common/service-api/asmail/retrieval';
 import { UserFiles, ObjReader } from '../../lib-server/resources/user-files';
 export { ObjPipe, ObjReader } from '../../lib-server/resources/user-files';
-declare type AnonSenderPolicy = configApi.p.anonSenderPolicy.Policy;
-export declare type AuthSenderPolicy = configApi.p.authSenderPolicy.Policy;
-declare type Whitelist = configApi.p.authSenderWhitelist.List;
-declare type Blacklist = configApi.p.authSenderBlacklist.List;
-declare type AuthSenderInvites = configApi.p.authSenderInvites.List;
-declare type AnonSenderInvites = configApi.p.anonSenderInvites.List;
-declare type MsgMeta = retrievalApi.MsgMeta;
-export declare type MsgEvents = retrievalApi.msgMainObjRecieved.Event | retrievalApi.msgRecievedCompletely.Event;
-export declare type MailEventsSink = (userId: string, channel: string, event: MsgEvents) => void;
+type AnonSenderPolicy = configApi.p.anonSenderPolicy.Policy;
+export type AuthSenderPolicy = configApi.p.authSenderPolicy.Policy;
+type Whitelist = configApi.p.authSenderWhitelist.List;
+type Blacklist = configApi.p.authSenderBlacklist.List;
+type AuthSenderInvites = configApi.p.authSenderInvites.List;
+type AnonSenderInvites = configApi.p.anonSenderInvites.List;
+type MsgMeta = retrievalApi.MsgMeta;
+export type MsgEvents = retrievalApi.msgMainObjRecieved.Event | retrievalApi.msgRecievedCompletely.Event;
+export type MailEventsSink = (userId: string, channel: string, event: MsgEvents) => void;
 export declare const SC: {
     OBJ_EXIST: string;
     USER_UNKNOWN: string;
@@ -22,7 +22,16 @@ export declare const SC: {
     WRONG_OBJ_STATE: string;
     OBJ_FILE_INCOMPLETE: string;
 };
-export declare class Inbox extends UserFiles {
+export interface InboxParams {
+    "pubkey": deliveryApi.initPubKey.Reply;
+    "anonymous/policy": AnonSenderPolicy;
+    "anonymous/invites": AnonSenderInvites;
+    "authenticated/policy": AuthSenderPolicy;
+    "authenticated/blacklist": Blacklist;
+    "authenticated/whitelist": Whitelist;
+    "authenticated/invites": AuthSenderInvites;
+}
+export declare class Inbox extends UserFiles<InboxParams> {
     private metas;
     private objFiles;
     private mailEventsSink;
@@ -97,35 +106,17 @@ export declare class Inbox extends UserFiles {
      */
     getObj(msgId: string, objId: string, header: boolean, segsOfs: number, segsLimit: number | undefined): Promise<ObjReader>;
     /**
-     * @param inbox
      * @param initKeyCerts
      * @param setDefault when it is true, sets default values -- null --
      * in place of an object with certs.
      * @return a promise, resolvable to true, when certs are set, or
      * resolvable to false, when given certs do not pass sanitization.
      */
-    static setPubKey(inbox: Inbox, initKeyCerts: deliveryApi.initPubKey.Reply, setDefault: boolean): Promise<boolean>;
-    /**
-     * @return a promise, either resolvable to object with certificates,
-     * or resolvable to null (default), if key certs were not set by the user.
-     */
-    static getPubKey(inbox: Inbox): Promise<deliveryApi.initPubKey.Reply>;
-    static getAnonSenderPolicy(inbox: Inbox): Promise<AnonSenderPolicy>;
-    static setAnonSenderPolicy(inbox: Inbox, policy: AnonSenderPolicy, setDefault: boolean): Promise<boolean>;
-    getAnonSenderPolicy(): Promise<AnonSenderPolicy>;
-    static getAnonSenderInvites(inbox: Inbox): Promise<AnonSenderInvites>;
-    static setAnonSenderInvites(inbox: Inbox, invites: AnonSenderInvites, setDefault: boolean): Promise<boolean>;
-    getAnonSenderInvites(): Promise<AnonSenderInvites>;
-    static getAuthSenderPolicy(inbox: Inbox): Promise<AuthSenderPolicy>;
-    static setAuthSenderPolicy(inbox: Inbox, policy: AuthSenderPolicy, setDefault: boolean): Promise<boolean>;
-    getAuthSenderPolicy(): Promise<AuthSenderPolicy>;
-    static getAuthSenderBlacklist(inbox: Inbox): Promise<Blacklist>;
-    static setAuthSenderBlacklist(inbox: Inbox, list: Blacklist, setDefault: boolean): Promise<boolean>;
-    getAuthSenderBlacklist(): Promise<Blacklist>;
-    static getAuthSenderWhitelist(inbox: Inbox): Promise<Whitelist>;
-    static setAuthSenderWhitelist(inbox: Inbox, list: Whitelist, setDefault: boolean): Promise<boolean>;
-    getAuthSenderWhitelist(): Promise<Whitelist>;
-    static getAuthSenderInvites(inbox: Inbox): Promise<AuthSenderInvites>;
-    static setAuthSenderInvites(inbox: Inbox, invites: AuthSenderInvites, setDefault: boolean): Promise<boolean>;
-    getAuthSenderInvites(): Promise<AuthSenderInvites>;
+    setPubKey(initKeyCerts: deliveryApi.initPubKey.Reply, setDefault: boolean): Promise<boolean>;
+    setAnonSenderPolicy(policy: AnonSenderPolicy, setDefault: boolean): Promise<boolean>;
+    setAnonSenderInvites(invites: AnonSenderInvites, setDefault: boolean): Promise<boolean>;
+    setAuthSenderPolicy(policy: AuthSenderPolicy, setDefault: boolean): Promise<boolean>;
+    setAuthSenderBlacklist(list: Blacklist, setDefault: boolean): Promise<boolean>;
+    setAuthSenderWhitelist(list: Whitelist, setDefault: boolean): Promise<boolean>;
+    setAuthSenderInvites(invites: AuthSenderInvites, setDefault: boolean): Promise<boolean>;
 }

package/build/asmail/resources/inbox.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2015 - 2017, 2019 - 2020 3NSoft Inc.
+ Copyright (C) 2015 - 2017, 2019 - 2020, 2025 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
@@ -329,14 +329,13 @@ class Inbox extends user_files_1.UserFiles {
         return reader;
     }
     /**
-     * @param inbox
      * @param initKeyCerts
      * @param setDefault when it is true, sets default values -- null --
      * in place of an object with certs.
      * @return a promise, resolvable to true, when certs are set, or
      * resolvable to false, when given certs do not pass sanitization.
      */
-    static async setPubKey(inbox, initKeyCerts, setDefault) {
+    async setPubKey(initKeyCerts, setDefault) {
         if (setDefault) {
             initKeyCerts = null;
         }
@@ -349,20 +348,10 @@ class Inbox extends user_files_1.UserFiles {
                 return false;
             }
         }
-        await inbox.setParam('pubkey', initKeyCerts);
+        await this.setParam('pubkey', initKeyCerts);
         return true;
     }
-    /**
-     * @return a promise, either resolvable to object with certificates,
-     * or resolvable to null (default), if key certs were not set by the user.
-     */
-    static getPubKey(inbox) {
-        return inbox.getParam('pubkey');
-    }
-    static getAnonSenderPolicy(inbox) {
-        return inbox.getParam('anonymous/policy');
-    }
-    static async setAnonSenderPolicy(inbox, policy, setDefault) {
+    async setAnonSenderPolicy(policy, setDefault) {
         if (setDefault) {
             policy = {
                 accept: true,
@@ -380,16 +369,10 @@ class Inbox extends user_files_1.UserFiles {
                 false;
             }
         }
-        await inbox.setParam('anonymous/policy', policy);
+        await this.setParam('anonymous/policy', policy);
         return true;
     }
-    getAnonSenderPolicy() {
-        return Inbox.getAnonSenderPolicy(this);
-    }
-    static getAnonSenderInvites(inbox) {
-        return inbox.getParam('anonymous/invites');
-    }
-    static async setAnonSenderInvites(inbox, invites, setDefault) {
+    async setAnonSenderInvites(invites, setDefault) {
         if (setDefault) {
             invites = {};
         }
@@ -406,16 +389,10 @@ class Inbox extends user_files_1.UserFiles {
                 }
             }
         }
-        await inbox.setParam('anonymous/invites', invites);
+        await this.setParam('anonymous/invites', invites);
         return true;
     }
-    getAnonSenderInvites() {
-        return Inbox.getAnonSenderInvites(this);
-    }
-    static getAuthSenderPolicy(inbox) {
-        return inbox.getParam('authenticated/policy');
-    }
-    static async setAuthSenderPolicy(inbox, policy, setDefault) {
+    async setAuthSenderPolicy(policy, setDefault) {
         if (setDefault) {
             policy = {
                 acceptWithInvitesOnly: false,
@@ -435,16 +412,10 @@ class Inbox extends user_files_1.UserFiles {
                 return false;
             }
         }
-        await inbox.setParam('authenticated/policy', policy);
+        await this.setParam('authenticated/policy', policy);
         return true;
     }
-    getAuthSenderPolicy() {
-        return Inbox.getAuthSenderPolicy(this);
-    }
-    static getAuthSenderBlacklist(inbox) {
-        return inbox.getParam('authenticated/blacklist');
-    }
-    static async setAuthSenderBlacklist(inbox, list, setDefault) {
+    async setAuthSenderBlacklist(list, setDefault) {
         if (setDefault) {
             list = {};
         }
@@ -454,16 +425,10 @@ class Inbox extends user_files_1.UserFiles {
                 return false;
             }
         }
-        await inbox.setParam('authenticated/blacklist', list);
+        await this.setParam('authenticated/blacklist', list);
         return true;
     }
-    getAuthSenderBlacklist() {
-        return Inbox.getAuthSenderBlacklist(this);
-    }
-    static getAuthSenderWhitelist(inbox) {
-        return inbox.getParam('authenticated/whitelist');
-    }
-    static async setAuthSenderWhitelist(inbox, list, setDefault) {
+    async setAuthSenderWhitelist(list, setDefault) {
         if (setDefault) {
             list = {};
         }
@@ -480,16 +445,10 @@ class Inbox extends user_files_1.UserFiles {
                 }
             }
         }
-        await inbox.setParam('authenticated/whitelist', list);
+        await this.setParam('authenticated/whitelist', list);
         return true;
     }
-    getAuthSenderWhitelist() {
-        return Inbox.getAuthSenderWhitelist(this);
-    }
-    static getAuthSenderInvites(inbox) {
-        return inbox.getParam('authenticated/invites');
-    }
-    static async setAuthSenderInvites(inbox, invites, setDefault) {
+    async setAuthSenderInvites(invites, setDefault) {
         if (setDefault) {
             invites = {};
         }
@@ -506,12 +465,9 @@ class Inbox extends user_files_1.UserFiles {
                 }
             }
         }
-        await inbox.setParam('authenticated/invites', invites);
+        await this.setParam('authenticated/invites', invites);
         return true;
     }
-    getAuthSenderInvites() {
-        return Inbox.getAuthSenderInvites(this);
-    }
 }
 exports.Inbox = Inbox;
 Object.freeze(Inbox.prototype);

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

@@ -1,8 +1,7 @@
 /// <reference types="node" />
 import { Readable } from 'stream';
-import { Inbox, ObjReader, MailEventsSink } from './inbox';
+import { ObjReader, MailEventsSink, InboxParams } from './inbox';
 import * as deliveryApi from '../../lib-common/service-api/asmail/delivery';
-import * as configApi from '../../lib-common/service-api/asmail/config';
 import * as retrievalApi from '../../lib-common/service-api/asmail/retrieval';
 export { SC } from './inbox';
 export declare const BIN_TYPE = "application/octet-stream";
@@ -10,7 +9,7 @@ export declare const BIN_TYPE = "application/octet-stream";
  * This checks existence of a given user, returning a promise, resolvable
  * either to true, when given user id is known, or to false, when it is not.
  */
-export declare type UserExists = (userId: string) => Promise<boolean>;
+export type UserExists = (userId: string) => Promise<boolean>;
 /**
  * This tells what is an allowable maximum message size for a given recipient,
  * for a given sender and/or under a given invitation token.
@@ -20,46 +19,46 @@ export declare type UserExists = (userId: string) => Promise<boolean>;
  * (3) -1 (less than zero), if mail cannot be accepted due to full mail
  *     box.
  */
-export declare type AllowedMaxMsgSize = (recipient: string, sender: string | undefined, invitation: string | undefined) => Promise<number>;
+export type AllowedMaxMsgSize = (recipient: string, sender: string | undefined, invitation: string | undefined) => Promise<number>;
 /**
  * This allocates storage for a message returning a promise, resolvable to
  * (1) message id, when a folder for new message has been created,
  * (2) undefined, if recipient is unknown.
  */
-export declare type SetMsgStorage = (recipient: string, msgMeta: deliveryApi.msgMeta.Request, authSender: string | undefined, invite: string | undefined, maxMsgLength: number) => Promise<string>;
+export type SetMsgStorage = (recipient: string, msgMeta: deliveryApi.msgMeta.Request, authSender: string | undefined, invite: string | undefined, maxMsgLength: number) => Promise<string>;
 /**
  * This saves object's bytes, returning a promise, resolvable when saving
  * is OK, otherwise, promise rejects with string error code from SC.
  */
-export declare type SaveObj = (recipient: string, msgId: string, objId: string, fstReq: deliveryApi.PutObjFirstQueryOpts | undefined, sndReq: deliveryApi.PutObjSecondQueryOpts | undefined, bytesLen: number, bytes: Readable) => Promise<void>;
+export type SaveObj = (recipient: string, msgId: string, objId: string, fstReq: deliveryApi.PutObjFirstQueryOpts | undefined, sndReq: deliveryApi.PutObjSecondQueryOpts | undefined, bytesLen: number, bytes: Readable) => Promise<void>;
 /**
  * This finalizes delivery of a message, returning a promise.
  * Rejected promise may have a string error code from SC.
  */
-export declare type FinalizeDelivery = (recipient: string, msgId: string) => Promise<void>;
+export type FinalizeDelivery = (recipient: string, msgId: string) => Promise<void>;
 /**
  * This returns a promise, resolvable to array with ids of available messages.
  * Rejected promise may have a string error code from SC.
  */
-export declare type GetMsgIds = (userId: string) => Promise<retrievalApi.listMsgs.Reply>;
+export type GetMsgIds = (userId: string) => Promise<retrievalApi.listMsgs.Reply>;
 /**
  * This returns a promise, resolvable to message meta.
  * Rejected promise may have a string error code from SC.
  */
-export declare type GetMsgMeta = (userId: string, msgId: string) => Promise<retrievalApi.MsgMeta>;
+export type GetMsgMeta = (userId: string, msgId: string) => Promise<retrievalApi.MsgMeta>;
 /**
  * This deletes a message returning a promise, resolvable when message is
  * removed.
  * Rejected promise may have a string error code from SC.
  */
-export declare type DeleteMsg = (userId: string, msgId: string) => Promise<void>;
+export type DeleteMsg = (userId: string, msgId: string) => Promise<void>;
 /**
  * This returns parameter of a message that is still in delivery, identified
  * by given recipient and message id. If message is unknown, or if it has
  * already been delivered, error code is thrown.
  * Rejected promise may have a string error code from SC.
  */
-export declare type IncompleteMsgDeliveryParams = (recipient: string, msgId: string) => Promise<{
+export type IncompleteMsgDeliveryParams = (recipient: string, msgId: string) => Promise<{
     maxMsgLength: number;
     currentMsgLength: number;
 }>;
@@ -67,14 +66,24 @@ export declare type IncompleteMsgDeliveryParams = (recipient: string, msgId: str
  * This returns a promise, resolvable to readable stream of object bytes.
  * Rejected promise may be passing string error code from SC.
  */
-export declare type GetObj = (userId: string, msgId: string, objId: string, header: boolean, segsOffset: number, segsLimit: number | undefined) => Promise<ObjReader>;
-declare type GetParam<T> = (userId: string) => Promise<T>;
-declare type SetParam<T> = (userId: string, param: T) => Promise<boolean>;
-export declare type GetPubKey = GetParam<configApi.p.initPubKey.Certs>;
-export declare type SetPubKey = SetParam<configApi.p.initPubKey.Certs>;
-export declare type GetAnonSenderInvites = GetParam<configApi.p.anonSenderInvites.List>;
-export declare type SetAnonSenderInvites = SetParam<configApi.p.anonSenderInvites.List>;
-export declare type EventsSink = MailEventsSink;
+export type GetObj = (userId: string, msgId: string, objId: string, header: boolean, segsOffset: number, segsLimit: number | undefined) => Promise<ObjReader>;
+type GetParam<P extends keyof InboxParams> = (userId: string) => Promise<InboxParams[P]>;
+type SetParam<P extends keyof InboxParams> = (userId: string, param: InboxParams[P]) => Promise<boolean>;
+export type GetPubKey = GetParam<'pubkey'>;
+export type SetPubKey = SetParam<'pubkey'>;
+export type GetAnonSenderPolicy = GetParam<'anonymous/policy'>;
+export type SetAnonSenderPolicy = SetParam<'anonymous/policy'>;
+export type GetAnonSenderInvites = GetParam<'anonymous/invites'>;
+export type SetAnonSenderInvites = SetParam<'anonymous/invites'>;
+export type GetAuthSenderPolicy = GetParam<'authenticated/policy'>;
+export type SetAuthSenderPolicy = SetParam<'authenticated/policy'>;
+export type GetAuthSenderInvites = GetParam<'authenticated/invites'>;
+export type SetAuthSenderInvites = SetParam<'authenticated/invites'>;
+export type GetAuthSenderBlacklist = GetParam<'authenticated/blacklist'>;
+export type SetAuthSenderBlacklist = SetParam<'authenticated/blacklist'>;
+export type GetAuthSenderWhitelist = GetParam<'authenticated/whitelist'>;
+export type SetAuthSenderWhitelist = SetParam<'authenticated/whitelist'>;
+export type EventsSink = MailEventsSink;
 export interface Factory {
     exists: UserExists;
     allowedMaxMsgSize: AllowedMaxMsgSize;
@@ -86,11 +95,20 @@ export interface Factory {
     deleteMsg: DeleteMsg;
     getObj: GetObj;
     incompleteMsgDeliveryParams: IncompleteMsgDeliveryParams;
+    setMailEventsSink(sink: EventsSink): void;
     getPubKey: GetPubKey;
     setPubKey: SetPubKey;
+    getAnonSenderPolicy: GetAnonSenderPolicy;
+    setAnonSenderPolicy: SetAnonSenderPolicy;
     getAnonSenderInvites: GetAnonSenderInvites;
     setAnonSenderInvites: SetAnonSenderInvites;
-    setMailEventsSink(sink: EventsSink): void;
+    getAuthSenderPolicy: GetAuthSenderPolicy;
+    setAuthSenderPolicy: SetAuthSenderPolicy;
+    getAuthSenderInvites: GetAuthSenderInvites;
+    setAuthSenderInvites: SetAuthSenderInvites;
+    getAuthSenderBlacklist: GetAuthSenderBlacklist;
+    setAuthSenderBlacklist: SetAuthSenderBlacklist;
+    getAuthSenderWhitelist: GetAuthSenderWhitelist;
+    setAuthSenderWhitelist: SetAuthSenderWhitelist;
 }
-export declare type StaticSetter<T> = (inbox: Inbox, param: T, setDefault: boolean) => Promise<boolean>;
 export declare function makeFactory(rootFolder: string, writeBufferSize?: string | number, readBufferSize?: string | number): Factory;

package/build/asmail/resources/recipients.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2015 - 2017, 2020 3NSoft Inc.
+ Copyright (C) 2015 - 2017, 2020, 2025 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
@@ -85,7 +85,7 @@ async function adaptToFreeSpaceLeft(inbox, msgSize) {
  *     mail box.
  */
 async function allowedMsgSizeForAnonSender(inbox, invitation) {
-    const policy = await inbox.getAnonSenderPolicy();
+    const policy = await inbox.getParam('anonymous/policy');
     if (!policy.accept) {
         return 0;
     }
@@ -96,7 +96,7 @@ async function allowedMsgSizeForAnonSender(inbox, invitation) {
         return await adaptToFreeSpaceLeft(inbox, policy.defaultMsgSize);
     }
     else {
-        const invites = await inbox.getAnonSenderInvites();
+        const invites = await inbox.getParam('anonymous/invites');
         const sizeForInvite = invites[invitation];
         if (typeof sizeForInvite !== 'number') {
             return 0;
@@ -116,8 +116,8 @@ async function allowedMsgSizeForAnonSender(inbox, invitation) {
  */
 async function allowedMsgSizeForAuthSender(inbox, sender, invitation) {
     const results = await Promise.all([
-        inbox.getAuthSenderPolicy(),
-        inbox.getAuthSenderWhitelist()
+        inbox.getParam('authenticated/policy'),
+        inbox.getParam('authenticated/whitelist')
     ]);
     const policy = results[0];
     const sizeFromWL = findMatchIn(results[1], sender);
@@ -134,7 +134,7 @@ async function allowedMsgSizeForAuthSender(inbox, sender, invitation) {
     }
     // if needed, apply blacklist
     if (policy.applyBlackList) {
-        const bList = await inbox.getAuthSenderBlacklist();
+        const bList = await inbox.getParam('authenticated/blacklist');
         if (typeof findMatchIn(bList, sender) === 'undefined') {
             return adaptToFreeSpaceLeft(inbox, policy.defaultMsgSize);
         }
@@ -169,18 +169,6 @@ function makeFactory(rootFolder, writeBufferSize, readBufferSize) {
             return inbox;
         }
     }
-    function makeParamGetter(staticGetter) {
-        return async (userId) => {
-            const inbox = await getInbox(userId);
-            return staticGetter(inbox);
-        };
-    }
-    function makeParamSetter(staticSetter) {
-        return async (userId, param, setDefault) => {
-            const inbox = await getInbox(userId);
-            return staticSetter(inbox, param, !!setDefault);
-        };
-    }
     const recipients = {
         exists: async (userId) => {
             try {
@@ -194,10 +182,62 @@ function makeFactory(rootFolder, writeBufferSize, readBufferSize) {
                 return false;
             }
         },
-        getPubKey: makeParamGetter(inbox_1.Inbox.getPubKey),
-        setPubKey: makeParamSetter(inbox_1.Inbox.setPubKey),
-        getAnonSenderInvites: makeParamGetter(inbox_1.Inbox.getAnonSenderInvites),
-        setAnonSenderInvites: makeParamSetter(inbox_1.Inbox.setAnonSenderInvites),
+        getPubKey: async (recipient) => {
+            const inbox = await getInbox(recipient);
+            return inbox.getParam('pubkey');
+        },
+        setPubKey: async (userId, pkey) => {
+            const inbox = await getInbox(userId);
+            return inbox.setPubKey(pkey, false);
+        },
+        getAnonSenderPolicy: async (recipient) => {
+            const inbox = await getInbox(recipient);
+            return inbox.getParam('anonymous/policy');
+        },
+        setAnonSenderPolicy: async (userId, policy) => {
+            const inbox = await getInbox(userId);
+            return inbox.setAnonSenderPolicy(policy, false);
+        },
+        getAnonSenderInvites: async (recipient) => {
+            const inbox = await getInbox(recipient);
+            return inbox.getParam('anonymous/invites');
+        },
+        setAnonSenderInvites: async (userId, invites) => {
+            const inbox = await getInbox(userId);
+            return inbox.setAnonSenderInvites(invites, false);
+        },
+        getAuthSenderPolicy: async (recipient) => {
+            const inbox = await getInbox(recipient);
+            return inbox.getParam('authenticated/policy');
+        },
+        setAuthSenderPolicy: async (userId, policy) => {
+            const inbox = await getInbox(userId);
+            return inbox.setAuthSenderPolicy(policy, false);
+        },
+        getAuthSenderInvites: async (recipient) => {
+            const inbox = await getInbox(recipient);
+            return inbox.getParam('authenticated/invites');
+        },
+        setAuthSenderInvites: async (userId, invites) => {
+            const inbox = await getInbox(userId);
+            return inbox.setAnonSenderInvites(invites, false);
+        },
+        getAuthSenderBlacklist: async (recipient) => {
+            const inbox = await getInbox(recipient);
+            return inbox.getParam('authenticated/blacklist');
+        },
+        setAuthSenderBlacklist: async (userId, list) => {
+            const inbox = await getInbox(userId);
+            return inbox.setAuthSenderBlacklist(list, false);
+        },
+        getAuthSenderWhitelist: async (recipient) => {
+            const inbox = await getInbox(recipient);
+            return inbox.getParam('authenticated/whitelist');
+        },
+        setAuthSenderWhitelist: async (userId, list) => {
+            const inbox = await getInbox(userId);
+            return inbox.setAuthSenderWhitelist(list, false);
+        },
         allowedMaxMsgSize: async (recipient, sender, invitation) => {
             const inbox = await getInbox(recipient);
             // XXX move these two functions into inbox

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

@@ -1,6 +1,6 @@
 import { Request as Req, SessionParams, Factory } from '../../lib-server/resources/sessions';
-export declare type SessionsFactory = Factory<SessionParams>;
-export declare type Request = Req<SessionParams>;
+export type SessionsFactory = Factory<SessionParams>;
+export type Request = Req<SessionParams>;
 /**
  * This returns factory, that works properly in a single process application,
  * clearing up sessions that past given timeout.

package/build/asmail/retrieval.d.ts

@@ -1,5 +1,5 @@
 import { AppWithWSs } from '../lib-server/web-sockets/app';
 import { SessionsFactory } from './resources/sessions';
-import { Factory as recipFactory } from './resources/recipients';
+import { Factory as RecipFactory } from './resources/recipients';
 import { MidAuthorizer } from '../lib-server/routes/sessions/mid-auth';
-export declare function makeApp(domain: string, sessions: SessionsFactory, recipients: recipFactory, midAuthorizer: MidAuthorizer): AppWithWSs;
+export declare function makeApp(domain: string, sessions: SessionsFactory, recipients: RecipFactory, midAuthorizer: MidAuthorizer): AppWithWSs;

package/build/asmail/retrieval.js

@@ -17,26 +17,19 @@
 */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeApp = void 0;
-/**
- * This module gives a function that creates a mountable, or app.use()-able,
- * express ASMail application.
- */
-// Internal libs
 const body_parsers_1 = require("../lib-server/middleware/body-parsers");
 const app_1 = require("../lib-server/web-sockets/app");
 const server_events_1 = require("../lib-server/web-sockets/server-events");
-// routes
-const mid_auth_1 = require("../lib-server/routes/sessions/mid-auth");
-const start_1 = require("../lib-server/routes/sessions/start");
 const close_1 = require("../lib-server/routes/sessions/close");
 const list_messages_1 = require("./routes/retrieval/list-messages");
 const get_message_meta_1 = require("./routes/retrieval/get-message-meta");
 const remove_message_1 = require("./routes/retrieval/remove-message");
 const get_message_obj_1 = require("./routes/retrieval/get-message-obj");
 const api = require("../lib-common/service-api/asmail/retrieval");
+const mid_access_1 = require("../lib-server/mid-access");
 function makeApp(domain, sessions, recipients, midAuthorizer) {
     const app = new app_1.AppWithWSs();
-    setHttpPart(app, domain, sessions, recipients, midAuthorizer);
+    setHttpPart(app.http, domain, sessions, recipients, midAuthorizer);
     setWSPart(app, sessions, recipients);
     return app;
 }
@@ -51,15 +44,15 @@ function setWSPart(app, sessions, recipients) {
     app.addWS(api.wsEventChannel.URL_END, sockets);
 }
 function setHttpPart(app, domain, sessions, recipients, midAuthorizer) {
-    app.http.disable('etag');
-    app.http.post('/' + api.midLogin.START_URL_END, sessions.checkSession(), (0, body_parsers_1.json)('1kb'), (0, start_1.startSession)(recipients.exists, sessions.generate));
-    app.http.post('/' + api.midLogin.AUTH_URL_END, sessions.ensureOpenedSession(), (0, body_parsers_1.json)('4kb'), (0, mid_auth_1.midLogin)(domain, midAuthorizer));
+    app.disable('etag');
+    // Login
+    (0, mid_access_1.addMailerIdLoginRoutes)(app, domain, '/' + api.midLogin.URL_PART, sessions, recipients.exists, midAuthorizer);
     // *** Require authorized session for everything below ***
-    app.http.use(sessions.ensureAuthorizedSession());
-    app.http.post('/' + api.closeSession.URL_END, (0, body_parsers_1.emptyBody)(), (0, close_1.closeSession)());
-    app.http.get('/' + api.listMsgs.URL_END, (0, list_messages_1.listMsgIds)(recipients.getMsgIds));
-    app.http.get('/' + api.msgMetadata.EXPRESS_URL_END, (0, get_message_meta_1.getMsgMeta)(recipients.getMsgMeta));
-    app.http.delete('/' + api.rmMsg.EXPRESS_URL_END, (0, remove_message_1.deleteMsg)(recipients.deleteMsg));
-    app.http.get('/' + api.msgObj.EXPRESS_URL_END, (0, get_message_obj_1.getMsgObj)(recipients.getObj));
+    app.use(sessions.ensureAuthorizedSession());
+    app.post('/' + api.closeSession.URL_END, (0, body_parsers_1.emptyBody)(), (0, close_1.closeSession)());
+    app.get('/' + api.listMsgs.URL_END, (0, list_messages_1.listMsgIds)(recipients.getMsgIds));
+    app.get('/' + api.msgMetadata.EXPRESS_URL_END, (0, get_message_meta_1.getMsgMeta)(recipients.getMsgMeta));
+    app.delete('/' + api.rmMsg.EXPRESS_URL_END, (0, remove_message_1.deleteMsg)(recipients.deleteMsg));
+    app.get('/' + api.msgObj.EXPRESS_URL_END, (0, get_message_obj_1.getMsgObj)(recipients.getObj));
 }
 Object.freeze(exports);

package/build/asmail/routes/delivery/sender-authorization.d.ts

@@ -1,6 +1,6 @@
 import { RequestHandler } from 'express';
 import { SignedLoad } from '../../../lib-common/jwkeys';
-export declare type IMidAuthorizer = (rpDomain: string, sessionId: string, userId: string, mailerIdAssertion: SignedLoad, userCert: SignedLoad, provCert: SignedLoad) => Promise<boolean>;
+export type IMidAuthorizer = (rpDomain: string, sessionId: string, userId: string, mailerIdAssertion: SignedLoad, userCert: SignedLoad, provCert: SignedLoad) => Promise<boolean>;
 /**
  * This creates an authorize-sender route handler.
  * @param relyingPartyDomain at which this service operates, as seen by client

package/build/asmail/routes/delivery/start-session.d.ts

@@ -1,7 +1,7 @@
 import { RequestHandler } from 'express';
 import { GenerateSession } from '../../resources/delivery-sessions';
 import { AllowedMaxMsgSize } from '../../resources/recipients';
-export declare type Redirect = (userId: string) => Promise<string>;
+export type Redirect = (userId: string) => Promise<string>;
 /**
  * This creates a start-session route handler.
  * @param allowedMsgSizeFunc is a function returning promises, that may resolve to

package/build/config/letsencrypt.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 import { ServerOptions } from "https";
-export declare type CertsUpdateListener = (newOpts: ServerOptions, originalOpts: ServerOptions) => Promise<void>;
+export type CertsUpdateListener = (newOpts: ServerOptions, originalOpts: ServerOptions) => Promise<void>;
 export declare function sslOptsFromConfig(letsencrypt: string | undefined, sslOpts: ServerOptions | undefined, skipReloadOnCertsChange: boolean | undefined): {
     sslOpts: ServerOptions;
     onCertsUpdate?: (listener: CertsUpdateListener) => (() => void);

package/build/config/signup.d.ts

@@ -1,4 +1,4 @@
-import { MultiDomainSignupCtx, SingleUserSignupCtx } from "../admin/signup-tokens";
+import { MultiDomainSignupCtx, SingleUserSignupCtx } from "../signup/signup-tokens";
 export declare function addSingleUserSignup(rootFolder: string, userId: string): Promise<string>;
 export declare function addMultiDomainSignup(rootFolder: string, domains: string[]): Promise<string>;
 export declare function readNoTokensFile(noTokenFile: string): Promise<MultiDomainSignupCtx>;

package/build/config/signup.js

@@ -18,7 +18,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.readAllSignupTokens = exports.readTokenFile = exports.readNoTokensFile = exports.addMultiDomainSignup = exports.addSingleUserSignup = void 0;
 const async_fs_node_1 = require("../lib-common/async-fs-node");
-const signup_tokens_1 = require("../admin/signup-tokens");
+const signup_tokens_1 = require("../signup/signup-tokens");
 const server_data_folders_1 = require("../lib-server/resources/server-data-folders");
 const error_1 = require("../lib-common/exceptions/error");
 const path_1 = require("path");
@@ -129,4 +129,5 @@ async function readAllSignupTokens(rootFolder) {
     return { multiUserTokens, singleUserTokens };
 }
 exports.readAllSignupTokens = readAllSignupTokens;
+// XXX external qrencode command can be used to display QR code
 Object.freeze(exports);

package/build/lib-common/assert.js

@@ -13,7 +13,8 @@
  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/>. */
+ this program. If not, see <http://www.gnu.org/licenses/>.
+*/
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.assert = void 0;
 function assert(ok, errMsg) {

package/build/lib-common/buffer-utils.js

@@ -13,7 +13,8 @@
  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/>. */
+ this program. If not, see <http://www.gnu.org/licenses/>.
+*/
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.joinByteArrs = exports.utf8 = exports.base64urlSafe = exports.base64 = exports.bufFromJson = exports.toBuffer = exports.EMPTY_BUFFER = void 0;
 exports.EMPTY_BUFFER = Buffer.alloc(0);