Merge pull request #57 from Interlisp/fgh_fio

Implement files.interlisp.org server "on top of" online.interlisp.org web portal

Author: fghalasz

system/oio-dev.service

@@ -18,6 +18,7 @@ ExecStart=/usr/bin/docker run \
                -v /var/run/docker.sock:/var/run/docker.sock \
                -v /srv/oio/development:/srv/oio \
                -v /srv/oio/static:/srv/static \
+               -v /srv/oio/files/development:/srv/files \
                -v /etc/letsencrypt:/etc/letsencrypt \
                -e DEV_OR_PROD \
                -e NODE_ENV \

system/oio.service

@@ -18,6 +18,7 @@ ExecStart=/usr/bin/docker run \
                -v /var/run/docker.sock:/var/run/docker.sock \
                -v /srv/oio/production:/srv/oio \
                -v /srv/oio/static:/srv/static \
+               -v /srv/oio/files/production:/srv/files \
                -v /etc/letsencrypt:/etc/letsencrypt \
                -e DEV_OR_PROD \
                -e NODE_ENV \

system/oio.sh

@@ -317,6 +317,18 @@ case $1 in
          fi
      ;;
 
+     start)
+         sudo systemctl start "${oio}".service
+     ;;
+
+     stop)
+         sudo systemctl stop "${oio}".service
+     ;;
+
+     xstat)
+         sudo systemctl status "${oio}".service
+     ;;
+
      help)
         echo "Usage:"
         echo
@@ -354,6 +366,10 @@ case $1 in
             echo "${oio} noRm off: turn noDockerRm off"
             echo
         fi
+        echo "${oio} start:  start ${oio}.service"
+        echo "${oio} stop:   stop ${oio}.service"
+        echo "${oio} xstat:  = systemctl status ${oio}.service"
+        echo
 	;;
 
     *)

web-portal/server/js/app.js

@@ -21,8 +21,15 @@ const session = require("express-session");
 const passport = require('passport');
 //const favicon = require('serve-favicon')
 
-// Set up express basics
+// Set up main app as well as the filesApp
+// And reroute queries with
 const app = express();
+const filesApp = require('./files');
+app.use((req, res, next) => {
+            if(config.isFIO(req)) filesApp(req, res);
+            else next();
+        });
+
 //app.use(favicon(path.join(config.imagesDir, 'favicon.ico')));
 app.use(express.json());
 app.use(express.urlencoded({ extended: true }));
@@ -37,11 +44,11 @@ logger.token('user', (req, res) => { return (req.user && req.user.username) || "
 logger.token('user-agent-short', (req, res) => { return (req.get('User-Agent') && req.get('User-Agent').split(' ', 1)[0]) || "Unknown"; });
 app.use(
   logger(
-    ':date[iso] :user :method :url :user-agent-short :status :response-time ms - :res[content-length]', { 
+    ':date[iso] :user :method :url :user-agent-short :status :response-time ms - :res[content-length]', {
         stream: logStream,
         skip: (req, res) => {
           return !(/^\/interlisp/.test(req.originalUrl) || /^\/client\/go/.test(req.originalUrl) || /^\/main$/.test(req.originalUrl) || /^\/$/.test(req.originalUrl));
-        }      
+        }
     }));
 
 //  Set up express session

web-portal/server/js/config.js

@@ -148,6 +148,11 @@ var isNCO = function(req) {
 };
 exports.isNCO = isNCO;
 
+var isFIO = function(req) {
+    return (req.hostname.toLowerCase() == "files.interlisp.org");
+}
+exports.isFIO = isFIO;
+
 var medleyMemoryArg = "64";
 exports.medleyMemoryArg = medleyMemoryArg;
 
@@ -157,6 +162,9 @@ exports.medleyNetworkHostMode = medleyNetworkHostMode;
 var staticHostingPath = "/srv/static";
 exports.staticHostingPath = staticHostingPath;
 
+var filesHostingPath = "/srv/files";
+exports.filesHostingPath = filesHostingPath;
+
 var idleTimeoutSecs = 7200;
 var idleTimeoutSecsGuest = 3600;
 exports.idleTimeoutSecs = idleTimeoutSecs;

web-portal/server/js/files.js

@@ -0,0 +1,94 @@
+/*******************************************************************************
+ *
+ *   files.js:   Sub-app to handle access to static files through
+ *               files.interlisp.org.
+ *
+ *   2024-07-07 Frank Halasz
+ *
+ *
+ *   Copyright: 2024 by Interlisp.org
+ *
+ *
+ ******************************************************************************/
+const mFs = require('fs');
+const mPath = require('node:path');
+const mExpress = require("express");
+
+const config = require("./config");
+const { isText, isBinary, getEncoding } = require('istextorbinary');
+
+const filesApp = mExpress();
+
+// Define function to set content type headers for files with no
+// extension.  Use isBinary to distinguish octet-stream versus
+// text content types.
+// Used by mExpress.static
+function setContentType(res, path, stat) {
+    const ext = mPath.extname(path);
+    if(ext.length == 0) {
+        const buffer = mFs.readFileSync(path);
+        const name = mPath.basename(path);
+        if(isInterlispSource(buffer, name)) {
+            res.set('Content-Type', 'application/octet-stream');
+        } else if (isText(null, buffer)) {
+            res.set('Content-Type', 'text/plain; charset=UTF-8');
+            res.set('X-Content-Type-Options', 'nosniff');
+         } else {
+            res.set('Content-Type', 'application/octet-stream');
+        }
+    } else {
+        switch(ext) {
+          case '.awk':
+          case '.cmd':
+          case '.command':
+          case '.dribble':
+          case '.iss':
+          case '.lisp':
+          case '.ps1':
+          case '.sh':
+          case '.tty':
+          case '.sh':
+          case '.yaml':
+          case '.yml':
+            res.set('Content-Type', 'text/plain; charset=UTF-8');
+            break;
+        }
+    }
+}
+
+// Does buffer contain an Interlisp source file?
+function isInterlispSource(buffer, name) {
+     return (
+              buffer.includes("(DEFINE-FILE-INFO")
+              && buffer.includes(name + "COMS")
+            );
+
+}
+
+
+filesApp.use((req, res, next) => {
+            if(req.protocol === 'https' || !config.supportHttps) next();
+            else res.redirect(`https://${req.hostname}:${config.httpsRedirectPort}${req.url}`);
+          });
+
+const staticOptions = {
+    dotfiles: "allow",
+    index: "index.html",
+    setHeaders: setContentType
+};
+
+filesApp.use(mExpress.static(config.filesHostingPath, staticOptions));
+
+// can't find file - send error message
+filesApp.use((req, res, next) => {
+  if(req.url == "/favicon.ico") {
+      res.status(404);
+      res.end();
+  } else {
+      res.status(404);
+      res.send("<!DOCTYPE html><html><body><h3>ERROR: Cannot find file: " + req.originalUrl + "</h3></body></html>");
+  }
+});
+
+
+module.exports = filesApp;

web-portal/server/js/server.js

@@ -1,16 +1,16 @@
 #!/usr/bin/env node
 /*******************************************************************************
- * 
- *   server.js:  Start up http(s) server(s) for online.interlisp.org web portal. 
+ *
+ *   server.js:  Start up http(s) server(s) for online.interlisp.org web portal.
  *               This is the module that starts up the whole portal by loading
  *               the express app (app.js) and initiating the server listens.
  *               Called by something like "node ./server.js".
- * 
+ *
  *   2021-11-18 Frank Halasz
- * 
- * 
- *   Copyright: 2021-2022 by Interlisp.org 
- * 
+ *
+ *
+ *   Copyright: 2021-2024 by Interlisp.org
+ *
  *
  ******************************************************************************/
 var config = require('./config');
@@ -36,9 +36,9 @@ if(config.supportHttps) {
 /**
  * Create HTTP & HTTPS server.
  */
- 
+
 if(config.supportHttps) {
-  var sslOpts = 
+  var sslOpts =
     {
       key: fs.readFileSync(config.tlsKeyPath),
       cert: fs.readFileSync(config.tlsCertPath),