spec-3nweb-server 1.7.13 → 1.7.14

package/build/{config/cli → cli}/index.js

@@ -17,7 +17,7 @@
 */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseProcessArgv = void 0;
-const default_confs_1 = require("../default-confs");
+const default_confs_1 = require("../config/default-confs");
 const run_cmd_1 = require("./run-cmd");
 const show_sample_config_1 = require("./show-sample-config");
 const signup_cmd_1 = require("./signup-cmd");

package/build/config/letsencrypt.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2023 3NSoft Inc.
+ Copyright (C) 2023, 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
@@ -19,13 +19,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.sslOptsFromConfig = void 0;
 const fs_1 = require("fs");
 const path_1 = require("path");
+const LETSENCRYPT_CERT_FILE = 'fullchain.pem';
+const LETSENCRYPT_KEY_FILE = 'privkey.pem';
 function sslOptsFromConfig(letsencrypt, sslOpts, skipReloadOnCertsChange) {
     if (!sslOpts) {
         sslOpts = {};
     }
     if (letsencrypt) {
-        sslOpts.cert = (0, fs_1.readFileSync)((0, path_1.join)(letsencrypt, 'fullchain.pem'));
-        sslOpts.key = (0, fs_1.readFileSync)((0, path_1.join)(letsencrypt, 'privkey.pem'));
+        sslOpts.cert = (0, fs_1.readFileSync)((0, path_1.join)(letsencrypt, LETSENCRYPT_CERT_FILE));
+        sslOpts.key = (0, fs_1.readFileSync)((0, path_1.join)(letsencrypt, LETSENCRYPT_KEY_FILE));
         if (skipReloadOnCertsChange) {
             return { sslOpts };
         }

package/build/lib-server/resources/mailerid-authorizer.d.ts

@@ -1,2 +1,7 @@
+import { SignedLoad } from '../../lib-common/jwkeys';
 import { MidAuthorizer } from '../routes/sessions/mid-auth';
-export declare function validator(): MidAuthorizer;
+export declare function validator(ownMidService: OwnMidService | undefined): MidAuthorizer;
+export interface OwnMidService {
+    domain: string;
+    getRoot: () => SignedLoad;
+}

package/build/lib-server/resources/mailerid-authorizer.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2015 - 2016, 2019 3NSoft Inc.
+ Copyright (C) 2015 - 2016, 2019, 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
@@ -62,11 +62,11 @@ function getRootCert(serviceURL) {
 }
 // TODO need to add caching of certs using domain->(kid->cert)
 //		(this will speed things up)
-function validator() {
-    return (rpDomain, sessionId, userId, assertion, userCert, provCert) => validate(rpDomain, sessionId, userId, assertion, userCert, provCert);
+function validator(ownMidService) {
+    return (rpDomain, sessionId, userId, assertion, userCert, provCert) => validate(rpDomain, sessionId, userId, assertion, userCert, provCert, ownMidService);
 }
 exports.validator = validator;
-async function validate(rpDomain, sessionId, userId, assertion, userCert, provCert) {
+async function validate(rpDomain, sessionId, userId, assertion, userCert, provCert, ownMidService) {
     const validAt = Date.now() / 1000;
     try {
         // check that certificate is for the user
@@ -83,7 +83,8 @@ async function validate(rpDomain, sessionId, userId, assertion, userCert, provCe
             return false;
         }
         // get root certificate and check the whole chain
-        const rootCert = await getRootCert(serviceURL);
+        const rootCert = ((ownMidService && (issuer === ownMidService.domain)) ?
+            ownMidService.getRoot() : await getRootCert(serviceURL));
         const assertInfo = mid.relyingParty.verifyAssertion(assertion, { user: userCert, prov: provCert, root: rootCert }, issuer, validAt);
         if ((assertInfo.relyingPartyDomain === rpDomain)
             && (assertInfo.sessionId === sessionId)) {

package/build/lib-server/routes/sessions/mid-auth.js

@@ -36,9 +36,9 @@ function midLogin(relyingPartyDomain, midAuthorizingFunc) {
         }
         const rb = req.body;
         const sessionId = req.session.id;
-        if (!(0, jwkeys_1.isLikeSignedMailerIdAssertion)(rb.assertion) ||
-            !(0, jwkeys_1.isLikeSignedKeyCert)(rb.userCert) ||
-            !(0, jwkeys_1.isLikeSignedKeyCert)(rb.provCert)) {
+        if (!(0, jwkeys_1.isLikeSignedMailerIdAssertion)(rb.assertion)
+            || !(0, jwkeys_1.isLikeSignedKeyCert)(rb.userCert)
+            || !(0, jwkeys_1.isLikeSignedKeyCert)(rb.provCert)) {
             res.sendStatus(login_1.ERR_SC.malformed);
             req.session.close();
             return;

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

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

package/build/mailerId/mailerId-app.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2015 - 2016, 2020, 2024 3NSoft Inc.
+ Copyright (C) 2015 - 2016, 2020, 2024 - 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
@@ -64,7 +64,13 @@ function makeMailerIdApp(rootFolder, domain, certFile, errLogger) {
         res.status(200).json(json); // content type application/json
     });
     app.use((0, error_handler_1.makeErrHandler)(errLogger));
-    return app;
+    return {
+        app,
+        ownService: {
+            domain,
+            getRoot: () => certifier.getRootCert()
+        }
+    };
 }
 exports.makeMailerIdApp = makeMailerIdApp;
 Object.freeze(exports);

package/build/main.js

@@ -17,7 +17,7 @@
  this program. If not, see <http://www.gnu.org/licenses/>.
 */
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("./config/cli");
+const cli_1 = require("./cli");
 const from_yaml_1 = require("./config/from-yaml");
 const letsencrypt_1 = require("./config/letsencrypt");
 const lib_1 = require("./lib");

package/build/services.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2015 - 2017, 2020, 2024 3NSoft Inc.
+ Copyright (C) 2015 - 2017, 2020, 2024 - 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
@@ -30,12 +30,17 @@ function servicesApp(conf, errLogger, logSetup) {
         throw new Error('Missing enabled-services sections in confs.');
     }
     const app = new app_1.AppWithWSs();
-    const midAuthorizer = (0, mailerid_authorizer_1.validator)(); // share, allowing for caching of certs
+    let midAuthorizer; // share, allowing for caching of certs
     if (conf.enabledServices.mailerId) {
-        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));
+        const { app: midApp, ownService } = (0, mailerId_app_1.makeMailerIdApp)(conf.rootFolder, conf.domain, conf.mailerId.certs, (errLogger === 'console') ? (0, error_handler_1.makeErrLoggerToConsole)('MailerId') : errLogger);
+        app.http.use('/mailerid', midApp);
         if (logSetup === 'console') {
             console.log(`Enabled MailerId service with provider domain ${conf.domain}`);
         }
+        midAuthorizer = (0, mailerid_authorizer_1.validator)(ownService);
+    }
+    else {
+        midAuthorizer = (0, mailerid_authorizer_1.validator)(undefined);
     }
     if (conf.enabledServices.asmail) {
         app.use('/asmail', (0, asmail_app_1.makeASMailApp)(conf.rootFolder, conf.domain, midAuthorizer, (errLogger === 'console') ? (0, error_handler_1.makeErrLoggerToConsole)('ASMail') : errLogger));

package/package.json

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