Haraka 3.1.1 → 3.1.2

package/host_pool.js

@@ -1,7 +1,7 @@
-'use strict';
+'use strict'
 
-const net    = require('node:net');
-const utils  = require('haraka-utils');
+const net = require('node:net')
+const utils = require('haraka-utils')
 
 /* HostPool:
  *
@@ -21,31 +21,30 @@ const utils  = require('haraka-utils');
  * network failure from taking the whole system down.
  */
 
-const logger = require('./logger');
+const logger = require('./logger')
 
 class HostPool {
-
     // takes a comma/space-separated list of ip:ports
     //  1.1.1.1:22,  3.3.3.3:44
-    constructor (hostports_str, retry_secs) {
+    constructor(hostports_str, retry_secs) {
         const hosts = (hostports_str || '')
             .trim()
             .split(/[\s,]+/)
-            .map(hostport => {
-                const splithost = hostport.split(/:/);
-                if (! splithost[1]){
-                    splithost[1] = 25;
+            .map((hostport) => {
+                const splithost = hostport.split(/:/)
+                if (!splithost[1]) {
+                    splithost[1] = 25
                 }
                 return {
                     host: splithost[0],
-                    port: splithost[1]
-                };
-            });
-        this.hostports_str = hostports_str;
-        this.hosts = utils.shuffle(hosts);
-        this.dead_hosts = {};  // hostport => true/false
-        this.last_i = 0;  // the last one we checked
-        this.retry_secs = retry_secs || 10;
+                    port: splithost[1],
+                }
+            })
+        this.hostports_str = hostports_str
+        this.hosts = utils.shuffle(hosts)
+        this.dead_hosts = {} // hostport => true/false
+        this.last_i = 0 // the last one we checked
+        this.retry_secs = retry_secs || 10
     }
 
     /* failed
@@ -54,30 +53,30 @@ class HostPool {
      * this backend host and it'll come out of the pool and put into the recheck
      * timer.
      */
-    failed (host, port) {
-        const self = this;
-        const key = `${host}:${port}`;
-        const retry_msecs = self.retry_secs * 1000;
-        self.dead_hosts[key] = true;
-
-        function cb_if_still_dead () {
-            logger.warn(`${host} ${key} is still dead, will retry in ${self.retry_secs} secs`);
-            self.dead_hosts[key] = true;
+    failed(host, port) {
+        const self = this
+        const key = `${host}:${port}`
+        const retry_msecs = self.retry_secs * 1000
+        self.dead_hosts[key] = true
+
+        function cb_if_still_dead() {
+            logger.warn(`${host} ${key} is still dead, will retry in ${self.retry_secs} secs`)
+            self.dead_hosts[key] = true
             // console.log(1);
             setTimeout(() => {
-                self.probe_dead_host(host, port, cb_if_still_dead, cb_if_alive);
-            }, retry_msecs);
+                self.probe_dead_host(host, port, cb_if_still_dead, cb_if_alive)
+            }, retry_msecs)
         }
 
-        function cb_if_alive () {
+        function cb_if_alive() {
             // console.log(2);
-            logger.info(`${host} ${key} is back! adding back into pool`);
-            delete self.dead_hosts[key];
+            logger.info(`${host} ${key} is back! adding back into pool`)
+            delete self.dead_hosts[key]
         }
 
         setTimeout(() => {
-            self.probe_dead_host(host, port, cb_if_still_dead, cb_if_alive);
-        }, retry_msecs);
+            self.probe_dead_host(host, port, cb_if_still_dead, cb_if_alive)
+        }, retry_msecs)
     }
 
     /* probe_dead_host
@@ -87,35 +86,32 @@ class HostPool {
      * dead_hosts lists, and the next time get_host() is called, it'll be in the
      * mix.
      */
-    probe_dead_host (
-        host, port, cb_if_still_dead, cb_if_alive
-    ){
-        logger.info(`probing dead host ${host}:${port}`);
+    probe_dead_host(host, port, cb_if_still_dead, cb_if_alive) {
+        logger.info(`probing dead host ${host}:${port}`)
 
-        const connect_timeout_ms = 200; // keep it snappy
-        let s;
+        const connect_timeout_ms = 200 // keep it snappy
+        let s
         try {
-            s = this.get_socket();
+            s = this.get_socket()
             s.setTimeout(connect_timeout_ms, () => {
                 // nobody home, it's still dead
-                s.destroy();
-                cb_if_still_dead();
-            });
-            s.on('error', e => {
+                s.destroy()
+                cb_if_still_dead()
+            })
+            s.on('error', (e) => {
                 // silently catch all errors - assume the port is closed
-                s.destroy();
-                cb_if_still_dead();
-            });
+                s.destroy()
+                cb_if_still_dead()
+            })
 
             s.connect(port, host, () => {
-                cb_if_alive();
-                s.destroy(); // will this conflict with setTimeout's s.destroy?
-            });
-        }
-        catch (e) {
+                cb_if_alive()
+                s.destroy() // will this conflict with setTimeout's s.destroy?
+            })
+        } catch (e) {
             // only way to catch run-time javascript errors in here;
-            console.log(`ERROR in probe_dead_host, got error ${e}`);
-            throw e;
+            console.log(`ERROR in probe_dead_host, got error ${e}`)
+            throw e
         }
     }
 
@@ -123,8 +119,8 @@ class HostPool {
      *
      * so we can override in unit test
      */
-    get_socket () {
-        return new net.Socket();
+    get_socket() {
+        return new net.Socket()
     }
 
     /* get_host
@@ -135,39 +131,39 @@ class HostPool {
      * anyway. That should make it more forgiving about transient but widespread
      * network problems that make all the hosts look dead.
      */
-    get_host () {
-        let host;
-        let found;
+    get_host() {
+        let host
+        let found
 
-        let first_i = this.last_i + 1;
-        if (first_i >= this.hosts.length){
-            first_i = 0;
+        let first_i = this.last_i + 1
+        if (first_i >= this.hosts.length) {
+            first_i = 0
         }
 
-        for (let i = 0; i < this.hosts.length; ++i){
-            let j = i + first_i;
+        for (let i = 0; i < this.hosts.length; ++i) {
+            let j = i + first_i
             if (j >= this.hosts.length) {
-                j -= this.hosts.length;
+                j -= this.hosts.length
             }
-            host = this.hosts[j];
-            const key = `${host.host}:${host.port}`;
+            host = this.hosts[j]
+            const key = `${host.host}:${host.port}`
             if (this.dead_hosts[key]) {
-                continue;
+                continue
             }
-            this.last_i = j;
-            found = true;
-            break;
+            this.last_i = j
+            found = true
+            break
         }
         if (found) {
-            return host;
-        }
-        else {
+            return host
+        } else {
             logger.warn(
-                `no working hosts found, retrying a dead one, config (probably from smtp_forward.forwarding_host_pool) is '${this.hostports_str}'`);
-            this.last_i = first_i;
-            return this.hosts[first_i];
+                `no working hosts found, retrying a dead one, config (probably from smtp_forward.forwarding_host_pool) is '${this.hostports_str}'`,
+            )
+            this.last_i = first_i
+            return this.hosts[first_i]
         }
     }
 }
 
-module.exports = HostPool;
+module.exports = HostPool

package/http/html/404.html

@@ -1,62 +1,58 @@
 <!doctype html>
 <html lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <title>Page Not Found</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <style>
+      * {
+        line-height: 1.2;
+        margin: 0;
+      }
 
-<head>
-  <meta charset="utf-8">
-  <title>Page Not Found</title>
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-  <style>
-    * {
-      line-height: 1.2;
-      margin: 0;
-    }
-
-    html {
-      color: #888;
-      display: table;
-      font-family: sans-serif;
-      height: 100%;
-      text-align: center;
-      width: 100%;
-    }
-
-    body {
-      display: table-cell;
-      vertical-align: middle;
-      margin: 2em auto;
-    }
-
-    h1 {
-      color: #555;
-      font-size: 2em;
-      font-weight: 400;
-    }
-
-    p {
-      margin: 0 auto;
-      width: 280px;
-    }
-
-    @media only screen and (max-width: 280px) {
+      html {
+        color: #888;
+        display: table;
+        font-family: sans-serif;
+        height: 100%;
+        text-align: center;
+        width: 100%;
+      }
 
-      body,
-      p {
-        width: 95%;
+      body {
+        display: table-cell;
+        vertical-align: middle;
+        margin: 2em auto;
       }
 
       h1 {
-        font-size: 1.5em;
-        margin: 0 0 0.3em;
+        color: #555;
+        font-size: 2em;
+        font-weight: 400;
+      }
+
+      p {
+        margin: 0 auto;
+        width: 280px;
       }
 
-    }
-  </style>
-</head>
+      @media only screen and (max-width: 280px) {
+        body,
+        p {
+          width: 95%;
+        }
 
-<body>
-  <h1>Page Not Found</h1>
-  <p>Sorry, but the page you were trying to view does not exist.</p>
-</body>
+        h1 {
+          font-size: 1.5em;
+          margin: 0 0 0.3em;
+        }
+      }
+    </style>
+  </head>
 
+  <body>
+    <h1>Page Not Found</h1>
+    <p>Sorry, but the page you were trying to view does not exist.</p>
+  </body>
 </html>
 <!-- IE needs 512+ bytes: https://docs.microsoft.com/archive/blogs/ieinternals/friendly-http-error-pages -->

package/http/html/index.html

@@ -1,36 +1,47 @@
-<!DOCTYPE html>
+<!doctype html>
 <html>
-    <head>
-        <meta charset="utf-8">
-        <meta http-equiv="X-UA-Compatible" content="IE=edge">
-        <title></title>
-        <meta name="description" content="">
-        <meta name="viewport" content="width=device-width, initial-scale=1">
+  <head>
+    <meta charset="utf-8" />
+    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+    <title></title>
+    <meta name="description" content="" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
 
-        <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/3.5.1/css/bootstrap.min.css">
-        <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/3.5.1/css/bootstrap-theme.min.css">
+    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/3.5.1/css/bootstrap.min.css" />
+    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/3.5.1/css/bootstrap-theme.min.css" />
 
-        <script src="https://code.jquery.com/jquery-3.5.1.min.js" async></script>
-        <script src="https://stackpath.bootstrapcdn.com/bootstrap/3.5.1/js/bootstrap.min.js" async></script>
-    </head>
-    <body>
-        <!--[if lt IE 7]>
-            <p class="browsehappy">You are using an <strong>outdated</strong> browser. Please <a href="https://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
+    <script src="https://code.jquery.com/jquery-3.5.1.min.js" async></script>
+    <script src="https://stackpath.bootstrapcdn.com/bootstrap/3.5.1/js/bootstrap.min.js" async></script>
+  </head>
+  <body>
+    <!--[if lt IE 7]>
+      <p class="browsehappy">
+        You are using an <strong>outdated</strong> browser. Please
+        <a href="https://browsehappy.com/">upgrade your browser</a> to improve your experience.
+      </p>
+    <![endif]-->
 
-        <ul id="tabList" class="nav nav-tabs" role="tablist navigation">
-            <li class="active"><a href="#home" role=tab data-toggle=tab>Home</a></li>
-        </ul>
+    <ul id="tabList" class="nav nav-tabs" role="tablist navigation">
+      <li class="active">
+        <a href="#home" role="tab" data-toggle="tab">Home</a>
+      </li>
+    </ul>
 
-        <div id="bodyDivContainer" class="tab-content">
-            <div class="tab-pane fade in active" id="home">
-                <h1>Haraka, a mail server (MTA).</h1>
+    <div id="bodyDivContainer" class="tab-content">
+      <div class="tab-pane fade in active" id="home">
+        <h1>Haraka, a mail server (MTA).</h1>
 
-                <p>You are visiting an installation of <a href="https://haraka.github.io">Haraka</a>.</p>
+        <p>
+          You are visiting an installation of
+          <a href="https://haraka.github.io">Haraka</a>.
+        </p>
 
-                <p>Haraka is on the <a href="https://haraka.github.io">web</a> and <a href="https://github.com/haraka/Haraka">GitHub</a></p>
-            </div>
-        </div>
-
-    </body>
+        <p>
+          Haraka is on the
+          <a href="https://haraka.github.io">web</a> and
+          <a href="https://github.com/haraka/Haraka">GitHub</a>
+        </p>
+      </div>
+    </div>
+  </body>
 </html>

package/http/package.json

@@ -16,8 +16,6 @@
   "dependencies": {
     "express": "^4.0"
   },
-  "devDependencies": {
-  },
-  "scripts": {
-  }
+  "devDependencies": {},
+  "scripts": {}
 }

package/line_socket.js

@@ -1,52 +1,51 @@
-'use strict';
+'use strict'
 // A subclass of Socket which reads data by line
 
-const net   = require('node:net');
-const utils = require('haraka-utils');
+const net = require('node:net')
+const utils = require('haraka-utils')
 
-const tls_socket = require('./tls_socket');
+const tls_socket = require('./tls_socket')
 
 class Socket extends net.Socket {
-    constructor (options) {
-        super(options);
-        setup_line_processor(this);
+    constructor(options) {
+        super(options)
+        setup_line_processor(this)
     }
 }
 
-function setup_line_processor (socket) {
-    let current_data = '';
+function setup_line_processor(socket) {
+    let current_data = ''
 
-    socket.on('data', function on_socket_data (data) {
-        current_data += data;
-        let results;
+    socket.on('data', function on_socket_data(data) {
+        current_data += data
+        let results
         while ((results = utils.line_regexp.exec(current_data))) {
-            const this_line = results[1];
-            current_data = current_data.slice(this_line.length);
-            socket.emit('line', this_line);
+            const this_line = results[1]
+            current_data = current_data.slice(this_line.length)
+            socket.emit('line', this_line)
         }
     })
 
-    socket.on('end', function on_socket_end () {
+    socket.on('end', function on_socket_end() {
         if (current_data.length) {
-            socket.emit('line', current_data);
+            socket.emit('line', current_data)
         }
-        current_data = '';
+        current_data = ''
     })
 }
 
-exports.Socket = Socket;
+exports.Socket = Socket
 
 // New interface - uses TLS
 exports.connect = (port, host) => {
-    let options = {};
+    let options = {}
     if (typeof port === 'object') {
-        options = port;
+        options = port
+    } else {
+        options.port = port
+        options.host = host
     }
-    else {
-        options.port = port;
-        options.host = host;
-    }
-    const sock = tls_socket.connect(options);
-    setup_line_processor(sock);
-    return sock;
+    const sock = tls_socket.connect(options)
+    setup_line_processor(sock)
+    return sock
 }