spec-3nweb-server 1.7.1 → 1.7.5

package/build/{mailerId/resources/compute-login-dhshared-key.js → lib-server/resources/server-key-for-pkl-challenge.js}

@@ -22,14 +22,14 @@ exports.calcNaClBoxSharedKey = void 0;
  */
 const ecma_nacl_1 = require("ecma-nacl");
 const random = require("../../lib-common/random-node");
-// XXX update the key from time-to-time
-const testLoginSecretKey = random.bytesSync(32);
-const testLoginPublicKey = ecma_nacl_1.box.generate_pubkey(testLoginSecretKey);
+// XXX update the key from time-to-time, and this must be single instance
+const skeyForPKLChallenge = random.bytesSync(32);
+const pkeyForPKLChallenge = ecma_nacl_1.box.generate_pubkey(skeyForPKLChallenge);
 function calcNaClBoxSharedKey(userPubKey) {
-    const dhsharedKey = ecma_nacl_1.box.calc_dhshared_key(userPubKey, testLoginSecretKey);
+    const dhsharedKey = ecma_nacl_1.box.calc_dhshared_key(userPubKey, skeyForPKLChallenge);
     return {
         dhsharedKey: dhsharedKey,
-        serverPubKey: testLoginPublicKey
+        serverPubKey: pkeyForPKLChallenge
     };
 }
 exports.calcNaClBoxSharedKey = calcNaClBoxSharedKey;

package/build/lib-server/resources/sessions.js

@@ -13,10 +13,10 @@
  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.wrapFactory = exports.BaseSessionFactory = exports.SESSION_ID_HEADER = void 0;
-const binding_1 = require("../../lib-common/binding");
 // Constant custom header
 exports.SESSION_ID_HEADER = "X-Session-Id";
 const LOW_CASED_SESSION_ID_HEADER = exports.SESSION_ID_HEADER.toLowerCase();
@@ -171,11 +171,11 @@ Object.freeze(BaseSessionFactory.prototype);
 Object.freeze(BaseSessionFactory);
 function wrapFactory(impl) {
     const wrap = {
-        checkSession: (0, binding_1.bind)(impl, impl.checkSession),
-        ensureAuthorizedSession: (0, binding_1.bind)(impl, impl.ensureAuthorizedSession),
-        ensureOpenedSession: (0, binding_1.bind)(impl, impl.ensureOpenedSession),
-        ensureAuthorizedSessionForSocketStart: (0, binding_1.bind)(impl, impl.ensureAuthorizedSessionForSocketStart),
-        generate: (0, binding_1.bind)(impl, impl.generate)
+        checkSession: impl.checkSession.bind(impl),
+        ensureAuthorizedSession: impl.ensureAuthorizedSession.bind(impl),
+        ensureOpenedSession: impl.ensureOpenedSession.bind(impl),
+        ensureAuthorizedSessionForSocketStart: impl.ensureAuthorizedSessionForSocketStart.bind(impl),
+        generate: impl.generate.bind(impl)
     };
     return wrap;
 }

package/build/lib-server/resources/user-files.d.ts

@@ -3,7 +3,7 @@ export declare const SC: {
     USER_UNKNOWN: string;
 };
 export declare function addressToFName(address: string): string;
-export declare abstract class UserFiles {
+export declare abstract class UserFiles<ParamTypes extends object> {
     readonly userId: string;
     readonly path: string;
     protected readonly fileWritingBufferSize: number;
@@ -12,8 +12,8 @@ export declare abstract class UserFiles {
     ensureUserExistsOnDisk(): Promise<void>;
     private commonInfoFolder;
     getSpaceQuota(): Promise<number>;
-    getParam<T>(paramFileName: string): Promise<T>;
-    setParam<T>(paramFileName: string, param: T): Promise<void>;
+    getParam<P extends keyof ParamTypes>(paramFileName: P): Promise<ParamTypes[P]>;
+    protected setParam<P extends keyof ParamTypes>(paramFileName: P, param: ParamTypes[P]): Promise<void>;
 }
 export type ObjPipe = (outStream: NodeJS.WritableStream) => Promise<void>;
 export interface ObjReader {

package/build/lib-server/resources/user-files.js

@@ -70,10 +70,12 @@ class UserFiles {
         return readJsonFile((0, path_1.join)(this.commonInfoFolder(), 'quota'));
     }
     getParam(paramFileName) {
-        return readJsonFile((0, path_1.join)(this.path, 'params', paramFileName));
+        const filePath = (0, path_1.join)(this.path, 'params', paramFileName);
+        return readJsonFile(filePath);
     }
     setParam(paramFileName, param) {
-        return fs.writeFile((0, path_1.join)(this.path, 'params', paramFileName), JSON.stringify(param), { encoding: 'utf8', flag: 'w' });
+        const filePath = (0, path_1.join)(this.path, 'params', paramFileName);
+        return fs.writeFile(filePath, JSON.stringify(param), { encoding: 'utf8', flag: 'w' });
     }
 }
 exports.UserFiles = UserFiles;

package/build/lib-server/routes/sessions/close.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.closeSession = void 0;
 function closeSession() {

package/build/lib-server/web-sockets/app.js

@@ -21,7 +21,6 @@ const http = require("http");
 const https = require("https");
 const express = require("express");
 const WebSocket = require("ws");
-const binding_1 = require("../../lib-common/binding");
 const map_of_sets_1 = require("../../lib-common/map-of-sets");
 const url_1 = require("url");
 const MAX_MSG_PAYLOAD = 4 * 1024;
@@ -57,9 +56,9 @@ class UserSocketsServer {
             server,
             clientTracking: true,
             maxPayload: MAX_MSG_PAYLOAD,
-            verifyClient: (0, binding_1.bind)(this, this.verifyClient)
+            verifyClient: this.verifyClient.bind(this)
         })
-            .on('connection', (0, binding_1.bind)(this, this.handleConnection)) // bad @types
+            .on('connection', this.handleConnection.bind(this))
             .on('error', (err) => { console.error(err); });
     }
     disconnect() {

package/build/lib-server/web-sockets/server-events.js

@@ -18,7 +18,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ServerEvents = void 0;
 const ws_ipc_1 = require("../../lib-common/ipc/ws-ipc");
-const binding_1 = require("../../lib-common/binding");
 class ServerEvents {
     constructor(ipcChannel, eventChannels, getSocket) {
         this.ipcChannel = ipcChannel;
@@ -49,7 +48,7 @@ class ServerEvents {
         }
     }
     get eventsSink() {
-        return (0, binding_1.bind)(this, this.sendEvent);
+        return this.sendEvent.bind(this);
     }
 }
 exports.ServerEvents = ServerEvents;

package/build/lib.d.ts

@@ -1,5 +1,5 @@
 export { AppWithWSs } from './lib-server/web-sockets/app';
-export { Configurations, servicesApp, adminApp } from './services';
+export { Configurations, servicesApp, accountsApp } from './services';
 export { addSingleUserSignup } from './config/signup';
 export import errors = require('./lib-server/middleware/error-handler');
 export * as mock from './mock/run-in-proc';

package/build/lib.js

@@ -16,12 +16,12 @@
  this program. If not, see <http://www.gnu.org/licenses/>.
 */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mock = exports.addSingleUserSignup = exports.adminApp = exports.servicesApp = exports.AppWithWSs = void 0;
+exports.mock = exports.addSingleUserSignup = exports.accountsApp = exports.servicesApp = exports.AppWithWSs = void 0;
 var app_1 = require("./lib-server/web-sockets/app");
 Object.defineProperty(exports, "AppWithWSs", { enumerable: true, get: function () { return app_1.AppWithWSs; } });
 var services_1 = require("./services");
 Object.defineProperty(exports, "servicesApp", { enumerable: true, get: function () { return services_1.servicesApp; } });
-Object.defineProperty(exports, "adminApp", { enumerable: true, get: function () { return services_1.adminApp; } });
+Object.defineProperty(exports, "accountsApp", { enumerable: true, get: function () { return services_1.accountsApp; } });
 var signup_1 = require("./config/signup");
 Object.defineProperty(exports, "addSingleUserSignup", { enumerable: true, get: function () { return signup_1.addSingleUserSignup; } });
 exports.errors = require("./lib-server/middleware/error-handler");

package/build/locker/locker-app.d.ts

@@ -0,0 +1,3 @@
+import { ErrLogger } from '../lib-server/middleware/error-handler';
+import { AppWithWSs } from '../lib-server/web-sockets/app';
+export declare function makeLockerApp(rootFolder: string, errLogger?: ErrLogger): AppWithWSs;

package/build/locker/locker-app.js

@@ -0,0 +1,41 @@
+"use strict";
+/*
+ Copyright (C) 2024 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/>.
+*/
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.makeLockerApp = void 0;
+const body_parsers_1 = require("../lib-server/middleware/body-parsers");
+const error_handler_1 = require("../lib-server/middleware/error-handler");
+const app_1 = require("../lib-server/web-sockets/app");
+const sessions_1 = require("./resources/sessions");
+const _3nstorage_app_1 = require("../3nstorage/3nstorage-app");
+const api = require("../lib-common/service-api/locker");
+function addLockerSetupRoutes(app) {
+    app.put('/' + api.createLocker.URL_END, (0, body_parsers_1.json)('1kb'));
+}
+function makeLockerApp(rootFolder, errLogger) {
+    const ownersSessions = (0, sessions_1.makeSessionFactory)(20 * 60);
+    const sharingSessions = (0, sessions_1.makeSessionFactory)(20 * 60);
+    const app = new app_1.AppWithWSs();
+    app.http.disable('etag');
+    addLockerSetupRoutes(app.http);
+    const lockers = undefined;
+    app.use('/3nstorage', (0, _3nstorage_app_1.makeStorageAppForLocker)(lockers, ownersSessions, sharingSessions, errLogger));
+    app.http.use((0, error_handler_1.makeErrHandler)(errLogger));
+    return app;
+}
+exports.makeLockerApp = makeLockerApp;
+Object.freeze(exports);

package/build/{lib-common/binding.js → locker/resources/lockers.js}

@@ -1,6 +1,5 @@
-"use strict";
 /*
- Copyright (C) 2015 3NSoft Inc.
+ Copyright (C) 2024 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
@@ -13,11 +12,5 @@
  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/>. */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.bind = void 0;
-function bind(thisArg, func) {
-    return func.bind(thisArg);
-}
-exports.bind = bind;
-Object.freeze(exports);
+ this program. If not, see <http://www.gnu.org/licenses/>.
+*/

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

@@ -0,0 +1,9 @@
+import { Request as Req, SessionParams, Factory } from '../../lib-server/resources/sessions';
+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.
+ * @param timeout is a session timeout in seconds
+ */
+export declare function makeSessionFactory(timeout: number): SessionsFactory;

package/build/locker/resources/sessions.js

@@ -0,0 +1,33 @@
+"use strict";
+/*
+ Copyright (C) 2017 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/>.
+*/
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.makeSessionFactory = void 0;
+const mem_backed_sessions_factory_1 = require("../../lib-server/resources/mem-backed-sessions-factory");
+function makeSessionParams() {
+    return { userId: undefined };
+}
+/**
+ * This returns factory, that works properly in a single process application,
+ * clearing up sessions that past given timeout.
+ * @param timeout is a session timeout in seconds
+ */
+function makeSessionFactory(timeout) {
+    return mem_backed_sessions_factory_1.InMemorySessions.factory(timeout, makeSessionParams);
+}
+exports.makeSessionFactory = makeSessionFactory;
+Object.freeze(exports);

package/build/locker/routes/create-locker.d.ts

@@ -0,0 +1,4 @@
+import { RequestHandler } from 'express';
+import { createLocker as api } from '../../lib-common/service-api/locker';
+export type LockerCreator = (token: string | undefined) => Promise<api.Reply>;
+export declare function createLocker(createLocker: LockerCreator): RequestHandler;

package/build/locker/routes/create-locker.js

@@ -0,0 +1,37 @@
+"use strict";
+/*
+ Copyright (C) 2024 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/>.
+*/
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createLocker = void 0;
+const locker_1 = require("../../lib-common/service-api/locker");
+function createLocker(createLocker) {
+    if ('function' !== typeof createLocker) {
+        throw new TypeError("Given argument 'createLocker' must be function, but is not.");
+    }
+    return async (req, res, next) => {
+        const { token } = req.body;
+        try {
+            const lockerInfo = await createLocker(token);
+            res.status(locker_1.createLocker.SC.ok).json(lockerInfo);
+        }
+        catch (err) {
+            next(err);
+        }
+    };
+}
+exports.createLocker = createLocker;
+Object.freeze(exports);

package/build/mailerId/mailerId-app.d.ts

@@ -4,4 +4,4 @@
  */
 import * as express from 'express';
 import { ErrLogger } from '../lib-server/middleware/error-handler';
-export declare function makeApp(rootFolder: string, domain: string, certFile: string, errLogger?: ErrLogger): express.Express;
+export declare function makeMailerIdApp(rootFolder: string, domain: string, certFile: string, errLogger?: ErrLogger): express.Express;

package/build/mailerId/mailerId-app.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2015 - 2016, 2020 3NSoft Inc.
+ Copyright (C) 2015 - 2016, 2020, 2024 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
@@ -16,39 +16,40 @@
  this program. If not, see <http://www.gnu.org/licenses/>.
 */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeApp = void 0;
+exports.makeMailerIdApp = void 0;
 /**
  * This module gives a function that creates a mountable, or app.use()-able,
  * express MailerId application.
  */
 const express = require("express");
 const body_parsers_1 = require("../lib-server/middleware/body-parsers");
-const start_exchange_1 = require("../lib-server/routes/pub-key-login/start-exchange");
-const complete_exchange_1 = require("../lib-server/routes/pub-key-login/complete-exchange");
 const certify_1 = require("./routes/certify");
 const sessions_1 = require("./resources/sessions");
 const users_1 = require("./resources/users");
 const certifier_1 = require("./resources/certifier");
-const compute_login_dhshared_key_1 = require("./resources/compute-login-dhshared-key");
+const server_key_for_pkl_challenge_1 = require("../lib-server/resources/server-key-for-pkl-challenge");
 const error_handler_1 = require("../lib-server/middleware/error-handler");
 const api = require("../lib-common/service-api/mailer-id/provisioning");
+const pkl_access_1 = require("../lib-server/pkl-access");
 // Constant url parts of MailerId provisioning requests
 const PROVISIONING_PATH = '/prov/';
 function provisioningApp(sessions, users, certifier, computeDHSharedKey) {
     const app = express();
     app.disable('etag');
+    // Login
+    (0, pkl_access_1.addPKLLoginRoutes)(app, '/', users.getUserParamsAndKey, sessions, computeDHSharedKey);
+    // *** Require authorized session for everything below ***
+    app.use(sessions.ensureAuthorizedSession());
     // MailerId certificate provisioning routes
-    app.post('/' + api.pkl.START_URL_END, sessions.checkSession(), (0, body_parsers_1.json)('1kb'), (0, start_exchange_1.startPKLogin)(users.getUserParamsAndKey, sessions.generate, computeDHSharedKey));
-    app.post('/' + api.pkl.COMPL_URL_END, sessions.ensureOpenedSession(), (0, body_parsers_1.binary)('1kb'), (0, complete_exchange_1.completePKLogin)());
-    app.post('/' + api.certify.URL_END, sessions.ensureAuthorizedSession(), (0, body_parsers_1.binary)('16kb'), (0, certify_1.certify)(certifier.certify));
+    app.post('/' + api.certify.URL_END, (0, body_parsers_1.binary)('16kb'), (0, certify_1.certify)(certifier.certify));
     return app;
 }
-function makeApp(rootFolder, domain, certFile, errLogger) {
+function makeMailerIdApp(rootFolder, domain, certFile, errLogger) {
     const app = express();
     const certProvisSessions = (0, sessions_1.makeSessionFactory)(2 * 60);
     const users = (0, users_1.makeFactory)(rootFolder);
     const certifier = (0, certifier_1.makeSingleProcCertifier)(domain, certFile);
-    app.use(PROVISIONING_PATH, provisioningApp(certProvisSessions, users, certifier, compute_login_dhshared_key_1.calcNaClBoxSharedKey));
+    app.use(PROVISIONING_PATH, provisioningApp(certProvisSessions, users, certifier, server_key_for_pkl_challenge_1.calcNaClBoxSharedKey));
     // MailerId display of service parameters, as per protocol
     app.get('/', (req, res) => {
         let path = req.originalUrl;
@@ -65,5 +66,5 @@ function makeApp(rootFolder, domain, certFile, errLogger) {
     app.use((0, error_handler_1.makeErrHandler)(errLogger));
     return app;
 }
-exports.makeApp = makeApp;
+exports.makeMailerIdApp = makeMailerIdApp;
 Object.freeze(exports);

package/build/mailerId/routes/certify.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.certify = void 0;
 const buffer_utils_1 = require("../../lib-common/buffer-utils");

package/build/main.js

@@ -31,7 +31,7 @@ async function run(conf) {
     function createApp(conf) {
         const app = new lib_1.AppWithWSs();
         app.use((0, lib_1.servicesApp)(conf, 'console', 'console'));
-        app.use((0, lib_1.adminApp)(conf, 'console', 'console'));
+        app.use((0, lib_1.accountsApp)(conf, 'console', 'console'));
         return app;
     }
     async function stopProcess() {

package/build/mock/dns.js

@@ -13,10 +13,10 @@
  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.DNSMock = void 0;
-const binding_1 = require("../lib-common/binding");
 const DNS_ERR_CODE = {
     NODATA: 'ENODATA',
     NOTFOUND: 'ENOTFOUND'
@@ -55,8 +55,7 @@ class DNSMock {
                 this.domains.set(d, midUrlOrBulkRecs[d]);
             }
         }
-        // node's definition incorrectly describes callback argument
-        this.resolveTxt = (0, binding_1.bind)(this, this.mockResolve);
+        this.resolveTxt = this.mockResolve.bind(this);
         Object.freeze(this);
     }
     mockResolve(domain, callback) {

package/build/mock/mock-as-child-proc.js

@@ -25,7 +25,7 @@ const https = require("https");
 const tls_options_1 = require("./tls-options");
 const app_1 = require("../lib-server/web-sockets/app");
 const path_1 = require("path");
-const signup_tokens_1 = require("../admin/signup-tokens");
+const signup_tokens_1 = require("../signup/signup-tokens");
 const SERVER_MOCK_CHANNEL = 'server-mock';
 const parent = (0, node_child_ipc_1.commToParent)(SERVER_MOCK_CHANNEL);
 const DEFAULT_SERVICE_PORT = 8088;
@@ -74,7 +74,7 @@ async function start(env) {
     await (0, async_fs_node_1.writeFile)(noTokensFilePath, JSON.stringify(noTokenCtx), { encoding: 'utf8' });
     // setup app
     app = new app_1.AppWithWSs();
-    app.use((0, services_1.adminApp)(conf));
+    app.use((0, services_1.accountsApp)(conf));
     app.use((0, services_1.servicesApp)(conf));
     // start app
     await app.start(tls_options_1.sslOpts, servicePort);

package/build/mock/node-child-ipc.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.commToParent = exports.commToChild = void 0;
 const generic_ipc_1 = require("../lib-common/ipc/generic-ipc");

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

@@ -25,7 +25,7 @@ const services_1 = require("../services");
 const dns = require("dns");
 const dns_1 = require("./dns");
 const path_1 = require("path");
-const signup_tokens_1 = require("../admin/signup-tokens");
+const signup_tokens_1 = require("../signup/signup-tokens");
 function setTestCertsAndDNS(domains, thisSrvLoc) {
     if (thisSrvLoc.endsWith('/')) {
         throw new Error(`Location value shouldn't have trailing slash`);
@@ -85,7 +85,7 @@ async function startOn(srvDomain, dataDir, port, domains) {
     const dnsMock = setTestCertsAndDNS(allDomains, `${srvDomain}:${port}`);
     // setup services and start
     const app = new app_1.AppWithWSs();
-    app.use((0, services_1.adminApp)(conf));
+    app.use((0, services_1.accountsApp)(conf));
     app.use((0, services_1.servicesApp)(conf));
     await app.start(conf.servicesConnect.sslOpts, conf.servicesConnect.port);
     return { dnsMock, stop: () => app.stop() };

package/build/mock/tls-options.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.sslOpts = void 0;
 exports.sslOpts = {

package/build/services.d.ts

@@ -7,6 +7,7 @@ export interface Configurations {
         asmail?: boolean;
         storage?: boolean;
         mailerId?: boolean;
+        locker?: boolean;
     };
     servicesConnect?: {
         hostname?: string;
@@ -25,4 +26,4 @@ export interface Configurations {
     };
 }
 export declare function servicesApp(conf: Configurations, errLogger?: ErrLogger | 'console', logSetup?: 'console'): AppWithWSs;
-export declare function adminApp(conf: Configurations, errLogger?: ErrLogger | 'console', logSetup?: 'console'): AppWithWSs;
+export declare function accountsApp(conf: Configurations, errLogger?: ErrLogger | 'console', logSetup?: 'console'): AppWithWSs;

package/build/services.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2015 - 2017, 2020 3NSoft Inc.
+ Copyright (C) 2015 - 2017, 2020, 2024 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
@@ -16,14 +16,15 @@
  this program. If not, see <http://www.gnu.org/licenses/>.
 */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.adminApp = exports.servicesApp = void 0;
+exports.accountsApp = exports.servicesApp = void 0;
 const mailerid_authorizer_1 = require("./lib-server/resources/mailerid-authorizer");
 const app_1 = require("./lib-server/web-sockets/app");
 const mailerId_app_1 = require("./mailerId/mailerId-app");
 const asmail_app_1 = require("./asmail/asmail-app");
 const _3nstorage_app_1 = require("./3nstorage/3nstorage-app");
-const admin_app_1 = require("./admin/admin-app");
+const signup_app_1 = require("./signup/signup-app");
 const error_handler_1 = require("./lib-server/middleware/error-handler");
+const locker_app_1 = require("./locker/locker-app");
 function servicesApp(conf, errLogger, logSetup) {
     if (!conf.enabledServices || (typeof conf.enabledServices !== 'object')) {
         throw new Error('Missing enabled-services sections in confs.');
@@ -31,31 +32,41 @@ function servicesApp(conf, errLogger, logSetup) {
     const app = new app_1.AppWithWSs();
     const midAuthorizer = (0, mailerid_authorizer_1.validator)(); // share, allowing for caching of certs
     if (conf.enabledServices.mailerId) {
-        app.http.use('/mailerid', (0, mailerId_app_1.makeApp)(conf.rootFolder, conf.domain, conf.mailerId.certs, (errLogger === 'console') ? (0, error_handler_1.makeErrLoggerToConsole)('MailerId') : errLogger));
+        app.http.use('/mailerid', (0, mailerId_app_1.makeMailerIdApp)(conf.rootFolder, conf.domain, conf.mailerId.certs, (errLogger === 'console') ? (0, error_handler_1.makeErrLoggerToConsole)('MailerId') : errLogger));
         if (logSetup === 'console') {
             console.log(`Enabled MailerId service with provider domain ${conf.domain}`);
         }
     }
     if (conf.enabledServices.asmail) {
-        app.use('/asmail', (0, asmail_app_1.makeApp)(conf.rootFolder, conf.domain, midAuthorizer, (errLogger === 'console') ? (0, error_handler_1.makeErrLoggerToConsole)('ASMail') : errLogger));
+        app.use('/asmail', (0, asmail_app_1.makeASMailApp)(conf.rootFolder, conf.domain, midAuthorizer, (errLogger === 'console') ? (0, error_handler_1.makeErrLoggerToConsole)('ASMail') : errLogger));
         if (logSetup === 'console') {
             console.log(`Enabled ASMail service with provider domain ${conf.domain}`);
         }
     }
     if (conf.enabledServices.storage) {
-        app.use('/3nstorage', (0, _3nstorage_app_1.makeApp)(conf.rootFolder, conf.domain, midAuthorizer, (errLogger === 'console') ? (0, error_handler_1.makeErrLoggerToConsole)('3NStorage') : errLogger));
+        app.use('/3nstorage', (0, _3nstorage_app_1.makeStorageApp)(conf.rootFolder, conf.domain, midAuthorizer, (errLogger === 'console') ? (0, error_handler_1.makeErrLoggerToConsole)('3NStorage') : errLogger));
         if (logSetup === 'console') {
             console.log(`Enabled 3NStorage service with provider domain ${conf.domain}`);
         }
     }
+    if (conf.enabledServices.locker) {
+        app.use('/locker', (0, locker_app_1.makeLockerApp)(conf.rootFolder, (errLogger === 'console') ? (0, error_handler_1.makeErrLoggerToConsole)('Locker') : errLogger));
+        if (logSetup === 'console') {
+            console.log(`Enabled Locker service`);
+        }
+    }
     return app;
 }
 exports.servicesApp = servicesApp;
-function adminApp(conf, errLogger, logSetup) {
-    if (errLogger === 'console') {
-        errLogger = (0, error_handler_1.makeErrLoggerToConsole)('3NWeb server admin');
+function accountsApp(conf, errLogger, logSetup) {
+    const app = new app_1.AppWithWSs();
+    if (conf.signup) {
+        app.http.use('/signup', (0, signup_app_1.makeSignupApp)(conf, (errLogger === 'console') ? (0, error_handler_1.makeErrLoggerToConsole)('Signup') : errLogger));
+        if (logSetup === 'console') {
+            console.log(`Enabled signup service.`);
+        }
     }
-    return new app_1.AppWithWSs((0, admin_app_1.makeApp)(conf, errLogger, logSetup));
+    return app;
 }
-exports.adminApp = adminApp;
+exports.accountsApp = accountsApp;
 Object.freeze(exports);

package/build/{admin → signup}/resources/users.js

@@ -25,7 +25,6 @@ const fs = require("../../lib-common/async-fs-node");
 const fs_1 = require("fs");
 const jwk = require("../../lib-common/jwkeys");
 const nacl = require("ecma-nacl");
-const binding_1 = require("../../lib-common/binding");
 const path_1 = require("path");
 const server_data_folders_1 = require("../../lib-server/resources/server-data-folders");
 const signup_tokens_1 = require("../signup-tokens");
@@ -357,9 +356,9 @@ class Users {
     }
     wrap() {
         const wrap = {
-            getAvailableDomains: (0, binding_1.bind)(this, this.getAvailableDomains),
-            getAvailableAddresses: (0, binding_1.bind)(this, this.getAvailableAddresses),
-            add: (0, binding_1.bind)(this, this.add),
+            getAvailableDomains: this.getAvailableDomains.bind(this),
+            getAvailableAddresses: this.getAvailableAddresses.bind(this),
+            add: this.add.bind(this),
         };
         Object.freeze(wrap);
         return wrap;

package/build/{admin/admin-app.d.ts → signup/signup-app.d.ts}

@@ -1,4 +1,4 @@
 import * as express from 'express';
 import { ErrLogger } from '../lib-server/middleware/error-handler';
 import { Configurations } from '../services';
-export declare function makeApp(conf: Configurations, errLogger?: ErrLogger, logSetup?: 'console'): express.Express;
+export declare function makeSignupApp(conf: Configurations, errLogger?: ErrLogger): express.Express;