Merge pull request #520 from NuSkooler/feature/multiarch_docker

Feature/multiarch docker

.devcontainer/devcontainer.json

@@ -7,7 +7,7 @@
 "features": {
 	"ghcr.io/devcontainers/features/python:1": {
 		"installTools": true,
-		"version": "latest"
+		"version": "3.11"
 	},
 	"ghcr.io/devcontainers-contrib/features/curl-apt-get:1": {},
 	"ghcr.io/jungaretti/features/ripgrep:1": {},

.github/workflows/docker.yml

@@ -11,25 +11,25 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v3
 
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v3
 
       - name: Login to DockerHub
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Build and push
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v3
         with:
           tags: enigmabbs/enigma-bbs:latest
           file: docker/Dockerfile
-          platforms: linux/amd64,linux/arm64
+          platforms: linux/amd64,linux/arm64,linux/arm/v7
           push: true

.gitignore

@@ -11,3 +11,5 @@ mail/
 node_modules/
 docs/_site/
 docs/.sass-cache/
+
+docs/.jekyll-cache/

.vscode/launch.json

@@ -1,17 +0,0 @@
-{
-    // Use IntelliSense to learn about possible attributes.
-    // Hover to view descriptions of existing attributes.
-    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "type": "node",
-            "request": "launch",
-            "name": "Launch Program",
-            "skipFiles": [
-                "<node_internals>/**"
-            ],
-            "program": "${workspaceFolder}/main.js"
-        }
-    ]
-}

UPGRADE.md

@@ -35,6 +35,10 @@ npm install # or simply 'yarn'
 
 ## 0.0.13-beta to 0.0.14-beta
 
+* Due to changes to supported algorithms in newer versions of openssl, the default list of supported algorithms for the ssh login server has changed. There are both removed ciphers as well as optional new kex algorithms available now. ***NOTE:*** Changes to supported algorithms are only needed to support keys generated with new versions of openssl, if you already have a ssl key in use you should not have to make any changes to your config.
+  * Removed ciphers: 'blowfish-cbc', 'arcfour256', 'arcfour128', and 'cast128-cbc'
+  * Added kex: 'curve25519-sha256', 'curve25519-sha256@libssh.org', 'curve25519-sha256', 'curve25519-sha256@libssh.org', 'ecdh-sha2-nistp256', 'ecdh-sha2-nistp384', 'ecdh-sha2-nistp521'
+
 ## 0.0.12-beta to 0.0.13-beta
 * To enable the new Waiting for Caller (WFC) support, please see [WFC](docs/modding/wfc.md).
 * :exclamation: The SSH server's `ssh2` module has gone through a major upgrade. Existing users will need to comment out two SSH KEX algorithms from their `config.hjson` if present else clients such as NetRunner will not be able to connect over SSH. Comment out `diffie-hellman-group-exchange-sha256` and `diffie-hellman-group-exchange-sha1`

art/themes/luciano_blocktronics/theme.hjson

@@ -187,7 +187,7 @@
 				}
 				mci: {
 					VM1: {
-						height: 15,
+						height: 14
 						width: 50
 						itemFormat: "|00|11{userName:<17.17}|03{affils:<21.21}|11{location:<19.19}|03{lastLoginTs}"
 						focusItemFormat: "|00|19|15{userName:<17.17}{affils:<21.21}{location:<19.19}{lastLoginTs}"
@@ -343,7 +343,7 @@
 				}
 				mci: {
 					VM1: {
-						height: 14
+						height: 13
 						width: 70
 						itemFormat: "|00|15{msgNum:>4}  |03{subject:<28.27} |11{fromUserName:<20.20} |03{ts:<15.16} |15{newIndicator}"
 						focusItemFormat: "|00|19|15{msgNum:>4}  {subject:<28.27} {fromUserName:<20.20} {ts:<15.16} {newIndicator}"
@@ -416,7 +416,7 @@
 				}
 				mci: {
 					VM1: {
-						height: 14
+						height: 12
 						width: 70
 						itemFormat: "|00|15{msgNum:>4}  |03{subject:<28.27} |11{fromUserName:<20.20} |03{ts} |15{newIndicator}"
 						focusItemFormat: "|00|19|15{msgNum:>4}  {subject:<28.27} {fromUserName:<20.20} {ts} {newIndicator}"
@@ -618,7 +618,7 @@
 				}
 				mci: {
 					VM1: {
-						height: 16
+						height: 12
 						width: 71
 						itemFormat:      "|00|15  {msgNum:<4.4} |03{subject:<34.33} {fromUserName:<19.18} |03{ts:<12.12}"
 						focusItemFormat: "|00|19> |15{msgNum:<4.4} {subject:<34.33} {fromUserName:<19.18} {ts:<12.12}"
@@ -783,7 +783,7 @@
 				}
 				mci: {
 					VM1: {
-						height: 14
+						height: 12
 						width: 70
 						itemFormat: "|00|15  {msgNum:<5.5}|03{subject:<28.27} |15{fromUserName:<20.20} {ts}"
 						focusItemFormat: "|00|19> |15{msgNum:<5.5}{subject:<28.27} {fromUserName:<20.20} {ts}"
@@ -1214,7 +1214,7 @@
 				2: {
 					mci: {
 						MT1: {
-							height: 14
+							height: 13
 							width: 45
 						}
 

core/ansi_escape_parser.js

@@ -24,7 +24,7 @@ function ANSIEscapeParser(options) {
     this.graphicRendition = {};
 
     this.parseState = {
-        re: /(?:\x1b\x5b)([?=;0-9]*?)([ABCDHJKfhlmnpsu])/g, //  eslint-disable-line no-control-regex
+        re: /(?:\x1b)(?:(?:\x5b([?=;0-9]*?)([ABCDEFGfHJKLmMsSTuUYZt@PXhlnpt]))|([78DEHM]))/g, //  eslint-disable-line no-control-regex
     };
 
     options = miscUtil.valueWithDefault(options, {
@@ -77,10 +77,25 @@ function ANSIEscapeParser(options) {
     self.clearScreen = function () {
         self.column = 1;
         self.row = 1;
+        self.positionUpdated();
         self.emit('clear screen');
     };
 
     self.positionUpdated = function () {
+        if(self.row > self.termHeight) {
+            if(this.savedPosition) {
+                this.savedPosition.row -= self.row - self.termHeight;
+            }
+            self.emit('scroll', self.row - self.termHeight);
+            self.row = self.termHeight;
+        }
+        else if(self.row < 1) {
+            if(this.savedPosition) {
+                this.savedPosition.row -= self.row - 1;
+            }
+            self.emit('scroll', -(self.row - 1));
+            self.row = 1;
+        }
         self.emit('position update', self.row, self.column);
     };
 
@@ -231,7 +246,7 @@ function ANSIEscapeParser(options) {
         self.parseState = {
             //  ignore anything past EOF marker, if any
             buffer: input.split(String.fromCharCode(0x1a), 1)[0],
-            re: /(?:\x1b\x5b)([?=;0-9]*?)([ABCDHJKfhlmnpsu])/g, //  eslint-disable-line no-control-regex
+            re: /(?:\x1b)(?:(?:\x5b([?=;0-9]*?)([ABCDEFGfHJKLmMsSTuUYZt@PXhlnpt]))|([78DEHM]))/g, //  eslint-disable-line no-control-regex
             stop: false,
         };
     };
@@ -271,9 +286,47 @@ function ANSIEscapeParser(options) {
                 opCode = match[2];
                 args = match[1].split(';').map(v => parseInt(v, 10)); //  convert to array of ints
 
-                escape(opCode, args);
+                // Handle the case where there is no bracket
+                if(!(_.isNil(match[3]))) {
+                    opCode = match[3];
+                    args = [];
+                    // no bracket
+                    switch(opCode) {
+                        // save cursor position
+                        case '7':
+                            escape('s', args);
+                            break;
+                        // restore cursor position
+                        case '8':
+                            escape('u', args);
+                            break;
+
+                        // scroll up
+                        case 'D':
+                            escape('S', args);
+                            break;
+
+                        // move to next line
+                        case 'E':
+                            // functonality is the same as ESC [ E
+                            escape(opCode, args);
+                            break;
+
+                        // create a tab at current cursor position
+                        case 'H':
+                            literal('\t');
+                            break;
+
+                        // scroll down
+                        case 'M':
+                            escape('T', args);
+                            break;
+                    }
+                }
+                else {
+                    escape(opCode, args);
+                }
 
-                //self.emit('chunk', match[0]);
                 self.emit('control', match[0], opCode, args);
             }
         } while (0 !== re.lastIndex);
@@ -281,8 +334,8 @@ function ANSIEscapeParser(options) {
         if (pos < buffer.length) {
             var lastBit = buffer.slice(pos);
 
-            //  :TODO: check for various ending LF's, not just DOS \r\n
-            if ('\r\n' === lastBit.slice(-2).toString()) {
+            //  handles either \r\n or \n
+            if ('\n' === lastBit.slice(-1).toString()) {
                 switch (self.trailingLF) {
                     case 'default':
                         //
@@ -290,14 +343,14 @@ function ANSIEscapeParser(options) {
                         //  if we're going to end on termHeight
                         //
                         if (this.termHeight === self.row) {
-                            lastBit = lastBit.slice(0, -2);
+                            lastBit = lastBit.slice(0, -1);
                         }
                         break;
 
                     case 'omit':
                     case 'no':
                     case false:
-                        lastBit = lastBit.slice(0, -2);
+                        lastBit = lastBit.slice(0, -1);
                         break;
                 }
             }
@@ -308,48 +361,6 @@ function ANSIEscapeParser(options) {
         self.emit('complete');
     };
 
-    /*
-    self.parse = function(buffer, savedRe) {
-        //  :TODO: ensure this conforms to ANSI-BBS / CTerm / bansi.txt for movement/etc.
-        //  :TODO: move this to "constants" section @ top
-        var re  = /(?:\x1b\x5b)([\?=;0-9]*?)([ABCDHJKfhlmnpsu])/g;
-        var pos = 0;
-        var match;
-        var opCode;
-        var args;
-
-        //  ignore anything past EOF marker, if any
-        buffer = buffer.split(String.fromCharCode(0x1a), 1)[0];
-
-        do {
-            pos     = re.lastIndex;
-            match   = re.exec(buffer);
-
-            if(null !== match) {
-                if(match.index > pos) {
-                    parseMCI(buffer.slice(pos, match.index));
-                }
-
-                opCode  = match[2];
-                args    = getArgArray(match[1].split(';'));
-
-                escape(opCode, args);
-
-                self.emit('chunk', match[0]);
-            }
-
-
-
-        } while(0 !== re.lastIndex);
-
-        if(pos < buffer.length) {
-            parseMCI(buffer.slice(pos));
-        }
-
-        self.emit('complete');
-    };
-    */
-
     function escape(opCode, args) {
         let arg;
 
@@ -382,6 +393,37 @@ function ANSIEscapeParser(options) {
                 self.moveCursor(-arg, 0);
                 break;
 
+            // line feed
+            case 'E':
+                arg = isNaN(args[0]) ? 1 : args[0];
+                if(this.row + arg > this.termHeight) {
+                    this.emit('scroll', arg - (this.termHeight - this.row));
+                    self.moveCursor(0, this.termHeight);
+                }
+                else {
+                    self.moveCursor(0, arg);
+                }
+                break;
+
+            // reverse line feed
+            case 'F':
+                arg = isNaN(args[0]) ? 1 : args[0];
+                if(this.row - arg < 1) {
+                    this.emit('scroll', -(arg - this.row));
+                    self.moveCursor(0, 1 - this.row);
+                }
+                else {
+                    self.moveCursor(0, -arg);
+                }
+                break;
+
+            // absolute horizontal cursor position
+            case 'G':
+                arg = isNaN(args[0]) ? 1 : args[0];
+                self.column = Math.max(1, arg);
+                self.positionUpdated();
+                break;
+
             case 'f': //  horiz & vertical
             case 'H': //  cursor position
                 //self.row  = args[0] || 1;
@@ -392,14 +434,37 @@ function ANSIEscapeParser(options) {
                 self.positionUpdated();
                 break;
 
-            //  save position
-            case 's':
-                self.saveCursorPosition();
+
+            //  erase display/screen
+            case 'J':
+                if(isNaN(args[0]) || 0 === args[0]) {
+                    self.emit('erase rows', self.row, self.termHeight);
+                }
+                else if (1 === args[0]) {
+                    self.emit('erase rows', 1, self.row);
+                }
+                else if (2 === args[0]) {
+                    self.clearScreen();
+                }
                 break;
 
-            //  restore position
-            case 'u':
-                self.restoreCursorPosition();
+            // erase text in line
+            case 'K':
+                if(isNaN(args[0]) || 0 === args[0]) {
+                    self.emit('erase columns', self.row, self.column, self.termWidth);
+                }
+                else if (1 === args[0]) {
+                    self.emit('erase columns', self.row, 1, self.column);
+                }
+                else if (2 === args[0]) {
+                    self.emit('erase columns', self.row, 1, self.termWidth);
+                }
+                break;
+
+            // insert line
+            case 'L':
+                arg = isNaN(args[0]) ? 1 : args[0];
+                self.emit('insert line', self.row, arg);
                 break;
 
             //  set graphic rendition
@@ -471,15 +536,52 @@ function ANSIEscapeParser(options) {
                 self.emit('sgr update', self.graphicRendition);
                 break; //  m
 
-            //  :TODO: s, u, K
-
-            //  erase display/screen
-            case 'J':
-                //  :TODO: Handle other 'J' types!
-                if (2 === args[0]) {
-                    self.clearScreen();
-                }
+            //  save position
+            case 's':
+                self.saveCursorPosition();
                 break;
+
+            // Scroll up
+            case 'S':
+                arg = isNaN(args[0]) ? 1 : args[0];
+                self.emit('scroll', arg);
+                break;
+
+            // Scroll down
+            case 'T':
+                arg = isNaN(args[0]) ? 1 : args[0];
+                self.emit('scroll', -arg);
+                break;
+
+            //  restore position
+            case 'u':
+                self.restoreCursorPosition();
+                break;
+
+            // clear
+            case 'U':
+                self.clearScreen();
+                break;
+
+            // delete line
+            // TODO: how should we handle 'M'?
+            case 'Y':
+                arg = isNaN(args[0]) ? 1 : args[0];
+                self.emit('delete line', self.row, arg);
+                break;
+
+            // back tab
+            case 'Z':
+                // calculate previous tabstop
+                self.column = Math.max( 1, self.column - (self.column % 8 || 8) );
+                self.positionUpdated();
+                break;
+            case '@':
+                // insert column(s)
+                arg = isNaN(args[0]) ? 1 : args[0];
+                self.emit('insert columns', self.row, self.column, arg);
+                break;
+
         }
     }
 }

core/archive_util.js

@@ -208,17 +208,17 @@ module.exports = class ArchiveUtil {
         //  pty.js doesn't currently give us a error when things fail,
         //  so we have this horrible, horrible hack:
         let err;
-        proc.once('data', d => {
+        proc.onData(d => {
             if (_.isString(d) && d.startsWith('execvp(3) failed.')) {
                 err = Errors.ExternalProcess(`${action} failed: ${d.trim()}`);
             }
         });
 
-        proc.once('exit', exitCode => {
+        proc.onExit(exitEvent => {
             return cb(
-                exitCode
+                exitEvent.exitCode
                     ? Errors.ExternalProcess(
-                          `${action} failed with exit code: ${exitCode}`
+                          `${action} failed with exit code: ${exitEvent.exitCode}`
                       )
                     : err
             );
@@ -358,10 +358,10 @@ module.exports = class ArchiveUtil {
             output += data;
         });
 
-        proc.once('exit', exitCode => {
-            if (exitCode) {
+        proc.onExit(exitEvent => {
+            if (exitEvent.exitCode) {
                 return cb(
-                    Errors.ExternalProcess(`List failed with exit code: ${exitCode}`)
+                    Errors.ExternalProcess(`List failed with exit code: ${exitEvent.exitCode}`)
                 );
             }
 

core/art.js

@@ -316,6 +316,75 @@ function display(client, art, options, cb) {
         }
     });
 
+    // Remove any MCI's that are in erased rows
+    ansiParser.on('erase row', (startRow, endRow) => {
+        _.forEach(mciMap, (mciInfo, mapKey) => {
+            if (mciInfo.position[0] >= startRow && mciInfo.position[0] <= endRow) {
+                delete mciMap[mapKey];
+            }
+        });
+    });
+
+    // Remove any MCI's that are in erased columns
+    ansiParser.on('erase columns', (row, startCol, endCol) => {
+        _.forEach(mciMap, (mciInfo, mapKey) => {
+            if (
+                mciInfo.position[0] === row &&
+                mciInfo.position[1] >= startCol &&
+                mciInfo.position[1] <= endCol
+            ) {
+                delete mciMap[mapKey];
+            }
+        });
+    });
+
+    ansiParser.on('insert columns', (row, startCol, numCols) => {
+        _.forEach(mciMap, (mciInfo, mapKey) => {
+            if (mciInfo.position[0] === row && mciInfo.position[1] >= startCol) {
+                mciInfo.position[1] += numCols;
+                if(mciInfo.position[1] > client.term.termWidth) {
+                    delete mciMap[mapKey];
+                }
+            }
+        });
+    });
+
+    // Clear the screen, removing any MCI's
+    ansiParser.on('clear screen', () => {
+        _.forEach(mciMap, (mciInfo, mapKey) => {
+            delete mciMap[mapKey];
+        });
+    });
+
+    ansiParser.on('scroll', (scrollY) => {
+        _.forEach(mciMap, (mciInfo) => {
+            mciInfo.position[0] -= scrollY;
+        });
+    });
+
+    ansiParser.on('insert line', (row, numLines) => {
+        _.forEach(mciMap, (mciInfo) => {
+            if (mciInfo.position[0] >= row) {
+                mciInfo.position[0] += numLines;
+            }
+        });
+    });
+
+    ansiParser.on('delete line', (row, numLines) => {
+        _.forEach(mciMap, (mciInfo, mapKey) => {
+            if (mciInfo.position[0] >= row) {
+                if(mciInfo.position[0] < row + numLines) {
+                    // unlike scrolling, the rows are actually gone,
+                    // so we need to delete any MCI's that are in them
+                    delete mciMap[mapKey];
+                }
+                else {
+                    mciInfo.position[0] -= numLines;
+                }
+            }
+        });
+    });
+
     ansiParser.on('literal', literal => client.term.write(literal, false));
     ansiParser.on('control', control => client.term.rawWrite(control));
 

core/config_default.js

@@ -188,22 +188,15 @@ module.exports = () => {
                 //
                 //  1 - Generate a Private Key (PK):
                 //  Currently ENiGMA 1/2 requires a PKCS#1 PEM formatted PK.
-                //  To generate a secure PK, issue the following command:
-                //
-                //  > openssl genpkey -algorithm RSA -pkeyopt rsa_keygen_bits:2048 \
-                //      -pkeyopt rsa_keygen_pubexp:65537 | openssl rsa \
-                //      -out ./config/security/ssh_private_key.pem -aes128
-                //
-                //  (The above is a more modern equivalent of the following):
-                //  > openssl genrsa -aes128 -out ./config/security/ssh_private_key.pem 2048
+                //  For information on generating a key, see:
+                //  https://nuskooler.github.io/enigma-bbs/servers/loginservers/ssh.html#generate-a-ssh-private-key
                 //
                 //  2 - Set 'privateKeyPass' to the password you used in step #1
                 //
                 //  3 - Finally, set 'enabled' to 'true'
                 //
                 //  Additional reading:
-                //  - https://blog.sleeplessbeastie.eu/2017/12/28/how-to-generate-private-key/
-                //  - https://gist.github.com/briansmith/2ee42439923d8e65a266994d0f70180b
+                //  - https://nuskooler.github.io/enigma-bbs/servers/loginservers/ssh.html
                 //
                 privateKeyPem: paths.join(
                     __dirname,
@@ -222,14 +215,18 @@ module.exports = () => {
                 //
                 algorithms: {
                     kex: [
+                        'curve25519-sha256',
+                        'curve25519-sha256@libssh.org',
                         'ecdh-sha2-nistp256',
                         'ecdh-sha2-nistp384',
                         'ecdh-sha2-nistp521',
                         'diffie-hellman-group14-sha1',
                         'diffie-hellman-group1-sha1',
-                        //  Group exchange not currnetly supported
-                        //  'diffie-hellman-group-exchange-sha256',
-                        //  'diffie-hellman-group-exchange-sha1',
+                        'curve25519-sha256',
+                        'curve25519-sha256@libssh.org',
+                        'ecdh-sha2-nistp256',
+                        'ecdh-sha2-nistp384',
+                        'ecdh-sha2-nistp521',
                     ],
                     cipher: [
                         'aes128-ctr',
@@ -242,12 +239,7 @@ module.exports = () => {
                         'aes256-cbc',
                         'aes192-cbc',
                         'aes128-cbc',
-                        'blowfish-cbc',
                         '3des-cbc',
-                        'arcfour256',
-                        'arcfour128',
-                        'cast128-cbc',
-                        'arcfour',
                     ],
                     hmac: [
                         'hmac-sha2-256',

core/door.js

@@ -57,8 +57,10 @@ module.exports = class Door {
     run(exeInfo, cb) {
         this.encoding = (exeInfo.encoding || 'cp437').toLowerCase();
 
-        if ('socket' === this.io && !this.sockServer) {
-            return cb(Errors.UnexpectedState('Socket server is not running'));
+        if ('socket' === this.io) {
+            if(!this.sockServer) {
+                return cb(Errors.UnexpectedState('Socket server is not running'));
+            }
         } else if ('stdio' !== this.io) {
             return cb(Errors.Invalid(`"${this.io}" is not a valid io type!`));
         }
@@ -113,9 +115,10 @@ module.exports = class Door {
                             spawnOptions
                         );
 
-                        prePty.once('exit', exitCode => {
+                        prePty.onExit(exitEvent => {
+                            const {exitCode, signal} = exitEvent;
                             this.client.log.info(
-                                { exitCode: exitCode },
+                                { exitCode, signal },
                                 'Door pre-command exited'
                             );
                             return callback(null);
@@ -165,7 +168,7 @@ module.exports = class Door {
 
                         this.doorPty.onData(this.doorDataHandler.bind(this));
 
-                        this.doorPty.once('close', () => {
+                        this.doorPty.onExit( (/*exitEvent*/) => {
                             return this.restoreIo(this.doorPty);
                         });
                     } else if ('socket' === this.io) {
@@ -178,8 +181,9 @@ module.exports = class Door {
                         );
                     }
 
-                    this.doorPty.once('exit', exitCode => {
-                        this.client.log.info({ exitCode: exitCode }, 'Door exited');
+                    this.doorPty.onExit(exitEvent => {
+                        const {exitCode, signal} = exitEvent;
+                        this.client.log.info({ exitCode, signal }, 'Door exited');
 
                         if (this.sockServer) {
                             this.sockServer.close();

core/event_scheduler.js

@@ -167,17 +167,17 @@ class ScheduledEvent {
                 return cb(e);
             }
 
-            proc.once('exit', exitCode => {
-                if (exitCode) {
+            proc.onExit(exitEvent => {
+                if (exitEvent.exitCode) {
                     Log.warn(
-                        { eventName: this.name, action: this.action, exitCode: exitCode },
+                        { eventName: this.name, action: this.action, exitCode: exitEvent.exitCode },
                         'Bad exit code while performing scheduled event action'
                     );
                 }
                 return cb(
-                    exitCode
+                    exitEvent.exitCode
                         ? Errors.ExternalProcess(
-                              `Bad exit code while performing scheduled event action: ${exitCode}`
+                              `Bad exit code while performing scheduled event action: ${exitEvent.exitCode}`
                           )
                         : null
                 );

core/file_transfer.js

@@ -485,13 +485,10 @@ exports.getModule = class TransferFileModule extends MenuModule {
             }
         });
 
-        externalProc.once('close', () => {
-            return this.restorePipeAfterExternalProc();
-        });
-
-        externalProc.once('exit', exitCode => {
+        externalProc.onExit(exitEvent => {
+            const {exitCode, signal} = exitEvent;
             this.client.log.debug(
-                { cmd: cmd, args: args, exitCode: exitCode },
+                { cmd: cmd, args: args, exitCode, signal },
                 'Process exited'
             );
 

core/fse.js

@@ -167,6 +167,7 @@ exports.FullScreenEditorModule =
                     var newFocusViewId;
                     if (errMsgView) {
                         if (err) {
+                            errMsgView.clearText();
                             errMsgView.setText(err.message);
 
                             if (MciViewIds.header.subject === err.view.getId()) {
@@ -183,6 +184,13 @@ exports.FullScreenEditorModule =
                     return cb(null);
                 },
                 editModeEscPressed: function (formData, extraArgs, cb) {
+                    const errMsgView = self.viewControllers.header.getView(
+                        MciViewIds.header.errorMsg
+                    );
+                    if (errMsgView) {
+                        errMsgView.clearText();
+                    }
+
                     self.footerMode =
                         'editor' === self.footerMode ? 'editorMenu' : 'editor';
 
@@ -1050,7 +1058,7 @@ exports.FullScreenEditorModule =
                     posView.setText(
                         _.padStart(String(pos.row + 1), 2, '0') +
                             ',' +
-                            _.padEnd(String(pos.col + 1), 2, '0')
+                            _.padStart(String(pos.col + 1), 2, '0')
                     );
                     this.client.term.rawWrite(ansi.restorePos());
                 }

core/ftn_address.js

@@ -135,7 +135,7 @@ module.exports = class Address {
     static fromString(addrStr) {
         const m = FTN_ADDRESS_REGEXP.exec(addrStr);
 
-        if (m) {
+        if (m && m[2] && m[3]) {
             //  start with a 2D
             let addr = {
                 net: parseInt(m[2]),

core/message.js

@@ -763,6 +763,11 @@ module.exports = class Message {
     }
 
     persist(cb) {
+        const containsNonWhitespaceCharacterRegEx = /\S/;
+        if (!containsNonWhitespaceCharacterRegEx.test(this.message)) {
+            return cb(Errors.Invalid('Empty message'));
+        }
+
         if (!this.isValid()) {
             return cb(Errors.Invalid('Cannot persist invalid message!'));
         }

core/msg_area_post_fse.js

@@ -14,6 +14,39 @@ exports.moduleInfo = {
     author: 'NuSkooler',
 };
 
+const MciViewIds = {
+    header: {
+        from: 1,
+        to: 2,
+        subject: 3,
+        errorMsg: 4,
+        modTimestamp: 5,
+        msgNum: 6,
+        msgTotal: 7,
+
+        customRangeStart: 10, //  10+ = customs
+    },
+
+    body: {
+        message: 1,
+    },
+
+    //  :TODO: quote builder MCIs - remove all magic #'s
+
+    //  :TODO: consolidate all footer MCI's - remove all magic #'s
+    ViewModeFooter: {
+        MsgNum: 6,
+        MsgTotal: 7,
+        //  :TODO: Just use custom ranges
+    },
+
+    quoteBuilder: {
+        quotedMsg: 1,
+        //  2 NYI
+        quoteLines: 3,
+    },
+};
+
 exports.getModule = class AreaPostFSEModule extends FullScreenEditorModule {
     constructor(options) {
         super(options);
@@ -42,19 +75,25 @@ exports.getModule = class AreaPostFSEModule extends FullScreenEditorModule {
                 ],
                 function complete(err) {
                     if (err) {
-                        //  :TODO:... sooooo now what?
-                    } else {
-                        //  note: not logging 'from' here as it's part of client.log.xxxx()
-                        self.client.log.info(
-                            {
-                                to: msg.toUserName,
-                                subject: msg.subject,
-                                uuid: msg.messageUuid,
-                            },
-                            `User "${self.client.user.username}" posted message to "${msg.toUserName}" (${msg.areaTag})`
+                        const errMsgView = self.viewControllers.header.getView(
+                            MciViewIds.header.errorMsg
                         );
+                        if (errMsgView) {
+                            errMsgView.setText(err.message);
+                        }
+                        return cb(err);
                     }
 
+                    //  note: not logging 'from' here as it's part of client.log.xxxx()
+                    self.client.log.info(
+                        {
+                            to: msg.toUserName,
+                            subject: msg.subject,
+                            uuid: msg.messageUuid,
+                        },
+                        `User "${self.client.user.username}" posted message to "${msg.toUserName}" (${msg.areaTag})`
+                    );
+
                     return self.nextMenu(cb);
                 }
             );

core/system_view_validate.js

@@ -21,8 +21,10 @@ exports.validateEmailAvail = validateEmailAvail;
 exports.validateBirthdate = validateBirthdate;
 exports.validatePasswordSpec = validatePasswordSpec;
 
+const emptyFieldError = () => new Error('Field cannot be empty');
+
 function validateNonEmpty(data, cb) {
-    return cb(data && data.length > 0 ? null : new Error('Field cannot be empty'));
+    return cb(data && data.length > 0 ? null : emptyFieldError);
 }
 
 function validateMessageSubject(data, cb) {
@@ -91,7 +93,11 @@ function validateGeneralMailAddressedTo(data, cb) {
     //  :TODO: remove hard-coded FTN check here. We need a decent way to register global supported flavors with modules.
     const addressedToInfo = getAddressedToInfo(data);
 
-    if (Message.AddressFlavor.FTN === addressedToInfo.flavor) {
+    if (addressedToInfo.name.length === 0) {
+        return cb(emptyFieldError());
+    }
+
+    if (Message.AddressFlavor.Local !== addressedToInfo.flavor) {
         return cb(null);
     }
 

core/text_view.js

@@ -179,6 +179,10 @@ TextView.prototype.setText = function (text, redraw) {
 };
 
 TextView.prototype.clearText = function () {
+    if (this.text) {
+        this.setText(this.fillChar.repeat(this.text.length));
+    }
+
     this.setText('');
 };
 

docker/Dockerfile

@@ -1,19 +1,25 @@
-FROM node:18-buster-slim
+FROM --platform=${BUILDPLATFORM:-linux/amd64} node:20-bookworm-slim
+
+ARG TARGETPLATFORM
+ARG BUILDPLATFORM
+ARG TARGETOS
+ARG TARGETBRANCH
 
 LABEL maintainer="dave@force9.org"
 
 ENV NVM_DIR /root/.nvm
 ENV DEBIAN_FRONTEND noninteractive
-COPY . /enigma-bbs
 
-# Do some installing! (and alot of cleaning up) keeping it in one step for less docker layers
-# - if you need to debug i recommend to break the steps with individual RUNs)
+
+# Just copy the package.json so it only needs to build once
+COPY package.json /enigma-bbs/
+
+# Install APT and NPM packages
 RUN apt-get update \
     && apt-get install -y \
     git \
     curl \
     build-essential \
-    python \
     python3 \
     libssl-dev \
     lrzsz \
@@ -22,9 +28,21 @@ RUN apt-get update \
     unrar-free \
     p7zip-full \
     dos2unix \
+    && npm set progress=false && npm config set depth 0 \
     && npm install -g npm@latest \
     && npm install -g pm2 \
-    && cd /enigma-bbs && npm install \
+    && cd /enigma-bbs && npm install
+
+
+# Do this after npm install to avoid cache-miss on every code change
+COPY . /enigma-bbs
+
+# Then run post source copy steps that have to happen every time
+RUN dos2unix /enigma-bbs/docker/bin/docker-entrypoint.sh \
+    && apt-get remove dos2unix -y \
+    && chmod +x /enigma-bbs/docker/bin/docker-entrypoint.sh \
+    && cp -f /enigma-bbs/docker/bin/sexyz /usr/local/bin \
+    && cd /enigma-bbs \
     && pm2 start main.js \
     && mkdir -p /enigma-bbs-pre/art \
     && mkdir /enigma-bbs-pre/mods \
@@ -32,16 +50,11 @@ RUN apt-get update \
     && cp -rp art/* ../enigma-bbs-pre/art/ \
     && cp -rp mods/* ../enigma-bbs-pre/mods/ \
     && cp -rp config/* ../enigma-bbs-pre/config/ \
-    && apt-get remove build-essential python python3 libssl-dev git curl -y \
+    && apt-get remove build-essential python3 libssl-dev git curl -y \
     && apt-get autoremove -y \
     && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* \
     && apt-get clean
 
-# sexyz
-COPY docker/bin/sexyz /usr/local/bin
-RUN dos2unix /enigma-bbs/docker/bin/docker-entrypoint.sh && apt-get remove dos2unix -y
-RUN chmod +x /enigma-bbs/docker/bin/docker-entrypoint.sh
-
 # enigma storage mounts
 VOLUME /enigma-bbs/art
 VOLUME /enigma-bbs/config

docs/Gemfile.lock

@@ -6,8 +6,8 @@ GEM
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
+    addressable (2.8.5)
+      public_suffix (>= 2.0.2, < 6.0)
     colorator (1.1.0)
     concurrent-ruby (1.2.2)
     cssminify2 (2.0.1)
@@ -19,14 +19,14 @@ GEM
     ffi (1.15.5)
     forwardable-extended (2.6.0)
     gemoji (3.0.1)
-    html-pipeline (2.14.0)
+    html-pipeline (2.14.3)
       activesupport (>= 2)
       nokogiri (>= 1.4)
     htmlcompressor (0.4.0)
     http_parser.rb (0.8.0)
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
-    jekyll (4.2.1)
+    jekyll (4.2.2)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
@@ -49,7 +49,7 @@ GEM
       uglifier (~> 4.1)
     jekyll-relative-links (0.6.1)
       jekyll (>= 3.3, < 5.0)
-    jekyll-sass-converter (2.1.0)
+    jekyll-sass-converter (2.2.0)
       sassc (> 2.0.1, < 3.0)
     jekyll-seo-tag (2.7.1)
       jekyll (>= 3.8, < 5.0)
@@ -64,30 +64,32 @@ GEM
       gemoji (~> 3.0)
       html-pipeline (~> 2.2)
       jekyll (>= 3.0, < 5.0)
-    json (2.6.1)
+    json (2.6.3)
     json-minify (0.0.3)
       json (> 0)
-    kramdown (2.3.1)
+    kramdown (2.4.0)
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
-    liquid (4.0.3)
-    listen (3.7.1)
+    liquid (4.0.4)
+    listen (3.8.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     mercenary (0.4.0)
     minitest (5.19.0)
-    nokogiri (1.14.3-x86_64-linux)
+    nokogiri (1.15.4-aarch64-linux)
+      racc (~> 1.4)
+    nokogiri (1.15.4-x86_64-linux)
       racc (~> 1.4)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    public_suffix (4.0.6)
-    racc (1.6.2)
-    rb-fsevent (0.11.0)
+    public_suffix (5.0.3)
+    racc (1.7.1)
+    rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rexml (3.2.5)
-    rouge (3.28.0)
+    rexml (3.2.6)
+    rouge (3.30.0)
     safe_yaml (1.0.5)
     sassc (2.4.0)
       ffi (~> 1.9)
@@ -98,8 +100,10 @@ GEM
     uglifier (4.2.0)
       execjs (>= 0.3.0, < 3)
     unicode-display_width (1.8.0)
+    webrick (1.8.1)
 
 PLATFORMS
+  aarch64-linux
   x86_64-linux
 
 DEPENDENCIES
@@ -111,6 +115,7 @@ DEPENDENCIES
   jekyll-theme-hacker (~> 0.2.0)
   jemoji (~> 0.12.0)
   tzinfo-data
+  webrick
 
 BUNDLED WITH
-   2.3.5
+   2.4.19

docs/_config.yml

@@ -131,4 +131,5 @@ collections:
       - admin/oputil.md
       - admin/updating.md
       - troubleshooting/monitoring-logs.md
+      - troubleshooting/ssh-troubleshooting.md
 

docs/_docs/filebase/tic-support.md

@@ -3,7 +3,7 @@ layout: page
 title: TIC Support
 ---
 ## TIC Support
-ENiGMA½ supports FidoNet-Style TIC file attachments by mapping TIC areas to local file areas.
+ENiGMA½ supports FidoNet-Style TIC file attachments by mapping external TIC area tags to local file areas.
 
 Under a given node defined in the `ftn_bso` config section in `config.hjson` (see
 [BSO Import/Export](../messageareas/bso-import-export.md)), TIC configuration may be supplied:
@@ -17,9 +17,9 @@ Under a given node defined in the `ftn_bso` config section in `config.hjson` (se
           packetPassword: mypass
           encoding: cp437
           archiveType: zip
-          tic: {
+          tic: { // <--- General TIC config for 46:*
             password: TESTY-TEST
-            uploadBy: Agoranet TIC
+            uploadBy: AgoraNet TIC
             allowReplace: true
           }
         }
@@ -29,7 +29,15 @@ Under a given node defined in the `ftn_bso` config section in `config.hjson` (se
 }
 ```
 
-You then need to configure the mapping between TIC areas you want to carry, and the file base area and storage tag for them to be tossed to. Optionally you can also add hashtags to the tossed files to assist users in searching for files:
+Valid `tic` members:
+
+| Item | Required | Description |
+|--------|---------------|------------------|
+| `password` | :-1: | TIC packet password, if required |
+| `uploadedBy` | :-1: | Sets the "uploaded by" field for TIC attachments, for example "AgoraNet TIC" |
+| `allowReplace` | :-1: | Set to `true` to allow TIC attachments to replace each other. This is especially handy for things like weekly node list attachments |
+
+Next, we need to configure the mapping between TIC areas you want to carry, and the file base area (and, optionally, specific storage tag) for them to be tossed to. You can also add hashtags to the tossed files to assist users in searching for files:
 
 ```hjson
 ticAreas: {
@@ -41,10 +49,22 @@ ticAreas: {
 }
 
 ```
-Multiple TIC areas can be mapped to a single file base area.
+
+> :information_source: Note that in the example above `agn_node` represents the **external** network area tag, usually represented in all caps. In this case, `AGN_NODE`.
+
+Valid `ticAreas` members under a given node mapping are as follows:
+
+| Item | Required | Description |
+|--------|---------------|------------------|
+| `areaTag` | :+1: | Specifies the local areaTag in which to place TIC attachments |
+| `storageTag` | :-1: | Optionally, set a specific storageTag. If not set, the default for this area will be used. |
+| `hashTags` | :-1: | One or more optional hash tags to assign TIC attachments in this area. |
+
+
+💡 Multiple TIC areas can be mapped to a single file base area.
 
 ### Example Configuration
-An example configuration linking file base areas, FTN BSO node configuration and TIC area configuration.
+Example configuration fragments mapping file base areas, FTN BSO node configuration and TIC area configuration.
 
 ```hjson
 fileBase: {
@@ -79,22 +99,24 @@ scannerTossers: {
                 }
             }
         }
+
+        ticAreas: {
+            // here we map AgoraNet AGN_NODE -> local msgNetworks file area
+            agn_node: {
+                areaTag: msgNetworks
+                storageTag: msg_network
+                hashTags: agoranet,nodelist
+            }
+            agn_info: {
+                areaTag: msgNetworks
+                storageTag: msg_network
+                hashTags: agoranet,infopack
+            }
+        }
     }
 }
 
 
-ticAreas: {
-    agn_node: {
-        areaTag: msgNetworks
-        storageTag: msg_network
-        hashTags: agoranet,nodelist
-    }
-    agn_info: {
-        areaTag: msgNetworks
-        storageTag: msg_network
-        hashTags: agoranet,infopack
-    }
-}
 ```
 
 ## See Also

docs/_docs/servers/loginservers/ssh.md

@@ -3,9 +3,13 @@ layout: page
 title: SSH Server
 ---
 ## SSH Login Server
+
 The ENiGMA½ SSH *login server* allows secure user logins over SSH (ssh://).
 
+*Note:* If you run into any troubles during SSH setup, please see [Troubleshooting SSH](../../troubleshooting/ssh-troubleshooting.md)
+
 ## Configuration
+
 Entries available under `config.loginServers.ssh`:
 
 | Item | Required | Description |
@@ -20,10 +24,8 @@ Entries available under `config.loginServers.ssh`:
 | `algorithms` | :-1: | Configuration block for SSH algorithms. Includes keys of `kex`, `cipher`, `hmac`, and `compress`. See the algorithms section in the [ssh2-streams](https://github.com/mscdex/ssh2-streams#ssh2stream-methods) documentation for details. For defaults set by ENiGMA½, see `core/config_default.js`.
 | `traceConnections` | :-1: | Set to `true` to enable full trace-level information on SSH connections.
 
-
 * *IMPORTANT* With the `privateKeyPass` option set, make sure that you verify that the config file is not readable by other users!
 
-
 ### Example Configuration
 
 ```hjson
@@ -40,42 +42,93 @@ Entries available under `config.loginServers.ssh`:
 ```
 
 ## Generate a SSH Private Key
+
 To utilize the SSH server, an SSH Private Key (PK) will need generated. OpenSSH or (with some versions) OpenSSL can be used for this task:
 
-### OpenSSH
+### OpenSSH (Preferred)
 
-```bash
-ssh-keygen -m PEM -h -f config/ssh_private_key.pem
+#### OpenSSH Install - Linux / Mac
+
+If it is not already available, install OpenSSH using the package manager of your choice (should be pre-installed on most distributions.)
+
+#### Running OpenSSH - Linux / Mac
+
+From the root directory of the Enigma BBS, run the following:
+
+```shell
+mkdir -p config/security
+ssh-keygen -t rsa -m PEM -h -f config/security/ssh_private_key.pem
 ```
 
+#### Windows Install - OpenSSH
+
+OpenSSH may already be installed, try running `ssh-keygen.exe`. If not, see this page: [Install OpenSSH for Windows](https://learn.microsoft.com/en-us/windows-server/administration/openssh/openssh_install_firstuse?tabs=gui)
+
+#### Running OpenSSH - Windows
+
+After installation, go to the root directory of your enigma project and run:
+
+```powershell
+mkdir .\config\security -ErrorAction SilentlyContinue
+ssh-keygen.exe -t rsa -m PEM -h -f .\config\security\ssh_private_key.pem
+```
+
+#### ssh-keygen options
+
 Option descriptions:
 
 | Option | Description |
 |------|-------------|
+| `-t rsa` | Use the RSA algorithm needed for the `ssh2` library |
 | `-m PEM` | Set the output format to `PEM`, compatible with the `ssh2` library |
 | `-h` | Generate a host key |
 | `-f config/ssh_private_key.pem` | Filename for the private key. Used in the `privateKeyPem` option in the configuration |
 
 When you execute the `ssh-keygen` command it will ask for a passphrase (and a confirmation.) This should then be used as the value for `privateKeyPass` in the configuration.
 
-
 ### OpenSSL
 
-If you do not have OpenSSH installed or if you have trouble with the above OpenSSH commands, using some versions for OpenSSL (before version 3) the following commands may work as well:
+#### Open SSL Install - Linux / Mac
 
+If not already installed, install via the `openssl` package on most package managers.
 
-```bash
-openssl genpkey -algorithm RSA -pkeyopt rsa_keygen_bits:2048 -pkeyopt rsa_keygen_pubexp:65537 | openssl rsa -out ./config/ssh_private_key.pem -aes128
+#### Open SSL Install - Windows
+
+```powershell
+winget install -e --id ShiningLight.OpenSSL
 ```
 
-Or for even older OpenSSL versions:
+#### Running OpenSSL
 
-```bash
+*Note:* Using `ssh-keygen` from OpenSSL is recommended where possible. If you have trouble with the above OpenSSH commands, using some versions for OpenSSL (before version 3) the following commands may work as well:
+
+#### Running OpenSSL - Linux / Mac
+
+Run the following from the root directory of Enigma
+
+```shell
+mkdir -p config/security
+openssl genpkey -algorithm RSA -pkeyopt rsa_keygen_bits:2048 -pkeyopt rsa_keygen_pubexp:65537 | openssl rsa -out ./config/security/ssh_private_key.pem -aes128
+```
+
+#### Running OpenSSL - Windows
+
+Run the following from the root directory of Enigma (note: you may need to specify the full path to openssl.exe if it isn't in your system path, on my system it was `C:\Program Files\OpenSSL-Win64\bin\openssl.exe`):
+
+```powershell
+mkdir .\config\security -ErrorAction SilentlyContinue
+openssl.exe genpkey -algorithm RSA -pkeyopt rsa_keygen_bits:2048 -pkeyopt rsa_keygen_pubexp:65537 | openssl.exe rsa -out ./config/security/ssh_private_key.pem -aes128
+```
+
+#### Running Older OpenSSL
+
+For older OpenSSL versions, the following command has been known to work:
+
+```shell
 openssl genrsa -aes128 -out ./config/ssh_private_key.pem 2048
 ```
 
-Note that you may need `-3des` for very old implementations or SSH clients!
-
+*Note:* that you may need `-3des` for very old implementations or SSH clients!
 
 ## Prompt
 

docs/_docs/troubleshooting/ssh-troubleshooting.md

@@ -0,0 +1,45 @@
+---
+layout: page
+title: Troubleshooting SSH
+---
+
+Stuck with errors trying to get your SSH setup configured? See below for some common problems. Or as always, reach out to us by creating an [Issue](https://github.com/NuSkooler/enigma-bbs/issues) or start a [Discussion](https://github.com/NuSkooler/enigma-bbs/discussions)
+
+## No Such File or Directory
+
+***Symptom:***
+BBS not starting with an error similar to the following:
+
+```shell
+Error initializing: Error: ENOENT: no such file or directory, open '<path>/config/security/ssh_private_key.pem'
+```
+
+***Solution:***
+Several things can cause this:
+
+1. `ssh_private_key.pem` was installed to the wrong location. Make sure that it is in the `config/security` directory and has the name matching the error message. You can also change your `config.hjson` if you prefer to point to the location of the key file.
+2. `ssh_private_key.pem` has the wrong file permissions. Verify that the file will be readable by the user that the BBS is running as. Because it is a cryptographic key however, we do recommend that access is restricted only to that user.
+
+## Error With Netrunner
+
+***Symptom:***
+Some ssh clients connect, but Netrunner (and other older clients) get a connection failed message and the following is in the log:
+
+```shell
+"level":40,"error":"Handshake failed","code":2,"msg":"SSH connection error"
+```
+
+***Solution:***
+
+The key was most likely not generated with the `-t rsa` option, and is using a newer algorithm that is not supported by Netrunner and similar clients. Regenerate the certificate with the `-t rsa` option.
+
+***Symptom:***
+Some ssh clients connect, but Netrunner (and other older clients) get a connection failed message and the following is in the log:
+
+```shell
+"level":40,"error":"Group exchange not implemented for server","msg":"SSH connection error"
+```
+
+***Solution:***
+
+Remove the following encryption protocols from your `config.hjson`: `diffie-hellman-group-exchange-sha256` and `diffie-hellman-group-exchange-sha1`

misc/menu_templates/private_mail.in.hjson

@@ -69,7 +69,7 @@
                             }
                         ]
                     }
-                    actionKeys: @reference: common.escToPrev
+                    actionKeys: @reference:common.escToPrev
                 }
                 1: {
                     mci: {

package.json

@@ -50,7 +50,7 @@
         "minimist": "^1.2.6",
         "moment": "2.29.4",
         "nntp-server": "3.1.0",
-        "node-pty": "0.10.1",
+        "node-pty": "1.0.0",
         "nodemailer": "6.7.7",
         "otplib": "11.0.1",
         "qrcode-generator": "^1.4.4",
@@ -59,8 +59,8 @@
         "sanitize-filename": "^1.6.3",
         "sqlite3": "5.1.6",
         "sqlite3-trans": "1.3.0",
-        "ssh2": "1.11.0",
-        "systeminformation": "5.12.3",
+        "ssh2": "1.14.0",
+        "systeminformation": "5.21.7",
         "telnet-socket": "0.2.4",
         "temptmp": "^1.1.0",
         "uuid": "8.3.2",