From 9fb2c640b9cabf4e6bd7870f059ee232d7efe2d7 Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Thu, 18 Feb 2021 18:49:43 +0000
Subject: [PATCH 001/115] tests: Microsoft Windows Server CI (#4791)

Due to a recent release that wasn't functioning properly this CI will help us catch the majority of Microsoft Node Quirks before they make it into a release.
---
 .gitattributes                                |  1 +
 .github/workflows/backend-tests.yml           | 92 ++++++++++++++++++-
 .../backend/specs/api/importexportGetPost.js  | 12 +--
 3 files changed, 91 insertions(+), 14 deletions(-)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000..6313b56c
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+* text=auto eol=lf
diff --git a/.github/workflows/backend-tests.yml b/.github/workflows/backend-tests.yml
index a9c8c602..d87973f1 100644
--- a/.github/workflows/backend-tests.yml
+++ b/.github/workflows/backend-tests.yml
@@ -4,13 +4,13 @@ name: "Backend tests"
 on: [push, pull_request]
 
 jobs:
-  withoutplugins:
+  withoutpluginsLinux:
     # run on pushes to any branch
     # run on PRs from external forks
     if: |
          (github.event_name != 'pull_request')
          || (github.event.pull_request.head.repo.id != github.event.pull_request.base.repo.id)
-    name: without plugins
+    name: Linux without plugins
     runs-on: ubuntu-latest
 
     steps:
@@ -33,13 +33,13 @@ jobs:
     - name: Run the backend tests
       run: cd src && npm test
 
-  withplugins:
+  withpluginsLinux:
     # run on pushes to any branch
     # run on PRs from external forks
     if: |
          (github.event_name != 'pull_request')
          || (github.event.pull_request.head.repo.id != github.event.pull_request.base.repo.id)
-    name: with Plugins
+    name: Linux with Plugins
     runs-on: ubuntu-latest
 
     steps:
@@ -85,3 +85,87 @@ jobs:
 
     - name: Run the backend tests
       run: cd src && npm test
+
+  withoutpluginsWindows:
+    # run on pushes to any branch
+    # run on PRs from external forks
+    if: |
+         (github.event_name != 'pull_request')
+         || (github.event.pull_request.head.repo.id != github.event.pull_request.base.repo.id)
+    name: Windows without plugins
+    runs-on: windows-latest
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    - uses: actions/setup-node@v2
+      with:
+        node-version: 12
+
+    - name: Install all dependencies and symlink for ep_etherpad-lite
+      run: |
+            cd src
+            npm ci --no-optional
+
+    - name:  Fix up the settings.json
+      run: |
+            powershell -Command "(gc settings.json.template) -replace '\"max\": 10', '\"max\": 10000' | Out-File -encoding ASCII settings.json.holder"
+            powershell -Command "(gc settings.json.holder) -replace '\"points\": 10', '\"points\": 1000' | Out-File -encoding ASCII settings.json"
+
+    - name: Run the backend tests
+      run: cd src && npm test
+
+  withpluginsWindows:
+    # run on pushes to any branch
+    # run on PRs from external forks
+    if: |
+         (github.event_name != 'pull_request')
+         || (github.event.pull_request.head.repo.id != github.event.pull_request.base.repo.id)
+    name: Windows with Plugins
+    runs-on: windows-latest
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    - uses: actions/setup-node@v2
+      with:
+        node-version: 12
+
+    - name: Install Etherpad plugins
+      run: >
+        npm install
+        ep_align
+        ep_author_hover
+        ep_cursortrace
+        ep_font_size
+        ep_hash_auth
+        ep_headings2
+        ep_image_upload
+        ep_markdown
+        ep_readonly_guest
+        ep_set_title_on_pad
+        ep_spellcheck
+        ep_subscript_and_superscript
+        ep_table_of_contents
+
+    # This must be run after installing the plugins, otherwise npm will try to
+    # hoist common dependencies by removing them from src/node_modules and
+    # installing them in the top-level node_modules. As of v6.14.10, npm's hoist
+    # logic appears to be buggy, because it sometimes removes dependencies from
+    # src/node_modules but fails to add them to the top-level node_modules. Even
+    # if npm correctly hoists the dependencies, the hoisting seems to confuse
+    # tools such as `npm outdated`, `npm update`, and some ESLint rules.
+    - name: Install all dependencies and symlink for ep_etherpad-lite
+      run: |
+            cd src
+            npm ci --no-optional
+
+    - name:  Fix up the settings.json
+      run: |
+            powershell -Command "(gc settings.json.template) -replace '\"max\": 10', '\"max\": 10000' | Out-File -encoding ASCII settings.json.holder"
+            powershell -Command "(gc settings.json.holder) -replace '\"points\": 10', '\"points\": 1000' | Out-File -encoding ASCII settings.json"
+
+    - name: Run the backend tests
+      run: cd src && npm test
diff --git a/src/tests/backend/specs/api/importexportGetPost.js b/src/tests/backend/specs/api/importexportGetPost.js
index fbd5b944..9261aafa 100644
--- a/src/tests/backend/specs/api/importexportGetPost.js
+++ b/src/tests/backend/specs/api/importexportGetPost.js
@@ -280,6 +280,8 @@ describe(__filename, function () {
         return pad;
       };
 
+      this.timeout(1000);
+
       beforeEach(async function () {
         await deleteTestPad();
         settings.requireAuthorization = true;
@@ -292,7 +294,6 @@ describe(__filename, function () {
       });
 
       it('!authn !exist -> create', async function () {
-        this.timeout(100);
         await agent.post(`/p/${testPadIdEnc}/import`)
             .attach('file', padText, {filename: '/test.txt', contentType: 'text/plain'})
             .expect(200);
@@ -302,7 +303,6 @@ describe(__filename, function () {
       });
 
       it('!authn exist -> replace', async function () {
-        this.timeout(100);
         const pad = await createTestPad('before import');
         await agent.post(`/p/${testPadIdEnc}/import`)
             .attach('file', padText, {filename: '/test.txt', contentType: 'text/plain'})
@@ -312,7 +312,6 @@ describe(__filename, function () {
       });
 
       it('authn anonymous !exist -> fail', async function () {
-        this.timeout(100);
         settings.requireAuthentication = true;
         await agent.post(`/p/${testPadIdEnc}/import`)
             .attach('file', padText, {filename: '/test.txt', contentType: 'text/plain'})
@@ -321,7 +320,6 @@ describe(__filename, function () {
       });
 
       it('authn anonymous exist -> fail', async function () {
-        this.timeout(100);
         settings.requireAuthentication = true;
         const pad = await createTestPad('before import\n');
         await agent.post(`/p/${testPadIdEnc}/import`)
@@ -331,7 +329,6 @@ describe(__filename, function () {
       });
 
       it('authn user create !exist -> create', async function () {
-        this.timeout(100);
         settings.requireAuthentication = true;
         await agent.post(`/p/${testPadIdEnc}/import`)
             .auth('user', 'user-password')
@@ -343,7 +340,6 @@ describe(__filename, function () {
       });
 
       it('authn user modify !exist -> fail', async function () {
-        this.timeout(100);
         settings.requireAuthentication = true;
         authorize = () => 'modify';
         await agent.post(`/p/${testPadIdEnc}/import`)
@@ -354,7 +350,6 @@ describe(__filename, function () {
       });
 
       it('authn user readonly !exist -> fail', async function () {
-        this.timeout(100);
         settings.requireAuthentication = true;
         authorize = () => 'readOnly';
         await agent.post(`/p/${testPadIdEnc}/import`)
@@ -365,7 +360,6 @@ describe(__filename, function () {
       });
 
       it('authn user create exist -> replace', async function () {
-        this.timeout(100);
         settings.requireAuthentication = true;
         const pad = await createTestPad('before import\n');
         await agent.post(`/p/${testPadIdEnc}/import`)
@@ -376,7 +370,6 @@ describe(__filename, function () {
       });
 
       it('authn user modify exist -> replace', async function () {
-        this.timeout(100);
         settings.requireAuthentication = true;
         authorize = () => 'modify';
         const pad = await createTestPad('before import\n');
@@ -388,7 +381,6 @@ describe(__filename, function () {
       });
 
       it('authn user readonly exist -> fail', async function () {
-        this.timeout(100);
         const pad = await createTestPad('before import\n');
         settings.requireAuthentication = true;
         authorize = () => 'readOnly';

From 449b03d7e8b4509d65896cdc666229816dc86578 Mon Sep 17 00:00:00 2001
From: snyk-bot <snyk-bot@snyk.io>
Date: Wed, 17 Feb 2021 21:54:13 +0000
Subject: [PATCH 002/115] fix: upgrade unorm from 1.4.1 to 1.6.0

Snyk has created this PR to upgrade unorm from 1.4.1 to 1.6.0.

See this package in npm:
https://www.npmjs.com/package/unorm

See this project in Snyk:
https://app.snyk.io/org/johnmclear/project/d9a12bfb-7ccd-443f-9e22-f30d339cc8c5?utm_source=github&utm_medium=upgrade-pr
---
 src/package-lock.json | 6 +++---
 src/package.json      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/package-lock.json b/src/package-lock.json
index a54e57b4..f5872831 100644
--- a/src/package-lock.json
+++ b/src/package-lock.json
@@ -8449,9 +8449,9 @@
       }
     },
     "unorm": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/unorm/-/unorm-1.4.1.tgz",
-      "integrity": "sha1-NkIA1fE2RsqLzURJAnEzVhR5IwA="
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/unorm/-/unorm-1.6.0.tgz",
+      "integrity": "sha512-b2/KCUlYZUeA7JFUuRJZPUtr4gZvBh7tavtv4fvk4+KV9pfGiR6CQAQAWl49ZpR3ts2dk4FYkP7EIgDJoiOLDA=="
     },
     "unpipe": {
       "version": "1.0.0",
diff --git a/src/package.json b/src/package.json
index 757525c2..adef338f 100644
--- a/src/package.json
+++ b/src/package.json
@@ -71,7 +71,7 @@
     "tinycon": "0.6.8",
     "ueberdb2": "^1.2.5",
     "underscore": "1.12.0",
-    "unorm": "1.4.1",
+    "unorm": "1.6.0",
     "wtfnode": "^0.8.4"
   },
   "bin": {

From 4c6cb53d18863b67f70a299be39b2f7d84f3b79d Mon Sep 17 00:00:00 2001
From: Richard Hansen <rhansen@rhansen.org>
Date: Thu, 18 Feb 2021 02:05:55 -0500
Subject: [PATCH 003/115] server: Improve log messages when exiting

---
 src/node/server.js | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/node/server.js b/src/node/server.js
index 0f0b0147..6986e527 100755
--- a/src/node/server.js
+++ b/src/node/server.js
@@ -111,10 +111,16 @@ exports.start = async () => {
     stats.gauge('memoryUsage', () => process.memoryUsage().rss);
     stats.gauge('memoryUsageHeap', () => process.memoryUsage().heapUsed);
 
-    process.on('uncaughtException', (err) => exports.exit(err));
+    process.on('uncaughtException', (err) => {
+      logger.debug(`uncaught exception: ${err.stack || err}`);
+      exports.exit(err);
+    });
     // As of v14, Node.js does not exit when there is an unhandled Promise rejection. Convert an
     // unhandled rejection into an uncaught exception, which does cause Node.js to exit.
-    process.on('unhandledRejection', (err) => { throw err; });
+    process.on('unhandledRejection', (err) => {
+      logger.debug(`unhandled rejection: ${err.stack || err}`);
+      throw err;
+    });
 
     for (const signal of ['SIGINT', 'SIGTERM']) {
       // Forcibly remove other signal listeners to prevent them from terminating node before we are
@@ -219,6 +225,7 @@ exports.exit = async (err = null) => {
       process.exit(1);
     }
   }
+  if (!exitCalled) logger.info('Exiting...');
   exitCalled = true;
   switch (state) {
     case State.STARTING:
@@ -241,7 +248,6 @@ exports.exit = async (err = null) => {
     default:
       throw new Error(`unknown State: ${state.toString()}`);
   }
-  logger.info('Exiting...');
   exitGate = new Gate();
   state = State.EXITING;
   exitGate.resolve();

From 84c1d74f8b07e7380efddbcb72280f10c1fdb6e5 Mon Sep 17 00:00:00 2001
From: Richard Hansen <rhansen@rhansen.org>
Date: Thu, 18 Feb 2021 02:08:25 -0500
Subject: [PATCH 004/115] server: Fix Gate constructor

The ECMAScript spec for `.then()` requires Promise subclass
constructors to take an executor.
---
 src/node/server.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/node/server.js b/src/node/server.js
index 6986e527..e890a020 100755
--- a/src/node/server.js
+++ b/src/node/server.js
@@ -65,9 +65,9 @@ const State = {
 let state = State.INITIAL;
 
 class Gate extends Promise {
-  constructor() {
+  constructor(executor = null) {
     let res;
-    super((resolve) => { res = resolve; });
+    super((resolve, reject) => { res = resolve; if (executor != null) executor(resolve, reject); });
     this.resolve = res;
   }
 }

From f8687884178fd5ac511b934421ace0fc20eb9a58 Mon Sep 17 00:00:00 2001
From: Richard Hansen <rhansen@rhansen.org>
Date: Wed, 10 Feb 2021 01:12:43 -0500
Subject: [PATCH 005/115] Remove unnecessary `path.normalize()` calls

`path.join()` already normalizes.
---
 src/node/hooks/express/tests.js      | 5 ++---
 src/node/utils/AbsolutePaths.js      | 2 +-
 src/node/utils/Minify.js             | 4 ++--
 src/node/utils/Settings.js           | 2 +-
 src/node/utils/caching_middleware.js | 2 +-
 src/static/js/pluginfw/plugins.js    | 4 ++--
 6 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/node/hooks/express/tests.js b/src/node/hooks/express/tests.js
index 825c495c..8c2e8edb 100644
--- a/src/node/hooks/express/tests.js
+++ b/src/node/hooks/express/tests.js
@@ -29,8 +29,7 @@ exports.expressCreateServer = (hookName, args, cb) => {
     res.end(`var specs_list = ${JSON.stringify(files)};\n`);
   });
 
-  // path.join seems to normalize by default, but we'll just be explicit
-  const rootTestFolder = path.normalize(path.join(npm.root, '../tests/frontend/'));
+  const rootTestFolder = path.join(npm.root, '../tests/frontend/');
 
   const url2FilePath = (url) => {
     let subPath = url.substr('/tests/frontend'.length);
@@ -39,7 +38,7 @@ exports.expressCreateServer = (hookName, args, cb) => {
     }
     subPath = subPath.split('?')[0];
 
-    let filePath = path.normalize(path.join(rootTestFolder, subPath));
+    let filePath = path.join(rootTestFolder, subPath);
 
     // make sure we jail the paths to the test folder, otherwise serve index
     if (filePath.indexOf(rootTestFolder) !== 0) {
diff --git a/src/node/utils/AbsolutePaths.js b/src/node/utils/AbsolutePaths.js
index 5b364ed8..8ca17ba1 100644
--- a/src/node/utils/AbsolutePaths.js
+++ b/src/node/utils/AbsolutePaths.js
@@ -132,7 +132,7 @@ exports.makeAbsolute = (somePath) => {
     return somePath;
   }
 
-  const rewrittenPath = path.normalize(path.join(exports.findEtherpadRoot(), somePath));
+  const rewrittenPath = path.join(exports.findEtherpadRoot(), somePath);
 
   absPathLogger.debug(`Relative path "${somePath}" can be rewritten to "${rewrittenPath}"`);
   return rewrittenPath;
diff --git a/src/node/utils/Minify.js b/src/node/utils/Minify.js
index 2a7ee2bf..c9d26340 100644
--- a/src/node/utils/Minify.js
+++ b/src/node/utils/Minify.js
@@ -101,7 +101,7 @@ const minify = async (req, res) => {
   let filename = req.params.filename;
 
   // No relative paths, especially if they may go up the file hierarchy.
-  filename = path.normalize(path.join(ROOT_DIR, filename));
+  filename = path.join(ROOT_DIR, filename);
   filename = filename.replace(/\.\./g, '');
 
   if (filename.indexOf(ROOT_DIR) === 0) {
@@ -198,7 +198,7 @@ const getAceFile = async () => {
   await Promise.all(filenames.map(async (filename) => {
     // Hostname "invalid.invalid" is a dummy value to allow parsing as a URI.
     const baseURI = 'http://invalid.invalid';
-    let resourceURI = baseURI + path.normalize(path.join('/static/', filename));
+    let resourceURI = baseURI + path.join('/static/', filename);
     resourceURI = resourceURI.replace(/\\/g, '/'); // Windows (safe generally?)
 
     const [status, , body] = await requestURI(resourceURI, 'GET', {});
diff --git a/src/node/utils/Settings.js b/src/node/utils/Settings.js
index 0da117a5..202e80c6 100644
--- a/src/node/utils/Settings.js
+++ b/src/node/utils/Settings.js
@@ -719,7 +719,7 @@ exports.reloadSettings = () => {
     }
 
     // informative variable, just for the log messages
-    let skinPath = path.normalize(path.join(skinBasePath, exports.skinName));
+    let skinPath = path.join(skinBasePath, exports.skinName);
 
     // what if someone sets skinName == ".." or "."? We catch him!
     if (absolutePaths.isSubdir(skinBasePath, skinPath) === false) {
diff --git a/src/node/utils/caching_middleware.js b/src/node/utils/caching_middleware.js
index ff25513c..23122342 100644
--- a/src/node/utils/caching_middleware.js
+++ b/src/node/utils/caching_middleware.js
@@ -44,7 +44,7 @@ try {
   _crypto = undefined;
 }
 
-let CACHE_DIR = path.normalize(path.join(settings.root, 'var/'));
+let CACHE_DIR = path.join(settings.root, 'var/');
 CACHE_DIR = existsSync(CACHE_DIR) ? CACHE_DIR : undefined;
 
 const responseCache = {};
diff --git a/src/static/js/pluginfw/plugins.js b/src/static/js/pluginfw/plugins.js
index 8323cfc7..48ae4c92 100644
--- a/src/static/js/pluginfw/plugins.js
+++ b/src/static/js/pluginfw/plugins.js
@@ -32,7 +32,7 @@ exports.formatHooks = (hookSetName) => {
 const callInit = async () => {
   await Promise.all(Object.keys(defs.plugins).map(async (pluginName) => {
     const plugin = defs.plugins[pluginName];
-    const epInit = path.normalize(path.join(plugin.package.path, '.ep_initialized'));
+    const epInit = path.join(plugin.package.path, '.ep_initialized');
     try {
       await fs.stat(epInit);
     } catch (err) {
@@ -48,7 +48,7 @@ exports.pathNormalization = (part, hookFnName, hookName) => {
   const functionName = (tmp.length > 1 ? tmp.pop() : null) || hookName;
   const moduleName = tmp.join(':') || part.plugin;
   const packageDir = path.dirname(defs.plugins[part.plugin].package.path);
-  const fileName = path.normalize(path.join(packageDir, moduleName));
+  const fileName = path.join(packageDir, moduleName);
   return `${fileName}:${functionName}`;
 };
 

From a45e85a730885fb74b4e8d18b32562cc904da04d Mon Sep 17 00:00:00 2001
From: Richard Hansen <rhansen@rhansen.org>
Date: Wed, 10 Feb 2021 01:21:29 -0500
Subject: [PATCH 006/115] Use `settings.root` to anchor pathnames

---
 src/node/hooks/express/tests.js | 3 +--
 src/node/hooks/i18n.js          | 9 +++++----
 src/node/utils/Minify.js        | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/node/hooks/express/tests.js b/src/node/hooks/express/tests.js
index 8c2e8edb..c533ae8c 100644
--- a/src/node/hooks/express/tests.js
+++ b/src/node/hooks/express/tests.js
@@ -1,7 +1,6 @@
 'use strict';
 
 const path = require('path');
-const npm = require('npm');
 const fs = require('fs');
 const util = require('util');
 const settings = require('../../utils/Settings');
@@ -29,7 +28,7 @@ exports.expressCreateServer = (hookName, args, cb) => {
     res.end(`var specs_list = ${JSON.stringify(files)};\n`);
   });
 
-  const rootTestFolder = path.join(npm.root, '../tests/frontend/');
+  const rootTestFolder = path.join(settings.root, 'src/tests/frontend/');
 
   const url2FilePath = (url) => {
     let subPath = url.substr('/tests/frontend'.length);
diff --git a/src/node/hooks/i18n.js b/src/node/hooks/i18n.js
index 31848b48..81944a07 100644
--- a/src/node/hooks/i18n.js
+++ b/src/node/hooks/i18n.js
@@ -4,8 +4,7 @@ const languages = require('languages4translatewiki');
 const fs = require('fs');
 const path = require('path');
 const _ = require('underscore');
-const npm = require('npm');
-const plugins = require('../../static/js/pluginfw/plugin_defs.js').plugins;
+const pluginDefs = require('../../static/js/pluginfw/plugin_defs.js');
 const existsSync = require('../utils/path_exists');
 const settings = require('../utils/Settings');
 
@@ -38,10 +37,12 @@ const getAllLocales = () => {
   };
 
   // add core supported languages first
-  extractLangs(`${npm.root}/ep_etherpad-lite/locales`);
+  extractLangs(path.join(settings.root, 'src/locales'));
 
   // add plugins languages (if any)
-  for (const pluginName in plugins) extractLangs(path.join(npm.root, pluginName, 'locales'));
+  for (const {package: {path: pluginPath}} of Object.values(pluginDefs.plugins)) {
+    extractLangs(path.join(pluginPath, 'locales'));
+  }
 
   // Build a locale index (merge all locale data other than user-supplied overrides)
   const locales = {};
diff --git a/src/node/utils/Minify.js b/src/node/utils/Minify.js
index c9d26340..bf25787a 100644
--- a/src/node/utils/Minify.js
+++ b/src/node/utils/Minify.js
@@ -32,7 +32,7 @@ const log4js = require('log4js');
 
 const logger = log4js.getLogger('Minify');
 
-const ROOT_DIR = path.normalize(`${__dirname}/../../static/`);
+const ROOT_DIR = path.join(settings.root, 'src/static/');
 
 const threadsPool = new Threads.Pool(() => Threads.spawn(new Threads.Worker('./MinifyWorker')), 2);
 

From a8479e4a0ee86a33e93d9a969bc366476026e9cf Mon Sep 17 00:00:00 2001
From: Richard Hansen <rhansen@rhansen.org>
Date: Wed, 10 Feb 2021 01:28:10 -0500
Subject: [PATCH 007/115] lint: Fix some ESLint errors in pluginfw

---
 src/static/js/pluginfw/installer.js | 8 ++++----
 src/static/js/pluginfw/plugins.js   | 3 ---
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/static/js/pluginfw/installer.js b/src/static/js/pluginfw/installer.js
index ae5c06e1..a0f60d82 100644
--- a/src/static/js/pluginfw/installer.js
+++ b/src/static/js/pluginfw/installer.js
@@ -21,15 +21,15 @@ const onAllTasksFinished = () => {
 
 let tasks = 0;
 
-function wrapTaskCb(cb) {
+const wrapTaskCb = (cb) => {
   tasks++;
 
-  return function (...args) {
-    cb && cb.apply(this, args);
+  return (...args) => {
+    cb && cb(...args);
     tasks--;
     if (tasks === 0) onAllTasksFinished();
   };
-}
+};
 
 exports.uninstall = async (pluginName, cb = null) => {
   cb = wrapTaskCb(cb);
diff --git a/src/static/js/pluginfw/plugins.js b/src/static/js/pluginfw/plugins.js
index 48ae4c92..7a01d424 100644
--- a/src/static/js/pluginfw/plugins.js
+++ b/src/static/js/pluginfw/plugins.js
@@ -5,9 +5,6 @@ const hooks = require('./hooks');
 const path = require('path');
 const runNpm = require('../../../node/utils/run_npm');
 const tsort = require('./tsort');
-const util = require('util');
-const settings = require('../../../node/utils/Settings');
-
 const pluginUtils = require('./shared');
 const defs = require('./plugin_defs');
 

From 4253a2ea8f595090d8b9cae72c53cedeb4885934 Mon Sep 17 00:00:00 2001
From: Richard Hansen <rhansen@rhansen.org>
Date: Thu, 18 Feb 2021 02:36:50 -0500
Subject: [PATCH 008/115] plugins: Move hook call and plugin update out of try
 block

Exceptions thrown by these function calls are serious and should crash
Etherpad.
---
 src/static/js/pluginfw/installer.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/static/js/pluginfw/installer.js b/src/static/js/pluginfw/installer.js
index a0f60d82..4d2e223d 100644
--- a/src/static/js/pluginfw/installer.js
+++ b/src/static/js/pluginfw/installer.js
@@ -36,12 +36,12 @@ exports.uninstall = async (pluginName, cb = null) => {
   try {
     await loadNpm();
     await util.promisify(npm.commands.uninstall)([pluginName]);
-    await hooks.aCallAll('pluginUninstall', {pluginName});
-    await plugins.update();
   } catch (err) {
     cb(err || new Error(err));
     throw err;
   }
+  await hooks.aCallAll('pluginUninstall', {pluginName});
+  await plugins.update();
   cb(null);
 };
 
@@ -50,12 +50,12 @@ exports.install = async (pluginName, cb = null) => {
   try {
     await loadNpm();
     await util.promisify(npm.commands.install)([`${pluginName}@latest`]);
-    await hooks.aCallAll('pluginInstall', {pluginName});
-    await plugins.update();
   } catch (err) {
     cb(err || new Error(err));
     throw err;
   }
+  await hooks.aCallAll('pluginInstall', {pluginName});
+  await plugins.update();
   cb(null);
 };
 

From dcf78913163c110e13942a0c8590ddb479100925 Mon Sep 17 00:00:00 2001
From: Richard Hansen <rhansen@rhansen.org>
Date: Wed, 10 Feb 2021 01:34:38 -0500
Subject: [PATCH 009/115] plugins: Improve logging of plugin events

This will make it easier to troubleshoot plugin and npm issues.
---
 src/node/utils/run_npm.js           |  7 +------
 src/static/js/pluginfw/installer.js | 12 ++++++++++--
 src/static/js/pluginfw/plugins.js   | 19 +++++++++++++------
 3 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/src/node/utils/run_npm.js b/src/node/utils/run_npm.js
index ff2b7b0d..90d8ade9 100644
--- a/src/node/utils/run_npm.js
+++ b/src/node/utils/run_npm.js
@@ -21,13 +21,8 @@ const stderrLogger = (line) => npmLogger.error(line);
  */
 module.exports = exports = (args, opts = {}) => {
   const cmd = ['npm', ...args];
-  logger.info(`Executing command: ${cmd.join(' ')}`);
-  const p = runCmd(cmd, {stdoutLogger, stderrLogger, ...opts});
-  p.then(
-      () => logger.info(`Successfully ran command: ${cmd.join(' ')}`),
-      () => logger.error(`npm command failed: ${cmd.join(' ')}`));
   // MUST return the original Promise returned from runCmd so that the caller can access stdout.
-  return p;
+  return runCmd(cmd, {stdoutLogger, stderrLogger, ...opts});
 };
 
 // Log the version of npm at startup.
diff --git a/src/static/js/pluginfw/installer.js b/src/static/js/pluginfw/installer.js
index 4d2e223d..5f2e6ea1 100644
--- a/src/static/js/pluginfw/installer.js
+++ b/src/static/js/pluginfw/installer.js
@@ -7,6 +7,8 @@ const npm = require('npm');
 const request = require('request');
 const util = require('util');
 
+const logger = log4js.getLogger('plugins');
+
 let npmIsLoaded = false;
 const loadNpm = async () => {
   if (npmIsLoaded) return;
@@ -33,13 +35,16 @@ const wrapTaskCb = (cb) => {
 
 exports.uninstall = async (pluginName, cb = null) => {
   cb = wrapTaskCb(cb);
+  logger.info(`Uninstalling plugin ${pluginName}...`);
   try {
     await loadNpm();
     await util.promisify(npm.commands.uninstall)([pluginName]);
   } catch (err) {
+    logger.error(`Failed to uninstall plugin ${pluginName}`);
     cb(err || new Error(err));
     throw err;
   }
+  logger.info(`Successfully uninstalled plugin ${pluginName}`);
   await hooks.aCallAll('pluginUninstall', {pluginName});
   await plugins.update();
   cb(null);
@@ -47,13 +52,16 @@ exports.uninstall = async (pluginName, cb = null) => {
 
 exports.install = async (pluginName, cb = null) => {
   cb = wrapTaskCb(cb);
+  logger.info(`Installing plugin ${pluginName}...`);
   try {
     await loadNpm();
     await util.promisify(npm.commands.install)([`${pluginName}@latest`]);
   } catch (err) {
+    logger.error(`Failed to install plugin ${pluginName}`);
     cb(err || new Error(err));
     throw err;
   }
+  logger.info(`Successfully installed plugin ${pluginName}`);
   await hooks.aCallAll('pluginInstall', {pluginName});
   await plugins.update();
   cb(null);
@@ -77,7 +85,7 @@ exports.getAvailablePlugins = (maxCacheAge) => {
       try {
         plugins = JSON.parse(plugins);
       } catch (err) {
-        console.error('error parsing plugins.json:', err);
+        logger.error(`error parsing plugins.json: ${err.stack || err}`);
         plugins = [];
       }
 
@@ -107,7 +115,7 @@ exports.search = (searchTerm, maxCacheAge) => exports.getAvailablePlugins(maxCac
               !~results[pluginName].description.toLowerCase().indexOf(searchTerm))
         ) {
           if (typeof results[pluginName].description === 'undefined') {
-            console.debug('plugin without Description: %s', results[pluginName].name);
+            logger.debug(`plugin without Description: ${results[pluginName].name}`);
           }
 
           continue;
diff --git a/src/static/js/pluginfw/plugins.js b/src/static/js/pluginfw/plugins.js
index 7a01d424..4cf01fa2 100644
--- a/src/static/js/pluginfw/plugins.js
+++ b/src/static/js/pluginfw/plugins.js
@@ -2,12 +2,15 @@
 
 const fs = require('fs').promises;
 const hooks = require('./hooks');
+const log4js = require('log4js');
 const path = require('path');
 const runNpm = require('../../../node/utils/run_npm');
 const tsort = require('./tsort');
 const pluginUtils = require('./shared');
 const defs = require('./plugin_defs');
 
+const logger = log4js.getLogger('plugins');
+
 exports.prefix = 'ep_';
 
 exports.formatPlugins = () => Object.keys(defs.plugins).join(', ');
@@ -55,8 +58,11 @@ exports.update = async () => {
   const plugins = {};
 
   // Load plugin metadata ep.json
-  await Promise.all(Object.keys(packages).map(
-      async (pluginName) => await loadPlugin(packages, pluginName, plugins, parts)));
+  await Promise.all(Object.keys(packages).map(async (pluginName) => {
+    logger.info(`Loading plugin ${pluginName}...`);
+    await loadPlugin(packages, pluginName, plugins, parts);
+  }));
+  logger.info(`Loaded ${Object.keys(packages).length} plugins`);
 
   defs.plugins = plugins;
   defs.parts = sortParts(parts);
@@ -66,6 +72,7 @@ exports.update = async () => {
 };
 
 exports.getPackages = async () => {
+  logger.info('Running npm to get a list of installed plugins...');
   // Note: Do not pass `--prod` because it does not work if there is no package.json.
   const np = runNpm(['ls', '--long', '--json', '--depth=0'], {
     stdoutLogger: null, // We want to capture stdout, so don't attempt to log it.
@@ -104,11 +111,11 @@ const loadPlugin = async (packages, pluginName, plugins, parts) => {
         part.full_name = `${pluginName}/${part.name}`;
         parts[part.full_name] = part;
       }
-    } catch (ex) {
-      console.error(`Unable to parse plugin definition file ${pluginPath}: ${ex.toString()}`);
+    } catch (err) {
+      logger.error(`Unable to parse plugin definition file ${pluginPath}: ${err.stack || err}`);
     }
-  } catch (er) {
-    console.error(`Unable to load plugin definition file ${pluginPath}`);
+  } catch (err) {
+    logger.error(`Unable to load plugin definition file ${pluginPath}: ${err.stack || err}`);
   }
 };
 

From 689a75b381e6fe4fc0e9b969bd5ae38f0adc1276 Mon Sep 17 00:00:00 2001
From: Richard Hansen <rhansen@rhansen.org>
Date: Wed, 10 Feb 2021 03:04:28 -0500
Subject: [PATCH 010/115] plugins: Pass `--no-production` instead of setting
 `NODE_ENV=development`

---
 src/static/js/pluginfw/plugins.js | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/static/js/pluginfw/plugins.js b/src/static/js/pluginfw/plugins.js
index 4cf01fa2..a65b4f08 100644
--- a/src/static/js/pluginfw/plugins.js
+++ b/src/static/js/pluginfw/plugins.js
@@ -73,14 +73,13 @@ exports.update = async () => {
 
 exports.getPackages = async () => {
   logger.info('Running npm to get a list of installed plugins...');
-  // Note: Do not pass `--prod` because it does not work if there is no package.json.
-  const np = runNpm(['ls', '--long', '--json', '--depth=0'], {
+  // Notes:
+  //   * Do not pass `--prod` otherwise `npm ls` will fail if there is no `package.json`.
+  //   * The `--no-production` flag is required (or the `NODE_ENV` environment variable must be
+  //     unset or set to `development`) because otherwise `npm ls` will not mention any packages
+  //     that are not included in `package.json` (which is expected to not exist).
+  const np = runNpm(['ls', '--long', '--json', '--depth=0', '--no-production'], {
     stdoutLogger: null, // We want to capture stdout, so don't attempt to log it.
-    env: {
-      ...process.env,
-      // NODE_ENV must be set to development for `npm ls` to show files without a package.json.
-      NODE_ENV: 'development',
-    },
   });
   const chunks = [];
   await Promise.all([

From 426c02512723a42300964f0dee2e252018fd98f3 Mon Sep 17 00:00:00 2001
From: Richard Hansen <rhansen@rhansen.org>
Date: Wed, 17 Feb 2021 18:22:01 -0500
Subject: [PATCH 011/115] run_cmd: Log to Etherpad logs by default

---
 src/node/utils/run_cmd.js | 11 ++++++++---
 src/node/utils/run_npm.js | 15 +++++----------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/node/utils/run_cmd.js b/src/node/utils/run_cmd.js
index 4b30af1f..2af5381a 100644
--- a/src/node/utils/run_cmd.js
+++ b/src/node/utils/run_cmd.js
@@ -38,8 +38,9 @@ const logLines = (readable, logLineFn) => {
  * @param opts Optional options that will be passed to `child_process.spawn()` with two extensions:
  *   - `stdoutLogger`: Callback that is called each time a line of text is written to stdout (utf8
  *     is assumed). The line (without trailing newline) is passed as the only argument. If null,
- *     stdout is not logged. If unset, defaults to no-op. Ignored if stdout is not a pipe.
- *   - `stderrLogger`: Like `stdoutLogger` but for stderr.
+ *     stdout is not logged. If unset, defaults to logging to the Etherpad logs at log level INFO.
+ *     Ignored if stdout is not a pipe.
+ *   - `stderrLogger`: Like `stdoutLogger` but for stderr and log level ERROR.
  *
  * @returns A Promise with `stdout`, `stderr`, and `child` properties containing the stdout stream,
  *     stderr stream, and ChildProcess objects, respectively.
@@ -47,7 +48,11 @@ const logLines = (readable, logLineFn) => {
 module.exports = exports = (args, opts = {}) => {
   logger.debug(`Executing command: ${args.join(' ')}`);
 
-  const {stdoutLogger = () => {}, stderrLogger = () => {}} = opts;
+  const cmdLogger = log4js.getLogger(`runCmd|${args[0]}`);
+  const {
+    stdoutLogger = (line) => cmdLogger.info(line),
+    stderrLogger = (line) => cmdLogger.error(line),
+  } = opts;
   // Avoid confusing child_process.spawn() with our extensions.
   opts = {...opts}; // Make a copy to avoid mutating the caller's copy.
   delete opts.stdoutLogger;
diff --git a/src/node/utils/run_npm.js b/src/node/utils/run_npm.js
index 90d8ade9..869e1087 100644
--- a/src/node/utils/run_npm.js
+++ b/src/node/utils/run_npm.js
@@ -4,17 +4,12 @@ const log4js = require('log4js');
 const runCmd = require('./run_cmd');
 
 const logger = log4js.getLogger('runNpm');
-const npmLogger = log4js.getLogger('npm');
-
-const stdoutLogger = (line) => npmLogger.info(line);
-const stderrLogger = (line) => npmLogger.error(line);
 
 /**
- * Wrapper around `runCmd()` that logs output to an npm logger by default.
+ * Wrapper around `runCmd()` to make it easier to run npm.
  *
  * @param args Command-line arguments to pass to npm.
- * @param opts See the documentation for `runCmd()`. The `stdoutLogger` and `stderrLogger` options
- *     default to a log4js logger.
+ * @param opts See the documentation for `runCmd()`.
  *
  * @returns A Promise with additional `stdout`, `stderr`, and `child` properties. See the
  *     documentation for `runCmd()`.
@@ -22,7 +17,7 @@ const stderrLogger = (line) => npmLogger.error(line);
 module.exports = exports = (args, opts = {}) => {
   const cmd = ['npm', ...args];
   // MUST return the original Promise returned from runCmd so that the caller can access stdout.
-  return runCmd(cmd, {stdoutLogger, stderrLogger, ...opts});
+  return runCmd(cmd, opts);
 };
 
 // Log the version of npm at startup.
@@ -30,11 +25,11 @@ let loggedVersion = false;
 (async () => {
   if (loggedVersion) return;
   loggedVersion = true;
-  const p = runCmd(['npm', '--version'], {stdoutLogger: null, stderrLogger});
+  const p = runCmd(['npm', '--version'], {stdoutLogger: null});
   const chunks = [];
   await Promise.all([
     (async () => { for await (const chunk of p.stdout) chunks.push(chunk); })(),
-    p, // Await in parallel to avoid unhandled rejection if np rejects during chunk read.
+    p, // Await in parallel to avoid unhandled rejection if p rejects during chunk read.
   ]);
   const version = Buffer.concat(chunks).toString().replace(/\n+$/g, '');
   logger.info(`npm --version: ${version}`);

From d8bb5aa0091f107804904fc8bebab64c0078ba3f Mon Sep 17 00:00:00 2001
From: Richard Hansen <rhansen@rhansen.org>
Date: Wed, 17 Feb 2021 19:54:49 -0500
Subject: [PATCH 012/115] plugins: Eliminate unnecessary `run_npm.js`

I had anticipated more shared logic than we actually need (the
abstraction in `run_npm.js` is YAGNI).
---
 src/node/utils/run_npm.js         | 39 -------------------------------
 src/static/js/pluginfw/plugins.js | 26 +++++++++++++++++----
 2 files changed, 22 insertions(+), 43 deletions(-)
 delete mode 100644 src/node/utils/run_npm.js

diff --git a/src/node/utils/run_npm.js b/src/node/utils/run_npm.js
deleted file mode 100644
index 869e1087..00000000
--- a/src/node/utils/run_npm.js
+++ /dev/null
@@ -1,39 +0,0 @@
-'use strict';
-
-const log4js = require('log4js');
-const runCmd = require('./run_cmd');
-
-const logger = log4js.getLogger('runNpm');
-
-/**
- * Wrapper around `runCmd()` to make it easier to run npm.
- *
- * @param args Command-line arguments to pass to npm.
- * @param opts See the documentation for `runCmd()`.
- *
- * @returns A Promise with additional `stdout`, `stderr`, and `child` properties. See the
- *     documentation for `runCmd()`.
- */
-module.exports = exports = (args, opts = {}) => {
-  const cmd = ['npm', ...args];
-  // MUST return the original Promise returned from runCmd so that the caller can access stdout.
-  return runCmd(cmd, opts);
-};
-
-// Log the version of npm at startup.
-let loggedVersion = false;
-(async () => {
-  if (loggedVersion) return;
-  loggedVersion = true;
-  const p = runCmd(['npm', '--version'], {stdoutLogger: null});
-  const chunks = [];
-  await Promise.all([
-    (async () => { for await (const chunk of p.stdout) chunks.push(chunk); })(),
-    p, // Await in parallel to avoid unhandled rejection if p rejects during chunk read.
-  ]);
-  const version = Buffer.concat(chunks).toString().replace(/\n+$/g, '');
-  logger.info(`npm --version: ${version}`);
-})().catch((err) => {
-  logger.error(`Failed to get npm version: ${err.stack}`);
-  // This isn't a fatal error so don't re-throw.
-});
diff --git a/src/static/js/pluginfw/plugins.js b/src/static/js/pluginfw/plugins.js
index a65b4f08..0860a65b 100644
--- a/src/static/js/pluginfw/plugins.js
+++ b/src/static/js/pluginfw/plugins.js
@@ -4,13 +4,31 @@ const fs = require('fs').promises;
 const hooks = require('./hooks');
 const log4js = require('log4js');
 const path = require('path');
-const runNpm = require('../../../node/utils/run_npm');
+const runCmd = require('../../../node/utils/run_cmd');
 const tsort = require('./tsort');
 const pluginUtils = require('./shared');
 const defs = require('./plugin_defs');
 
 const logger = log4js.getLogger('plugins');
 
+// Log the version of npm at startup.
+let loggedVersion = false;
+(async () => {
+  if (loggedVersion) return;
+  loggedVersion = true;
+  const p = runCmd(['npm', '--version'], {stdoutLogger: null});
+  const chunks = [];
+  await Promise.all([
+    (async () => { for await (const chunk of p.stdout) chunks.push(chunk); })(),
+    p, // Await in parallel to avoid unhandled rejection if p rejects during chunk read.
+  ]);
+  const version = Buffer.concat(chunks).toString().replace(/\n+$/g, '');
+  logger.info(`npm --version: ${version}`);
+})().catch((err) => {
+  logger.error(`Failed to get npm version: ${err.stack || err}`);
+  // This isn't a fatal error so don't re-throw.
+});
+
 exports.prefix = 'ep_';
 
 exports.formatPlugins = () => Object.keys(defs.plugins).join(', ');
@@ -78,13 +96,13 @@ exports.getPackages = async () => {
   //   * The `--no-production` flag is required (or the `NODE_ENV` environment variable must be
   //     unset or set to `development`) because otherwise `npm ls` will not mention any packages
   //     that are not included in `package.json` (which is expected to not exist).
-  const np = runNpm(['ls', '--long', '--json', '--depth=0', '--no-production'], {
+  const p = runCmd(['npm', 'ls', '--long', '--json', '--depth=0', '--no-production'], {
     stdoutLogger: null, // We want to capture stdout, so don't attempt to log it.
   });
   const chunks = [];
   await Promise.all([
-    (async () => { for await (const chunk of np.stdout) chunks.push(chunk); })(),
-    np, // Await in parallel to avoid unhandled rejection if np rejects during chunk read.
+    (async () => { for await (const chunk of p.stdout) chunks.push(chunk); })(),
+    p, // Await in parallel to avoid unhandled rejection if p rejects during chunk read.
   ]);
   const {dependencies = {}} = JSON.parse(Buffer.concat(chunks).toString());
   await Promise.all(Object.entries(dependencies).map(async ([pkg, info]) => {

From 1cfbf88f7c62d66a6c686757ae5e405126d6768e Mon Sep 17 00:00:00 2001
From: Richard Hansen <rhansen@rhansen.org>
Date: Thu, 18 Feb 2021 01:26:16 -0500
Subject: [PATCH 013/115] run_cmd: Enhance with ability to return stdout as
 string

---
 src/node/utils/run_cmd.js         | 158 +++++++++++++++++++++---------
 src/static/js/pluginfw/plugins.js |  34 ++-----
 2 files changed, 119 insertions(+), 73 deletions(-)

diff --git a/src/node/utils/run_cmd.js b/src/node/utils/run_cmd.js
index 2af5381a..f4bc59bd 100644
--- a/src/node/utils/run_cmd.js
+++ b/src/node/utils/run_cmd.js
@@ -28,70 +28,130 @@ const logLines = (readable, logLineFn) => {
 };
 
 /**
- * Similar to `util.promisify(child_rocess.exec)`, except:
- *   - `cwd` defaults to the Etherpad root directory.
- *   - PATH is prefixed with src/node_modules/.bin so that utilities from installed dependencies
- *     (e.g., npm) are preferred over system utilities.
- *   - Output is passed to logger callback functions by default. See below for details.
+ * Runs a command, logging its output to Etherpad's logs by default.
+ *
+ * Examples:
+ *
+ *   Just run a command, logging stdout and stder to Etherpad's logs:
+ *     await runCmd(['ls', '-l']);
+ *
+ *   Capture just stdout as a string:
+ *     const stdout = await runCmd(['ls', '-l'], {stdio: [null, 'string']});
+ *
+ *   Capture both stdout and stderr as strings:
+ *     const p = runCmd(['ls', '-l'], {stdio: 'string'});
+ *     const stdout = await p; // Or: await p.stdout;
+ *     const stderr = await p.stderr;
+ *
+ *   Call a callback with each line of stdout:
+ *     await runCmd(['ls', '-l'], {stdio: [null, (line) => console.log(line)]});
  *
  * @param args Array of command-line arguments, where `args[0]` is the command to run.
- * @param opts Optional options that will be passed to `child_process.spawn()` with two extensions:
- *   - `stdoutLogger`: Callback that is called each time a line of text is written to stdout (utf8
- *     is assumed). The line (without trailing newline) is passed as the only argument. If null,
- *     stdout is not logged. If unset, defaults to logging to the Etherpad logs at log level INFO.
- *     Ignored if stdout is not a pipe.
- *   - `stderrLogger`: Like `stdoutLogger` but for stderr and log level ERROR.
+ * @param opts As with `child_process.spawn()`, except:
+ *   - `cwd` defaults to the Etherpad root directory.
+ *   - `env.PATH` is prefixed with `src/node_modules/.bin:node_modules/.bin` so that utilities from
+ *     installed dependencies (e.g., npm) are preferred over system utilities.
+ *   - By default stdout and stderr are logged to the Etherpad log at log levels INFO and ERROR.
+ *     To pipe without logging you must explicitly use 'pipe' for opts.stdio.
+ *   - opts.stdio[1] and opts.stdio[2] can be functions that will be called each time a line (utf8)
+ *     is written to stdout or stderr. The line (without its trailing newline, if present) will be
+ *     passed as the only argument, and the return value is ignored. opts.stdio = fn is equivalent
+ *     to opts.stdio = [null, fn, fn].
+ *   - opts.stdio[1] and opts.stdio[2] can be 'string', which will cause output to be collected,
+ *     decoded as utf8, and returned (see below). opts.stdio = 'string' is equivalent to
+ *     opts.stdio = [null, 'string', 'string'].
  *
- * @returns A Promise with `stdout`, `stderr`, and `child` properties containing the stdout stream,
- *     stderr stream, and ChildProcess objects, respectively.
+ * @returns A Promise that resolves when the command exits. The Promise resolves to the complete
+ * stdout if opts.stdio[1] is 'string', otherwise it resolves to undefined. The returned Promise is
+ * augmented with these additional properties:
+ *   - `stdout`: If opts.stdio[1] is 'pipe', the stdout stream object. If opts.stdio[1] is 'string',
+ *     a Promise that will resolve to the complete stdout (utf8 decoded) when the command exits.
+ *   - `stderr`: Similar to `stdout` but for stderr.
+ *   - `child`: The ChildProcess object.
  */
 module.exports = exports = (args, opts = {}) => {
   logger.debug(`Executing command: ${args.join(' ')}`);
 
-  const cmdLogger = log4js.getLogger(`runCmd|${args[0]}`);
-  const {
-    stdoutLogger = (line) => cmdLogger.info(line),
-    stderrLogger = (line) => cmdLogger.error(line),
-  } = opts;
-  // Avoid confusing child_process.spawn() with our extensions.
-  opts = {...opts}; // Make a copy to avoid mutating the caller's copy.
-  delete opts.stdoutLogger;
-  delete opts.stderrLogger;
+  opts = {cwd: settings.root, ...opts};
+  logger.debug(`cwd: ${opts.cwd}`);
 
+  // Log stdout and stderr by default.
+  const stdio =
+      Array.isArray(opts.stdio) ? opts.stdio.slice() // Copy to avoid mutating the caller's array.
+      : typeof opts.stdio === 'function' ? [null, opts.stdio, opts.stdio]
+      : opts.stdio === 'string' ? [null, 'string', 'string']
+      : Array(3).fill(opts.stdio);
+  const cmdLogger = log4js.getLogger(`runCmd|${args[0]}`);
+  if (stdio[1] == null) stdio[1] = (line) => cmdLogger.info(line);
+  if (stdio[2] == null) stdio[2] = (line) => cmdLogger.error(line);
+  const stdioLoggers = [];
+  const stdioSaveString = [];
+  for (const fd of [1, 2]) {
+    if (typeof stdio[fd] === 'function') {
+      stdioLoggers[fd] = stdio[fd];
+      stdio[fd] = 'pipe';
+    } else if (stdio[fd] === 'string') {
+      stdioSaveString[fd] = true;
+      stdio[fd] = 'pipe';
+    }
+  }
+  opts.stdio = stdio;
+
+  // On Windows the PATH environment var might be spelled "Path".
+  const pathVarName =
+      Object.keys(process.env).filter((k) => k.toUpperCase() === 'PATH')[0] || 'PATH';
   // Set PATH so that utilities from installed dependencies (e.g., npm) are preferred over system
   // (global) utilities.
-  let {env = process.env} = opts;
-  env = {...env}; // Copy to avoid modifying process.env.
-  // On Windows the PATH environment var might be spelled "Path".
-  const pathVarName = Object.keys(env).filter((k) => k.toUpperCase() === 'PATH')[0] || 'PATH';
-  env[pathVarName] = [
-    path.join(settings.root, 'src', 'node_modules', '.bin'),
-    path.join(settings.root, 'node_modules', '.bin'),
-    ...(env[pathVarName] ? env[pathVarName].split(path.delimiter) : []),
-  ].join(path.delimiter);
+  const {env = process.env} = opts;
+  const {[pathVarName]: PATH} = env;
+  opts.env = {
+    ...env, // Copy env to avoid modifying process.env or the caller's supplied env.
+    [pathVarName]: [
+      path.join(settings.root, 'src', 'node_modules', '.bin'),
+      path.join(settings.root, 'node_modules', '.bin'),
+      ...(PATH ? PATH.split(path.delimiter) : []),
+    ].join(path.delimiter),
+  };
   logger.debug(`${pathVarName}=${env[pathVarName]}`);
 
   // Create an error object to use in case the process fails. This is done here rather than in the
   // process's `exit` handler so that we get a useful stack trace.
-  const procFailedErr = new Error(`Command exited non-zero: ${args.join(' ')}`);
+  const procFailedErr = new Error();
 
-  const proc = spawn(args[0], args.slice(1), {cwd: settings.root, ...opts, env});
-  if (proc.stdout != null && stdoutLogger != null) logLines(proc.stdout, stdoutLogger);
-  if (proc.stderr != null && stderrLogger != null) logLines(proc.stderr, stderrLogger);
-  const p = new Promise((resolve, reject) => {
-    proc.on('exit', (code, signal) => {
-      if (code !== 0) {
-        logger.debug(procFailedErr.stack);
-        procFailedErr.code = code;
-        procFailedErr.signal = signal;
-        return reject(procFailedErr);
-      }
-      logger.debug(`Command returned successfully: ${args.join(' ')}`);
-      resolve();
-    });
-  });
-  p.stdout = proc.stdout;
-  p.stderr = proc.stderr;
+  const proc = spawn(args[0], args.slice(1), opts);
+  const streams = [undefined, proc.stdout, proc.stderr];
+
+  let px;
+  const p = new Promise((resolve, reject) => { px = {resolve, reject}; });
+  [, p.stdout, p.stderr] = streams;
   p.child = proc;
+
+  const stdioStringPromises = [undefined, Promise.resolve(), Promise.resolve()];
+  for (const fd of [1, 2]) {
+    if (streams[fd] == null) continue;
+    if (stdioLoggers[fd] != null) {
+      logLines(streams[fd], stdioLoggers[fd]);
+    } else if (stdioSaveString[fd]) {
+      p[[null, 'stdout', 'stderr'][fd]] = stdioStringPromises[fd] = (async () => {
+        const chunks = [];
+        for await (const chunk of streams[fd]) chunks.push(chunk);
+        return Buffer.concat(chunks).toString().replace(/\n+$/g, '');
+      })();
+    }
+  }
+
+  proc.on('exit', async (code, signal) => {
+    const [, stdout] = await Promise.all(stdioStringPromises);
+    if (code !== 0) {
+      procFailedErr.message =
+          `Command exited ${code ? `with code ${code}` : `on signal ${signal}`}: ${args.join(' ')}`;
+      procFailedErr.code = code;
+      procFailedErr.signal = signal;
+      logger.debug(procFailedErr.stack);
+      return px.reject(procFailedErr);
+    }
+    logger.debug(`Command returned successfully: ${args.join(' ')}`);
+    px.resolve(stdout);
+  });
   return p;
 };
diff --git a/src/static/js/pluginfw/plugins.js b/src/static/js/pluginfw/plugins.js
index 0860a65b..b705fb73 100644
--- a/src/static/js/pluginfw/plugins.js
+++ b/src/static/js/pluginfw/plugins.js
@@ -12,22 +12,15 @@ const defs = require('./plugin_defs');
 const logger = log4js.getLogger('plugins');
 
 // Log the version of npm at startup.
-let loggedVersion = false;
 (async () => {
-  if (loggedVersion) return;
-  loggedVersion = true;
-  const p = runCmd(['npm', '--version'], {stdoutLogger: null});
-  const chunks = [];
-  await Promise.all([
-    (async () => { for await (const chunk of p.stdout) chunks.push(chunk); })(),
-    p, // Await in parallel to avoid unhandled rejection if p rejects during chunk read.
-  ]);
-  const version = Buffer.concat(chunks).toString().replace(/\n+$/g, '');
-  logger.info(`npm --version: ${version}`);
-})().catch((err) => {
-  logger.error(`Failed to get npm version: ${err.stack || err}`);
-  // This isn't a fatal error so don't re-throw.
-});
+  try {
+    const version = await runCmd(['npm', '--version'], {stdio: [null, 'string']});
+    logger.info(`npm --version: ${version}`);
+  } catch (err) {
+    logger.error(`Failed to get npm version: ${err.stack || err}`);
+    // This isn't a fatal error so don't re-throw.
+  }
+})();
 
 exports.prefix = 'ep_';
 
@@ -96,15 +89,8 @@ exports.getPackages = async () => {
   //   * The `--no-production` flag is required (or the `NODE_ENV` environment variable must be
   //     unset or set to `development`) because otherwise `npm ls` will not mention any packages
   //     that are not included in `package.json` (which is expected to not exist).
-  const p = runCmd(['npm', 'ls', '--long', '--json', '--depth=0', '--no-production'], {
-    stdoutLogger: null, // We want to capture stdout, so don't attempt to log it.
-  });
-  const chunks = [];
-  await Promise.all([
-    (async () => { for await (const chunk of p.stdout) chunks.push(chunk); })(),
-    p, // Await in parallel to avoid unhandled rejection if p rejects during chunk read.
-  ]);
-  const {dependencies = {}} = JSON.parse(Buffer.concat(chunks).toString());
+  const cmd = ['npm', 'ls', '--long', '--json', '--depth=0', '--no-production'];
+  const {dependencies = {}} = JSON.parse(await runCmd(cmd, {stdio: [null, 'string']}));
   await Promise.all(Object.entries(dependencies).map(async ([pkg, info]) => {
     if (!pkg.startsWith(exports.prefix)) {
       delete dependencies[pkg];

From 9633b98f92a6270dbeb7d4865a480a555f4fbe51 Mon Sep 17 00:00:00 2001
From: Richard Hansen <rhansen@rhansen.org>
Date: Wed, 17 Feb 2021 22:53:24 -0500
Subject: [PATCH 014/115] tests: Delete unnecessary use of `npm` package

---
 src/tests/backend/specs/api/tidy.js | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/src/tests/backend/specs/api/tidy.js b/src/tests/backend/specs/api/tidy.js
index aa07aa0b..6a8bd6a2 100644
--- a/src/tests/backend/specs/api/tidy.js
+++ b/src/tests/backend/specs/api/tidy.js
@@ -1,25 +1,15 @@
 'use strict';
 
+const Settings = require('../../../../node/utils/Settings');
+const TidyHtml = require('../../../../node/utils/TidyHtml');
 const assert = require('assert');
 const os = require('os');
 const fs = require('fs');
 const path = require('path');
-let TidyHtml;
-let Settings;
-const npm = require('npm/lib/npm.js');
 const nodeify = require('nodeify');
 
 describe(__filename, function () {
   describe('tidyHtml', function () {
-    before(function (done) {
-      npm.load({}, (err) => {
-        assert.ok(!err);
-        TidyHtml = require('../../../../node/utils/TidyHtml');
-        Settings = require('../../../../node/utils/Settings');
-        return done();
-      });
-    });
-
     const tidy = (file, callback) => nodeify(TidyHtml.tidy(file), callback);
 
     it('Tidies HTML', function (done) {

From b3b5af3c3c69380686c3374a9a190f19ca5e05bc Mon Sep 17 00:00:00 2001
From: Richard Hansen <rhansen@rhansen.org>
Date: Wed, 17 Feb 2021 22:53:50 -0500
Subject: [PATCH 015/115] plugins: Use `npm` CLI to install/uninstall plugins

Using npm as a module has long been discouraged and will stop working
with npm v7.
---
 src/node/server.js                  |  3 ---
 src/static/js/pluginfw/installer.js | 19 +++++--------------
 2 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/src/node/server.js b/src/node/server.js
index e890a020..aec0d442 100755
--- a/src/node/server.js
+++ b/src/node/server.js
@@ -43,11 +43,9 @@ const UpdateCheck = require('./utils/UpdateCheck');
 const db = require('./db/DB');
 const express = require('./hooks/express');
 const hooks = require('../static/js/pluginfw/hooks');
-const npm = require('npm/lib/npm.js');
 const pluginDefs = require('../static/js/pluginfw/plugin_defs');
 const plugins = require('../static/js/pluginfw/plugins');
 const settings = require('./utils/Settings');
-const util = require('util');
 
 const logger = log4js.getLogger('server');
 
@@ -138,7 +136,6 @@ exports.start = async () => {
       });
     }
 
-    await util.promisify(npm.load)();
     await db.init();
     await plugins.update();
     const installedPlugins = Object.values(pluginDefs.plugins)
diff --git a/src/static/js/pluginfw/installer.js b/src/static/js/pluginfw/installer.js
index 5f2e6ea1..8908dbaa 100644
--- a/src/static/js/pluginfw/installer.js
+++ b/src/static/js/pluginfw/installer.js
@@ -3,20 +3,11 @@
 const log4js = require('log4js');
 const plugins = require('./plugins');
 const hooks = require('./hooks');
-const npm = require('npm');
 const request = require('request');
-const util = require('util');
+const runCmd = require('../../../node/utils/run_cmd');
 
 const logger = log4js.getLogger('plugins');
 
-let npmIsLoaded = false;
-const loadNpm = async () => {
-  if (npmIsLoaded) return;
-  await util.promisify(npm.load)({});
-  npmIsLoaded = true;
-  npm.on('log', log4js.getLogger('npm').log);
-};
-
 const onAllTasksFinished = () => {
   hooks.aCallAll('restartServer', {}, () => {});
 };
@@ -37,8 +28,8 @@ exports.uninstall = async (pluginName, cb = null) => {
   cb = wrapTaskCb(cb);
   logger.info(`Uninstalling plugin ${pluginName}...`);
   try {
-    await loadNpm();
-    await util.promisify(npm.commands.uninstall)([pluginName]);
+    // The --no-save flag prevents npm from creating package.json or package-lock.json.
+    await runCmd(['npm', 'uninstall', '--no-save', pluginName]);
   } catch (err) {
     logger.error(`Failed to uninstall plugin ${pluginName}`);
     cb(err || new Error(err));
@@ -54,8 +45,8 @@ exports.install = async (pluginName, cb = null) => {
   cb = wrapTaskCb(cb);
   logger.info(`Installing plugin ${pluginName}...`);
   try {
-    await loadNpm();
-    await util.promisify(npm.commands.install)([`${pluginName}@latest`]);
+    // The --no-save flag prevents npm from creating package.json or package-lock.json.
+    await runCmd(['npm', 'install', '--no-save', pluginName]);
   } catch (err) {
     logger.error(`Failed to install plugin ${pluginName}`);
     cb(err || new Error(err));

From 6163339c0dfab013ca30dff476cc753fc3e3c820 Mon Sep 17 00:00:00 2001
From: Richard Hansen <rhansen@rhansen.org>
Date: Thu, 18 Feb 2021 03:13:09 -0500
Subject: [PATCH 016/115] plugins: Always install plugins with `--no-save`

The npm CLI can get confused if `package.json` or `package-lock.json`
exist.
---
 .github/workflows/backend-tests.yml        | 2 +-
 .github/workflows/frontend-admin-tests.yml | 2 +-
 .github/workflows/frontend-tests.yml       | 2 +-
 .github/workflows/load-test.yml            | 2 +-
 .travis.yml                                | 2 +-
 README.md                                  | 2 +-
 doc/plugins.md                             | 4 ++--
 src/bin/plugins/lib/README.md              | 5 ++++-
 8 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/backend-tests.yml b/.github/workflows/backend-tests.yml
index d87973f1..fc488256 100644
--- a/.github/workflows/backend-tests.yml
+++ b/.github/workflows/backend-tests.yml
@@ -58,7 +58,7 @@ jobs:
 
     - name: Install Etherpad plugins
       run: >
-        npm install
+        npm install --no-save
         ep_align
         ep_author_hover
         ep_cursortrace
diff --git a/.github/workflows/frontend-admin-tests.yml b/.github/workflows/frontend-admin-tests.yml
index e42aa3bb..0592d03f 100644
--- a/.github/workflows/frontend-admin-tests.yml
+++ b/.github/workflows/frontend-admin-tests.yml
@@ -28,7 +28,7 @@ jobs:
 
       # We intentionally install a much old ep_align version to test update minor versions
     - name: Install etherpad plugins
-      run: npm install ep_align@0.2.27
+      run: npm install --no-save ep_align@0.2.27
 
       # Nuke plugin tests
     - name: Install etherpad plugins
diff --git a/.github/workflows/frontend-tests.yml b/.github/workflows/frontend-tests.yml
index 00c8dd6b..60429ab2 100644
--- a/.github/workflows/frontend-tests.yml
+++ b/.github/workflows/frontend-tests.yml
@@ -65,7 +65,7 @@ jobs:
 
     - name: Install Etherpad plugins
       run: >
-        npm install
+        npm install --no-save
         ep_align
         ep_author_hover
         ep_cursortrace
diff --git a/.github/workflows/load-test.yml b/.github/workflows/load-test.yml
index 98379dfe..2dbe9815 100644
--- a/.github/workflows/load-test.yml
+++ b/.github/workflows/load-test.yml
@@ -52,7 +52,7 @@ jobs:
 
     - name: Install etherpad plugins
       run: >
-        npm install
+        npm install --no-save
         ep_align
         ep_author_hover
         ep_cursortrace
diff --git a/.travis.yml b/.travis.yml
index 99aece0b..5048d7f7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,7 +29,7 @@ _install_libreoffice: &install_libreoffice >-
   sudo apt-get -y install libreoffice libreoffice-pdfimport
 
 _install_plugins: &install_plugins >-
-  npm install
+  npm install --no-save
   ep_align
   ep_author_hover
   ep_cursortrace
diff --git a/README.md b/README.md
index d2dcfbe2..fff848a7 100644
--- a/README.md
+++ b/README.md
@@ -105,7 +105,7 @@ Etherpad is very customizable through plugins. Instructions for installing theme
 Run the following command in your Etherpad folder to get all of the features visible in the demo gif:
 
 ```
-npm install ep_headings2 ep_markdown ep_comments_page ep_align ep_font_color ep_webrtc ep_embedded_hyperlinks2
+npm install --no-save ep_headings2 ep_markdown ep_comments_page ep_align ep_font_color ep_webrtc ep_embedded_hyperlinks2
 ```
 
 ## Customize the style with skin variants
diff --git a/doc/plugins.md b/doc/plugins.md
index d8239c68..1df620f9 100644
--- a/doc/plugins.md
+++ b/doc/plugins.md
@@ -7,8 +7,8 @@ execute its own functionality based on these events.
 Publicly available plugins can be found in the npm registry (see
 <https://npmjs.org>). Etherpad's naming convention for plugins is to prefix your
 plugins with `ep_`. So, e.g. it's `ep_flubberworms`. Thus you can install
-plugins from npm, using `npm install ep_flubberworm` in Etherpad's root
-directory.
+plugins from npm, using `npm install --no-save ep_flubberworm` in Etherpad's
+root directory.
 
 You can also browse to `http://yourEtherpadInstan.ce/admin/plugins`, which will
 list all installed plugins and those available on npm. It even provides
diff --git a/src/bin/plugins/lib/README.md b/src/bin/plugins/lib/README.md
index 3a1e2619..d2457b5f 100755
--- a/src/bin/plugins/lib/README.md
+++ b/src/bin/plugins/lib/README.md
@@ -7,7 +7,10 @@ Explain what your plugin does and who it's useful for.
 ![screenshot](https://user-images.githubusercontent.com/220864/99979953-97841d80-2d9f-11eb-9782-5f65817c58f4.PNG)
 
 ## Installing
-npm install [plugin_name]
+
+```
+npm install --no-save [plugin_name]
+```
 
 or Use the Etherpad ``/admin`` interface.
 

From d5997ddf0540bf91f1c3108b8b14aecfc213bd3d Mon Sep 17 00:00:00 2001
From: snyk-bot <snyk-bot@snyk.io>
Date: Thu, 11 Feb 2021 21:58:44 +0000
Subject: [PATCH 017/115] fix: upgrade log4js from 0.6.35 to 0.6.38

Snyk has created this PR to upgrade log4js from 0.6.35 to 0.6.38.

See this package in npm:
https://www.npmjs.com/package/log4js

See this project in Snyk:
https://app.snyk.io/org/johnmclear/project/d9a12bfb-7ccd-443f-9e22-f30d339cc8c5?utm_source=github&utm_medium=upgrade-pr
---
 src/package-lock.json | 6 +++---
 src/package.json      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/package-lock.json b/src/package-lock.json
index f5872831..5c4b4b14 100644
--- a/src/package-lock.json
+++ b/src/package-lock.json
@@ -3181,9 +3181,9 @@
       }
     },
     "log4js": {
-      "version": "0.6.35",
-      "resolved": "https://registry.npmjs.org/log4js/-/log4js-0.6.35.tgz",
-      "integrity": "sha1-OrHafLFII7dO04ZcSFk6zfEfG1k=",
+      "version": "0.6.38",
+      "resolved": "https://registry.npmjs.org/log4js/-/log4js-0.6.38.tgz",
+      "integrity": "sha1-LElBFmldb7JUgJQ9P8hy5mKlIv0=",
       "requires": {
         "readable-stream": "~1.0.2",
         "semver": "~4.3.3"
diff --git a/src/package.json b/src/package.json
index adef338f..324c4621 100644
--- a/src/package.json
+++ b/src/package.json
@@ -50,7 +50,7 @@
     "jsonminify": "0.4.1",
     "languages4translatewiki": "0.1.3",
     "lodash.clonedeep": "4.5.0",
-    "log4js": "0.6.35",
+    "log4js": "0.6.38",
     "measured-core": "1.51.1",
     "mime-types": "^2.1.27",
     "nodeify": "1.0.1",

From 4d50813c948906a1ffa55d79c40d26bc8d6aaf21 Mon Sep 17 00:00:00 2001
From: Richard Hansen <rhansen@rhansen.org>
Date: Fri, 19 Feb 2021 02:51:15 -0500
Subject: [PATCH 018/115] issue templates: Ask for server info when opening a
 bug

---
 .github/ISSUE_TEMPLATE/bug_report.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index dd84ea78..d003a478 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -23,6 +23,12 @@ A clear and concise description of what you expected to happen.
 **Screenshots**
 If applicable, add screenshots to help explain your problem.
 
+**Server (please complete the following information):**
+ - Etherpad version:
+ - OS: [e.g., Ubuntu 20.04]
+ - Node.js version (`node --version`):
+ - npm version (`npm --version`):
+
 **Desktop (please complete the following information):**
  - OS: [e.g. iOS]
  - Browser [e.g. chrome, safari]

From 7e86acad8ffee163a56b15e7e2638b0db6f96baf Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Sat, 20 Feb 2021 09:13:44 +0000
Subject: [PATCH 019/115] CI: Build and test Windows .zip (#4828)

---
 .github/workflows/windows-zip.yml | 66 +++++++++++++++++++++++++++++++
 1 file changed, 66 insertions(+)
 create mode 100644 .github/workflows/windows-zip.yml

diff --git a/.github/workflows/windows-zip.yml b/.github/workflows/windows-zip.yml
new file mode 100644
index 00000000..8e52dc06
--- /dev/null
+++ b/.github/workflows/windows-zip.yml
@@ -0,0 +1,66 @@
+name: "Windows Zip"
+
+# any branch is useful for testing before a PR is submitted
+on: [push, pull_request]
+
+jobs:
+  build:
+    # run on pushes to any branch
+    # run on PRs from external forks
+    if: |
+         (github.event_name != 'pull_request')
+         || (github.event.pull_request.head.repo.id != github.event.pull_request.base.repo.id)
+    name: Building Windows Zip on Linux without plugins
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    - uses: actions/setup-node@v2
+      with:
+        node-version: 12
+
+    - name: Install all dependencies and symlink for ep_etherpad-lite
+      run: src/bin/installDeps.sh
+
+    - name: Run the backend tests
+      run: cd src && npm test
+
+    - name: Build the .zip
+      run: src/bin/buildForWindows.sh
+
+    - name: Archive production artifacts
+      uses: actions/upload-artifact@v2
+      with:
+        name: etherpad-lite-win.zip
+        path: etherpad-lite-win.zip
+
+
+  deploy:
+    # run on pushes to any branch
+    # run on PRs from external forks
+    if: |
+         (github.event_name != 'pull_request')
+         || (github.event.pull_request.head.repo.id != github.event.pull_request.base.repo.id)
+    name: Deploy Windows Zip on Windows
+    needs: build
+    runs-on: windows-latest
+
+    steps:
+    - name: Download zip
+      uses: actions/download-artifact@v2
+      with:
+        name: etherpad-lite-win.zip
+
+    - name: Extract Etherpad
+      run: 7z x etherpad-lite-win.zip -oetherpad
+
+    - name: list
+      run: dir etherpad
+
+    - name: Run Etherpad
+      run: |
+            cd etherpad
+            node node_modules\ep_etherpad-lite\node\server.js &
+            curl --connect-timeout 10 --max-time 20 --retry 5 --retry-delay 10 --retry-max-time 60 --retry-connrefused http://127.0.0.1:9001/p/test

From 08d2024caf1183c476804e0f014d50ca36edc90a Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Sat, 20 Feb 2021 13:22:23 +0000
Subject: [PATCH 020/115] docs: badges

Badges into the README.md to show code quality, engagement etc.
---
 README.md | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index fff848a7..c06a9931 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,4 @@
 # A real-time collaborative editor for the web
-<a href="https://hub.docker.com/r/etherpad/etherpad"><img alt="Docker Pulls" src="https://img.shields.io/docker/pulls/etherpad/etherpad"></a>
-
-[![Travis (.com)](https://api.travis-ci.com/ether/etherpad-lite.svg?branch=develop)](https://travis-ci.com/github/ether/etherpad-lite)
 
 ![Demo Etherpad Animated Jif](doc/images/etherpad_demo.gif "Etherpad in action")
 
@@ -10,6 +7,19 @@ Etherpad is a real-time collaborative editor [scalable to thousands of simultane
 
 **[Try it out](https://video.etherpad.com)**
 
+# Project Status
+
+### Code Quality
+[![Code Quality](https://github.com/ether/etherpad-lite/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/ether/etherpad-lite/actions/workflows/codeql-analysis.yml) [![Total alerts](https://img.shields.io/lgtm/alerts/g/ether/etherpad-lite.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/ether/etherpad-lite/alerts/) [![Language grade: JavaScript](https://img.shields.io/lgtm/grade/javascript/g/ether/etherpad-lite.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/ether/etherpad-lite/context:javascript) [![package.lock](https://github.com/ether/etherpad-lite/actions/workflows/lint-package-lock.yml/badge.svg)](https://github.com/ether/etherpad-lite/actions/workflows/lint-package-lock.yml)
+
+### Testing
+[![Backend tests](https://github.com/ether/etherpad-lite/actions/workflows/backend-tests.yml/badge.svg)](https://github.com/ether/etherpad-lite/actions/workflows/backend-tests.yml) [![Simulated Load](https://github.com/ether/etherpad-lite/actions/workflows/load-test.yml/badge.svg)](https://github.com/ether/etherpad-lite/actions/workflows/load-test.yml) [![Rate Limit](https://github.com/ether/etherpad-lite/actions/workflows/rate-limit.yml/badge.svg)](https://github.com/ether/etherpad-lite/actions/workflows/rate-limit.yml) [![Windows Zip](https://github.com/ether/etherpad-lite/actions/workflows/windows-zip.yml/badge.svg)](https://github.com/ether/etherpad-lite/actions/workflows/windows-zip.yml) [![Docker file](https://github.com/ether/etherpad-lite/actions/workflows/dockerfile.yml/badge.svg)](https://github.com/ether/etherpad-lite/actions/workflows/dockerfile.yml)
+[![Frontend admin tests](https://github.com/ether/etherpad-lite/actions/workflows/frontend-admin-tests.yml/badge.svg)](https://github.com/ether/etherpad-lite/actions/workflows/frontend-admin-tests.yml) [![Frontend tests](https://github.com/ether/etherpad-lite/actions/workflows/frontend-tests.yml/badge.svg)](https://github.com/ether/etherpad-lite/actions/workflows/frontend-tests.yml)
+
+### Engagement
+<a href="https://hub.docker.com/r/etherpad/etherpad"><img alt="Docker Pulls" src="https://img.shields.io/docker/pulls/etherpad/etherpad"></a>
+![GitHub all releases](https://img.shields.io/github/downloads/ether/etherpad-lite/total) ![Discord](https://img.shields.io/discord/741309013593030667) ![Etherpad plugins](https://img.shields.io/endpoint?url=https%3A%2F%2Fstatic.etherpad.org%2Fshields.json "Etherpad plugins")
+
 # Installation
 
 ## Requirements

From 4ca2d7ea3a80aa54efb66671770ba3c73fab311e Mon Sep 17 00:00:00 2001
From: Sebastian Castro <sebastian.castro@protonmail.com>
Date: Sat, 20 Feb 2021 14:24:17 +0100
Subject: [PATCH 021/115] include lineHeight property in sidebar elements
 (#4831)

This also makes the full line number element clickable to ensure a positive UX for the ``?lineNumber`` URL endpoint.  It also makes it more obvious that a click action can happen based on the hover.

Make line numbers stick to baseline of first line of wrapped content and editor lines with increased line hieght.

Make it compatible with ep_author_neat
---
 src/static/js/ace2_inner.js                   | 43 ++++++++++++++++---
 .../skins/colibris/src/components/sidediv.css | 16 ++++++-
 2 files changed, 52 insertions(+), 7 deletions(-)

diff --git a/src/static/js/ace2_inner.js b/src/static/js/ace2_inner.js
index b41f4f0f..8e41ae13 100644
--- a/src/static/js/ace2_inner.js
+++ b/src/static/js/ace2_inner.js
@@ -3786,7 +3786,24 @@ function Ace2Inner() {
 
     // Refs #4228, to avoid layout trashing, we need to first calculate all the heights,
     // and then apply at once all new height to div elements
+    const lineOffsets = [];
+
+    // To place the line number on the same Z point as the first character of the first line
+    // we need to know the line height including the margins of the firstChild within the line
+    // This is somewhat computationally expensive as it looks at the first element within
+    // the line.  Alternative, cheaper approaches are welcome.
+    // Original Issue: https://github.com/ether/etherpad-lite/issues/4527
     const lineHeights = [];
+
+    // 24 is the default line height within Etherpad - There may be quirks here such as
+    // none text elements (images/embeds etc) where the line height will be greater
+    // but as it's non-text type the line-height/margins might not be present and it
+    // could be that this breaks a theme that has a different default line height..
+    // So instead of using an integer here we get the value from the Editor CSS.
+    const innerdocbody = document.querySelector('#innerdocbody');
+    const innerdocbodyStyles = getComputedStyle(innerdocbody);
+    const defaultLineHeight = parseInt(innerdocbodyStyles['line-height']);
+
     let docLine = doc.body.firstChild;
     let currentLine = 0;
     let h = null;
@@ -3811,7 +3828,21 @@ function Ace2Inner() {
         // last line
         h = (docLine.clientHeight || docLine.offsetHeight);
       }
-      lineHeights.push(h);
+      lineOffsets.push(h);
+
+      if (docLine.clientHeight !== defaultLineHeight) {
+        // line is wrapped OR has a larger line height within so we will do additional
+        // computation to figure out the line-height of the first element and
+        // use that for displaying the side div line number inline with the first line
+        // of content -- This is used in ep_headings, ep_font_size etc. where the line
+        // height is increased.
+        const elementStyle = window.getComputedStyle(docLine.firstChild);
+        const lineHeight = parseInt(elementStyle.getPropertyValue('line-height'));
+        const marginBottom = parseInt(elementStyle.getPropertyValue('margin-bottom'));
+        lineHeights.push(lineHeight + marginBottom);
+      } else {
+        lineHeights.push(defaultLineHeight);
+      }
       docLine = docLine.nextSibling;
       currentLine++;
     }
@@ -3823,8 +3854,9 @@ function Ace2Inner() {
     // Apply height to existing sidediv lines
     currentLine = 0;
     while (sidebarLine && currentLine <= lineNumbersShown) {
-      if (lineHeights[currentLine] != null) {
-        sidebarLine.style.height = `${lineHeights[currentLine]}px`;
+      if (lineOffsets[currentLine] != null) {
+        sidebarLine.style.height = `${lineOffsets[currentLine]}px`;
+        sidebarLine.style.lineHeight = `${lineHeights[currentLine]}px`;
       }
       sidebarLine = sidebarLine.nextSibling;
       currentLine++;
@@ -3839,8 +3871,9 @@ function Ace2Inner() {
       while (lineNumbersShown < newNumLines) {
         lineNumbersShown++;
         const div = odoc.createElement('DIV');
-        if (lineHeights[currentLine]) {
-          div.style.height = `${lineHeights[currentLine]}px`;
+        if (lineOffsets[currentLine]) {
+          div.style.height = `${lineOffsets[currentLine]}px`;
+          div.style.lineHeight = `${lineHeights[currentLine]}px`;
         }
         $(div).append($(`<span class='line-number'>${String(lineNumbersShown)}</span>`));
         fragment.appendChild(div);
diff --git a/src/static/skins/colibris/src/components/sidediv.css b/src/static/skins/colibris/src/components/sidediv.css
index 6f5556df..c48d38f6 100644
--- a/src/static/skins/colibris/src/components/sidediv.css
+++ b/src/static/skins/colibris/src/components/sidediv.css
@@ -12,8 +12,20 @@
 }
 
 #sidedivinner>div .line-number {
-  line-height: 24px;
+  line-height: inherit;
   font-family: RobotoMono;
+  display: inline-block;
   color: #576273;
   color: var(--text-soft-color);
-}
\ No newline at end of file
+  height:100%;
+}
+
+#sidedivinner>div .line-number:hover {
+  background-color: var(--bg-soft-color);
+  border-radius: 5px 0 0 5px;  
+  font-weight: bold;
+  color: var(--text-color);
+}
+.plugin-ep_author_neat #sidedivinner>div .line-number:hover {
+  background-color: transparent;
+}

From c64b1b8eade4358bee78b3bb54e47c37e2b7e7a8 Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Wed, 17 Feb 2021 14:49:34 +0000
Subject: [PATCH 022/115] lint: skins

---
 src/static/skins/colibris/index.js      | 6 ++++--
 src/static/skins/colibris/pad.js        | 6 ++++--
 src/static/skins/colibris/timeslider.js | 6 ++++--
 src/static/skins/no-skin/index.js       | 6 ++++--
 src/static/skins/no-skin/pad.js         | 6 ++++--
 src/static/skins/no-skin/timeslider.js  | 6 ++++--
 6 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/src/static/skins/colibris/index.js b/src/static/skins/colibris/index.js
index c56ba5bb..633db726 100644
--- a/src/static/skins/colibris/index.js
+++ b/src/static/skins/colibris/index.js
@@ -1,5 +1,7 @@
-function customStart() {
+'use strict';
+
+window.customStart = () => {
   // define your javascript here
   // jquery is available - except index.js
   // you can load extra scripts with $.getScript http://api.jquery.com/jQuery.getScript/
-}
+};
diff --git a/src/static/skins/colibris/pad.js b/src/static/skins/colibris/pad.js
index 0f5e4731..1987f320 100644
--- a/src/static/skins/colibris/pad.js
+++ b/src/static/skins/colibris/pad.js
@@ -1,5 +1,7 @@
-function customStart() {
+'use strict';
+
+window.customStart = () => {
   $('#pad_title').show();
   $('.buttonicon').mousedown(function () { $(this).parent().addClass('pressed'); });
   $('.buttonicon').mouseup(function () { $(this).parent().removeClass('pressed'); });
-}
+};
diff --git a/src/static/skins/colibris/timeslider.js b/src/static/skins/colibris/timeslider.js
index 74101127..5fa8ae3b 100644
--- a/src/static/skins/colibris/timeslider.js
+++ b/src/static/skins/colibris/timeslider.js
@@ -1,2 +1,4 @@
-function customStart() {
-}
+'use strict';
+
+window.customStart = () => {
+};
diff --git a/src/static/skins/no-skin/index.js b/src/static/skins/no-skin/index.js
index c56ba5bb..633db726 100644
--- a/src/static/skins/no-skin/index.js
+++ b/src/static/skins/no-skin/index.js
@@ -1,5 +1,7 @@
-function customStart() {
+'use strict';
+
+window.customStart = () => {
   // define your javascript here
   // jquery is available - except index.js
   // you can load extra scripts with $.getScript http://api.jquery.com/jQuery.getScript/
-}
+};
diff --git a/src/static/skins/no-skin/pad.js b/src/static/skins/no-skin/pad.js
index c56ba5bb..633db726 100644
--- a/src/static/skins/no-skin/pad.js
+++ b/src/static/skins/no-skin/pad.js
@@ -1,5 +1,7 @@
-function customStart() {
+'use strict';
+
+window.customStart = () => {
   // define your javascript here
   // jquery is available - except index.js
   // you can load extra scripts with $.getScript http://api.jquery.com/jQuery.getScript/
-}
+};
diff --git a/src/static/skins/no-skin/timeslider.js b/src/static/skins/no-skin/timeslider.js
index c56ba5bb..633db726 100644
--- a/src/static/skins/no-skin/timeslider.js
+++ b/src/static/skins/no-skin/timeslider.js
@@ -1,5 +1,7 @@
-function customStart() {
+'use strict';
+
+window.customStart = () => {
   // define your javascript here
   // jquery is available - except index.js
   // you can load extra scripts with $.getScript http://api.jquery.com/jQuery.getScript/
-}
+};

From 7c514460401f382bc0dc299ba92abd1b5380ff12 Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Wed, 17 Feb 2021 14:55:54 +0000
Subject: [PATCH 023/115] lint: use strict

---
 src/static/js/ChangesetUtils.js | 2 ++
 src/static/js/index.js          | 4 ++--
 src/static/js/l10n.js           | 4 +++-
 src/static/js/security.js       | 2 ++
 src/static/js/underscore.js     | 2 ++
 5 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/static/js/ChangesetUtils.js b/src/static/js/ChangesetUtils.js
index c7333afc..15ce9c56 100644
--- a/src/static/js/ChangesetUtils.js
+++ b/src/static/js/ChangesetUtils.js
@@ -1,3 +1,5 @@
+'use strict';
+
 /**
  * This module contains several helper Functions to build Changesets
  * based on a SkipList
diff --git a/src/static/js/index.js b/src/static/js/index.js
index 72941cd8..566305e7 100644
--- a/src/static/js/index.js
+++ b/src/static/js/index.js
@@ -1,3 +1,5 @@
+'use strict';
+
 // @license magnet:?xt=urn:btih:8e4f440f4c65981c5bf93c76d35135ba5064d8b7&dn=apache-2.0.txt Apache-2.0
 /**
  * Copyright 2011 Peter Martischka, Primary Technology.
@@ -16,8 +18,6 @@
  * limitations under the License.
  */
 
-/* global $, customStart */
-
 function randomPadName() {
   // the number of distinct chars (64) is chosen to ensure that the selection will be uniform when
   // using the PRNG below
diff --git a/src/static/js/l10n.js b/src/static/js/l10n.js
index 3c980898..7206f913 100644
--- a/src/static/js/l10n.js
+++ b/src/static/js/l10n.js
@@ -1,4 +1,6 @@
-(function (document) {
+'use strict';
+
+((document) => {
   // Set language for l10n
   let language = document.cookie.match(/language=((\w{2,3})(-\w+)?)/);
   if (language) language = language[1];
diff --git a/src/static/js/security.js b/src/static/js/security.js
index 9c9fff37..d92425cb 100644
--- a/src/static/js/security.js
+++ b/src/static/js/security.js
@@ -1,3 +1,5 @@
+'use strict';
+
 /**
  * Copyright 2009 Google Inc.
  *
diff --git a/src/static/js/underscore.js b/src/static/js/underscore.js
index a6d42b85..d30543ca 100644
--- a/src/static/js/underscore.js
+++ b/src/static/js/underscore.js
@@ -1 +1,3 @@
+'use strict';
+
 module.exports = require('underscore');

From 01dd0040542ff84a8989881431c7fd56a6c64e44 Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Wed, 17 Feb 2021 14:56:25 +0000
Subject: [PATCH 024/115] lint: ChangesetUtils

---
 src/static/js/ChangesetUtils.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/static/js/ChangesetUtils.js b/src/static/js/ChangesetUtils.js
index 15ce9c56..ef2be2eb 100644
--- a/src/static/js/ChangesetUtils.js
+++ b/src/static/js/ChangesetUtils.js
@@ -20,7 +20,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-exports.buildRemoveRange = function (rep, builder, start, end) {
+exports.buildRemoveRange = (rep, builder, start, end) => {
   const startLineOffset = rep.lines.offsetOfIndex(start[0]);
   const endLineOffset = rep.lines.offsetOfIndex(end[0]);
 
@@ -32,7 +32,7 @@ exports.buildRemoveRange = function (rep, builder, start, end) {
   }
 };
 
-exports.buildKeepRange = function (rep, builder, start, end, attribs, pool) {
+exports.buildKeepRange = (rep, builder, start, end, attribs, pool) => {
   const startLineOffset = rep.lines.offsetOfIndex(start[0]);
   const endLineOffset = rep.lines.offsetOfIndex(end[0]);
 
@@ -44,7 +44,7 @@ exports.buildKeepRange = function (rep, builder, start, end, attribs, pool) {
   }
 };
 
-exports.buildKeepToStartOfRange = function (rep, builder, start) {
+exports.buildKeepToStartOfRange = (rep, builder, start) => {
   const startLineOffset = rep.lines.offsetOfIndex(start[0]);
 
   builder.keep(startLineOffset, start[0]);

From b029edb9319a221ee57ff77306dedfe844cdca9a Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Wed, 17 Feb 2021 14:58:05 +0000
Subject: [PATCH 025/115] lint: index.js

---
 src/static/js/index.js | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/static/js/index.js b/src/static/js/index.js
index 566305e7..b0b3a1eb 100644
--- a/src/static/js/index.js
+++ b/src/static/js/index.js
@@ -1,5 +1,6 @@
 'use strict';
 
+/* eslint-disable-next-line max-len */
 // @license magnet:?xt=urn:btih:8e4f440f4c65981c5bf93c76d35135ba5064d8b7&dn=apache-2.0.txt Apache-2.0
 /**
  * Copyright 2011 Peter Martischka, Primary Technology.
@@ -18,26 +19,26 @@
  * limitations under the License.
  */
 
-function randomPadName() {
+const randomPadName = () => {
   // the number of distinct chars (64) is chosen to ensure that the selection will be uniform when
   // using the PRNG below
   const chars = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz-_';
   // the length of the pad name is chosen to get 120-bit security: log2(64^20) = 120
-  const string_length = 20;
+  const stringLength = 20;
   // make room for 8-bit integer values that span from 0 to 255.
-  const randomarray = new Uint8Array(string_length);
+  const randomarray = new Uint8Array(stringLength);
   // use browser's PRNG to generate a "unique" sequence
   const cryptoObj = window.crypto || window.msCrypto; // for IE 11
   cryptoObj.getRandomValues(randomarray);
   let randomstring = '';
-  for (let i = 0; i < string_length; i++) {
+  for (let i = 0; i < stringLength; i++) {
     // instead of writing "Math.floor(randomarray[i]/256*64)"
     // we can save some cycles.
     const rnum = Math.floor(randomarray[i] / 4);
     randomstring += chars.substring(rnum, rnum + 1);
   }
   return randomstring;
-}
+};
 
 $(() => {
   $('#go2Name').submit(() => {
@@ -55,7 +56,7 @@ $(() => {
   });
 
   // start the custom js
-  if (typeof customStart === 'function') customStart();
+  if (typeof window.customStart === 'function') window.customStart();
 });
 
 // @license-end

From cf37f52093e766fb47702db6586919f3ef00b963 Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Wed, 17 Feb 2021 15:03:30 +0000
Subject: [PATCH 026/115] lint: collab_client.js

---
 src/static/js/collab_client.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/static/js/collab_client.js b/src/static/js/collab_client.js
index abe3911d..d2b9c402 100644
--- a/src/static/js/collab_client.js
+++ b/src/static/js/collab_client.js
@@ -34,7 +34,7 @@ const getSocket = () => pad && pad.socket;
 /** Call this when the document is ready, and a new Ace2Editor() has been created and inited.
     ACE's ready callback does not need to have fired yet.
     "serverVars" are from calling doc.getCollabClientVars() on the server. */
-function getCollabClient(ace2editor, serverVars, initialUserInfo, options, _pad) {
+const getCollabClient = (ace2editor, serverVars, initialUserInfo, options, _pad) => {
   const editor = ace2editor;
   pad = _pad; // Inject pad to avoid a circular dependency.
 
@@ -583,6 +583,6 @@ function getCollabClient(ace2editor, serverVars, initialUserInfo, options, _pad)
 
   setUpSocket();
   return self;
-}
+};
 
 exports.getCollabClient = getCollabClient;

From acccf5672419969e369fa137f3a153326dacb087 Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Wed, 17 Feb 2021 15:23:11 +0000
Subject: [PATCH 027/115] lint: Changeset.js arrow-functions

---
 src/static/js/Changeset.js | 399 +++++++++++++++++--------------------
 1 file changed, 179 insertions(+), 220 deletions(-)

diff --git a/src/static/js/Changeset.js b/src/static/js/Changeset.js
index 422c7ede..18018454 100644
--- a/src/static/js/Changeset.js
+++ b/src/static/js/Changeset.js
@@ -1,5 +1,8 @@
+'use strict';
+
 /*
- * This is the Changeset library copied from the old Etherpad with some modifications to use it in node.js
+ * This is the Changeset library copied from the old Etherpad with some modifications
+ * to use it in node.js
  * Can be found in https://github.com/ether/pad/blob/master/infrastructure/ace/www/easysync2.js
  */
 
@@ -35,7 +38,7 @@ const AttributePool = require('./AttributePool');
  * This method is called whenever there is an error in the sync process
  * @param msg {string} Just some message
  */
-exports.error = function error(msg) {
+exports.error = (msg) => {
   const e = new Error(msg);
   e.easysync = true;
   throw e;
@@ -47,7 +50,7 @@ exports.error = function error(msg) {
  * @param b {boolean} assertion condition
  * @param msgParts {string} error to be passed if it fails
  */
-exports.assert = function assert(b, msgParts) {
+exports.assert = (b, msgParts) => {
   if (!b) {
     const msg = Array.prototype.slice.call(arguments, 1).join('');
     exports.error(`Failed assertion: ${msg}`);
@@ -59,18 +62,14 @@ exports.assert = function assert(b, msgParts) {
  * @param str {string} string of the number in base 36
  * @returns {int} number
  */
-exports.parseNum = function (str) {
-  return parseInt(str, 36);
-};
+exports.parseNum = (str) => parseInt(str, 36);
 
 /**
  * Writes a number in base 36 and puts it in a string
  * @param num {int} number
  * @returns {string} string
  */
-exports.numToString = function (num) {
-  return num.toString(36).toLowerCase();
-};
+exports.numToString = (num) => num.toString(36).toLowerCase();
 
 /**
  * Converts stuff before $ to base 10
@@ -78,7 +77,7 @@ exports.numToString = function (num) {
  * @param cs {string} the string
  * @return integer
  */
-exports.toBaseTen = function (cs) {
+exports.toBaseTen = (cs) => {
   const dollarIndex = cs.indexOf('$');
   const beforeDollar = cs.substring(0, dollarIndex);
   const fromDollar = cs.substring(dollarIndex);
@@ -95,17 +94,13 @@ exports.toBaseTen = function (cs) {
  * can be applied
  * @param cs {string} String representation of the Changeset
  */
-exports.oldLen = function (cs) {
-  return exports.unpack(cs).oldLen;
-};
+exports.oldLen = (cs) => exports.unpack(cs).oldLen;
 
 /**
  * returns the length of the text after changeset is applied
  * @param cs {string} String representation of the Changeset
  */
-exports.newLen = function (cs) {
-  return exports.unpack(cs).newLen;
-};
+exports.newLen = (cs) => exports.unpack(cs).newLen;
 
 /**
  * this function creates an iterator which decodes string changeset operations
@@ -113,29 +108,28 @@ exports.newLen = function (cs) {
  * @param optStartIndex {int} from where in the string should the iterator start
  * @return {Op} type object iterator
  */
-exports.opIterator = function (opsStr, optStartIndex) {
+exports.opIterator = (opsStr, optStartIndex) => {
   // print(opsStr);
   const regex = /((?:\*[0-9a-z]+)*)(?:\|([0-9a-z]+))?([-+=])([0-9a-z]+)|\?|/g;
   const startIndex = (optStartIndex || 0);
   let curIndex = startIndex;
   let prevIndex = curIndex;
 
-  function nextRegexMatch() {
+  const nextRegexMatch = () => {
     prevIndex = curIndex;
-    let result;
     regex.lastIndex = curIndex;
-    result = regex.exec(opsStr);
+    const result = regex.exec(opsStr);
     curIndex = regex.lastIndex;
-    if (result[0] == '?') {
+    if (result[0] === '?') {
       exports.error('Hit error opcode in op stream');
     }
 
     return result;
-  }
+  };
   let regexResult = nextRegexMatch();
   const obj = exports.newOp();
 
-  function next(optObj) {
+  const next = (optObj) => {
     const op = (optObj || obj);
     if (regexResult[0]) {
       op.attribs = regexResult[1];
@@ -147,15 +141,12 @@ exports.opIterator = function (opsStr, optStartIndex) {
       exports.clearOp(op);
     }
     return op;
-  }
+  };
 
-  function hasNext() {
-    return !!(regexResult[0]);
-  }
+  const hasNext = () => !!(regexResult[0]);
+
+  const lastIndex = () => prevIndex;
 
-  function lastIndex() {
-    return prevIndex;
-  }
   return {
     next,
     hasNext,
@@ -167,7 +158,7 @@ exports.opIterator = function (opsStr, optStartIndex) {
  * Cleans an Op object
  * @param {Op} object to be cleared
  */
-exports.clearOp = function (op) {
+exports.clearOp = (op) => {
   op.opcode = '';
   op.chars = 0;
   op.lines = 0;
@@ -178,34 +169,30 @@ exports.clearOp = function (op) {
  * Creates a new Op object
  * @param optOpcode the type operation of the Op object
  */
-exports.newOp = function (optOpcode) {
-  return {
-    opcode: (optOpcode || ''),
-    chars: 0,
-    lines: 0,
-    attribs: '',
-  };
-};
+exports.newOp = (optOpcode) => ({
+  opcode: (optOpcode || ''),
+  chars: 0,
+  lines: 0,
+  attribs: '',
+});
 
 /**
  * Clones an Op
  * @param op Op to be cloned
  */
-exports.cloneOp = function (op) {
-  return {
-    opcode: op.opcode,
-    chars: op.chars,
-    lines: op.lines,
-    attribs: op.attribs,
-  };
-};
+exports.cloneOp = (op) => ({
+  opcode: op.opcode,
+  chars: op.chars,
+  lines: op.lines,
+  attribs: op.attribs,
+});
 
 /**
  * Copies op1 to op2
  * @param op1 src Op
  * @param op2 dest Op
  */
-exports.copyOp = function (op1, op2) {
+exports.copyOp = (op1, op2) => {
   op2.opcode = op1.opcode;
   op2.chars = op1.chars;
   op2.lines = op1.lines;
@@ -215,7 +202,7 @@ exports.copyOp = function (op1, op2) {
 /**
  * Writes the Op in a string the way that changesets need it
  */
-exports.opString = function (op) {
+exports.opString = (op) => {
   // just for debugging
   if (!op.opcode) return 'null';
   const assem = exports.opAssembler();
@@ -226,16 +213,13 @@ exports.opString = function (op) {
 /**
  * Used just for debugging
  */
-exports.stringOp = function (str) {
-  // just for debugging
-  return exports.opIterator(str).next();
-};
+exports.stringOp = (str) => exports.opIterator(str).next();
 
 /**
  * Used to check if a Changeset if valid
  * @param cs {Changeset} Changeset to be checked
  */
-exports.checkRep = function (cs) {
+exports.checkRep = (cs) => {
   // doesn't check things that require access to attrib pool (e.g. attribute order)
   // or original string (e.g. newline positions)
   const unpacked = exports.unpack(cs);
@@ -279,7 +263,7 @@ exports.checkRep = function (cs) {
 
   assem.endDocument();
   const normalized = exports.pack(oldLen, calcNewLen, assem.toString(), charBank);
-  exports.assert(normalized == cs, 'Invalid changeset (checkRep failed)');
+  exports.assert(normalized === cs, 'Invalid changeset (checkRep failed)');
 
   return cs;
 };
@@ -293,7 +277,7 @@ exports.checkRep = function (cs) {
  * creates an object that allows you to append operations (type Op) and also
  * compresses them if possible
  */
-exports.smartOpAssembler = function () {
+exports.smartOpAssembler = () => {
   // Like opAssembler but able to produce conforming exportss
   // from slightly looser input, at the cost of speed.
   // Specifically:
@@ -308,19 +292,19 @@ exports.smartOpAssembler = function () {
   let lastOpcode = '';
   let lengthChange = 0;
 
-  function flushKeeps() {
+  const flushKeeps = () => {
     assem.append(keepAssem.toString());
     keepAssem.clear();
-  }
+  };
 
-  function flushPlusMinus() {
+  const flushPlusMinus = () => {
     assem.append(minusAssem.toString());
     minusAssem.clear();
     assem.append(plusAssem.toString());
     plusAssem.clear();
-  }
+  };
 
-  function append(op) {
+  const append = (op) => {
     if (!op.opcode) return;
     if (!op.chars) return;
 
@@ -343,9 +327,9 @@ exports.smartOpAssembler = function () {
       keepAssem.append(op);
     }
     lastOpcode = op.opcode;
-  }
+  };
 
-  function appendOpWithText(opcode, text, attribs, pool) {
+  const appendOpWithText = (opcode, text, attribs, pool) => {
     const op = exports.newOp(opcode);
     op.attribs = exports.makeAttribsString(opcode, attribs, pool);
     const lastNewlinePos = text.lastIndexOf('\n');
@@ -361,29 +345,27 @@ exports.smartOpAssembler = function () {
       op.lines = 0;
       append(op);
     }
-  }
+  };
 
-  function toString() {
+  const toString = () => {
     flushPlusMinus();
     flushKeeps();
     return assem.toString();
-  }
+  };
 
-  function clear() {
+  const clear = () => {
     minusAssem.clear();
     plusAssem.clear();
     keepAssem.clear();
     assem.clear();
     lengthChange = 0;
-  }
+  };
 
-  function endDocument() {
+  const endDocument = () => {
     keepAssem.endDocument();
-  }
+  };
 
-  function getLengthChange() {
-    return lengthChange;
-  }
+  const getLengthChange = () => lengthChange;
 
   return {
     append,
@@ -396,7 +378,7 @@ exports.smartOpAssembler = function () {
 };
 
 
-exports.mergingOpAssembler = function () {
+exports.mergingOpAssembler = () => {
   // This assembler can be used in production; it efficiently
   // merges consecutive operations that are mergeable, ignores
   // no-ops, and drops final pure "keeps".  It does not re-order
@@ -410,7 +392,7 @@ exports.mergingOpAssembler = function () {
   // ops immediately after it.
   let bufOpAdditionalCharsAfterNewline = 0;
 
-  function flush(isEndDocument) {
+  const flush = (isEndDocument) => {
     if (bufOp.opcode) {
       if (isEndDocument && bufOp.opcode == '=' && !bufOp.attribs) {
         // final merged keep, leave it implicit
@@ -425,9 +407,9 @@ exports.mergingOpAssembler = function () {
       }
       bufOp.opcode = '';
     }
-  }
+  };
 
-  function append(op) {
+  const append = (op) => {
     if (op.chars > 0) {
       if (bufOp.opcode == op.opcode && bufOp.attribs == op.attribs) {
         if (op.lines > 0) {
@@ -447,21 +429,21 @@ exports.mergingOpAssembler = function () {
         exports.copyOp(op, bufOp);
       }
     }
-  }
+  };
 
-  function endDocument() {
+  const endDocument = () => {
     flush(true);
-  }
+  };
 
-  function toString() {
+  const toString = () => {
     flush();
     return assem.toString();
-  }
+  };
 
-  function clear() {
+  const clear = () => {
     assem.clear();
     exports.clearOp(bufOp);
-  }
+  };
   return {
     append,
     toString,
@@ -471,26 +453,24 @@ exports.mergingOpAssembler = function () {
 };
 
 
-exports.opAssembler = function () {
+exports.opAssembler = () => {
   const pieces = [];
   // this function allows op to be mutated later (doesn't keep a ref)
 
-  function append(op) {
+  const append = (op) => {
     pieces.push(op.attribs);
     if (op.lines) {
       pieces.push('|', exports.numToString(op.lines));
     }
     pieces.push(op.opcode);
     pieces.push(exports.numToString(op.chars));
-  }
+  };
 
-  function toString() {
-    return pieces.join('');
-  }
+  const toString = () => pieces.join('');
 
-  function clear() {
+  const clear = () => {
     pieces.length = 0;
-  }
+  };
   return {
     append,
     toString,
@@ -502,40 +482,36 @@ exports.opAssembler = function () {
  * A custom made String Iterator
  * @param str {string} String to be iterated over
  */
-exports.stringIterator = function (str) {
+exports.stringIterator = (str) => {
   let curIndex = 0;
   // newLines is the number of \n between curIndex and str.length
   let newLines = str.split('\n').length - 1;
-  function getnewLines() {
-    return newLines;
-  }
+  const getnewLines = () => newLines;
 
-  function assertRemaining(n) {
+  const assertRemaining = (n) => {
     exports.assert(n <= remaining(), '!(', n, ' <= ', remaining(), ')');
-  }
+  };
 
-  function take(n) {
+  const take = (n) => {
     assertRemaining(n);
     const s = str.substr(curIndex, n);
     newLines -= s.split('\n').length - 1;
     curIndex += n;
     return s;
-  }
+  };
 
-  function peek(n) {
+  const peek = (n) => {
     assertRemaining(n);
     const s = str.substr(curIndex, n);
     return s;
-  }
+  };
 
-  function skip(n) {
+  const skip = (n) => {
     assertRemaining(n);
     curIndex += n;
-  }
+  };
 
-  function remaining() {
-    return str.length - curIndex;
-  }
+  const remaining = () => str.length - curIndex;
   return {
     take,
     skip,
@@ -548,16 +524,14 @@ exports.stringIterator = function (str) {
 /**
  * A custom made StringBuffer
  */
-exports.stringAssembler = function () {
+exports.stringAssembler = () => {
   const pieces = [];
 
-  function append(x) {
+  const append = (x) => {
     pieces.push(String(x));
-  }
+  };
 
-  function toString() {
-    return pieces.join('');
-  }
+  const toString = () => pieces.join('');
   return {
     append,
     toString,
@@ -569,7 +543,7 @@ exports.stringAssembler = function () {
  * It is used for applying Changesets on arrays of lines
  * Note from prev docs: "lines" need not be an array as long as it supports certain calls (lines_foo inside).
  */
-exports.textLinesMutator = function (lines) {
+exports.textLinesMutator = (lines) => {
   // Mutates lines, an array of strings, in place.
   // Mutation operations have the same constraints as exports operations
   // with respect to newlines, but not the other additional constraints
@@ -588,72 +562,68 @@ exports.textLinesMutator = function (lines) {
   // invariant: if (inSplice && (curLine >= curSplice[0] + curSplice.length - 2)) then
   //            curCol == 0
 
-  function lines_applySplice(s) {
+  const lines_applySplice = (s) => {
     lines.splice.apply(lines, s);
-  }
+  };
 
-  function lines_toSource() {
-    return lines.toSource();
-  }
+  const lines_toSource = () => lines.toSource();
 
-  function lines_get(idx) {
+  const lines_get = (idx) => {
     if (lines.get) {
       return lines.get(idx);
     } else {
       return lines[idx];
     }
-  }
+  };
   // can be unimplemented if removeLines's return value not needed
 
-  function lines_slice(start, end) {
+  const lines_slice = (start, end) => {
     if (lines.slice) {
       return lines.slice(start, end);
     } else {
       return [];
     }
-  }
+  };
 
-  function lines_length() {
+  const lines_length = () => {
     if ((typeof lines.length) === 'number') {
       return lines.length;
     } else {
       return lines.length();
     }
-  }
+  };
 
-  function enterSplice() {
+  const enterSplice = () => {
     curSplice[0] = curLine;
     curSplice[1] = 0;
     if (curCol > 0) {
       putCurLineInSplice();
     }
     inSplice = true;
-  }
+  };
 
-  function leaveSplice() {
+  const leaveSplice = () => {
     lines_applySplice(curSplice);
     curSplice.length = 2;
     curSplice[0] = curSplice[1] = 0;
     inSplice = false;
-  }
+  };
 
-  function isCurLineInSplice() {
-    return (curLine - curSplice[0] < (curSplice.length - 2));
-  }
+  const isCurLineInSplice = () => (curLine - curSplice[0] < (curSplice.length - 2));
 
-  function debugPrint(typ) {
+  const debugPrint = (typ) => {
     print(`${typ}: ${curSplice.toSource()} / ${curLine},${curCol} / ${lines_toSource()}`);
-  }
+  };
 
-  function putCurLineInSplice() {
+  const putCurLineInSplice = () => {
     if (!isCurLineInSplice()) {
       curSplice.push(lines_get(curSplice[0] + curSplice[1]));
       curSplice[1]++;
     }
     return 2 + curLine - curSplice[0];
-  }
+  };
 
-  function skipLines(L, includeInSplice) {
+  const skipLines = (L, includeInSplice) => {
     if (L) {
       if (includeInSplice) {
         if (!inSplice) {
@@ -683,9 +653,9 @@ exports.textLinesMutator = function (lines) {
       // tests case foo in remove(), which isn't otherwise covered in current impl
     }
     // debugPrint("skip");
-  }
+  };
 
-  function skip(N, L, includeInSplice) {
+  const skip = (N, L, includeInSplice) => {
     if (N) {
       if (L) {
         skipLines(L, includeInSplice);
@@ -700,19 +670,19 @@ exports.textLinesMutator = function (lines) {
         // debugPrint("skip");
       }
     }
-  }
+  };
 
-  function removeLines(L) {
+  const removeLines = (L) => {
     let removed = '';
     if (L) {
       if (!inSplice) {
         enterSplice();
       }
 
-      function nextKLinesText(k) {
+      const nextKLinesText = (k) => {
         const m = curSplice[0] + curSplice[1];
         return lines_slice(m, m + k).join('');
-      }
+      };
       if (isCurLineInSplice()) {
         // print(curCol);
         if (curCol == 0) {
@@ -736,9 +706,9 @@ exports.textLinesMutator = function (lines) {
       // debugPrint("remove");
     }
     return removed;
-  }
+  };
 
-  function remove(N, L) {
+  const remove = (N, L) => {
     let removed = '';
     if (N) {
       if (L) {
@@ -754,9 +724,9 @@ exports.textLinesMutator = function (lines) {
       }
     }
     return removed;
-  }
+  };
 
-  function insert(text, L) {
+  const insert = (text, L) => {
     if (text) {
       if (!inSplice) {
         enterSplice();
@@ -796,23 +766,23 @@ exports.textLinesMutator = function (lines) {
       }
       // debugPrint("insert");
     }
-  }
+  };
 
-  function hasMore() {
+  const hasMore = () => {
     // print(lines.length+" / "+inSplice+" / "+(curSplice.length - 2)+" / "+curSplice[1]);
     let docLines = lines_length();
     if (inSplice) {
       docLines += curSplice.length - 2 - curSplice[1];
     }
     return curLine < docLines;
-  }
+  };
 
-  function close() {
+  const close = () => {
     if (inSplice) {
       leaveSplice();
     }
     // debugPrint("close");
-  }
+  };
 
   const self = {
     skip,
@@ -841,7 +811,7 @@ exports.textLinesMutator = function (lines) {
  *             opOut - result operator to be put into Changeset
  * @return {string} the integrated changeset
  */
-exports.applyZip = function (in1, idx1, in2, idx2, func) {
+exports.applyZip = (in1, idx1, in2, idx2, func) => {
   const iter1 = exports.opIterator(in1, idx1);
   const iter2 = exports.opIterator(in2, idx2);
   const assem = exports.smartOpAssembler();
@@ -867,7 +837,7 @@ exports.applyZip = function (in1, idx1, in2, idx2, func) {
  * @params cs {string} String encoded Changeset
  * @returns {Changeset} a Changeset class
  */
-exports.unpack = function (cs) {
+exports.unpack = (cs) => {
   const headerRegex = /Z:([0-9a-z]+)([><])([0-9a-z]+)|/;
   const headerMatch = headerRegex.exec(cs);
   if ((!headerMatch) || (!headerMatch[0])) {
@@ -896,7 +866,7 @@ exports.unpack = function (cs) {
  * @params bank {string} Charbank of the Changeset
  * @returns {Changeset} a Changeset class
  */
-exports.pack = function (oldLen, newLen, opsStr, bank) {
+exports.pack = (oldLen, newLen, opsStr, bank) => {
   const lenDiff = newLen - oldLen;
   const lenDiffStr = (lenDiff >= 0 ? `>${exports.numToString(lenDiff)}` : `<${exports.numToString(-lenDiff)}`);
   const a = [];
@@ -909,7 +879,7 @@ exports.pack = function (oldLen, newLen, opsStr, bank) {
  * @params cs {string} String encoded Changeset
  * @params str {string} String to which a Changeset should be applied
  */
-exports.applyToText = function (cs, str) {
+exports.applyToText = (cs, str) => {
   const unpacked = exports.unpack(cs);
   exports.assert(str.length == unpacked.oldLen, 'mismatched apply: ', str.length, ' / ', unpacked.oldLen);
   const csIter = exports.opIterator(unpacked.ops);
@@ -954,7 +924,7 @@ exports.applyToText = function (cs, str) {
  * @param CS {Changeset} the changeset to be applied
  * @param lines The lines to which the changeset needs to be applied
  */
-exports.mutateTextLines = function (cs, lines) {
+exports.mutateTextLines = (cs, lines) => {
   const unpacked = exports.unpack(cs);
   const csIter = exports.opIterator(unpacked.ops);
   const bankIter = exports.stringIterator(unpacked.charBank);
@@ -983,7 +953,7 @@ exports.mutateTextLines = function (cs, lines) {
  * @param resultIsMutaton {boolean}
  * @param pool {AttribPool} attribute pool
  */
-exports.composeAttributes = function (att1, att2, resultIsMutation, pool) {
+exports.composeAttributes = (att1, att2, resultIsMutation, pool) => {
   // att1 and att2 are strings like "*3*f*1c", asMutation is a boolean.
   // Sometimes attribute (key,value) pairs are treated as attribute presence
   // information, while other times they are treated as operations that
@@ -1044,7 +1014,7 @@ exports.composeAttributes = function (att1, att2, resultIsMutation, pool) {
  * Function used as parameter for applyZip to apply a Changeset to an
  * attribute
  */
-exports._slicerZipperFunc = function (attOp, csOp, opOut, pool) {
+exports._slicerZipperFunc = (attOp, csOp, opOut, pool) => {
   // attOp is the op from the sequence that is being operated on, either an
   // attribution string or the earlier of two exportss being composed.
   // pool can be null if definitely not needed.
@@ -1136,7 +1106,7 @@ exports._slicerZipperFunc = function (attOp, csOp, opOut, pool) {
  * @param astr {string} the attribs string of a AText
  * @param pool {AttribsPool} the attibutes pool
  */
-exports.applyToAttribution = function (cs, astr, pool) {
+exports.applyToAttribution = (cs, astr, pool) => {
   const unpacked = exports.unpack(cs);
 
   return exports.applyZip(astr, 0, unpacked.ops, 0, (op1, op2, opOut) => exports._slicerZipperFunc(op1, op2, opOut, pool));
@@ -1148,7 +1118,7 @@ exports.applyToAttribution = function (cs, astr, pool) {
 
 };*/
 
-exports.mutateAttributionLines = function (cs, lines, pool) {
+exports.mutateAttributionLines = (cs, lines, pool) => {
   // dmesg(cs);
   // dmesg(lines.toSource()+" ->");
   const unpacked = exports.unpack(cs);
@@ -1160,11 +1130,9 @@ exports.mutateAttributionLines = function (cs, lines, pool) {
 
   let lineIter = null;
 
-  function isNextMutOp() {
-    return (lineIter && lineIter.hasNext()) || mut.hasMore();
-  }
+  const isNextMutOp = () => (lineIter && lineIter.hasNext()) || mut.hasMore();
 
-  function nextMutOp(destOp) {
+  const nextMutOp = (destOp) => {
     if ((!(lineIter && lineIter.hasNext())) && mut.hasMore()) {
       const line = mut.removeLines(1);
       lineIter = exports.opIterator(line);
@@ -1174,10 +1142,10 @@ exports.mutateAttributionLines = function (cs, lines, pool) {
     } else {
       destOp.opcode = '';
     }
-  }
+  };
   let lineAssem = null;
 
-  function outputMutOp(op) {
+  const outputMutOp = (op) => {
     // print("outputMutOp: "+op.toSource());
     if (!lineAssem) {
       lineAssem = exports.mergingOpAssembler();
@@ -1189,7 +1157,7 @@ exports.mutateAttributionLines = function (cs, lines, pool) {
       mut.insert(lineAssem.toString(), 1);
       lineAssem = null;
     }
-  }
+  };
 
   const csOp = exports.newOp();
   const attOp = exports.newOp();
@@ -1247,7 +1215,7 @@ exports.mutateAttributionLines = function (cs, lines, pool) {
  * @param theAlines collection of Attribution lines
  * @returns {string} joined Attribution lines
  */
-exports.joinAttributionLines = function (theAlines) {
+exports.joinAttributionLines = (theAlines) => {
   const assem = exports.mergingOpAssembler();
   for (let i = 0; i < theAlines.length; i++) {
     const aline = theAlines[i];
@@ -1259,20 +1227,20 @@ exports.joinAttributionLines = function (theAlines) {
   return assem.toString();
 };
 
-exports.splitAttributionLines = function (attrOps, text) {
+exports.splitAttributionLines = (attrOps, text) => {
   const iter = exports.opIterator(attrOps);
   const assem = exports.mergingOpAssembler();
   const lines = [];
   let pos = 0;
 
-  function appendOp(op) {
+  const appendOp = (op) => {
     assem.append(op);
     if (op.lines > 0) {
       lines.push(assem.toString());
       assem.clear();
     }
     pos += op.chars;
-  }
+  };
 
   while (iter.hasNext()) {
     const op = iter.next();
@@ -1301,9 +1269,7 @@ exports.splitAttributionLines = function (attrOps, text) {
  * splits text into lines
  * @param {string} text to be splitted
  */
-exports.splitTextLines = function (text) {
-  return text.match(/[^\n]*(?:\n|[^\n]$)/g);
-};
+exports.splitTextLines = (text) => text.match(/[^\n]*(?:\n|[^\n]$)/g);
 
 /**
  * compose two Changesets
@@ -1311,7 +1277,7 @@ exports.splitTextLines = function (text) {
  * @param cs2 {Changeset} second Changeset
  * @param pool {AtribsPool} Attribs pool
  */
-exports.compose = function (cs1, cs2, pool) {
+exports.compose = (cs1, cs2, pool) => {
   const unpacked1 = exports.unpack(cs1);
   const unpacked2 = exports.unpack(cs2);
   const len1 = unpacked1.oldLen;
@@ -1360,7 +1326,8 @@ exports.compose = function (cs1, cs2, pool) {
  * @param attribPair array [key,value] of the attribute
  * @param pool {AttribPool} Attribute pool
  */
-exports.attributeTester = function (attribPair, pool) {
+exports.attributeTester = (attribPair, pool) => {
+  const never = (attribs) => false;
   if (!pool) {
     return never;
   }
@@ -1373,19 +1340,13 @@ exports.attributeTester = function (attribPair, pool) {
       return re.test(attribs);
     };
   }
-
-  function never(attribs) {
-    return false;
-  }
 };
 
 /**
  * creates the identity Changeset of length N
  * @param N {int} length of the identity changeset
  */
-exports.identity = function (N) {
-  return exports.pack(N, N, '', '');
-};
+exports.identity = (N) => exports.pack(N, N, '', '');
 
 
 /**
@@ -1400,7 +1361,7 @@ exports.identity = function (N) {
  * @param optNewTextAPairs {string} new pairs to be inserted
  * @param pool {AttribPool} Attribution Pool
  */
-exports.makeSplice = function (oldFullText, spliceStart, numRemoved, newText, optNewTextAPairs, pool) {
+exports.makeSplice = (oldFullText, spliceStart, numRemoved, newText, optNewTextAPairs, pool) => {
   const oldLen = oldFullText.length;
 
   if (spliceStart >= oldLen) {
@@ -1426,7 +1387,7 @@ exports.makeSplice = function (oldFullText, spliceStart, numRemoved, newText, op
  * startChar to endChar with newText
  * @param cs Changeset
  */
-exports.toSplices = function (cs) {
+exports.toSplices = (cs) => {
   //
   const unpacked = exports.unpack(cs);
   const splices = [];
@@ -1460,7 +1421,7 @@ exports.toSplices = function (cs) {
 /**
  *
  */
-exports.characterRangeFollow = function (cs, startChar, endChar, insertionsAfter) {
+exports.characterRangeFollow = (cs, startChar, endChar, insertionsAfter) => {
   let newStartChar = startChar;
   let newEndChar = endChar;
   const splices = exports.toSplices(cs);
@@ -1512,7 +1473,7 @@ exports.characterRangeFollow = function (cs, startChar, endChar, insertionsAfter
  * @param newPool {AttribPool} new attributes pool
  * @return {string} the new Changeset
  */
-exports.moveOpsToNewPool = function (cs, oldPool, newPool) {
+exports.moveOpsToNewPool = (cs, oldPool, newPool) => {
   // works on exports or attribution string
   let dollarPos = cs.indexOf('$');
   if (dollarPos < 0) {
@@ -1544,7 +1505,7 @@ exports.moveOpsToNewPool = function (cs, oldPool, newPool) {
  * create an attribution inserting a text
  * @param text {string} text to be inserted
  */
-exports.makeAttribution = function (text) {
+exports.makeAttribution = (text) => {
   const assem = exports.smartOpAssembler();
   assem.appendOpWithText('+', text);
   return assem.toString();
@@ -1556,7 +1517,7 @@ exports.makeAttribution = function (text) {
  * @param cs {Changeset} changeset
  * @param func {function} function to be called
  */
-exports.eachAttribNumber = function (cs, func) {
+exports.eachAttribNumber = (cs, func) => {
   let dollarPos = cs.indexOf('$');
   if (dollarPos < 0) {
     dollarPos = cs.length;
@@ -1577,14 +1538,14 @@ exports.eachAttribNumber = function (cs, func) {
  * @param filter {function} fnc which returns true if an
  *        attribute X (int) should be kept in the Changeset
  */
-exports.filterAttribNumbers = function (cs, filter) {
+exports.filterAttribNumbers = (cs, filter) => {
   return exports.mapAttribNumbers(cs, filter);
 };
 
 /**
  * does exactly the same as exports.filterAttribNumbers
  */
-exports.mapAttribNumbers = function (cs, func) {
+exports.mapAttribNumbers = (cs, func) => {
   let dollarPos = cs.indexOf('$');
   if (dollarPos < 0) {
     dollarPos = cs.length;
@@ -1611,7 +1572,7 @@ exports.mapAttribNumbers = function (cs, func) {
  * @attribs attribs {string} optional, operations which insert
  *    the text and also puts the right attributes
  */
-exports.makeAText = function (text, attribs) {
+exports.makeAText = (text, attribs) => {
   return {
     text,
     attribs: (attribs || exports.makeAttribution(text)),
@@ -1624,7 +1585,7 @@ exports.makeAText = function (text, attribs) {
  * @param atext {AText}
  * @param pool {AttribPool} Attribute Pool to add to
  */
-exports.applyToAText = function (cs, atext, pool) {
+exports.applyToAText = (cs, atext, pool) => {
   return {
     text: exports.applyToText(cs, atext.text),
     attribs: exports.applyToAttribution(cs, atext.attribs, pool),
@@ -1635,7 +1596,7 @@ exports.applyToAText = function (cs, atext, pool) {
  * Clones a AText structure
  * @param atext {AText}
  */
-exports.cloneAText = function (atext) {
+exports.cloneAText = (atext) => {
   if (atext) {
     return {
       text: atext.text,
@@ -1648,7 +1609,7 @@ exports.cloneAText = function (atext) {
  * Copies a AText structure from atext1 to atext2
  * @param atext {AText}
  */
-exports.copyAText = function (atext1, atext2) {
+exports.copyAText = (atext1, atext2) => {
   atext2.text = atext1.text;
   atext2.attribs = atext1.attribs;
 };
@@ -1658,7 +1619,7 @@ exports.copyAText = function (atext1, atext2) {
  * @param atext {AText}
  * @param assem Assembler like smartOpAssembler
  */
-exports.appendATextToAssembler = function (atext, assem) {
+exports.appendATextToAssembler = (atext, assem) => {
   // intentionally skips last newline char of atext
   const iter = exports.opIterator(atext.attribs);
   const op = exports.newOp();
@@ -1696,7 +1657,7 @@ exports.appendATextToAssembler = function (atext, assem) {
  * @param cs {Changeset}
  * @param pool {AtributePool}
  */
-exports.prepareForWire = function (cs, pool) {
+exports.prepareForWire = (cs, pool) => {
   const newPool = new AttributePool();
   const newCs = exports.moveOpsToNewPool(cs, pool, newPool);
   return {
@@ -1708,7 +1669,7 @@ exports.prepareForWire = function (cs, pool) {
 /**
  * Checks if a changeset s the identity changeset
  */
-exports.isIdentity = function (cs) {
+exports.isIdentity = (cs) => {
   const unpacked = exports.unpack(cs);
   return unpacked.ops == '' && unpacked.oldLen == unpacked.newLen;
 };
@@ -1720,9 +1681,7 @@ exports.isIdentity = function (cs) {
  * @param key {string} string to be seached for
  * @param pool {AttribPool} attribute pool
  */
-exports.opAttributeValue = function (op, key, pool) {
-  return exports.attribsAttributeValue(op.attribs, key, pool);
-};
+exports.opAttributeValue = (op, key, pool) => exports.attribsAttributeValue(op.attribs, key, pool);
 
 /**
  * returns all the values of attributes with a certain key
@@ -1731,7 +1690,7 @@ exports.opAttributeValue = function (op, key, pool) {
  * @param key {string} string to be seached for
  * @param pool {AttribPool} attribute pool
  */
-exports.attribsAttributeValue = function (attribs, key, pool) {
+exports.attribsAttributeValue = (attribs, key, pool) => {
   let value = '';
   if (attribs) {
     exports.eachAttribNumber(attribs, (n) => {
@@ -1748,7 +1707,7 @@ exports.attribsAttributeValue = function (attribs, key, pool) {
  * length oldLen. Allows to add/remove parts of it
  * @param oldLen {int} Old length
  */
-exports.builder = function (oldLen) {
+exports.builder = (oldLen) => {
   const assem = exports.smartOpAssembler();
   const o = exports.newOp();
   const charBank = exports.stringAssembler();
@@ -1763,7 +1722,7 @@ exports.builder = function (oldLen) {
       assem.append(o);
       return self;
     },
-    keepText(text, attribs, pool) {
+    keepText: (text, attribs, pool) => {
       assem.appendOpWithText('=', text, attribs, pool);
       return self;
     },
@@ -1790,7 +1749,7 @@ exports.builder = function (oldLen) {
   return self;
 };
 
-exports.makeAttribsString = function (opcode, attribs, pool) {
+exports.makeAttribsString = (opcode, attribs, pool) => {
   // makeAttribsString(opcode, '*3') or makeAttribsString(opcode, [['foo','bar']], myPool) work
   if (!attribs) {
     return '';
@@ -1813,14 +1772,14 @@ exports.makeAttribsString = function (opcode, attribs, pool) {
 };
 
 // like "substring" but on a single-line attribution string
-exports.subattribution = function (astr, start, optEnd) {
+exports.subattribution = (astr, start, optEnd) => {
   const iter = exports.opIterator(astr, 0);
   const assem = exports.smartOpAssembler();
   const attOp = exports.newOp();
   const csOp = exports.newOp();
   const opOut = exports.newOp();
 
-  function doCsOp() {
+  const doCsOp = () => {
     if (csOp.chars) {
       while (csOp.opcode && (attOp.opcode || iter.hasNext())) {
         if (!attOp.opcode) iter.next(attOp);
@@ -1860,12 +1819,12 @@ exports.subattribution = function (astr, start, optEnd) {
   return assem.toString();
 };
 
-exports.inverse = function (cs, lines, alines, pool) {
+exports.inverse = (cs, lines, alines, pool) => {
   // lines and alines are what the exports is meant to apply to.
   // They may be arrays or objects with .get(i) and .length methods.
   // They include final newlines on lines.
 
-  function lines_get(idx) {
+  const lines_get = (idx) => {
     if (lines.get) {
       return lines.get(idx);
     } else {
@@ -1873,7 +1832,7 @@ exports.inverse = function (cs, lines, alines, pool) {
     }
   }
 
-  function alines_get(idx) {
+  const alines_get = (idx) => {
     if (alines.get) {
       return alines.get(idx);
     } else {
@@ -1891,7 +1850,7 @@ exports.inverse = function (cs, lines, alines, pool) {
   const csIter = exports.opIterator(unpacked.ops);
   const builder = exports.builder(unpacked.newLen);
 
-  function consumeAttribRuns(numChars, func /* (len, attribs, endsLine)*/) {
+  const consumeAttribRuns = (numChars, func /* (len, attribs, endsLine)*/) => {
     if ((!curLineOpIter) || (curLineOpIterLine != curLine)) {
       // create curLineOpIter and advance it to curChar
       curLineOpIter = exports.opIterator(alines_get(curLine));
@@ -1933,7 +1892,7 @@ exports.inverse = function (cs, lines, alines, pool) {
     }
   }
 
-  function skip(N, L) {
+  const skip = (N, L) => {
     if (L) {
       curLine += L;
       curChar = 0;
@@ -1942,9 +1901,9 @@ exports.inverse = function (cs, lines, alines, pool) {
     } else {
       curChar += N;
     }
-  }
+  };
 
-  function nextText(numChars) {
+  const nextText = (numChars) => {
     let len = 0;
     const assem = exports.stringAssembler();
     const firstString = lines_get(curLine).substring(curChar);
@@ -1962,7 +1921,7 @@ exports.inverse = function (cs, lines, alines, pool) {
     return assem.toString().substring(0, numChars);
   }
 
-  function cachedStrFunc(func) {
+  const cachedStrFunc = (func) => {
     const cache = {};
     return function (s) {
       if (!cache[s]) {
@@ -2019,7 +1978,7 @@ exports.inverse = function (cs, lines, alines, pool) {
 };
 
 // %CLIENT FILE ENDS HERE%
-exports.follow = function (cs1, cs2, reverseInsertOrder, pool) {
+exports.follow = (cs1, cs2, reverseInsertOrder, pool) => {
   const unpacked1 = exports.unpack(cs1);
   const unpacked2 = exports.unpack(cs2);
   const len1 = unpacked1.oldLen;
@@ -2160,7 +2119,7 @@ exports.follow = function (cs1, cs2, reverseInsertOrder, pool) {
   return exports.pack(oldLen, newLen, newOps, unpacked2.charBank);
 };
 
-exports.followAttributes = function (att1, att2, pool) {
+exports.followAttributes = (att1, att2, pool) => {
   // The merge of two sets of attribute changes to the same text
   // takes the lexically-earlier value if there are two values
   // for the same key.  Otherwise, all key/value changes from
@@ -2197,7 +2156,7 @@ exports.followAttributes = function (att1, att2, pool) {
   return buf.toString();
 };
 
-exports.composeWithDeletions = function (cs1, cs2, pool) {
+exports.composeWithDeletions = (cs1, cs2, pool) => {
   const unpacked1 = exports.unpack(cs1);
   const unpacked2 = exports.unpack(cs2);
   const len1 = unpacked1.oldLen;
@@ -2229,7 +2188,7 @@ exports.composeWithDeletions = function (cs1, cs2, pool) {
 
 // This function is 95% like _slicerZipperFunc, we just changed two lines to ensure it merges the attribs of deletions properly.
 // This is necassary for correct paddiff. But to ensure these changes doesn't affect anything else, we've created a seperate function only used for paddiffs
-exports._slicerZipperFuncWithDeletions = function (attOp, csOp, opOut, pool) {
+exports._slicerZipperFuncWithDeletions = (attOp, csOp, opOut, pool) => {
   // attOp is the op from the sequence that is being operated on, either an
   // attribution string or the earlier of two exportss being composed.
   // pool can be null if definitely not needed.

From d91f2b5b077717dcb1d7a3558d46644469248616 Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Wed, 17 Feb 2021 15:35:53 +0000
Subject: [PATCH 028/115] lint: Changeset.js additional arrow functions

---
 src/static/js/Changeset.js | 50 ++++++++++++++++----------------------
 1 file changed, 21 insertions(+), 29 deletions(-)

diff --git a/src/static/js/Changeset.js b/src/static/js/Changeset.js
index 18018454..6c7905a5 100644
--- a/src/static/js/Changeset.js
+++ b/src/static/js/Changeset.js
@@ -1336,9 +1336,7 @@ exports.attributeTester = (attribPair, pool) => {
     return never;
   } else {
     const re = new RegExp(`\\*${exports.numToString(attribNum)}(?!\\w)`);
-    return function (attribs) {
-      return re.test(attribs);
-    };
+    return (attribs) => re.test(attribs);
   }
 };
 
@@ -1538,9 +1536,7 @@ exports.eachAttribNumber = (cs, func) => {
  * @param filter {function} fnc which returns true if an
  *        attribute X (int) should be kept in the Changeset
  */
-exports.filterAttribNumbers = (cs, filter) => {
-  return exports.mapAttribNumbers(cs, filter);
-};
+exports.filterAttribNumbers = (cs, filter) => exports.mapAttribNumbers(cs, filter);
 
 /**
  * does exactly the same as exports.filterAttribNumbers
@@ -1572,12 +1568,10 @@ exports.mapAttribNumbers = (cs, func) => {
  * @attribs attribs {string} optional, operations which insert
  *    the text and also puts the right attributes
  */
-exports.makeAText = (text, attribs) => {
-  return {
-    text,
-    attribs: (attribs || exports.makeAttribution(text)),
-  };
-};
+exports.makeAText = (text, attribs) => ({
+  text,
+  attribs: (attribs || exports.makeAttribution(text)),
+});
 
 /**
  * Apply a Changeset to a AText
@@ -1585,12 +1579,10 @@ exports.makeAText = (text, attribs) => {
  * @param atext {AText}
  * @param pool {AttribPool} Attribute Pool to add to
  */
-exports.applyToAText = (cs, atext, pool) => {
-  return {
-    text: exports.applyToText(cs, atext.text),
-    attribs: exports.applyToAttribution(cs, atext.attribs, pool),
-  };
-};
+exports.applyToAText = (cs, atext, pool) => ({
+  text: exports.applyToText(cs, atext.text),
+  attribs: exports.applyToAttribution(cs, atext.attribs, pool),
+});
 
 /**
  * Clones a AText structure
@@ -1714,7 +1706,7 @@ exports.builder = (oldLen) => {
 
   var self = {
     // attribs are [[key1,value1],[key2,value2],...] or '*0*1...' (no pool needed in latter case)
-    keep(N, L, attribs, pool) {
+    keep: (N, L, attribs, pool) => {
       o.opcode = '=';
       o.attribs = (attribs && exports.makeAttribsString('=', attribs, pool)) || '';
       o.chars = N;
@@ -1726,12 +1718,12 @@ exports.builder = (oldLen) => {
       assem.appendOpWithText('=', text, attribs, pool);
       return self;
     },
-    insert(text, attribs, pool) {
+    insert: (text, attribs, pool) => {
       assem.appendOpWithText('+', text, attribs, pool);
       charBank.append(text);
       return self;
     },
-    remove(N, L) {
+    remove: (N, L) => {
       o.opcode = '-';
       o.attribs = '';
       o.chars = N;
@@ -1739,7 +1731,7 @@ exports.builder = (oldLen) => {
       assem.append(o);
       return self;
     },
-    toString() {
+    toString: () => {
       assem.endDocument();
       const newLen = oldLen + assem.getLengthChange();
       return exports.pack(oldLen, newLen, assem.toString(), charBank.toString());
@@ -1795,7 +1787,7 @@ exports.subattribution = (astr, start, optEnd) => {
         }
       }
     }
-  }
+  };
 
   csOp.opcode = '-';
   csOp.chars = start;
@@ -1830,7 +1822,7 @@ exports.inverse = (cs, lines, alines, pool) => {
     } else {
       return lines[idx];
     }
-  }
+  };
 
   const alines_get = (idx) => {
     if (alines.get) {
@@ -1838,7 +1830,7 @@ exports.inverse = (cs, lines, alines, pool) => {
     } else {
       return alines[idx];
     }
-  }
+  };
 
   let curLine = 0;
   let curChar = 0;
@@ -1890,7 +1882,7 @@ exports.inverse = (cs, lines, alines, pool) => {
       curLine++;
       curChar = 0;
     }
-  }
+  };
 
   const skip = (N, L) => {
     if (L) {
@@ -1919,17 +1911,17 @@ exports.inverse = (cs, lines, alines, pool) => {
     }
 
     return assem.toString().substring(0, numChars);
-  }
+  };
 
   const cachedStrFunc = (func) => {
     const cache = {};
-    return function (s) {
+    return (s) => {
       if (!cache[s]) {
         cache[s] = func(s);
       }
       return cache[s];
     };
-  }
+  };
 
   const attribKeys = [];
   const attribValues = [];

From 98a0e76a20e4fb5d652779caa7d37d96b93a3618 Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Wed, 17 Feb 2021 15:53:42 +0000
Subject: [PATCH 029/115] lint: Changeset.js opcode eqeqeq checks

---
 src/static/js/Changeset.js | 76 +++++++++++++++++++-------------------
 1 file changed, 38 insertions(+), 38 deletions(-)

diff --git a/src/static/js/Changeset.js b/src/static/js/Changeset.js
index 6c7905a5..28863ef4 100644
--- a/src/static/js/Changeset.js
+++ b/src/static/js/Changeset.js
@@ -308,20 +308,20 @@ exports.smartOpAssembler = () => {
     if (!op.opcode) return;
     if (!op.chars) return;
 
-    if (op.opcode == '-') {
-      if (lastOpcode == '=') {
+    if (op.opcode === '-') {
+      if (lastOpcode === '=') {
         flushKeeps();
       }
       minusAssem.append(op);
       lengthChange -= op.chars;
-    } else if (op.opcode == '+') {
-      if (lastOpcode == '=') {
+    } else if (op.opcode === '+') {
+      if (lastOpcode === '=') {
         flushKeeps();
       }
       plusAssem.append(op);
       lengthChange += op.chars;
-    } else if (op.opcode == '=') {
-      if (lastOpcode != '=') {
+    } else if (op.opcode === '=') {
+      if (lastOpcode !== '=') {
         flushPlusMinus();
       }
       keepAssem.append(op);
@@ -394,7 +394,7 @@ exports.mergingOpAssembler = () => {
 
   const flush = (isEndDocument) => {
     if (bufOp.opcode) {
-      if (isEndDocument && bufOp.opcode == '=' && !bufOp.attribs) {
+      if (isEndDocument && bufOp.opcode === '=' && !bufOp.attribs) {
         // final merged keep, leave it implicit
       } else {
         assem.append(bufOp);
@@ -411,7 +411,7 @@ exports.mergingOpAssembler = () => {
 
   const append = (op) => {
     if (op.chars > 0) {
-      if (bufOp.opcode == op.opcode && bufOp.attribs == op.attribs) {
+      if (bufOp.opcode === op.opcode && bufOp.attribs === op.attribs) {
         if (op.lines > 0) {
           // bufOp and additional chars are all mergeable into a multi-line op
           bufOp.chars += bufOpAdditionalCharsAfterNewline + op.chars;
@@ -844,7 +844,7 @@ exports.unpack = (cs) => {
     exports.error(`Not a exports: ${cs}`);
   }
   const oldLen = exports.parseNum(headerMatch[1]);
-  const changeSign = (headerMatch[2] == '>') ? 1 : -1;
+  const changeSign = (headerMatch[2] === '>') ? 1 : -1;
   const changeMag = exports.parseNum(headerMatch[3]);
   const newLen = oldLen + changeSign * changeMag;
   const opsStart = headerMatch[0].length;
@@ -1019,7 +1019,7 @@ exports._slicerZipperFunc = (attOp, csOp, opOut, pool) => {
   // attribution string or the earlier of two exportss being composed.
   // pool can be null if definitely not needed.
   // print(csOp.toSource()+" "+attOp.toSource()+" "+opOut.toSource());
-  if (attOp.opcode == '-') {
+  if (attOp.opcode === '-') {
     exports.copyOp(attOp, opOut);
     attOp.opcode = '';
   } else if (!attOp.opcode) {
@@ -1045,7 +1045,7 @@ exports._slicerZipperFunc = (attOp, csOp, opOut, pool) => {
           }
         } else {
           // delete and keep going
-          if (attOp.opcode == '=') {
+          if (attOp.opcode === '=') {
             opOut.opcode = '-';
             opOut.chars = attOp.chars;
             opOut.lines = attOp.lines;
@@ -1071,7 +1071,7 @@ exports._slicerZipperFunc = (attOp, csOp, opOut, pool) => {
           opOut.opcode = attOp.opcode;
           opOut.chars = csOp.chars;
           opOut.lines = csOp.lines;
-          opOut.attribs = exports.composeAttributes(attOp.attribs, csOp.attribs, attOp.opcode == '=', pool);
+          opOut.attribs = exports.composeAttributes(attOp.attribs, csOp.attribs, attOp.opcode === '=', pool);
           csOp.opcode = '';
           attOp.chars -= csOp.chars;
           attOp.lines -= csOp.lines;
@@ -1171,12 +1171,12 @@ exports.mutateAttributionLines = (cs, lines, pool) => {
     // print("csOp: "+csOp.toSource());
     if ((!csOp.opcode) && (!attOp.opcode) && (!lineAssem) && (!(lineIter && lineIter.hasNext()))) {
       break; // done
-    } else if (csOp.opcode == '=' && csOp.lines > 0 && (!csOp.attribs) && (!attOp.opcode) && (!lineAssem) && (!(lineIter && lineIter.hasNext()))) {
+    } else if (csOp.opcode === '=' && csOp.lines > 0 && (!csOp.attribs) && (!attOp.opcode) && (!lineAssem) && (!(lineIter && lineIter.hasNext()))) {
       // skip multiple lines; this is what makes small changes not order of the document size
       mut.skipLines(csOp.lines);
       // print("skipped: "+csOp.lines);
       csOp.opcode = '';
-    } else if (csOp.opcode == '+') {
+    } else if (csOp.opcode === '+') {
       if (csOp.lines > 1) {
         const firstLineLen = csBank.indexOf('\n', csBankIndex) + 1 - csBankIndex;
         exports.copyOp(csOp, opOut);
@@ -1296,12 +1296,12 @@ exports.compose = (cs1, cs2, pool) => {
     // debugBuilder.append(' / ');
     const op1code = op1.opcode;
     const op2code = op2.opcode;
-    if (op1code == '+' && op2code == '-') {
+    if (op1code === '+' && op2code === '-') {
       bankIter1.skip(Math.min(op1.chars, op2.chars));
     }
     exports._slicerZipperFunc(op1, op2, opOut, pool);
-    if (opOut.opcode == '+') {
-      if (op2code == '+') {
+    if (opOut.opcode === '+') {
+      if (op2code === '+') {
         bankAssem.append(bankIter2.take(opOut.chars));
       } else {
         bankAssem.append(bankIter1.take(opOut.chars));
@@ -1396,7 +1396,7 @@ exports.toSplices = (cs) => {
   let inSplice = false;
   while (iter.hasNext()) {
     const op = iter.next();
-    if (op.opcode == '=') {
+    if (op.opcode === '=') {
       oldPos += op.chars;
       inSplice = false;
     } else {
@@ -1404,10 +1404,10 @@ exports.toSplices = (cs) => {
         splices.push([oldPos, oldPos, '']);
         inSplice = true;
       }
-      if (op.opcode == '-') {
+      if (op.opcode === '-') {
         oldPos += op.chars;
         splices[splices.length - 1][1] += op.chars;
-      } else if (op.opcode == '+') {
+      } else if (op.opcode === '+') {
         splices[splices.length - 1][2] += charIter.take(op.chars);
       }
     }
@@ -1663,7 +1663,7 @@ exports.prepareForWire = (cs, pool) => {
  */
 exports.isIdentity = (cs) => {
   const unpacked = exports.unpack(cs);
-  return unpacked.ops == '' && unpacked.oldLen == unpacked.newLen;
+  return unpacked.ops === '' && unpacked.oldLen == unpacked.newLen;
 };
 
 /**
@@ -1755,7 +1755,7 @@ exports.makeAttribsString = (opcode, attribs, pool) => {
     const result = [];
     for (let i = 0; i < attribs.length; i++) {
       const pair = attribs[i];
-      if (opcode == '=' || (opcode == '+' && pair[1])) {
+      if (opcode === '=' || (opcode === '+' && pair[1])) {
         result.push(`*${exports.numToString(pool.putAttrib(pair))}`);
       }
     }
@@ -1927,7 +1927,7 @@ exports.inverse = (cs, lines, alines, pool) => {
   const attribValues = [];
   while (csIter.hasNext()) {
     const csOp = csIter.next();
-    if (csOp.opcode == '=') {
+    if (csOp.opcode === '=') {
       if (csOp.attribs) {
         attribKeys.length = 0;
         attribValues.length = 0;
@@ -1954,9 +1954,9 @@ exports.inverse = (cs, lines, alines, pool) => {
         skip(csOp.chars, csOp.lines);
         builder.keep(csOp.chars, csOp.lines);
       }
-    } else if (csOp.opcode == '+') {
+    } else if (csOp.opcode === '+') {
       builder.remove(csOp.chars, csOp.lines);
-    } else if (csOp.opcode == '-') {
+    } else if (csOp.opcode === '-') {
       var textBank = nextText(csOp.chars);
       var textBankIndex = 0;
       consumeAttribRuns(csOp.chars, (len, attribs, endsLine) => {
@@ -1986,11 +1986,11 @@ exports.follow = (cs1, cs2, reverseInsertOrder, pool) => {
   const hasInsertFirst = exports.attributeTester(['insertorder', 'first'], pool);
 
   const newOps = exports.applyZip(unpacked1.ops, 0, unpacked2.ops, 0, (op1, op2, opOut) => {
-    if (op1.opcode == '+' || op2.opcode == '+') {
+    if (op1.opcode === '+' || op2.opcode === '+') {
       let whichToDo;
-      if (op2.opcode != '+') {
+      if (op2.opcode !== '+') {
         whichToDo = 1;
-      } else if (op1.opcode != '+') {
+      } else if (op1.opcode !== '+') {
         whichToDo = 2;
       } else {
         // both +
@@ -2029,7 +2029,7 @@ exports.follow = (cs1, cs2, reverseInsertOrder, pool) => {
         exports.copyOp(op2, opOut);
         op2.opcode = '';
       }
-    } else if (op1.opcode == '-') {
+    } else if (op1.opcode === '-') {
       if (!op2.opcode) {
         op1.opcode = '';
       } else if (op1.chars <= op2.chars) {
@@ -2044,7 +2044,7 @@ exports.follow = (cs1, cs2, reverseInsertOrder, pool) => {
         op1.lines -= op2.lines;
         op2.opcode = '';
       }
-    } else if (op2.opcode == '-') {
+    } else if (op2.opcode === '-') {
       exports.copyOp(op2, opOut);
       if (!op1.opcode) {
         op2.opcode = '';
@@ -2162,12 +2162,12 @@ exports.composeWithDeletions = (cs1, cs2, pool) => {
   const newOps = exports.applyZip(unpacked1.ops, 0, unpacked2.ops, 0, (op1, op2, opOut) => {
     const op1code = op1.opcode;
     const op2code = op2.opcode;
-    if (op1code == '+' && op2code == '-') {
+    if (op1code === '+' && op2code === '-') {
       bankIter1.skip(Math.min(op1.chars, op2.chars));
     }
     exports._slicerZipperFuncWithDeletions(op1, op2, opOut, pool);
-    if (opOut.opcode == '+') {
-      if (op2code == '+') {
+    if (opOut.opcode === '+') {
+      if (op2code === '+') {
         bankAssem.append(bankIter2.take(opOut.chars));
       } else {
         bankAssem.append(bankIter1.take(opOut.chars));
@@ -2185,7 +2185,7 @@ exports._slicerZipperFuncWithDeletions = (attOp, csOp, opOut, pool) => {
   // attribution string or the earlier of two exportss being composed.
   // pool can be null if definitely not needed.
   // print(csOp.toSource()+" "+attOp.toSource()+" "+opOut.toSource());
-  if (attOp.opcode == '-') {
+  if (attOp.opcode === '-') {
     exports.copyOp(attOp, opOut);
     attOp.opcode = '';
   } else if (!attOp.opcode) {
@@ -2197,7 +2197,7 @@ exports._slicerZipperFuncWithDeletions = (attOp, csOp, opOut, pool) => {
       {
         if (csOp.chars <= attOp.chars) {
           // delete or delete part
-          if (attOp.opcode == '=') {
+          if (attOp.opcode === '=') {
             opOut.opcode = '-';
             opOut.chars = csOp.chars;
             opOut.lines = csOp.lines;
@@ -2211,7 +2211,7 @@ exports._slicerZipperFuncWithDeletions = (attOp, csOp, opOut, pool) => {
           }
         } else {
           // delete and keep going
-          if (attOp.opcode == '=') {
+          if (attOp.opcode === '=') {
             opOut.opcode = '-';
             opOut.chars = attOp.chars;
             opOut.lines = attOp.lines;
@@ -2237,7 +2237,7 @@ exports._slicerZipperFuncWithDeletions = (attOp, csOp, opOut, pool) => {
           opOut.opcode = attOp.opcode;
           opOut.chars = csOp.chars;
           opOut.lines = csOp.lines;
-          opOut.attribs = exports.composeAttributes(attOp.attribs, csOp.attribs, attOp.opcode == '=', pool);
+          opOut.attribs = exports.composeAttributes(attOp.attribs, csOp.attribs, attOp.opcode === '=', pool);
           csOp.opcode = '';
           attOp.chars -= csOp.chars;
           attOp.lines -= csOp.lines;
@@ -2249,7 +2249,7 @@ exports._slicerZipperFuncWithDeletions = (attOp, csOp, opOut, pool) => {
           opOut.opcode = attOp.opcode;
           opOut.chars = attOp.chars;
           opOut.lines = attOp.lines;
-          opOut.attribs = exports.composeAttributes(attOp.attribs, csOp.attribs, attOp.opcode == '=', pool);
+          opOut.attribs = exports.composeAttributes(attOp.attribs, csOp.attribs, attOp.opcode === '=', pool);
           attOp.opcode = '';
           csOp.chars -= attOp.chars;
           csOp.lines -= attOp.lines;

From 23d7544763e522ef8a20f90fdc2f3ae5c0932cb7 Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Wed, 17 Feb 2021 15:59:52 +0000
Subject: [PATCH 030/115] lint: Changeset.js max-len

---
 src/static/js/Changeset.js | 54 +++++++++++++++++++++++++-------------
 1 file changed, 36 insertions(+), 18 deletions(-)

diff --git a/src/static/js/Changeset.js b/src/static/js/Changeset.js
index 28863ef4..de23fa98 100644
--- a/src/static/js/Changeset.js
+++ b/src/static/js/Changeset.js
@@ -541,7 +541,8 @@ exports.stringAssembler = () => {
 /**
  * This class allows to iterate and modify texts which have several lines
  * It is used for applying Changesets on arrays of lines
- * Note from prev docs: "lines" need not be an array as long as it supports certain calls (lines_foo inside).
+ * Note from prev docs: "lines" need not be an array as long as it supports
+ * certain calls (lines_foo inside).
  */
 exports.textLinesMutator = (lines) => {
   // Mutates lines, an array of strings, in place.
@@ -645,7 +646,8 @@ exports.textLinesMutator = (lines) => {
         curLine += L;
         curCol = 0;
       }
-      // print(inSplice+" / "+isCurLineInSplice()+" / "+curSplice[0]+" / "+curSplice[1]+" / "+lines.length);
+      // print(inSplice+" / "+isCurLineInSplice()+" / "+curSplice[0]+" /
+      // "+curSplice[1]+" / "+lines.length);
       /* if (inSplice && (! isCurLineInSplice()) && (curSplice[0] + curSplice[1] < lines.length)) {
   print("BLAH");
   putCurLineInSplice();
@@ -696,7 +698,8 @@ exports.textLinesMutator = (lines) => {
           curSplice[1] += L - 1;
           const sline = curSplice.length - 1;
           removed = curSplice[sline].substring(curCol) + removed;
-          curSplice[sline] = curSplice[sline].substring(0, curCol) + lines_get(curSplice[0] + curSplice[1]);
+          curSplice[sline] = curSplice[sline].substring(0, curCol) +
+              lines_get(curSplice[0] + curSplice[1]);
           curSplice[1] += 1;
         }
       } else {
@@ -719,7 +722,8 @@ exports.textLinesMutator = (lines) => {
         }
         const sline = putCurLineInSplice();
         removed = curSplice[sline].substring(curCol, curCol + N);
-        curSplice[sline] = curSplice[sline].substring(0, curCol) + curSplice[sline].substring(curCol + N);
+        curSplice[sline] = curSplice[sline].substring(0, curCol) +
+            curSplice[sline].substring(curCol + N);
         // debugPrint("remove");
       }
     }
@@ -761,7 +765,8 @@ exports.textLinesMutator = (lines) => {
         if (!curSplice[sline]) {
           console.error('curSplice[sline] not populated, actual curSplice contents is ', curSplice, '. Possibly related to https://github.com/ether/etherpad-lite/issues/2802');
         }
-        curSplice[sline] = curSplice[sline].substring(0, curCol) + text + curSplice[sline].substring(curCol);
+        curSplice[sline] = curSplice[sline].substring(0, curCol) + text +
+            curSplice[sline].substring(curCol);
         curCol += text.length;
       }
       // debugPrint("insert");
@@ -868,7 +873,8 @@ exports.unpack = (cs) => {
  */
 exports.pack = (oldLen, newLen, opsStr, bank) => {
   const lenDiff = newLen - oldLen;
-  const lenDiffStr = (lenDiff >= 0 ? `>${exports.numToString(lenDiff)}` : `<${exports.numToString(-lenDiff)}`);
+  const lenDiffStr = (lenDiff >= 0 ? `>${exports.numToString(lenDiff)}`
+    : `<${exports.numToString(-lenDiff)}`);
   const a = [];
   a.push('Z:', exports.numToString(oldLen), lenDiffStr, opsStr, '$', bank);
   return a.join('');
@@ -881,7 +887,8 @@ exports.pack = (oldLen, newLen, opsStr, bank) => {
  */
 exports.applyToText = (cs, str) => {
   const unpacked = exports.unpack(cs);
-  exports.assert(str.length == unpacked.oldLen, 'mismatched apply: ', str.length, ' / ', unpacked.oldLen);
+  exports.assert(str.length == unpacked.oldLen, 'mismatched apply: ', str.length,
+      ' / ', unpacked.oldLen);
   const csIter = exports.opIterator(unpacked.ops);
   const bankIter = exports.stringIterator(unpacked.charBank);
   const strIter = exports.stringIterator(str);
@@ -1071,7 +1078,8 @@ exports._slicerZipperFunc = (attOp, csOp, opOut, pool) => {
           opOut.opcode = attOp.opcode;
           opOut.chars = csOp.chars;
           opOut.lines = csOp.lines;
-          opOut.attribs = exports.composeAttributes(attOp.attribs, csOp.attribs, attOp.opcode === '=', pool);
+          opOut.attribs = exports.composeAttributes(
+              attOp.attribs, csOp.attribs, attOp.opcode === '=', pool);
           csOp.opcode = '';
           attOp.chars -= csOp.chars;
           attOp.lines -= csOp.lines;
@@ -1083,7 +1091,8 @@ exports._slicerZipperFunc = (attOp, csOp, opOut, pool) => {
           opOut.opcode = attOp.opcode;
           opOut.chars = attOp.chars;
           opOut.lines = attOp.lines;
-          opOut.attribs = exports.composeAttributes(attOp.attribs, csOp.attribs, attOp.opcode == '=', pool);
+          opOut.attribs = exports.composeAttributes(
+              attOp.attribs, csOp.attribs, attOp.opcode == '=', pool);
           attOp.opcode = '';
           csOp.chars -= attOp.chars;
           csOp.lines -= attOp.lines;
@@ -1109,7 +1118,8 @@ exports._slicerZipperFunc = (attOp, csOp, opOut, pool) => {
 exports.applyToAttribution = (cs, astr, pool) => {
   const unpacked = exports.unpack(cs);
 
-  return exports.applyZip(astr, 0, unpacked.ops, 0, (op1, op2, opOut) => exports._slicerZipperFunc(op1, op2, opOut, pool));
+  return exports.applyZip(astr, 0, unpacked.ops, 0,
+      (op1, op2, opOut) => exports._slicerZipperFunc(op1, op2, opOut, pool));
 };
 
 /* exports.oneInsertedLineAtATimeOpIterator = function(opsStr, optStartIndex, charBank) {
@@ -1167,11 +1177,13 @@ exports.mutateAttributionLines = (cs, lines, pool) => {
       csIter.next(csOp);
     }
     // print(csOp.toSource()+" "+attOp.toSource()+" "+opOut.toSource());
-    // print(csOp.opcode+"/"+csOp.lines+"/"+csOp.attribs+"/"+lineAssem+"/"+lineIter+"/"+(lineIter?lineIter.hasNext():null));
+    // print(csOp.opcode+"/"+csOp.lines+"/"+csOp.attribs+"/"+lineAssem+
+    // "/"+lineIter+"/"+(lineIter?lineIter.hasNext():null));
     // print("csOp: "+csOp.toSource());
     if ((!csOp.opcode) && (!attOp.opcode) && (!lineAssem) && (!(lineIter && lineIter.hasNext()))) {
       break; // done
-    } else if (csOp.opcode === '=' && csOp.lines > 0 && (!csOp.attribs) && (!attOp.opcode) && (!lineAssem) && (!(lineIter && lineIter.hasNext()))) {
+    } else if (csOp.opcode === '=' && csOp.lines > 0 && (!csOp.attribs) &&
+        (!attOp.opcode) && (!lineAssem) && (!(lineIter && lineIter.hasNext()))) {
       // skip multiple lines; this is what makes small changes not order of the document size
       mut.skipLines(csOp.lines);
       // print("skipped: "+csOp.lines);
@@ -1776,7 +1788,8 @@ exports.subattribution = (astr, start, optEnd) => {
       while (csOp.opcode && (attOp.opcode || iter.hasNext())) {
         if (!attOp.opcode) iter.next(attOp);
 
-        if (csOp.opcode && attOp.opcode && csOp.chars >= attOp.chars && attOp.lines > 0 && csOp.lines <= 0) {
+        if (csOp.opcode && attOp.opcode && csOp.chars >= attOp.chars &&
+              attOp.lines > 0 && csOp.lines <= 0) {
           csOp.lines++;
         }
 
@@ -1872,7 +1885,8 @@ exports.inverse = (cs, lines, alines, pool) => {
         curLineOpIter.next(curLineNextOp);
       }
       const charsToUse = Math.min(numChars, curLineNextOp.chars);
-      func(charsToUse, curLineNextOp.attribs, charsToUse == curLineNextOp.chars && curLineNextOp.lines > 0);
+      func(charsToUse, curLineNextOp.attribs, charsToUse == curLineNextOp.chars &&
+          curLineNextOp.lines > 0);
       numChars -= charsToUse;
       curLineNextOp.chars -= charsToUse;
       curChar += charsToUse;
@@ -2178,8 +2192,10 @@ exports.composeWithDeletions = (cs1, cs2, pool) => {
   return exports.pack(len1, len3, newOps, bankAssem.toString());
 };
 
-// This function is 95% like _slicerZipperFunc, we just changed two lines to ensure it merges the attribs of deletions properly.
-// This is necassary for correct paddiff. But to ensure these changes doesn't affect anything else, we've created a seperate function only used for paddiffs
+// This function is 95% like _slicerZipperFunc, we just changed two lines to
+// ensure it merges the attribs of deletions properly.
+// This is necassary for correct paddiff. But to ensure these changes doesn't
+// affect anything else, we've created a seperate function only used for paddiffs
 exports._slicerZipperFuncWithDeletions = (attOp, csOp, opOut, pool) => {
   // attOp is the op from the sequence that is being operated on, either an
   // attribution string or the earlier of two exportss being composed.
@@ -2237,7 +2253,8 @@ exports._slicerZipperFuncWithDeletions = (attOp, csOp, opOut, pool) => {
           opOut.opcode = attOp.opcode;
           opOut.chars = csOp.chars;
           opOut.lines = csOp.lines;
-          opOut.attribs = exports.composeAttributes(attOp.attribs, csOp.attribs, attOp.opcode === '=', pool);
+          opOut.attribs = exports.composeAttributes(
+              attOp.attribs, csOp.attribs, attOp.opcode === '=', pool);
           csOp.opcode = '';
           attOp.chars -= csOp.chars;
           attOp.lines -= csOp.lines;
@@ -2249,7 +2266,8 @@ exports._slicerZipperFuncWithDeletions = (attOp, csOp, opOut, pool) => {
           opOut.opcode = attOp.opcode;
           opOut.chars = attOp.chars;
           opOut.lines = attOp.lines;
-          opOut.attribs = exports.composeAttributes(attOp.attribs, csOp.attribs, attOp.opcode === '=', pool);
+          opOut.attribs = exports.composeAttributes(
+              attOp.attribs, csOp.attribs, attOp.opcode === '=', pool);
           attOp.opcode = '';
           csOp.chars -= attOp.chars;
           csOp.lines -= attOp.lines;

From 0b78ad2f90bfb9fadc795d9e9f72d34e7d2fe21a Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Wed, 17 Feb 2021 16:02:10 +0000
Subject: [PATCH 031/115] lint: Changeset.js curly braces in correct position

---
 src/static/js/Changeset.js | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/static/js/Changeset.js b/src/static/js/Changeset.js
index de23fa98..71e1eb8e 100644
--- a/src/static/js/Changeset.js
+++ b/src/static/js/Changeset.js
@@ -2016,21 +2016,19 @@ exports.follow = (cs1, cs2, reverseInsertOrder, pool) => {
           whichToDo = 1;
         } else if (insertFirst2 && !insertFirst1) {
           whichToDo = 2;
-        }
-        // insert string that doesn't start with a newline first so as not to break up lines
-        else if (firstChar1 == '\n' && firstChar2 != '\n') {
+        } else if (firstChar1 === '\n' && firstChar2 !== '\n') {
+          // insert string that doesn't start with a newline first so as not to break up lines
           whichToDo = 2;
-        } else if (firstChar1 != '\n' && firstChar2 == '\n') {
+        } else if (firstChar1 !== '\n' && firstChar2 === '\n') {
           whichToDo = 1;
-        }
-        // break symmetry:
-        else if (reverseInsertOrder) {
+        } else if (reverseInsertOrder) {
+          // break symmetry:
           whichToDo = 2;
         } else {
           whichToDo = 1;
         }
       }
-      if (whichToDo == 1) {
+      if (whichToDo === 1) {
         chars1.skip(op1.chars);
         opOut.opcode = '=';
         opOut.lines = op1.lines;

From 3b5b996d846ede758cb33b818f975a95184a4bbb Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Wed, 17 Feb 2021 16:15:36 +0000
Subject: [PATCH 032/115] lint: Changeset no var

---
 src/static/js/Changeset.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/static/js/Changeset.js b/src/static/js/Changeset.js
index 71e1eb8e..da0d92d3 100644
--- a/src/static/js/Changeset.js
+++ b/src/static/js/Changeset.js
@@ -612,7 +612,7 @@ exports.textLinesMutator = (lines) => {
 
   const isCurLineInSplice = () => (curLine - curSplice[0] < (curSplice.length - 2));
 
-  const debugPrint = (typ) => {
+  const debugPrint = (typ) => { /* eslint-disable-line no-unused-vars */
     print(`${typ}: ${curSplice.toSource()} / ${curLine},${curCol} / ${lines_toSource()}`);
   };
 
@@ -745,7 +745,7 @@ exports.textLinesMutator = (lines) => {
           // curLine += newLines.length;
           // }
           // else {
-          var sline = curSplice.length - 1;
+          const sline = curSplice.length - 1;
           const theLine = curSplice[sline];
           const lineCol = curCol;
           curSplice[sline] = theLine.substring(0, lineCol) + newLines[0];
@@ -761,7 +761,7 @@ exports.textLinesMutator = (lines) => {
           curLine += newLines.length;
         }
       } else {
-        var sline = putCurLineInSplice();
+        const sline = putCurLineInSplice();
         if (!curSplice[sline]) {
           console.error('curSplice[sline] not populated, actual curSplice contents is ', curSplice, '. Possibly related to https://github.com/ether/etherpad-lite/issues/2802');
         }
@@ -1716,7 +1716,7 @@ exports.builder = (oldLen) => {
   const o = exports.newOp();
   const charBank = exports.stringAssembler();
 
-  var self = {
+  const self = {
     // attribs are [[key1,value1],[key2,value2],...] or '*0*1...' (no pool needed in latter case)
     keep: (N, L, attribs, pool) => {
       o.opcode = '=';
@@ -1949,7 +1949,7 @@ exports.inverse = (cs, lines, alines, pool) => {
           attribKeys.push(pool.getAttribKey(n));
           attribValues.push(pool.getAttribValue(n));
         });
-        var undoBackToAttribs = cachedStrFunc((attribs) => {
+        const undoBackToAttribs = cachedStrFunc((attribs) => {
           const backAttribs = [];
           for (let i = 0; i < attribKeys.length; i++) {
             const appliedKey = attribKeys[i];
@@ -1971,8 +1971,8 @@ exports.inverse = (cs, lines, alines, pool) => {
     } else if (csOp.opcode === '+') {
       builder.remove(csOp.chars, csOp.lines);
     } else if (csOp.opcode === '-') {
-      var textBank = nextText(csOp.chars);
-      var textBankIndex = 0;
+      const textBank = nextText(csOp.chars);
+      let textBankIndex = 0;
       consumeAttribRuns(csOp.chars, (len, attribs, endsLine) => {
         builder.insert(textBank.substr(textBankIndex, len), attribs);
         textBankIndex += len;

From d4b6cbc897af19cc4e9f150a7d9898bf4d46be8c Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Wed, 17 Feb 2021 16:24:47 +0000
Subject: [PATCH 033/115] line: broadcast.js

---
 src/static/js/broadcast.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/static/js/broadcast.js b/src/static/js/broadcast.js
index 1d35884b..26370f6b 100644
--- a/src/static/js/broadcast.js
+++ b/src/static/js/broadcast.js
@@ -33,7 +33,7 @@ const hooks = require('./pluginfw/hooks');
 
 // These parameters were global, now they are injected. A reference to the
 // Timeslider controller would probably be more appropriate.
-function loadBroadcastJS(socket, sendSocketMsg, fireWhenAllScriptsAreLoaded, BroadcastSlider) {
+const loadBroadcastJS = (socket, sendSocketMsg, fireWhenAllScriptsAreLoaded, BroadcastSlider) => {
   let goToRevisionIfEnabledCount = 0;
   let changesetLoader = undefined;
 
@@ -488,6 +488,6 @@ function loadBroadcastJS(socket, sendSocketMsg, fireWhenAllScriptsAreLoaded, Bro
   receiveAuthorData(clientVars.collab_client_vars.historicalAuthorData);
 
   return changesetLoader;
-}
+};
 
 exports.loadBroadcastJS = loadBroadcastJS;

From f5f4e3a6d1047fe0a51050201c8667bb7f0028cb Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Wed, 17 Feb 2021 16:28:33 +0000
Subject: [PATCH 034/115] lint: changesettracker.js arrow funcs

---
 src/static/js/changesettracker.js | 32 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/src/static/js/changesettracker.js b/src/static/js/changesettracker.js
index 8b0ac18c..d6492339 100644
--- a/src/static/js/changesettracker.js
+++ b/src/static/js/changesettracker.js
@@ -1,3 +1,5 @@
+'use strict';
+
 /**
  * This code is mostly from the old Etherpad. Please help us to comment this code.
  * This helps other people to understand this code better and helps them to improve it.
@@ -23,7 +25,7 @@
 const AttributePool = require('./AttributePool');
 const Changeset = require('./Changeset');
 
-function makeChangesetTracker(scheduler, apool, aceCallbacksProvider) {
+const makeChangesetTracker = (scheduler, apool, aceCallbacksProvider) => {
   // latest official text from server
   let baseAText = Changeset.makeAText('\n');
   // changes applied to baseText that have been submitted
@@ -42,7 +44,7 @@ function makeChangesetTracker(scheduler, apool, aceCallbacksProvider) {
 
   let changeCallbackTimeout = null;
 
-  function setChangeCallbackTimeout() {
+  const setChangeCallbackTimeout = () => {
     // can call this multiple times per call-stack, because
     // we only schedule a call to changeCallback if it exists
     // and if there isn't a timeout already scheduled.
@@ -55,17 +57,15 @@ function makeChangesetTracker(scheduler, apool, aceCallbacksProvider) {
         }
       }, 0);
     }
-  }
+  };
 
   let self;
   return self = {
-    isTracking() {
-      return tracking;
-    },
-    setBaseText(text) {
+    isTracking: () => tracking,
+    setBaseText: (text) => {
       self.setBaseAttributedText(Changeset.makeAText(text), null);
     },
-    setBaseAttributedText(atext, apoolJsonObj) {
+    setBaseAttributedText: (atext, apoolJsonObj) => {
       aceCallbacksProvider.withCallbacks('setBaseText', (callbacks) => {
         tracking = true;
         baseAText = Changeset.cloneAText(atext);
@@ -83,7 +83,7 @@ function makeChangesetTracker(scheduler, apool, aceCallbacksProvider) {
         }
       });
     },
-    composeUserChangeset(c) {
+    composeUserChangeset: (c) => {
       if (!tracking) return;
       if (applyingNonUserChanges) return;
       if (Changeset.isIdentity(c)) return;
@@ -91,7 +91,7 @@ function makeChangesetTracker(scheduler, apool, aceCallbacksProvider) {
 
       setChangeCallbackTimeout();
     },
-    applyChangesToBase(c, optAuthor, apoolJsonObj) {
+    applyChangesToBase: (c, optAuthor, apoolJsonObj) => {
       if (!tracking) return;
 
       aceCallbacksProvider.withCallbacks('applyChangesToBase', (callbacks) => {
@@ -123,7 +123,7 @@ function makeChangesetTracker(scheduler, apool, aceCallbacksProvider) {
         }
       });
     },
-    prepareUserChangeset() {
+    prepareUserChangeset: () => {
       // If there are user changes to submit, 'changeset' will be the
       // changeset, else it will be null.
       let toSubmit;
@@ -201,7 +201,7 @@ function makeChangesetTracker(scheduler, apool, aceCallbacksProvider) {
       };
       return data;
     },
-    applyPreparedChangesetToBase() {
+    applyPreparedChangesetToBase: () => {
       if (!submittedChangeset) {
         // violation of protocol; use prepareUserChangeset first
         throw new Error('applySubmittedChangesToBase: no submitted changes to apply');
@@ -210,13 +210,11 @@ function makeChangesetTracker(scheduler, apool, aceCallbacksProvider) {
       baseAText = Changeset.applyToAText(submittedChangeset, baseAText, apool);
       submittedChangeset = null;
     },
-    setUserChangeNotificationCallback(callback) {
+    setUserChangeNotificationCallback: (callback) => {
       changeCallback = callback;
     },
-    hasUncommittedChanges() {
-      return !!(submittedChangeset || (!Changeset.isIdentity(userChangeset)));
-    },
+    hasUncommittedChanges: () => !!(submittedChangeset || (!Changeset.isIdentity(userChangeset))),
   };
-}
+};
 
 exports.makeChangesetTracker = makeChangesetTracker;

From 3635cb6ca6b95ccc851aaaa21d6132f4ae744041 Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Wed, 17 Feb 2021 16:29:33 +0000
Subject: [PATCH 035/115] lint: changesettracker.js long-lines

---
 src/static/js/changesettracker.js | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/static/js/changesettracker.js b/src/static/js/changesettracker.js
index d6492339..7ddc54a1 100644
--- a/src/static/js/changesettracker.js
+++ b/src/static/js/changesettracker.js
@@ -111,8 +111,10 @@ const makeChangesetTracker = (scheduler, apool, aceCallbacksProvider) => {
 
         const preferInsertingAfterUserChanges = true;
         const oldUserChangeset = userChangeset;
-        userChangeset = Changeset.follow(c2, oldUserChangeset, preferInsertingAfterUserChanges, apool);
-        const postChange = Changeset.follow(oldUserChangeset, c2, !preferInsertingAfterUserChanges, apool);
+        userChangeset = Changeset.follow(
+            c2, oldUserChangeset, preferInsertingAfterUserChanges, apool);
+        const postChange = Changeset.follow(
+            oldUserChangeset, c2, !preferInsertingAfterUserChanges, apool);
 
         const preferInsertionAfterCaret = true; // (optAuthor && optAuthor > thisAuthor);
         applyingNonUserChanges = true;
@@ -135,7 +137,9 @@ const makeChangesetTracker = (scheduler, apool, aceCallbacksProvider) => {
         // add forEach function to Array.prototype for IE8
         if (!('forEach' in Array.prototype)) {
           Array.prototype.forEach = function (action, that /* opt*/) {
-            for (let i = 0, n = this.length; i < n; i++) if (i in this) action.call(that, this[i], i, this);
+            for (let i = 0, n = this.length; i < n; i++) {
+              if (i in this) action.call(that, this[i], i, this);
+            }
           };
         }
 
@@ -143,10 +147,13 @@ const makeChangesetTracker = (scheduler, apool, aceCallbacksProvider) => {
         const authorId = parent.parent.pad.myUserInfo.userId;
 
         // Sanitize authorship
-        // We need to replace all author attribs with thisSession.author, in case they copy/pasted or otherwise inserted other peoples changes
+        // We need to replace all author attribs with thisSession.author,
+        // in case they copy/pasted or otherwise inserted other peoples changes
         if (apool.numToAttrib) {
           for (const attr in apool.numToAttrib) {
-            if (apool.numToAttrib[attr][0] == 'author' && apool.numToAttrib[attr][1] == authorId) var authorAttr = Number(attr).toString(36);
+            if (apool.numToAttrib[attr][0] == 'author' && apool.numToAttrib[attr][1] == authorId) {
+              var authorAttr = Number(attr).toString(36);
+            }
           }
 
           // Replace all added 'author' attribs with the value of the current user

From f86578ffc35986deb51838f8ee6e71991d7f29dc Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Wed, 17 Feb 2021 16:31:56 +0000
Subject: [PATCH 036/115] lint: changesettracker.js var > const/let and other
 easy fixes

---
 src/static/js/changesettracker.js | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/static/js/changesettracker.js b/src/static/js/changesettracker.js
index 7ddc54a1..6a132247 100644
--- a/src/static/js/changesettracker.js
+++ b/src/static/js/changesettracker.js
@@ -48,11 +48,13 @@ const makeChangesetTracker = (scheduler, apool, aceCallbacksProvider) => {
     // can call this multiple times per call-stack, because
     // we only schedule a call to changeCallback if it exists
     // and if there isn't a timeout already scheduled.
-    if (changeCallback && changeCallbackTimeout === null) {
+    if (changeCallback && changeCallbackTimeout == null) {
       changeCallbackTimeout = scheduler.setTimeout(() => {
         try {
           changeCallback();
-        } catch (pseudoError) {} finally {
+        } catch (pseudoError) {
+          // as empty as my soul
+        } finally {
           changeCallbackTimeout = null;
         }
       }, 0);
@@ -150,28 +152,30 @@ const makeChangesetTracker = (scheduler, apool, aceCallbacksProvider) => {
         // We need to replace all author attribs with thisSession.author,
         // in case they copy/pasted or otherwise inserted other peoples changes
         if (apool.numToAttrib) {
+          let authorAttr;
           for (const attr in apool.numToAttrib) {
-            if (apool.numToAttrib[attr][0] == 'author' && apool.numToAttrib[attr][1] == authorId) {
-              var authorAttr = Number(attr).toString(36);
+            if (apool.numToAttrib[attr][0] === 'author' &&
+                apool.numToAttrib[attr][1] === authorId) {
+              authorAttr = Number(attr).toString(36);
             }
           }
 
           // Replace all added 'author' attribs with the value of the current user
-          var cs = Changeset.unpack(userChangeset);
+          const cs = Changeset.unpack(userChangeset);
           const iterator = Changeset.opIterator(cs.ops);
           let op;
           const assem = Changeset.mergingOpAssembler();
 
           while (iterator.hasNext()) {
             op = iterator.next();
-            if (op.opcode == '+') {
-              var newAttrs = '';
+            if (op.opcode === '+') {
+              let newAttrs = '';
 
               op.attribs.split('*').forEach((attrNum) => {
                 if (!attrNum) return;
                 const attr = apool.getAttrib(parseInt(attrNum, 36));
                 if (!attr) return;
-                if ('author' == attr[0]) {
+                if ('author' === attr[0]) {
                   // replace that author with the current one
                   newAttrs += `*${authorAttr}`;
                 } else { newAttrs += `*${attrNum}`; } // overtake all other attribs as is
@@ -188,7 +192,7 @@ const makeChangesetTracker = (scheduler, apool, aceCallbacksProvider) => {
         else toSubmit = userChangeset;
       }
 
-      var cs = null;
+      let cs = null;
       if (toSubmit) {
         submittedChangeset = toSubmit;
         userChangeset = Changeset.identity(Changeset.newLen(toSubmit));

From 73b3a2dc54bc5b85ec06069e2b1aebd02b3ef1ec Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Wed, 17 Feb 2021 17:25:06 +0000
Subject: [PATCH 037/115] lint: AttributeManager.js use ES6 method for
 hasAttrib

---
 src/static/js/AttributeManager.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/static/js/AttributeManager.js b/src/static/js/AttributeManager.js
index 19424b0a..7a37c8ff 100644
--- a/src/static/js/AttributeManager.js
+++ b/src/static/js/AttributeManager.js
@@ -406,7 +406,8 @@ AttributeManager.prototype = _(AttributeManager.prototype).extend({
       hasAttrib = this.getAttributeOnSelection(attributeName);
     } else {
       const attributesOnCaretPosition = this.getAttributesOnCaret();
-      hasAttrib = _.contains(_.flatten(attributesOnCaretPosition), attributeName);
+      const allAttribs = [].concat(...attributesOnCaretPosition); // flatten
+      hasAttrib = allAttribs.includes(attributeName);
     }
     return hasAttrib;
   },

From 8cbd5222dd9009cd0b83fffd4f02216c87d70b90 Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Wed, 17 Feb 2021 17:49:59 +0000
Subject: [PATCH 038/115] lint: pad_userlist.js - remove require browser

---
 src/static/js/pad_userlist.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/static/js/pad_userlist.js b/src/static/js/pad_userlist.js
index a43ef69a..074798fc 100644
--- a/src/static/js/pad_userlist.js
+++ b/src/static/js/pad_userlist.js
@@ -18,7 +18,6 @@
 
 const padutils = require('./pad_utils').padutils;
 const hooks = require('./pluginfw/hooks');
-const browser = require('./browser');
 
 let myUserInfo = {};
 

From 2511eed472c85dd479192fbbf8d1a4981373bcf2 Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Wed, 17 Feb 2021 18:15:01 +0000
Subject: [PATCH 039/115] lint: Changeset.js more literal conditionals

---
 src/static/js/Changeset.js | 42 +++++++++++++++++++-------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/static/js/Changeset.js b/src/static/js/Changeset.js
index da0d92d3..75bb92b2 100644
--- a/src/static/js/Changeset.js
+++ b/src/static/js/Changeset.js
@@ -417,7 +417,7 @@ exports.mergingOpAssembler = () => {
           bufOp.chars += bufOpAdditionalCharsAfterNewline + op.chars;
           bufOp.lines += op.lines;
           bufOpAdditionalCharsAfterNewline = 0;
-        } else if (bufOp.lines == 0) {
+        } else if (bufOp.lines === 0) {
           // both bufOp and op are in-line
           bufOp.chars += op.chars;
         } else {
@@ -687,7 +687,7 @@ exports.textLinesMutator = (lines) => {
       };
       if (isCurLineInSplice()) {
         // print(curCol);
-        if (curCol == 0) {
+        if (curCol === 0) {
           removed = curSplice[curSplice.length - 1];
           // print("FOO"); // case foo
           curSplice.length--;
@@ -887,7 +887,7 @@ exports.pack = (oldLen, newLen, opsStr, bank) => {
  */
 exports.applyToText = (cs, str) => {
   const unpacked = exports.unpack(cs);
-  exports.assert(str.length == unpacked.oldLen, 'mismatched apply: ', str.length,
+  exports.assert(str.length === unpacked.oldLen, 'mismatched apply: ', str.length,
       ' / ', unpacked.oldLen);
   const csIter = exports.opIterator(unpacked.ops);
   const bankIter = exports.stringIterator(unpacked.charBank);
@@ -899,7 +899,7 @@ exports.applyToText = (cs, str) => {
       case '+':
       // op is + and op.lines 0: no newlines must be in op.chars
       // op is + and op.lines >0: op.chars must include op.lines newlines
-        if (op.lines != bankIter.peek(op.chars).split('\n').length - 1) {
+        if (op.lines !== bankIter.peek(op.chars).split('\n').length - 1) {
           throw new Error(`newline count is wrong in op +; cs:${cs} and text:${str}`);
         }
         assem.append(bankIter.take(op.chars));
@@ -907,7 +907,7 @@ exports.applyToText = (cs, str) => {
       case '-':
       // op is - and op.lines 0: no newlines must be in the deleted string
       // op is - and op.lines >0: op.lines newlines must be in the deleted string
-        if (op.lines != strIter.peek(op.chars).split('\n').length - 1) {
+        if (op.lines !== strIter.peek(op.chars).split('\n').length - 1) {
           throw new Error(`newline count is wrong in op -; cs:${cs} and text:${str}`);
         }
         strIter.skip(op.chars);
@@ -915,7 +915,7 @@ exports.applyToText = (cs, str) => {
       case '=':
       // op is = and op.lines 0: no newlines must be in the copied string
       // op is = and op.lines >0: op.lines newlines must be in the copied string
-        if (op.lines != strIter.peek(op.chars).split('\n').length - 1) {
+        if (op.lines !== strIter.peek(op.chars).split('\n').length - 1) {
           throw new Error(`newline count is wrong in op =; cs:${cs} and text:${str}`);
         }
         assem.append(strIter.take(op.chars));
@@ -992,7 +992,7 @@ exports.composeAttributes = (att1, att2, resultIsMutation, pool) => {
     let found = false;
     for (let i = 0; i < atts.length; i++) {
       const oldPair = atts[i];
-      if (oldPair[0] == pair[0]) {
+      if (oldPair[0] === pair[0]) {
         if (pair[1] || resultIsMutation) {
           oldPair[1] = pair[1];
         } else {
@@ -1038,7 +1038,7 @@ exports._slicerZipperFunc = (attOp, csOp, opOut, pool) => {
       {
         if (csOp.chars <= attOp.chars) {
           // delete or delete part
-          if (attOp.opcode == '=') {
+          if (attOp.opcode === '=') {
             opOut.opcode = '-';
             opOut.chars = csOp.chars;
             opOut.lines = csOp.lines;
@@ -1092,7 +1092,7 @@ exports._slicerZipperFunc = (attOp, csOp, opOut, pool) => {
           opOut.chars = attOp.chars;
           opOut.lines = attOp.lines;
           opOut.attribs = exports.composeAttributes(
-              attOp.attribs, csOp.attribs, attOp.opcode == '=', pool);
+              attOp.attribs, csOp.attribs, attOp.opcode === '=', pool);
           attOp.opcode = '';
           csOp.chars -= attOp.chars;
           csOp.lines -= attOp.lines;
@@ -1162,7 +1162,7 @@ exports.mutateAttributionLines = (cs, lines, pool) => {
     }
     lineAssem.append(op);
     if (op.lines > 0) {
-      exports.assert(op.lines == 1, "Can't have op.lines of ", op.lines, ' in attribution lines');
+      exports.assert(op.lines === 1, "Can't have op.lines of ", op.lines, ' in attribution lines');
       // ship it to the mut
       mut.insert(lineAssem.toString(), 1);
       lineAssem = null;
@@ -1267,7 +1267,7 @@ exports.splitAttributionLines = (attrOps, text) => {
       numChars -= op.chars;
       numLines -= op.lines;
     }
-    if (numLines == 1) {
+    if (numLines === 1) {
       op.chars = numChars;
       op.lines = 1;
     }
@@ -1294,7 +1294,7 @@ exports.compose = (cs1, cs2, pool) => {
   const unpacked2 = exports.unpack(cs2);
   const len1 = unpacked1.oldLen;
   const len2 = unpacked1.newLen;
-  exports.assert(len2 == unpacked2.oldLen, 'mismatched composition of two changesets');
+  exports.assert(len2 === unpacked2.oldLen, 'mismatched composition of two changesets');
   const len3 = unpacked2.newLen;
   const bankIter1 = exports.stringIterator(unpacked1.charBank);
   const bankIter2 = exports.stringIterator(unpacked2.charBank);
@@ -1675,7 +1675,7 @@ exports.prepareForWire = (cs, pool) => {
  */
 exports.isIdentity = (cs) => {
   const unpacked = exports.unpack(cs);
-  return unpacked.ops === '' && unpacked.oldLen == unpacked.newLen;
+  return unpacked.ops === '' && unpacked.oldLen === unpacked.newLen;
 };
 
 /**
@@ -1698,7 +1698,7 @@ exports.attribsAttributeValue = (attribs, key, pool) => {
   let value = '';
   if (attribs) {
     exports.eachAttribNumber(attribs, (n) => {
-      if (pool.getAttribKey(n) == key) {
+      if (pool.getAttribKey(n) === key) {
         value = pool.getAttribValue(n);
       }
     });
@@ -1856,7 +1856,7 @@ exports.inverse = (cs, lines, alines, pool) => {
   const builder = exports.builder(unpacked.newLen);
 
   const consumeAttribRuns = (numChars, func /* (len, attribs, endsLine)*/) => {
-    if ((!curLineOpIter) || (curLineOpIterLine != curLine)) {
+    if ((!curLineOpIter) || (curLineOpIterLine !== curLine)) {
       // create curLineOpIter and advance it to curChar
       curLineOpIter = exports.opIterator(alines_get(curLine));
       curLineOpIterLine = curLine;
@@ -1885,7 +1885,7 @@ exports.inverse = (cs, lines, alines, pool) => {
         curLineOpIter.next(curLineNextOp);
       }
       const charsToUse = Math.min(numChars, curLineNextOp.chars);
-      func(charsToUse, curLineNextOp.attribs, charsToUse == curLineNextOp.chars &&
+      func(charsToUse, curLineNextOp.attribs, charsToUse === curLineNextOp.chars &&
           curLineNextOp.lines > 0);
       numChars -= charsToUse;
       curLineNextOp.chars -= charsToUse;
@@ -1902,7 +1902,7 @@ exports.inverse = (cs, lines, alines, pool) => {
     if (L) {
       curLine += L;
       curChar = 0;
-    } else if (curLineOpIter && curLineOpIterLine == curLine) {
+    } else if (curLineOpIter && curLineOpIterLine === curLine) {
       consumeAttribRuns(N, () => {});
     } else {
       curChar += N;
@@ -1955,7 +1955,7 @@ exports.inverse = (cs, lines, alines, pool) => {
             const appliedKey = attribKeys[i];
             const appliedValue = attribValues[i];
             const oldValue = exports.attribsAttributeValue(attribs, appliedKey, pool);
-            if (appliedValue != oldValue) {
+            if (appliedValue !== oldValue) {
               backAttribs.push([appliedKey, oldValue]);
             }
           }
@@ -1989,7 +1989,7 @@ exports.follow = (cs1, cs2, reverseInsertOrder, pool) => {
   const unpacked2 = exports.unpack(cs2);
   const len1 = unpacked1.oldLen;
   const len2 = unpacked2.oldLen;
-  exports.assert(len1 == len2, 'mismatched follow - cannot transform cs1 on top of cs2');
+  exports.assert(len1 === len2, 'mismatched follow - cannot transform cs1 on top of cs2');
   const chars1 = exports.stringIterator(unpacked1.charBank);
   const chars2 = exports.stringIterator(unpacked2.charBank);
 
@@ -2141,7 +2141,7 @@ exports.followAttributes = (att1, att2, pool) => {
     const pair1 = pool.getAttrib(exports.parseNum(a));
     for (let i = 0; i < atts.length; i++) {
       const pair2 = atts[i];
-      if (pair1[0] == pair2[0]) {
+      if (pair1[0] === pair2[0]) {
         if (pair1[1] <= pair2[1]) {
           // winner of merge is pair1, delete this attribute
           atts.splice(i, 1);
@@ -2165,7 +2165,7 @@ exports.composeWithDeletions = (cs1, cs2, pool) => {
   const unpacked2 = exports.unpack(cs2);
   const len1 = unpacked1.oldLen;
   const len2 = unpacked1.newLen;
-  exports.assert(len2 == unpacked2.oldLen, 'mismatched composition of two changesets');
+  exports.assert(len2 === unpacked2.oldLen, 'mismatched composition of two changesets');
   const len3 = unpacked2.newLen;
   const bankIter1 = exports.stringIterator(unpacked1.charBank);
   const bankIter2 = exports.stringIterator(unpacked2.charBank);

From 77b2f372abb3f71044ae51a190190a7aeefe9e35 Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Wed, 17 Feb 2021 18:31:38 +0000
Subject: [PATCH 040/115] lint: pad_userlist.js arrow functions

This probably needs a good rewrite/refactor to remove self.
---
 src/static/js/pad_userlist.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/static/js/pad_userlist.js b/src/static/js/pad_userlist.js
index 074798fc..07c22334 100644
--- a/src/static/js/pad_userlist.js
+++ b/src/static/js/pad_userlist.js
@@ -24,8 +24,8 @@ let myUserInfo = {};
 let colorPickerOpen = false;
 let colorPickerSetup = false;
 
-const paduserlist = (function () {
-  const rowManager = (function () {
+const paduserlist = (() => {
+  const rowManager = (() => {
     // The row manager handles rendering rows of the user list and animating
     // their insertion, removal, and reordering.  It manipulates TD height
     // and TD opacity.
@@ -290,7 +290,7 @@ const paduserlist = (function () {
       updateRow,
     };
     return self;
-  }()); // //////// rowManager
+  })(); // //////// rowManager
   const otherUsersInfo = [];
   const otherUsersData = [];
 
@@ -346,7 +346,7 @@ const paduserlist = (function () {
 
   let pad = undefined;
   const self = {
-    init(myInitialUserInfo, _pad) {
+    init: (myInitialUserInfo, _pad) => {
       pad = _pad;
 
       self.setMyUserInfo(myInitialUserInfo);
@@ -543,7 +543,7 @@ const paduserlist = (function () {
     },
   };
   return self;
-}());
+})();
 
 const getColorPickerSwatchIndex = (jnode) => $('#colorpickerswatches li').index(jnode);
 

From ee2b32281c538490583955b51614bbfc3bfebff0 Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Sun, 21 Feb 2021 11:07:13 +0000
Subject: [PATCH 041/115] pluginfw: Warn plugins on missing plugin (#4826)

* pluginfw: Warn plugins on missing plugin

Add functionality to console.warn when a plugin is missing.  This will help admins know when people are trying to use plugins that are missing.  Resolves https://github.com/ether/etherpad-lite/issues/4730

* pluginfw: importing .etherpad can notify admins of missing plugins

Extending .etherpad imports to notify admins if a missing plugin is present

* Update ImportEtherpad.js
---
 src/node/utils/ImportEtherpad.js  | 18 ++++++++++++++++++
 src/static/js/contentcollector.js |  4 ++++
 2 files changed, 22 insertions(+)

diff --git a/src/node/utils/ImportEtherpad.js b/src/node/utils/ImportEtherpad.js
index bc46d10b..6494da56 100644
--- a/src/node/utils/ImportEtherpad.js
+++ b/src/node/utils/ImportEtherpad.js
@@ -22,6 +22,13 @@ const hooks = require('../../static/js/pluginfw/hooks');
 exports.setPadRaw = (padId, r) => {
   const records = JSON.parse(r);
 
+  const blockElems = ['div', 'br', 'p', 'pre', 'li', 'author', 'lmkr', 'insertorder'];
+
+  // get supported block Elements from plugins, we will use this later.
+  hooks.callAll('ccRegisterBlockElements').forEach((element) => {
+    blockElems.push(element);
+  });
+
   Object.keys(records).forEach(async (key) => {
     let value = records[key];
 
@@ -53,6 +60,17 @@ exports.setPadRaw = (padId, r) => {
     } else {
       // Not author data, probably pad data
       // we can split it to look to see if it's pad data
+
+      // is this an attribute we support or not?  If not, tell the admin
+      if (value.pool) {
+        for (const attrib of Object.keys(value.pool.numToAttrib)) {
+          const attribName = value.pool.numToAttrib[attrib][0];
+          if(blockElems.indexOf(attribName) === -1) {
+            console.warn('Plugin missing: ' +
+                `You might want to install a plugin to support this node name: ${attribName}`);
+          }
+        }
+      }
       const oldPadId = key.split(':');
 
       // we know it's pad data
diff --git a/src/static/js/contentcollector.js b/src/static/js/contentcollector.js
index 7ac27168..1c601cc5 100644
--- a/src/static/js/contentcollector.js
+++ b/src/static/js/contentcollector.js
@@ -315,6 +315,10 @@ const makeContentCollector = (collectStyles, abrowser, apool, className2Author)
     const localAttribs = state.localAttribs;
     state.localAttribs = null;
     const isBlock = isBlockElement(node);
+    if (!isBlock && node.name && (node.name !== 'body') && (node.name !== 'br')) {
+      console.warn('Plugin missing: ' +
+          `You might want to install a plugin to support this node name: ${node.name}`);
+    }
     const isEmpty = _isEmpty(node, state);
     if (isBlock) _ensureColumnZero(state);
     const startLine = lines.length() - 1;

From 227370547d0968a444762d55f612843a0d2024bc Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Thu, 18 Feb 2021 19:58:20 +0000
Subject: [PATCH 042/115] update openapi-backend

---
 src/package-lock.json | 118 +++++++++++++++++-------------------------
 src/package.json      |   2 +-
 2 files changed, 48 insertions(+), 72 deletions(-)

diff --git a/src/package-lock.json b/src/package-lock.json
index 5c4b4b14..8a343b52 100644
--- a/src/package-lock.json
+++ b/src/package-lock.json
@@ -5,39 +5,15 @@
   "requires": true,
   "dependencies": {
     "@apidevtools/json-schema-ref-parser": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/@apidevtools/json-schema-ref-parser/-/json-schema-ref-parser-8.0.0.tgz",
-      "integrity": "sha512-n4YBtwQhdpLto1BaUCyAeflizmIbaloGShsPyRtFf5qdFJxfssj+GgLavczgKJFa3Bq+3St2CKcpRJdjtB4EBw==",
+      "version": "9.0.7",
+      "resolved": "https://registry.npmjs.org/@apidevtools/json-schema-ref-parser/-/json-schema-ref-parser-9.0.7.tgz",
+      "integrity": "sha512-QdwOGF1+eeyFh+17v2Tz626WX0nucd1iKOm6JUTUvCZdbolblCOOQCxGrQPY0f7jEhn36PiAWqZnsC2r5vmUWg==",
       "requires": {
-        "@jsdevtools/ono": "^7.1.0",
+        "@jsdevtools/ono": "^7.1.3",
         "call-me-maybe": "^1.0.1",
         "js-yaml": "^3.13.1"
       }
     },
-    "@apidevtools/openapi-schemas": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@apidevtools/openapi-schemas/-/openapi-schemas-2.0.4.tgz",
-      "integrity": "sha512-ob5c4UiaMYkb24pNhvfSABShAwpREvUGCkqjiz/BX9gKZ32y/S22M+ALIHftTAuv9KsFVSpVdIDzi9ZzFh5TCA=="
-    },
-    "@apidevtools/swagger-methods": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/@apidevtools/swagger-methods/-/swagger-methods-3.0.2.tgz",
-      "integrity": "sha512-QAkD5kK2b1WfjDS/UQn/qQkbwF31uqRjPTrsCs5ZG9BQGAkjwvqGFjjPqAuzac/IYzpPtRzjCP1WrTuAIjMrXg=="
-    },
-    "@apidevtools/swagger-parser": {
-      "version": "9.0.1",
-      "resolved": "https://registry.npmjs.org/@apidevtools/swagger-parser/-/swagger-parser-9.0.1.tgz",
-      "integrity": "sha512-Irqybg4dQrcHhZcxJc/UM4vO7Ksoj1Id5e+K94XUOzllqX1n47HEA50EKiXTCQbykxuJ4cYGIivjx/MRSTC5OA==",
-      "requires": {
-        "@apidevtools/json-schema-ref-parser": "^8.0.0",
-        "@apidevtools/openapi-schemas": "^2.0.2",
-        "@apidevtools/swagger-methods": "^3.0.0",
-        "@jsdevtools/ono": "^7.1.0",
-        "call-me-maybe": "^1.0.1",
-        "openapi-types": "^1.3.5",
-        "z-schema": "^4.2.2"
-      }
-    },
     "@azure/ms-rest-azure-env": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/@azure/ms-rest-azure-env/-/ms-rest-azure-env-2.0.0.tgz",
@@ -2921,12 +2897,14 @@
     "jsonschema": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/jsonschema/-/jsonschema-1.2.4.tgz",
-      "integrity": "sha512-lz1nOH69GbsVHeVgEdvyavc/33oymY1AZwtePMiMj4HZPMbP5OIKK3zT9INMWjwua/V4Z4yq7wSlBbSG+g4AEw=="
+      "integrity": "sha512-lz1nOH69GbsVHeVgEdvyavc/33oymY1AZwtePMiMj4HZPMbP5OIKK3zT9INMWjwua/V4Z4yq7wSlBbSG+g4AEw==",
+      "dev": true
     },
     "jsonschema-draft4": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/jsonschema-draft4/-/jsonschema-draft4-1.0.0.tgz",
-      "integrity": "sha1-8K8gBQVPDwrefqIRhhS2ncUS2GU="
+      "integrity": "sha1-8K8gBQVPDwrefqIRhhS2ncUS2GU=",
+      "dev": true
     },
     "jsprim": {
       "version": "1.4.1",
@@ -3091,12 +3069,8 @@
     "lodash.get": {
       "version": "4.4.2",
       "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
-      "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk="
-    },
-    "lodash.isequal": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
-      "integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA="
+      "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=",
+      "dev": true
     },
     "lodash.isplainobject": {
       "version": "4.0.6",
@@ -3423,6 +3397,13 @@
       "requires": {
         "lodash": "^4.17.11",
         "openapi-types": "^1.3.2"
+      },
+      "dependencies": {
+        "openapi-types": {
+          "version": "1.3.5",
+          "resolved": "https://registry.npmjs.org/openapi-types/-/openapi-types-1.3.5.tgz",
+          "integrity": "sha512-11oi4zYorsgvg5yBarZplAqbpev5HkuVNPlZaPTknPDzAynq+lnJdXAmruGWP0s+dNYZS7bjM+xrTpJw7184Fg=="
+        }
       }
     },
     "mongodb": {
@@ -6952,35 +6933,54 @@
       }
     },
     "openapi-backend": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/openapi-backend/-/openapi-backend-2.4.1.tgz",
-      "integrity": "sha512-48j8QhDD9sfV6t7Zgn9JrfJtCpJ53bmoT2bzXYYig1HhG/Xn0Aa5fJhM0cQSZq9nq78/XbU7RDEa3e+IADNkmA==",
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/openapi-backend/-/openapi-backend-3.9.0.tgz",
+      "integrity": "sha512-RaEBFBFBGFcnOSqoKiX+Dg+CxS0zWBop1qw+JjPLzLs7ob637QEZcEGvKYKcwGv99mWwvcCHIuGH9l+LV5pHew==",
       "requires": {
+        "@apidevtools/json-schema-ref-parser": "^9.0.7",
         "ajv": "^6.10.0",
         "bath-es5": "^3.0.3",
         "cookie": "^0.4.0",
         "lodash": "^4.17.15",
-        "mock-json-schema": "^1.0.5",
-        "openapi-schema-validation": "^0.4.2",
-        "openapi-types": "^1.3.4",
-        "qs": "^6.6.0",
-        "swagger-parser": "^9.0.1"
+        "mock-json-schema": "^1.0.7",
+        "openapi-schema-validator": "^7.0.1",
+        "openapi-types": "^7.0.1",
+        "qs": "^6.9.3"
+      },
+      "dependencies": {
+        "qs": {
+          "version": "6.9.6",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.6.tgz",
+          "integrity": "sha512-TIRk4aqYLNoJUbd+g2lEdz5kLWIuTMRagAXxl78Q0RiVjAOugHmeKNGdd3cwo/ktpf9aL9epCfFqWDEKysUlLQ=="
+        }
       }
     },
     "openapi-schema-validation": {
       "version": "0.4.2",
       "resolved": "https://registry.npmjs.org/openapi-schema-validation/-/openapi-schema-validation-0.4.2.tgz",
       "integrity": "sha512-K8LqLpkUf2S04p2Nphq9L+3bGFh/kJypxIG2NVGKX0ffzT4NQI9HirhiY6Iurfej9lCu7y4Ndm4tv+lm86Ck7w==",
+      "dev": true,
       "requires": {
         "jsonschema": "1.2.4",
         "jsonschema-draft4": "^1.0.0",
         "swagger-schema-official": "2.0.0-bab6bed"
       }
     },
+    "openapi-schema-validator": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/openapi-schema-validator/-/openapi-schema-validator-7.2.3.tgz",
+      "integrity": "sha512-XT8NM5e/zBBa/cydTS1IeYkCPzJp9oixvt9Y1lEx+2gsCTOooNxw9x/KEivtWMSokne7X1aR+VtsYHQtNNOSyA==",
+      "requires": {
+        "ajv": "^6.5.2",
+        "lodash.merge": "^4.6.1",
+        "openapi-types": "^7.2.3",
+        "swagger-schema-official": "2.0.0-bab6bed"
+      }
+    },
     "openapi-types": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/openapi-types/-/openapi-types-1.3.5.tgz",
-      "integrity": "sha512-11oi4zYorsgvg5yBarZplAqbpev5HkuVNPlZaPTknPDzAynq+lnJdXAmruGWP0s+dNYZS7bjM+xrTpJw7184Fg=="
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/openapi-types/-/openapi-types-7.2.3.tgz",
+      "integrity": "sha512-olbaNxz12R27+mTyJ/ZAFEfUruauHH27AkeQHDHRq5AF0LdNkK1SSV7EourXQDK+4aX7dv2HtyirAGK06WMAsA=="
     },
     "optional-js": {
       "version": "2.3.0",
@@ -8076,14 +8076,6 @@
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
       "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
     },
-    "swagger-parser": {
-      "version": "9.0.1",
-      "resolved": "https://registry.npmjs.org/swagger-parser/-/swagger-parser-9.0.1.tgz",
-      "integrity": "sha512-oxOHUaeNetO9ChhTJm2fD+48DbGbLD09ZEOwPOWEqcW8J6zmjWxutXtSuOiXsoRgDWvORYlImbwM21Pn+EiuvQ==",
-      "requires": {
-        "@apidevtools/swagger-parser": "9.0.1"
-      }
-    },
     "swagger-schema-official": {
       "version": "2.0.0-bab6bed",
       "resolved": "https://registry.npmjs.org/swagger-schema-official/-/swagger-schema-official-2.0.0-bab6bed.tgz",
@@ -8487,11 +8479,6 @@
       "integrity": "sha512-gTpR5XQNKFwOd4clxfnhaqvfqMpqEwr4tOtCyz4MtYZX2JYhfr1JvBFKdS+7K/9rfpZR3VLX+YWBbKoxCgS43Q==",
       "dev": true
     },
-    "validator": {
-      "version": "12.2.0",
-      "resolved": "https://registry.npmjs.org/validator/-/validator-12.2.0.tgz",
-      "integrity": "sha512-jJfE/DW6tIK1Ek8nCfNFqt8Wb3nzMoAbocBF6/Icgg1ZFSBpObdnwVY2jQj6qUqzhx5jc71fpvBWyLGO7Xl+nQ=="
-    },
     "vargs": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/vargs/-/vargs-0.1.0.tgz",
@@ -8847,17 +8834,6 @@
       "resolved": "https://registry.npmjs.org/yeast/-/yeast-0.1.2.tgz",
       "integrity": "sha1-AI4G2AlDIMNy28L47XagymyKxBk="
     },
-    "z-schema": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/z-schema/-/z-schema-4.2.3.tgz",
-      "integrity": "sha512-zkvK/9TC6p38IwcrbnT3ul9in1UX4cm1y/VZSs4GHKIiDCrlafc+YQBgQBUdDXLAoZHf2qvQ7gJJOo6yT1LH6A==",
-      "requires": {
-        "commander": "^2.7.1",
-        "lodash.get": "^4.4.2",
-        "lodash.isequal": "^4.5.0",
-        "validator": "^12.0.0"
-      }
-    },
     "zip-stream": {
       "version": "2.1.3",
       "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-2.1.3.tgz",
diff --git a/src/package.json b/src/package.json
index 324c4621..3c847b74 100644
--- a/src/package.json
+++ b/src/package.json
@@ -55,7 +55,7 @@
     "mime-types": "^2.1.27",
     "nodeify": "1.0.1",
     "npm": "6.14.11",
-    "openapi-backend": "2.4.1",
+    "openapi-backend": "^3.9.0",
     "proxy-addr": "^2.0.6",
     "rate-limiter-flexible": "^2.1.4",
     "rehype": "^10.0.0",

From bb14775820d5217273d01902ef08fd3f9d756ed5 Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Sat, 20 Feb 2021 15:43:20 +0000
Subject: [PATCH 043/115] drop apiRoot object from build

---
 src/node/hooks/express/openapi.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/node/hooks/express/openapi.js b/src/node/hooks/express/openapi.js
index bf7e5b14..056a98a2 100644
--- a/src/node/hooks/express/openapi.js
+++ b/src/node/hooks/express/openapi.js
@@ -573,7 +573,6 @@ exports.expressCreateServer = (hookName, args, cb) => {
 
       // build openapi-backend instance for this api version
       const api = new OpenAPIBackend({
-        apiRoot, // each api version has its own root
         definition,
         validate: false,
         // for a small optimisation, we can run the quick startup for older

From 6023117d2956733fcb35c7ca1baeabf00b7dd90d Mon Sep 17 00:00:00 2001
From: Richard Hansen <rhansen@rhansen.org>
Date: Sun, 21 Feb 2021 08:17:41 -0500
Subject: [PATCH 044/115] CI: Use `saucelabs/sauce-connect-action` to create
 the tunnel (#4833)

---
 .github/workflows/frontend-admin-tests.yml | 12 +++++-------
 .github/workflows/frontend-tests.yml       | 12 +++++-------
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/frontend-admin-tests.yml b/.github/workflows/frontend-admin-tests.yml
index 0592d03f..bbe3d23f 100644
--- a/.github/workflows/frontend-admin-tests.yml
+++ b/.github/workflows/frontend-admin-tests.yml
@@ -15,13 +15,11 @@ jobs:
       with:
         node-version: 12
 
-    - name: Run sauce-connect-action
-      shell: bash
-      env:
-        SAUCE_USERNAME: ${{ secrets.SAUCE_USERNAME }}
-        SAUCE_ACCESS_KEY: ${{ secrets.SAUCE_ACCESS_KEY }}
-        TRAVIS_JOB_NUMBER: ${{ github.run_id }}-${{ github.run_number }}-${{ github.job }}
-      run: src/tests/frontend/travis/sauce_tunnel.sh
+    - uses: saucelabs/sauce-connect-action@v1.1.2
+      with:
+        username: ${{ secrets.SAUCE_USERNAME }}
+        accessKey: ${{ secrets.SAUCE_ACCESS_KEY }}
+        tunnelIdentifier: ${{ github.run_id }}-${{ github.run_number }}-${{ github.job }}
 
     - name: Install all dependencies and symlink for ep_etherpad-lite
       run: src/bin/installDeps.sh
diff --git a/.github/workflows/frontend-tests.yml b/.github/workflows/frontend-tests.yml
index 60429ab2..6ddd9cf6 100644
--- a/.github/workflows/frontend-tests.yml
+++ b/.github/workflows/frontend-tests.yml
@@ -15,13 +15,11 @@ jobs:
       with:
         node-version: 12
 
-    - name: Run sauce-connect-action
-      shell: bash
-      env:
-        SAUCE_USERNAME: ${{ secrets.SAUCE_USERNAME }}
-        SAUCE_ACCESS_KEY: ${{ secrets.SAUCE_ACCESS_KEY }}
-        TRAVIS_JOB_NUMBER: ${{ github.run_id }}-${{ github.run_number }}-${{ github.job }}
-      run: src/tests/frontend/travis/sauce_tunnel.sh
+    - uses: saucelabs/sauce-connect-action@v1.1.2
+      with:
+        username: ${{ secrets.SAUCE_USERNAME }}
+        accessKey: ${{ secrets.SAUCE_ACCESS_KEY }}
+        tunnelIdentifier: ${{ github.run_id }}-${{ github.run_number }}-${{ github.job }}
 
     - name: Install all dependencies and symlink for ep_etherpad-lite
       run: src/bin/installDeps.sh

From 086b59b30d4fbf1a313dc51fa54ae570b6fc9c9b Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Sun, 21 Feb 2021 13:24:51 +0000
Subject: [PATCH 045/115] editor: UI polish - Etherpad brand as reconnect &
 loading animation

---
 src/static/css/pad.css       |  7 ++++
 src/static/css/pad/icons.css |  3 +-
 src/static/img/brand.svg     | 65 ++++++++++++++++++++++++++++++++++++
 src/templates/pad.html       |  5 ++-
 4 files changed, 77 insertions(+), 3 deletions(-)
 create mode 100755 src/static/img/brand.svg

diff --git a/src/static/css/pad.css b/src/static/css/pad.css
index 6edd08d4..624da616 100644
--- a/src/static/css/pad.css
+++ b/src/static/css/pad.css
@@ -70,3 +70,10 @@ input {
 @media (max-width: 800px) {
   .hide-for-mobile { display: none; }
 }
+
+.etherpadBrand{
+  width:20%;
+  max-width:100px;
+  margin-left:auto;
+  margin-right:auto;
+}
diff --git a/src/static/css/pad/icons.css b/src/static/css/pad/icons.css
index 0a342770..c89d359e 100644
--- a/src/static/css/pad/icons.css
+++ b/src/static/css/pad/icons.css
@@ -130,7 +130,6 @@
 .buttonicon-microphone-alt-slash:before { content: '\e83e'; } /* '' */
 .buttonicon-compress:before { content: '\e83f'; } /* '' */
 .buttonicon-expand:before { content: '\e840'; } /* '' */
-.buttonicon-spin5:before { content: '\e841'; } /* '' */
 .buttonicon-eye-slash:before { content: '\e843'; } /* '' */
 .buttonicon-list-ol:before { content: '\e844'; } /* '' */
 .buttonicon-bold:before { content: '\e845'; } /* '' */
@@ -190,4 +189,4 @@
     -webkit-transform: rotate(359deg);
     transform: rotate(359deg);
   }
-}
\ No newline at end of file
+}
diff --git a/src/static/img/brand.svg b/src/static/img/brand.svg
new file mode 100755
index 00000000..df6fff34
--- /dev/null
+++ b/src/static/img/brand.svg
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="355px" height="355px" viewBox="0 0 355 355" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Group 10</title>
+    <defs>
+        <!-- top line -->
+        <rect id="path-4" x="41" y="110" width="142" height="25" rx="12.5">
+          <animate attributeName="width" from="0" to="142" dur="3s" fill="freeze"/>
+        </rect>
+        <filter x="-11.3%" y="-32.0%" width="122.5%" height="228.0%" filterUnits="objectBoundingBox" id="filter-5">
+            <feOffset dx="0" dy="8" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
+            <feGaussianBlur stdDeviation="4" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
+            <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.0568181818 0" type="matrix" in="shadowBlurOuter1"></feColorMatrix>
+        </filter>
+
+        <!-- middle line -->
+        <rect id="path-2" x="42" y="167" width="168" height="27" rx="13.5">
+          <animate attributeName="width" from="0" to="168" dur="5s" fill="freeze"/>
+        </rect>
+        <filter x="-9.5%" y="-29.6%" width="119.0%" height="218.5%" filterUnits="objectBoundingBox" id="filter-3">
+            <feOffset dx="0" dy="8" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
+            <feGaussianBlur stdDeviation="4" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
+            <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.0568181818 0" type="matrix" in="shadowBlurOuter1"></feColorMatrix>
+        </filter>
+
+        <!-- bottom line -->
+        <rect id="path-6" x="41" y="226" width="105" height="25" rx="12.5">
+          <animate attributeName="width" from="0" to="105" dur="2s" fill="freeze"/>
+        </rect>
+        <filter x="-15.2%" y="-32.0%" width="130.5%" height="228.0%" filterUnits="objectBoundingBox" id="filter-7">
+            <feOffset dx="0" dy="8" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
+            <feGaussianBlur stdDeviation="4" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
+            <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.0568181818 0" type="matrix" in="shadowBlurOuter1"></feColorMatrix>
+        </filter>
+    </defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Group-5-Copy-2" transform="translate(-415.000000, -351.000000)">
+            <g id="Group-10" transform="translate(415.000000, 351.000000)">
+                <g id="Group-9" transform="translate(0.000000, 15.000000)">
+                    <!-- small radio wave -->
+                    <path d="M237.612214,138.157654 C234.725783,135.28192 230.051254,135.279644 227.164823,138.157654 C224.278392,141.035663 224.278392,145.698831 227.164823,148.57684 C234.93988,156.329214 239.222735,166.601382 239.222735,177.499403 C239.222735,188.397423 234.93988,198.669591 227.164823,206.424696 C224.278392,209.30043 224.278392,213.965873 227.164823,216.841607 C228.608267,218.280384 230.497251,219 232.388518,219 C234.277503,219 236.16877,218.280384 237.612214,216.841607 C248.18012,206.304532 254,192.334147 254,177.499403 C254,162.665114 248.18012,148.694728 237.612214,138.157654 Z" id="Path-Copy-26" fill-opacity="0.200482" fill="#000000" fill-rule="nonzero" opacity="0.754065225">
+                      <animate attributeName="opacity" from="0" to="1" dur="3s" repeatCount="indefinite"/>
+                    </path>
+                    <!-- large radio wave -->
+                    <path d="M267.333026,113.158661 C264.51049,110.280446 259.939438,110.280446 257.116902,113.158661 C254.294366,116.039154 254.294366,120.709078 257.116902,123.586837 C285.703837,152.763042 285.703837,200.237641 257.116902,229.413847 C254.294366,232.292061 254.294366,236.96153 257.116902,239.839744 C258.528393,241.280219 260.375562,242 262.224964,242 C264.074365,242 265.921535,241.279763 267.333026,239.837011 C301.555658,204.912576 301.555658,148.084007 267.333026,113.158661 Z" id="Path-Copy-27" fill-opacity="0.250565" fill="#131514" fill-rule="nonzero" opacity="0.754065225">
+                      <animate attributeName="opacity" from="0" to="1" dur="3s" repeatCount="indefinite"/>
+                    </path>
+                    <!-- top line -->
+                    <g id="Rectangle-Copy-56">
+                      <use fill="#000000" fill-opacity="0.200482" fill-rule="evenodd" xlink:href="#path-4"></use>
+                    </g>
+                    <!-- middle line -->
+                    <g id="Rectangle-Copy-55">
+                      <use fill="black" fill-opacity="1" filter="url(#filter-3)" xlink:href="#path-2"></use>
+                      <use fill="#000000" fill-opacity="0.200482" fill-rule="evenodd" xlink:href="#path-2"></use>
+                    </g>
+                    <!-- bottom line -->
+                    <g id="Rectangle-Copy-57">
+                      <use fill="black" fill-opacity="1" filter="url(#filter-7)" xlink:href="#path-6"></use>
+                      <use fill="#000000" fill-opacity="0.200482" xlink:href="#path-6"></use>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
diff --git a/src/templates/pad.html b/src/templates/pad.html
index ca410154..0f96734e 100644
--- a/src/templates/pad.html
+++ b/src/templates/pad.html
@@ -100,6 +100,7 @@
         <% e.end_block(); %>
         <% e.begin_block("loading"); %>
         <p data-l10n-id="pad.loading" id="loading" class="editorloadingbox-message">
+          <img src='../static/img/brand.svg' class='etherpadBrand'><br/>
           Loading...
         </p>
         <% e.end_block(); %>
@@ -237,7 +238,9 @@
           </div>
           <div class="reconnecting">
             <h1 data-l10n-id="pad.modals.reconnecting"></h1>
-            <i class='buttonicon buttonicon-spin5 icon-spin'></i>
+            <i class='buttonicon buttonicon-spin5 icon-spin'>
+              <img src='../static/img/brand.svg' class='etherpadBrand'><br/>
+            </i>
           </div>
           <div class="userdup">
             <h1 data-l10n-id="pad.modals.userdup"></h1>

From bdb78adb3fd6bfdf912c8805d56b450a22de1abe Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Sun, 21 Feb 2021 13:50:25 +0000
Subject: [PATCH 046/115] Update CHANGELOG.md

---
 CHANGELOG.md | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a17488f3..c94227fc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,18 @@
 
 ### Notable fixes
 
+### Notable enhancements
+
+* Improved line number alignment and user experience around line anchors
+* Notification to admin console if a plugin is missing during user file import
+* Beautiful loading and reconnecting animation
+* Additional code quality improvements
+* Dependency updates
+
+# 1.8.9
+
+### Notable fixes
+
 * Fixed HTTP 400 error when importing via the UI.
 * Fixed "Error: spawn npm ENOENT" crash on startup in Windows.
 

From 0bb3e6502065b94647d9fe9662b4a744adabde79 Mon Sep 17 00:00:00 2001
From: webzwo0i <webzwo0i@c3d2.de>
Date: Mon, 15 Feb 2021 08:52:38 +0100
Subject: [PATCH 047/115] fix for caching plugin-definitions

---
 src/node/utils/Settings.js               | 28 ++++++++++++------------
 src/static/js/pluginfw/client_plugins.js |  5 +++--
 src/static/js/pluginfw/installer.js      |  7 ++++--
 src/templates/pad.html                   |  6 ++++-
 src/templates/timeslider.html            |  6 ++++-
 5 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/src/node/utils/Settings.js b/src/node/utils/Settings.js
index 202e80c6..70e9bb45 100644
--- a/src/node/utils/Settings.js
+++ b/src/node/utils/Settings.js
@@ -42,20 +42,6 @@ const _ = require('underscore');
 exports.root = absolutePaths.findEtherpadRoot();
 console.log(`All relative paths will be interpreted relative to the identified Etherpad base dir: ${exports.root}`);
 
-/*
- * At each start, Etherpad generates a random string and appends it as query
- * parameter to the URLs of the static assets, in order to force their reload.
- * Subsequent requests will be cached, as long as the server is not reloaded.
- *
- * For the rationale behind this choice, see
- * https://github.com/ether/etherpad-lite/pull/3958
- *
- * ACHTUNG: this may prevent caching HTTP proxies to work
- * TODO: remove the "?v=randomstring" parameter, and replace with hashed filenames instead
- */
-exports.randomVersionString = randomString(4);
-console.log(`Random string used for versioning assets: ${exports.randomVersionString}`);
-
 /**
  * The app title, visible e.g. in the browser window
  */
@@ -796,6 +782,20 @@ exports.reloadSettings = () => {
     // using Unix socket for connectivity
     console.warn('The settings file contains an empty string ("") for the "ip" parameter. The "port" parameter will be interpreted as the path to a Unix socket to bind at.');
   }
+
+  /*
+   * At each start, Etherpad generates a random string and appends it as query
+   * parameter to the URLs of the static assets, in order to force their reload.
+   * Subsequent requests will be cached, as long as the server is not reloaded.
+   *
+   * For the rationale behind this choice, see
+   * https://github.com/ether/etherpad-lite/pull/3958
+   *
+   * ACHTUNG: this may prevent caching HTTP proxies to work
+   * TODO: remove the "?v=randomstring" parameter, and replace with hashed filenames instead
+   */
+  exports.randomVersionString = randomString(4);
+  console.log(`Random string used for versioning assets: ${exports.randomVersionString}`);
 };
 
 // initially load settings
diff --git a/src/static/js/pluginfw/client_plugins.js b/src/static/js/pluginfw/client_plugins.js
index 6163241a..221e786f 100644
--- a/src/static/js/pluginfw/client_plugins.js
+++ b/src/static/js/pluginfw/client_plugins.js
@@ -12,9 +12,10 @@ exports.update = (cb) => {
   // of execution on Firefox. This schedules the response in the run-loop,
   // which appears to fix the issue.
   const callback = () => setTimeout(cb, 0);
-  $.ajaxSetup({cache: false});
 
-  jQuery.getJSON(`${exports.baseURL}pluginfw/plugin-definitions.json`).done((data) => {
+  jQuery.getJSON(
+      `${exports.baseURL}pluginfw/plugin-definitions.json?v=${clientVars.randomVersionString}`
+  ).done((data) => {
     defs.plugins = data.plugins;
     defs.parts = data.parts;
     defs.hooks = pluginUtils.extractHooks(defs.parts, 'client_hooks');
diff --git a/src/static/js/pluginfw/installer.js b/src/static/js/pluginfw/installer.js
index 8908dbaa..104777d3 100644
--- a/src/static/js/pluginfw/installer.js
+++ b/src/static/js/pluginfw/installer.js
@@ -5,11 +5,14 @@ const plugins = require('./plugins');
 const hooks = require('./hooks');
 const request = require('request');
 const runCmd = require('../../../node/utils/run_cmd');
+const settings = require('../../../node/utils/Settings');
 
 const logger = log4js.getLogger('plugins');
 
-const onAllTasksFinished = () => {
-  hooks.aCallAll('restartServer', {}, () => {});
+const onAllTasksFinished = async () => {
+  settings.reloadSettings();
+  await hooks.aCallAll('loadSettings', {settings});
+  await hooks.aCallAll('restartServer');
 };
 
 let tasks = 0;
diff --git a/src/templates/pad.html b/src/templates/pad.html
index 0f96734e..819abd86 100644
--- a/src/templates/pad.html
+++ b/src/templates/pad.html
@@ -478,7 +478,11 @@
   <!-- Bootstrap page -->
   <script type="text/javascript">
       // @license magnet:?xt=urn:btih:8e4f440f4c65981c5bf93c76d35135ba5064d8b7&dn=apache-2.0.txt
-      var clientVars = {};
+      var clientVars = {
+        // This is needed to fetch /pluginfw/plugin-definitions.json, which happens before the
+        // server sends the CLIENT_VARS message.
+        randomVersionString: <%-JSON.stringify(settings.randomVersionString)%>,
+      };
       (function () {
         var pathComponents = location.pathname.split('/');
 
diff --git a/src/templates/timeslider.html b/src/templates/timeslider.html
index 82da2625..9489c4e4 100644
--- a/src/templates/timeslider.html
+++ b/src/templates/timeslider.html
@@ -260,7 +260,11 @@
 <!-- Bootstrap -->
 <script type="text/javascript" >
   // @license magnet:?xt=urn:btih:8e4f440f4c65981c5bf93c76d35135ba5064d8b7&dn=apache-2.0.txt
-  var clientVars = {};
+  var clientVars = {
+    // This is needed to fetch /pluginfw/plugin-definitions.json, which happens before the
+    // server sends the CLIENT_VARS message.
+    randomVersionString: <%-JSON.stringify(settings.randomVersionString)%>,
+  };
   var BroadcastSlider;
   (function () {
     var pathComponents = location.pathname.split('/');

From 1b8cd0747dc76b7a46f7e00201b2b73b1591e456 Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Sun, 21 Feb 2021 15:07:39 +0000
Subject: [PATCH 048/115] Move vendor libraries to /vendors folder and exclude
 from LGTM

---
 lgtm.yml                                  |  9 ++++++++
 src/node/utils/tar.json                   | 16 ++++++-------
 src/package.json                          | 10 ++++----
 src/static/js/AttributeManager.js         |  2 +-
 src/static/js/ace2_inner.js               |  2 +-
 src/static/js/broadcast.js                |  2 +-
 src/static/js/broadcast_slider.js         |  2 +-
 src/static/js/collab_client.js            |  2 +-
 src/static/js/domline.js                  |  2 +-
 src/static/js/pad.js                      |  6 ++---
 src/static/js/pad_editbar.js              |  2 +-
 src/static/js/rjquery.js                  |  2 +-
 src/static/js/skiplist.js                 |  2 +-
 src/static/js/timeslider.js               |  2 +-
 src/static/js/undomodule.js               |  2 +-
 src/static/js/{ => vendors}/browser.js    |  6 ++++-
 src/static/js/{ => vendors}/farbtastic.js |  3 +++
 src/static/js/{ => vendors}/gritter.js    |  2 ++
 src/static/js/{ => vendors}/html10n.js    |  2 ++
 src/static/js/{ => vendors}/jquery.js     |  0
 src/static/js/vendors/nice-select.js      | 28 +++++------------------
 src/static/js/{ => vendors}/underscore.js |  0
 src/templates/admin/index.html            |  4 ++--
 src/templates/admin/plugins-info.html     |  2 +-
 src/templates/admin/plugins.html          |  4 ++--
 src/templates/admin/settings.html         |  4 ++--
 src/templates/index.html                  |  4 ++--
 src/templates/javascript.html             | 16 ++++++-------
 src/templates/pad.html                    |  4 ++--
 src/templates/timeslider.html             |  4 ++--
 src/tests/frontend/helper.js              |  2 +-
 src/tests/frontend/index.html             |  6 ++---
 32 files changed, 79 insertions(+), 75 deletions(-)
 create mode 100644 lgtm.yml
 rename src/static/js/{ => vendors}/browser.js (97%)
 rename src/static/js/{ => vendors}/farbtastic.js (99%)
 rename src/static/js/{ => vendors}/gritter.js (99%)
 rename src/static/js/{ => vendors}/html10n.js (99%)
 rename src/static/js/{ => vendors}/jquery.js (100%)
 rename src/static/js/{ => vendors}/underscore.js (100%)

diff --git a/lgtm.yml b/lgtm.yml
new file mode 100644
index 00000000..9dd0f16b
--- /dev/null
+++ b/lgtm.yml
@@ -0,0 +1,9 @@
+extraction:
+  javascript:
+    index:
+      exclude:
+        - src/static/js/vendors
+  python:
+    index:
+      exclude:
+        - /
diff --git a/src/node/utils/tar.json b/src/node/utils/tar.json
index c3081072..63944f85 100644
--- a/src/node/utils/tar.json
+++ b/src/node/utils/tar.json
@@ -2,7 +2,7 @@
   "pad.js": [
     "pad.js"
   , "pad_utils.js"
-  , "browser.js"
+  , "vendors/browser.js"
   , "pad_cookie.js"
   , "pad_editor.js"
   , "pad_editbar.js"
@@ -16,10 +16,10 @@
   , "pad_savedrevs.js"
   , "pad_connectionstatus.js"
   , "chat.js"
-  , "gritter.js"
+  , "vendors/gritter.js"
   , "$js-cookie/src/js.cookie.js"
   , "$tinycon/tinycon.js"
-  , "farbtastic.js"
+  , "vendors/farbtastic.js"
   , "skin_variants.js"
   , "socketio.js"
   ]
@@ -28,7 +28,7 @@
   , "colorutils.js"
   , "draggable.js"
   , "pad_utils.js"
-  , "browser.js"
+  , "vendors/browser.js"
   , "pad_cookie.js"
   , "pad_editor.js"
   , "pad_editbar.js"
@@ -49,7 +49,7 @@
   ]
 , "ace2_inner.js": [
     "ace2_inner.js"
-  , "browser.js"
+  , "vendors/browser.js"
   , "AttributePool.js"
   , "Changeset.js"
   , "ChangesetUtils.js"
@@ -68,11 +68,11 @@
   ]
 , "ace2_common.js": [
     "ace2_common.js"
-  , "browser.js"
-  , "jquery.js"
+  , "vendors/browser.js"
+  , "vendors/jquery.js"
   , "rjquery.js"
   , "$async.js"
-  , "underscore.js"
+  , "vendors/underscore.js"
   , "$underscore.js"
   , "$underscore/underscore.js"
   , "security.js"
diff --git a/src/package.json b/src/package.json
index 3c847b74..5580380d 100644
--- a/src/package.json
+++ b/src/package.json
@@ -100,11 +100,11 @@
     "ignorePatterns": [
       "/static/js/admin/jquery.autosize.js",
       "/static/js/admin/minify.json.js",
-      "/static/js/browser.js",
-      "/static/js/farbtastic.js",
-      "/static/js/gritter.js",
-      "/static/js/html10n.js",
-      "/static/js/jquery.js",
+      "/static/js/vendors/browser.js",
+      "/static/js/vendors/farbtastic.js",
+      "/static/js/vendors/gritter.js",
+      "/static/js/vendors/html10n.js",
+      "/static/js/vendors/jquery.js",
       "/static/js/vendors/nice-select.js",
       "/tests/frontend/lib/"
     ],
diff --git a/src/static/js/AttributeManager.js b/src/static/js/AttributeManager.js
index 7a37c8ff..1d8bd937 100644
--- a/src/static/js/AttributeManager.js
+++ b/src/static/js/AttributeManager.js
@@ -2,7 +2,7 @@
 
 const Changeset = require('./Changeset');
 const ChangesetUtils = require('./ChangesetUtils');
-const _ = require('./underscore');
+const _ = require('./vendors/underscore');
 
 const lineMarkerAttribute = 'lmkr';
 
diff --git a/src/static/js/ace2_inner.js b/src/static/js/ace2_inner.js
index 8e41ae13..429fef7c 100644
--- a/src/static/js/ace2_inner.js
+++ b/src/static/js/ace2_inner.js
@@ -18,7 +18,7 @@
  */
 let documentAttributeManager;
 
-const browser = require('./browser');
+const browser = require('./vendors/browser');
 const padutils = require('./pad_utils').padutils;
 const Ace2Common = require('./ace2_common');
 const $ = require('./rjquery').$;
diff --git a/src/static/js/broadcast.js b/src/static/js/broadcast.js
index 26370f6b..871e8c9b 100644
--- a/src/static/js/broadcast.js
+++ b/src/static/js/broadcast.js
@@ -28,7 +28,7 @@ const AttribPool = require('./AttributePool');
 const Changeset = require('./Changeset');
 const linestylefilter = require('./linestylefilter').linestylefilter;
 const colorutils = require('./colorutils').colorutils;
-const _ = require('./underscore');
+const _ = require('./vendors/underscore');
 const hooks = require('./pluginfw/hooks');
 
 // These parameters were global, now they are injected. A reference to the
diff --git a/src/static/js/broadcast_slider.js b/src/static/js/broadcast_slider.js
index f03a2283..816a67a2 100644
--- a/src/static/js/broadcast_slider.js
+++ b/src/static/js/broadcast_slider.js
@@ -23,7 +23,7 @@
 
 // These parameters were global, now they are injected. A reference to the
 // Timeslider controller would probably be more appropriate.
-const _ = require('./underscore');
+const _ = require('./vendors/underscore');
 const padmodals = require('./pad_modals').padmodals;
 const colorutils = require('./colorutils').colorutils;
 
diff --git a/src/static/js/collab_client.js b/src/static/js/collab_client.js
index d2b9c402..a4cbafd9 100644
--- a/src/static/js/collab_client.js
+++ b/src/static/js/collab_client.js
@@ -24,7 +24,7 @@
 
 const chat = require('./chat').chat;
 const hooks = require('./pluginfw/hooks');
-const browser = require('./browser');
+const browser = require('./vendors/browser');
 
 // Dependency fill on init. This exists for `pad.socket` only.
 // TODO: bind directly to the socket.
diff --git a/src/static/js/domline.js b/src/static/js/domline.js
index 324e1353..727d81ed 100644
--- a/src/static/js/domline.js
+++ b/src/static/js/domline.js
@@ -24,7 +24,7 @@
 
 const Security = require('./security');
 const hooks = require('./pluginfw/hooks');
-const _ = require('./underscore');
+const _ = require('./vendors/underscore');
 const lineAttributeMarker = require('./linestylefilter').lineAttributeMarker;
 const noop = () => {};
 
diff --git a/src/static/js/pad.js b/src/static/js/pad.js
index d8aaa4fe..77a37cd1 100644
--- a/src/static/js/pad.js
+++ b/src/static/js/pad.js
@@ -26,9 +26,9 @@ let socket;
 
 // These jQuery things should create local references, but for now `require()`
 // assigns to the global `$` and augments it with plugins.
-require('./jquery');
-require('./farbtastic');
-require('./gritter');
+require('./vendors/jquery');
+require('./vendors/farbtastic');
+require('./vendors/gritter');
 
 const Cookies = require('./pad_utils').Cookies;
 const chat = require('./chat').chat;
diff --git a/src/static/js/pad_editbar.js b/src/static/js/pad_editbar.js
index 788d5ecd..7305608f 100644
--- a/src/static/js/pad_editbar.js
+++ b/src/static/js/pad_editbar.js
@@ -22,7 +22,7 @@
  * limitations under the License.
  */
 
-const browser = require('./browser');
+const browser = require('./vendors/browser');
 const hooks = require('./pluginfw/hooks');
 const padutils = require('./pad_utils').padutils;
 const padeditor = require('./pad_editor').padeditor;
diff --git a/src/static/js/rjquery.js b/src/static/js/rjquery.js
index d729a25b..a80e1f8d 100644
--- a/src/static/js/rjquery.js
+++ b/src/static/js/rjquery.js
@@ -1,5 +1,5 @@
 'use strict';
 // Provides a require'able version of jQuery without leaking $ and jQuery;
-window.$ = require('./jquery');
+window.$ = require('./vendors/jquery');
 const jq = window.$.noConflict(true);
 exports.jQuery = exports.$ = jq;
diff --git a/src/static/js/skiplist.js b/src/static/js/skiplist.js
index 4ea74010..006cf008 100644
--- a/src/static/js/skiplist.js
+++ b/src/static/js/skiplist.js
@@ -23,7 +23,7 @@
  */
 
 const Ace2Common = require('./ace2_common');
-const _ = require('./underscore');
+const _ = require('./vendors/underscore');
 
 const noop = Ace2Common.noop;
 
diff --git a/src/static/js/timeslider.js b/src/static/js/timeslider.js
index 23d7c79c..74aaf4f5 100644
--- a/src/static/js/timeslider.js
+++ b/src/static/js/timeslider.js
@@ -24,7 +24,7 @@
 
 // These jQuery things should create local references, but for now `require()`
 // assigns to the global `$` and augments it with plugins.
-require('./jquery');
+require('./vendors/jquery');
 
 const Cookies = require('./pad_utils').Cookies;
 const randomString = require('./pad_utils').randomString;
diff --git a/src/static/js/undomodule.js b/src/static/js/undomodule.js
index b8270b80..294b23bb 100644
--- a/src/static/js/undomodule.js
+++ b/src/static/js/undomodule.js
@@ -23,7 +23,7 @@
  */
 
 const Changeset = require('./Changeset');
-const _ = require('./underscore');
+const _ = require('./vendors/underscore');
 
 const undoModule = (() => {
   const stack = (() => {
diff --git a/src/static/js/browser.js b/src/static/js/vendors/browser.js
similarity index 97%
rename from src/static/js/browser.js
rename to src/static/js/vendors/browser.js
index 5d5f741a..2516a325 100644
--- a/src/static/js/browser.js
+++ b/src/static/js/vendors/browser.js
@@ -1,3 +1,7 @@
+// WARNING: This file may have been modified from original.
+// TODO: Check requirement of this file, this afaik was to cover weird edge cases
+// that have probably been fixed in browsers.
+
 /*!
   * Bowser - a browser detector
   * https://github.com/ded/bowser
@@ -303,4 +307,4 @@
   bowser._detect = detect;
 
   return bowser
-});
\ No newline at end of file
+});
diff --git a/src/static/js/farbtastic.js b/src/static/js/vendors/farbtastic.js
similarity index 99%
rename from src/static/js/farbtastic.js
rename to src/static/js/vendors/farbtastic.js
index c6e12da4..cc0c2c1b 100644
--- a/src/static/js/farbtastic.js
+++ b/src/static/js/vendors/farbtastic.js
@@ -1,3 +1,6 @@
+// WARNING: This file has been modified from original.
+// TODO: Replace with https://github.com/Simonwep/pickr
+
 // Farbtastic 2.0 alpha
 // Original can be found at:
 // https://github.com/mattfarina/farbtastic/blob/71ca15f4a09c8e5a08a1b0d1cf37ef028adf22f0/src/farbtastic.js
diff --git a/src/static/js/gritter.js b/src/static/js/vendors/gritter.js
similarity index 99%
rename from src/static/js/gritter.js
rename to src/static/js/vendors/gritter.js
index 64295ef7..a20cb4de 100644
--- a/src/static/js/gritter.js
+++ b/src/static/js/vendors/gritter.js
@@ -1,3 +1,5 @@
+// WARNING: This file has been modified from the Original
+
 /*
  * Gritter for jQuery
  * http://www.boedesign.com/
diff --git a/src/static/js/html10n.js b/src/static/js/vendors/html10n.js
similarity index 99%
rename from src/static/js/html10n.js
rename to src/static/js/vendors/html10n.js
index 969a6a1a..43ac67f3 100644
--- a/src/static/js/html10n.js
+++ b/src/static/js/vendors/html10n.js
@@ -1,3 +1,5 @@
+// WARNING: This file has been modified from the Original
+
 /**
  * Copyright (c) 2012 Marcel Klehr
  * Copyright (c) 2011-2012 Fabien Cazenave, Mozilla
diff --git a/src/static/js/jquery.js b/src/static/js/vendors/jquery.js
similarity index 100%
rename from src/static/js/jquery.js
rename to src/static/js/vendors/jquery.js
diff --git a/src/static/js/vendors/nice-select.js b/src/static/js/vendors/nice-select.js
index cbd978ac..8975f03e 100644
--- a/src/static/js/vendors/nice-select.js
+++ b/src/static/js/vendors/nice-select.js
@@ -1,3 +1,6 @@
+// WARNING: This file has been modified from the Original
+// TODO: Nice Select seems relatively abandoned, we should consider other options.
+
 /*  jQuery Nice Select - v1.1.0
     https://github.com/hernansartorio/jquery-nice-select
     Made by Hernán Sartorio  */
@@ -60,14 +63,14 @@
         .addClass($select.attr('class') || '')
         .addClass($select.attr('disabled') ? 'disabled' : '')
         .attr('tabindex', $select.attr('disabled') ? null : '0')
-        .html('<span class="current"></span><ul class="list thin-scrollbar"></ul>')
+        .html('<span class="current"></span><ul class="list"></ul>')
       );
 
       var $dropdown = $select.next();
       var $options = $select.find('option');
       var $selected = $select.find('option:selected');
 
-      $dropdown.find('.current').html($selected.data('display') || $selected.text());
+      $dropdown.find('.current').html($selected.data('display') || $selected.text());
 
       $options.each(function(i) {
         var $option = $(this);
@@ -94,31 +97,12 @@
       var $dropdown = $(this);
 
       $('.nice-select').not($dropdown).removeClass('open');
-
       $dropdown.toggleClass('open');
 
       if ($dropdown.hasClass('open')) {
         $dropdown.find('.option');
         $dropdown.find('.focus').removeClass('focus');
         $dropdown.find('.selected').addClass('focus');
-        if ($dropdown.closest('.toolbar').length > 0) {
-          $dropdown.find('.list').css('left', $dropdown.offset().left);
-          $dropdown.find('.list').css('top', $dropdown.offset().top + $dropdown.outerHeight());
-          $dropdown.find('.list').css('min-width', $dropdown.outerWidth() + 'px');
-        }
-
-        $listHeight = $dropdown.find('.list').outerHeight();
-        $top = $dropdown.parent().offset().top;
-        $bottom = $('body').height() - $top;
-        $maxListHeight = $bottom - $dropdown.outerHeight() - 20;
-        if ($maxListHeight < 200) {
-          $dropdown.addClass('reverse');
-          $maxListHeight = 250;
-        } else {
-          $dropdown.removeClass('reverse')
-        }
-        $dropdown.find('.list').css('max-height', $maxListHeight + 'px');
-
       } else {
         $dropdown.focus();
       }
@@ -206,4 +190,4 @@
 
   };
 
-}(jQuery));
\ No newline at end of file
+}(jQuery));
diff --git a/src/static/js/underscore.js b/src/static/js/vendors/underscore.js
similarity index 100%
rename from src/static/js/underscore.js
rename to src/static/js/vendors/underscore.js
diff --git a/src/templates/admin/index.html b/src/templates/admin/index.html
index efed7f80..d4478153 100644
--- a/src/templates/admin/index.html
+++ b/src/templates/admin/index.html
@@ -4,10 +4,10 @@
     <title data-l10n-id="admin.page-title">Admin Dashboard - Etherpad</title>
     <meta name="viewport" content="width=device-width">
     <link rel="stylesheet" href="../static/css/admin.css">
-    <script src="../static/js/jquery.js"></script>
+    <script src="../static/js/vendors/jquery.js"></script>
     <script src="../socket.io/socket.io.js"></script>
     <link rel="localizations" type="application/l10n+json" href="../locales.json" />
-    <script src="../static/js/html10n.js"></script>
+    <script src="../static/js/vendors/html10n.js"></script>
     <script src="../static/js/l10n.js"></script>
   </head>
   <body>
diff --git a/src/templates/admin/plugins-info.html b/src/templates/admin/plugins-info.html
index a737ea05..57e41f85 100644
--- a/src/templates/admin/plugins-info.html
+++ b/src/templates/admin/plugins-info.html
@@ -5,7 +5,7 @@
     <meta name="viewport" content="width=device-width">
     <link rel="stylesheet" href="../../static/css/admin.css">
     <link rel="localizations" type="application/l10n+json" href="../../locales.json" />
-    <script src="../../static/js/html10n.js"></script>
+    <script src="../../static/js/vendors/html10n.js"></script>
     <script src="../../static/js/l10n.js"></script>
   </head>
   <body>
diff --git a/src/templates/admin/plugins.html b/src/templates/admin/plugins.html
index 76b01acb..278304fa 100644
--- a/src/templates/admin/plugins.html
+++ b/src/templates/admin/plugins.html
@@ -4,12 +4,12 @@
     <title data-l10n-id="admin_plugins.page-title">Plugin manager - Etherpad</title>
     <meta name="viewport" content="width=device-width">
     <link rel="stylesheet" href="../static/css/admin.css">
-    <script src="../static/js/jquery.js"></script>
+    <script src="../static/js/vendors/jquery.js"></script>
     <script src="../socket.io/socket.io.js"></script>
     <script src="../static/js/socketio.js"></script>
     <script src="../static/js/admin/plugins.js"></script>
     <link rel="localizations" type="application/l10n+json" href="../locales.json" />
-    <script src="../static/js/html10n.js"></script>
+    <script src="../static/js/vendors/html10n.js"></script>
     <script src="../static/js/l10n.js"></script>
   </head>
   <body>
diff --git a/src/templates/admin/settings.html b/src/templates/admin/settings.html
index a75a9168..ffa4172f 100644
--- a/src/templates/admin/settings.html
+++ b/src/templates/admin/settings.html
@@ -4,14 +4,14 @@
     <title data-l10n-id="admin_settings.page-title">Settings - Etherpad</title>
     <meta name="viewport" content="width=device-width">
     <link rel="stylesheet" href="../static/css/admin.css">
-    <script src="../static/js/jquery.js"></script>
+    <script src="../static/js/vendors/jquery.js"></script>
     <script src="../socket.io/socket.io.js"></script>
     <script src="../static/js/socketio.js"></script>
     <script src="../static/js/admin/minify.json.js"></script>
     <script src="../static/js/admin/settings.js"></script>
     <script src="../static/js/admin/jquery.autosize.js"></script>
     <link rel="localizations" type="application/l10n+json" href="../locales.json" />
-    <script src="../static/js/html10n.js"></script>
+    <script src="../static/js/vendors/html10n.js"></script>
     <script src="../static/js/l10n.js"></script>
   </head>
   <body>
diff --git a/src/templates/index.html b/src/templates/index.html
index 213071fe..8f20c08d 100644
--- a/src/templates/index.html
+++ b/src/templates/index.html
@@ -11,9 +11,9 @@
         <link rel="shortcut icon" href="<%=settings.favicon%>">
 
         <link rel="localizations" type="application/l10n+json" href="locales.json">
-        <script type="text/javascript" src="static/js/html10n.js?v=<%=settings.randomVersionString%>"></script>
+        <script type="text/javascript" src="static/js/vendors/html10n.js?v=<%=settings.randomVersionString%>"></script>
         <script type="text/javascript" src="static/js/l10n.js?v=<%=settings.randomVersionString%>"></script>
-        <script src="static/js/jquery.js"></script>
+        <script src="static/js/vendors/jquery.js"></script>
         <script src="static/js/index.js"></script>
 
         <style>
diff --git a/src/templates/javascript.html b/src/templates/javascript.html
index 7bc92e05..42482f69 100644
--- a/src/templates/javascript.html
+++ b/src/templates/javascript.html
@@ -9,24 +9,24 @@
     <body>
         <table id="jslicense-labels1">
             <tr>
-                <td><a href="/static/js/jquery-2.1.1.min.js">jquery-2.1.1.min.js</a></td>
+                <td><a href="/static/js/vendors/jquery-3.0.0.min.js">jquery-3.0.1.min.js</a></td>
                 <td><a href="http://www.jclark.com/xml/copying.txt">Expat</a></td>
-                <td><a href="/static/js/jquery.js">jquery.js</a></td>
+                <td><a href="/static/js/vendors/jquery.js">jquery.js</a></td>
             </tr>
             <tr>
-                <td><a href="/static/js/html10n.js">html10n.js</a></td>
+                <td><a href="/static/js/vendors/html10n.js">html10n.js</a></td>
                 <td><a href="http://www.jclark.com/xml/copying.txt">Expat</a></td>
-                <td><a href="/static/js/html10n.js">html10n.js</a></td>
+                <td><a href="/static/js/vendors/html10n.js">html10n.js</a></td>
             </tr>
             <tr>
-                <td><a href="/static/js/l10n.js">l10n.js</a></td>
+                <td><a href="/static/js/vendors/l10n.js">l10n.js</a></td>
                 <td><a href="http://www.apache.org/licenses/LICENSE-2.0">Apache-2.0-only</a></td>
-                <td><a href="/static/js/l10n.js">l10n.js</a></td>
+                <td><a href="/static/js/vendors/l10n.js">l10n.js</a></td>
             </tr>
             <tr>
-                <td><a href="/static/js/socket.io.js">socket.io.js</a></td>
+                <td><a href="/static/js/vendors/socket.io.js">socket.io.js</a></td>
                 <td><a href="http://www.jclark.com/xml/copying.txt">Expat</a></td>
-                <td><a href="/static/js/socket.io.js">socket.io.js</a></td>
+                <td><a href="/static/js/vendors/socket.io.js">socket.io.js</a></td>
             </tr>
             <tr>
                 <td><a href="/static/js/require-kernel.js">require-kernel.js</a></td>
diff --git a/src/templates/pad.html b/src/templates/pad.html
index 819abd86..de88b6f7 100644
--- a/src/templates/pad.html
+++ b/src/templates/pad.html
@@ -52,7 +52,7 @@
   <% e.end_block(); %>
 
   <link rel="localizations" type="application/l10n+json" href="../locales.json" />
-  <script type="text/javascript" src="../static/js/html10n.js?v=<%=settings.randomVersionString%>"></script>
+  <script type="text/javascript" src="../static/js/vendors/html10n.js?v=<%=settings.randomVersionString%>"></script>
   <script type="text/javascript" src="../static/js/l10n.js?v=<%=settings.randomVersionString%>"></script>
 
   <!-- head and body had been removed intentionally -->
@@ -494,7 +494,7 @@
         require.setGlobalKeyPath("require");
 
         $ = jQuery = require('ep_etherpad-lite/static/js/rjquery').jQuery; // Expose jQuery #HACK
-        browser = require('ep_etherpad-lite/static/js/browser');
+        browser = require('ep_etherpad-lite/static/js/vendors/browser');
 
         var plugins = require('ep_etherpad-lite/static/js/pluginfw/client_plugins');
         var hooks = require('ep_etherpad-lite/static/js/pluginfw/hooks');
diff --git a/src/templates/timeslider.html b/src/templates/timeslider.html
index 9489c4e4..f04bf0c2 100644
--- a/src/templates/timeslider.html
+++ b/src/templates/timeslider.html
@@ -45,7 +45,7 @@
 
   <link rel="localizations" type="application/l10n+json" href="../../locales.json" />
   <% e.begin_block("timesliderScripts"); %>
-  <script type="text/javascript" src="../../static/js/html10n.js?v=<%=settings.randomVersionString%>"></script>
+  <script type="text/javascript" src="../../static/js/vendors/html10n.js?v=<%=settings.randomVersionString%>"></script>
   <script type="text/javascript" src="../../static/js/l10n.js?v=<%=settings.randomVersionString%>"></script>
   <% e.end_block(); %>
 </head>
@@ -278,7 +278,7 @@
     require.setGlobalKeyPath("require");
 
     $ = jQuery = require('ep_etherpad-lite/static/js/rjquery').jQuery; // Expose jQuery #HACK
-    browser = require('ep_etherpad-lite/static/js/browser');
+    browser = require('ep_etherpad-lite/static/js/vendors/browser');
 
     var plugins = require('ep_etherpad-lite/static/js/pluginfw/client_plugins');
     var socket = require('ep_etherpad-lite/static/js/timeslider').socket;
diff --git a/src/tests/frontend/helper.js b/src/tests/frontend/helper.js
index 4dd7f22a..4b187608 100644
--- a/src/tests/frontend/helper.js
+++ b/src/tests/frontend/helper.js
@@ -7,7 +7,7 @@ const helper = {};
   const jsLibraries = {};
 
   helper.init = (cb) => {
-    $.get('/static/js/jquery.js').done((code) => {
+    $.get('/static/js/vendors/jquery.js').done((code) => {
       // make sure we don't override existing jquery
       jsLibraries.jquery = `if(typeof $ === 'undefined') {\n${code}\n}`;
 
diff --git a/src/tests/frontend/index.html b/src/tests/frontend/index.html
index 8d31a8e6..3d806f62 100644
--- a/src/tests/frontend/index.html
+++ b/src/tests/frontend/index.html
@@ -9,8 +9,8 @@
     <div id="mocha"></div>
     <div id="iframe-container"></div>
 
-    <script src="/static/js/jquery.js"></script>
-    <script src="/static/js/browser.js"></script>
+    <script src="/static/js/vendors/jquery.js"></script>
+    <script src="/static/js/vendors/browser.js"></script>
     <script src="lib/underscore.js"></script>
 
     <script src="lib/mocha.js"></script>
@@ -20,7 +20,7 @@
     <script src="helper.js"></script>
     <script src="helper/methods.js"></script>
     <script src="helper/ui.js"></script>
-    
+
     <script src="specs_list.js"></script>
     <script src="runner.js"></script>
 </html>

From 543e94fd4a76cbd2a454f2c102a86afbbbaa2356 Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Sun, 21 Feb 2021 17:59:15 +0000
Subject: [PATCH 049/115] timeslider: slight improvement on code quality
 (#4836)

This is an interim patch, ultimately the JS needs to be thrown out of the HTML...
---
 src/templates/timeslider.html | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/templates/timeslider.html b/src/templates/timeslider.html
index f04bf0c2..c577f301 100644
--- a/src/templates/timeslider.html
+++ b/src/templates/timeslider.html
@@ -265,12 +265,12 @@
     // server sends the CLIENT_VARS message.
     randomVersionString: <%-JSON.stringify(settings.randomVersionString)%>,
   };
-  var BroadcastSlider;
+  let BroadcastSlider;
   (function () {
-    var pathComponents = location.pathname.split('/');
+    const pathComponents = location.pathname.split('/');
 
     // Strip 'p', the padname and 'timeslider' from the pathname and set as baseURL
-    var baseURL = pathComponents.slice(0,pathComponents.length-3).join('/') + '/';
+    const baseURL = pathComponents.slice(0,pathComponents.length-3).join('/') + '/';
 
 
     require.setRootURI(baseURL + "javascripts/src");
@@ -280,20 +280,20 @@
     $ = jQuery = require('ep_etherpad-lite/static/js/rjquery').jQuery; // Expose jQuery #HACK
     browser = require('ep_etherpad-lite/static/js/vendors/browser');
 
-    var plugins = require('ep_etherpad-lite/static/js/pluginfw/client_plugins');
-    var socket = require('ep_etherpad-lite/static/js/timeslider').socket;
+    const plugins = require('ep_etherpad-lite/static/js/pluginfw/client_plugins');
+    const socket = require('ep_etherpad-lite/static/js/timeslider').socket;
     BroadcastSlider = require('ep_etherpad-lite/static/js/timeslider').BroadcastSlider;
     plugins.baseURL = baseURL;
 
     plugins.update(function () {
-      var hooks = require('ep_etherpad-lite/static/js/pluginfw/hooks');
-      var timeslider = require('ep_etherpad-lite/static/js/timeslider')
+      const hooks = require('ep_etherpad-lite/static/js/pluginfw/hooks');
+      const timeslider = require('ep_etherpad-lite/static/js/timeslider')
       timeslider.baseURL = baseURL;
       timeslider.init();
 
       /* TODO: These globals shouldn't exist. */
-      padeditbar = require('ep_etherpad-lite/static/js/pad_editbar').padeditbar;
-      padimpexp = require('ep_etherpad-lite/static/js/pad_impexp').padimpexp;
+      const padeditbar = require('ep_etherpad-lite/static/js/pad_editbar').padeditbar;
+      const padimpexp = require('ep_etherpad-lite/static/js/pad_impexp').padimpexp;
 
       padeditbar.init()
     });

From 2c763fb4d1d657776bef9463df3276578dec8f57 Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Sun, 21 Feb 2021 18:05:34 +0000
Subject: [PATCH 050/115] Delete dirty-db-cleaner.py

---
 src/bin/dirty-db-cleaner.py | 48 -------------------------------------
 1 file changed, 48 deletions(-)
 delete mode 100755 src/bin/dirty-db-cleaner.py

diff --git a/src/bin/dirty-db-cleaner.py b/src/bin/dirty-db-cleaner.py
deleted file mode 100755
index dc77cd0d..00000000
--- a/src/bin/dirty-db-cleaner.py
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/usr/bin/env PYTHONUNBUFFERED=1 python
-#
-# Created by Bjarni R. Einarsson, placed in the public domain. Go wild!
-#
-import json
-import os
-import sys
-
-try:
-    dirtydb_input = sys.argv[1]
-    dirtydb_output = '%s.new' % dirtydb_input
-    assert(os.path.exists(dirtydb_input))
-    assert(not os.path.exists(dirtydb_output))
-except:
-    print()
-    print('Usage: %s /path/to/dirty.db' % sys.argv[0])
-    print()
-    print('Note: Will create a file named dirty.db.new in the same folder,')
-    print('      please make sure permissions are OK and a file by that')
-    print('      name does not exist already. This script works by omitting')
-    print('      duplicate lines from the dirty.db file, keeping only the')
-    print('      last (latest) instance. No revision data should be lost,')
-    print('      but be careful, make backups. If it breaks you get to keep')
-    print('      both pieces!')
-    print()
-    sys.exit(1)
-
-dirtydb = {}
-lines = 0
-with open(dirtydb_input, 'r') as fd:
-    print('Reading %s' % dirtydb_input)
-    for line in fd:
-        lines += 1
-        try:
-            data = json.loads(line)
-            dirtydb[data['key']] = line
-        except:
-            print("Skipping invalid JSON!")
-        if lines % 10000 == 0:
-            sys.stderr.write('.')
-print()
-print('OK, found %d unique keys in %d lines' % (len(dirtydb), lines))
-
-with open(dirtydb_output, 'w') as fd:
-    for data in list(dirtydb.values()):
-        fd.write(data)
-
-print('Wrote data to %s. All done!' % dirtydb_output)

From 6b6201b44804d8907dd1cfbf584fa237cfba7d2c Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Sun, 21 Feb 2021 19:30:39 +0000
Subject: [PATCH 051/115] null link on plugins and noopener / noreferrer

Resolves a (non) security issue brought up by LGTM but I think the noopener and norefferer are good shouts
---
 src/static/js/admin/plugins.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/static/js/admin/plugins.js b/src/static/js/admin/plugins.js
index 8dcb4a60..613df368 100644
--- a/src/static/js/admin/plugins.js
+++ b/src/static/js/admin/plugins.js
@@ -84,9 +84,10 @@ $(document).ready(() => {
 
       for (const attr in plugin) {
         if (attr === 'name') { // Hack to rewrite URLS into name
-          const link = $('<a>');
+          const link = $('<a href="">'); // intentional null href
           link.attr('href', `https://npmjs.org/package/${plugin.name}`);
           link.attr('plugin', 'Plugin details');
+          link.attr('rel', 'noopener noreferrer');
           link.attr('target', '_blank');
           link.text(plugin.name.substr(3));
           row.find('.name').append(link);

From 3ed4ac649c378d7af080e367c6bc01daf6a8b0a5 Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Sun, 21 Feb 2021 19:49:41 +0000
Subject: [PATCH 052/115] lint: PadManager.js

---
 src/node/db/PadManager.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/node/db/PadManager.js b/src/node/db/PadManager.js
index 48507949..58434c8c 100644
--- a/src/node/db/PadManager.js
+++ b/src/node/db/PadManager.js
@@ -173,7 +173,7 @@ const padIdTransforms = [
 ];
 
 // returns a sanitized padId, respecting legacy pad id formats
-exports.sanitizePadId = async function sanitizePadId(padId) {
+exports.sanitizePadId = async (padId) => {
   for (let i = 0, n = padIdTransforms.length; i < n; ++i) {
     const exists = await exports.doesPadExist(padId);
 

From d67f170c468ce53a59233f58cb2b629b0b238ac9 Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Sun, 21 Feb 2021 19:51:28 +0000
Subject: [PATCH 053/115] lint: eejs/index.js

---
 src/node/eejs/index.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/node/eejs/index.js b/src/node/eejs/index.js
index d7d8db5f..1bf29634 100644
--- a/src/node/eejs/index.js
+++ b/src/node/eejs/index.js
@@ -84,7 +84,8 @@ exports.require = (name, args, mod) => {
 
   const cache = settings.maxAge !== 0;
   const template = cache && templateCache.get(ejspath) || ejs.compile(
-      `<% e._init({get: () => __output, set: (s) => { __output = s; }}); %>${fs.readFileSync(ejspath).toString()}<% e._exit(); %>`,
+      '<% e._init({get: () => __output, set: (s) => { __output = s; }}); %>' +
+        `${fs.readFileSync(ejspath).toString()}<% e._exit(); %>`,
       {filename: ejspath});
   if (cache) templateCache.set(ejspath, template);
 

From 5201cb717f36b08fd4ef5fa965322297e3054761 Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Sun, 21 Feb 2021 19:53:45 +0000
Subject: [PATCH 054/115] lint: PadMessageHandler.js

---
 src/node/handler/PadMessageHandler.js | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/node/handler/PadMessageHandler.js b/src/node/handler/PadMessageHandler.js
index c7ff1f66..e32fcf1d 100644
--- a/src/node/handler/PadMessageHandler.js
+++ b/src/node/handler/PadMessageHandler.js
@@ -669,7 +669,8 @@ const handleUserChanges = async (socket, message) => {
     if (Changeset.oldLen(changeset) !== prevText.length) {
       socket.json.send({disconnect: 'badChangeset'});
       stats.meter('failedChangesets').mark();
-      throw new Error(`Can't apply USER_CHANGES ${changeset} with oldLen ${Changeset.oldLen(changeset)} to document of length ${prevText.length}`);
+      throw new Error(`Can't apply USER_CHANGES ${changeset} with oldLen ` +
+                      `${Changeset.oldLen(changeset)} to document of length ${prevText.length}`);
     }
 
     try {
@@ -887,7 +888,8 @@ const handleClientReady = async (socket, message, authorID) => {
   }
 
   if (message.protocolVersion !== 2) {
-    messageLogger.warn(`Dropped message, CLIENT_READY Message has a unknown protocolVersion '${message.protocolVersion}'!`);
+    messageLogger.warn('Dropped message, CLIENT_READY Message has a unknown protocolVersion ' +
+                       `'${message.protocolVersion}'!`);
     return;
   }
 
@@ -1085,12 +1087,16 @@ const handleClientReady = async (socket, message, authorID) => {
       indentationOnNewLine: settings.indentationOnNewLine,
       scrollWhenFocusLineIsOutOfViewport: {
         percentage: {
-          editionAboveViewport: settings.scrollWhenFocusLineIsOutOfViewport.percentage.editionAboveViewport,
-          editionBelowViewport: settings.scrollWhenFocusLineIsOutOfViewport.percentage.editionBelowViewport,
+          editionAboveViewport:
+              settings.scrollWhenFocusLineIsOutOfViewport.percentage.editionAboveViewport,
+          editionBelowViewport:
+              settings.scrollWhenFocusLineIsOutOfViewport.percentage.editionBelowViewport,
         },
         duration: settings.scrollWhenFocusLineIsOutOfViewport.duration,
-        scrollWhenCaretIsInTheLastLineOfViewport: settings.scrollWhenFocusLineIsOutOfViewport.scrollWhenCaretIsInTheLastLineOfViewport,
-        percentageToScrollWhenUserPressesArrowUp: settings.scrollWhenFocusLineIsOutOfViewport.percentageToScrollWhenUserPressesArrowUp,
+        scrollWhenCaretIsInTheLastLineOfViewport:
+            settings.scrollWhenFocusLineIsOutOfViewport.scrollWhenCaretIsInTheLastLineOfViewport,
+        percentageToScrollWhenUserPressesArrowUp:
+            settings.scrollWhenFocusLineIsOutOfViewport.percentageToScrollWhenUserPressesArrowUp,
       },
       initialChangesets: [], // FIXME: REMOVE THIS SHIT
     };
@@ -1380,7 +1386,8 @@ const composePadChangesets = async (padId, startNum, endNum) => {
   // get all changesets
   const changesets = {};
   await Promise.all(changesetsNeeded.map(
-      (revNum) => pad.getRevisionChangeset(revNum).then((changeset) => changesets[revNum] = changeset)
+      (revNum) => pad.getRevisionChangeset(revNum)
+          .then((changeset) => changesets[revNum] = changeset)
   ));
 
   // compose Changesets
@@ -1406,7 +1413,7 @@ const _getRoomSockets = (padID) => {
   const room = socketio.sockets.adapter.rooms[padID];
 
   if (room) {
-    for (const id in room.sockets) {
+    for (const id of Object.keys(room.sockets)) {
       roomSockets.push(socketio.sockets.sockets[id]);
     }
   }

From 25d4faddd985582ec17a3a081e4d9237bb05ef46 Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Sun, 21 Feb 2021 19:54:32 +0000
Subject: [PATCH 055/115] lint: SocketIORouter.js

---
 src/node/handler/SocketIORouter.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/node/handler/SocketIORouter.js b/src/node/handler/SocketIORouter.js
index 35325c07..cad53d17 100644
--- a/src/node/handler/SocketIORouter.js
+++ b/src/node/handler/SocketIORouter.js
@@ -60,7 +60,7 @@ exports.setSocketIO = (_socket) => {
     };
 
     // tell all components about this connect
-    for (const i in components) {
+    for (const i of Object.keys(components)) {
       components[i].handleConnect(client);
     }
 
@@ -84,7 +84,7 @@ exports.setSocketIO = (_socket) => {
       // this instance can be brought out of a scaling cluster.
       stats.gauge('lastDisconnect', () => Date.now());
       // tell all components about this disconnect
-      for (const i in components) {
+      for (const i of Object.keys(components)) {
         components[i].handleDisconnect(client);
       }
     });

From 86c938cae2a7f0d2020c4b0feb1f8cfdd0fe3c82 Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Sun, 21 Feb 2021 19:56:19 +0000
Subject: [PATCH 056/115] lint: openapi.js

---
 src/node/hooks/express/openapi.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/node/hooks/express/openapi.js b/src/node/hooks/express/openapi.js
index 056a98a2..4dc335ce 100644
--- a/src/node/hooks/express/openapi.js
+++ b/src/node/hooks/express/openapi.js
@@ -491,7 +491,7 @@ const generateDefinitionForVersion = (version, style = APIPathStyle.FLAT) => {
   };
 
   // build operations
-  for (const funcName in apiHandler.version[version]) {
+  for (const funcName of Object.keys(apiHandler.version[version])) {
     let operation = {};
     if (operations[funcName]) {
       operation = {...operations[funcName]};
@@ -545,7 +545,7 @@ exports.expressCreateServer = (hookName, args, cb) => {
   const {app} = args;
 
   // create openapi-backend handlers for each api version under /api/{version}/*
-  for (const version in apiHandler.version) {
+  for (const version of Object.keys(apiHandler.version)) {
     // we support two different styles of api: flat + rest
     // TODO: do we really want to support both?
 
@@ -591,7 +591,7 @@ exports.expressCreateServer = (hookName, args, cb) => {
       });
 
       // register operation handlers
-      for (const funcName in apiHandler.version[version]) {
+      for (const funcName of Object.keys(apiHandler.version[version])) {
         const handler = async (c, req, res) => {
           // parse fields from request
           const {header, params, query} = c.request;

From 586af5e16e07519affc3570ab45c539da3b5bc32 Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Sun, 21 Feb 2021 19:57:57 +0000
Subject: [PATCH 057/115] lint: padurlsanitize.js

---
 src/node/hooks/express/padurlsanitize.js | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/node/hooks/express/padurlsanitize.js b/src/node/hooks/express/padurlsanitize.js
index c4c1b675..30297479 100644
--- a/src/node/hooks/express/padurlsanitize.js
+++ b/src/node/hooks/express/padurlsanitize.js
@@ -1,7 +1,6 @@
 'use strict';
 
 const padManager = require('../../db/PadManager');
-const url = require('url');
 
 exports.expressCreateServer = (hookName, args, cb) => {
   // redirects browser to the pad's sanitized url if needed. otherwise, renders the html
@@ -19,10 +18,7 @@ exports.expressCreateServer = (hookName, args, cb) => {
       next();
     } else {
       // the pad id was sanitized, so we redirect to the sanitized version
-      let realURL = sanitizedPadId;
-      realURL = encodeURIComponent(realURL);
-      const query = url.parse(req.url).query;
-      if (query) realURL += `?${query}`;
+      const realURL = encodeURIComponent(sanitizedPadId) + new URL(req.url).search;
       res.header('Location', realURL);
       res.status(302).send(`You should be redirected to <a href="${realURL}">${realURL}</a>`);
     }

From b1614f0592d987d1146667c281eff4b2f2cfcc95 Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Sun, 21 Feb 2021 20:06:10 +0000
Subject: [PATCH 058/115] lint: i18n.js

Partial, still 3 more to do that are slightly higher hanging that can get done.
---
 src/node/hooks/i18n.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/node/hooks/i18n.js b/src/node/hooks/i18n.js
index 81944a07..1cd663c4 100644
--- a/src/node/hooks/i18n.js
+++ b/src/node/hooks/i18n.js
@@ -84,18 +84,18 @@ const getAllLocales = () => {
 // e.g. { es: {nativeName: "español", direction: "ltr"}, ... }
 const getAvailableLangs = (locales) => {
   const result = {};
-  _.each(_.keys(locales), (langcode) => {
+  for (const langcode of Object.keys(locales)) {
     result[langcode] = languages.getLanguageInfo(langcode);
-  });
+  }
   return result;
 };
 
 // returns locale index that will be served in /locales.json
 const generateLocaleIndex = (locales) => {
   const result = _.clone(locales); // keep English strings
-  _.each(_.keys(locales), (langcode) => {
+  for (const langcode of Object.keys(locales)) {
     if (langcode !== 'en') result[langcode] = `locales/${langcode}.json`;
-  });
+  }
   return JSON.stringify(result);
 };
 
@@ -109,7 +109,7 @@ exports.expressCreateServer = (n, args, cb) => {
   args.app.get('/locales/:locale', (req, res) => {
     // works with /locale/en and /locale/en.json requests
     const locale = req.params.locale.split('.')[0];
-    if (exports.availableLangs.hasOwnProperty(locale)) {
+    if (Object.prototype.hasOwnProperty.call(exports.availableLangs, locale)) {
       res.setHeader('Cache-Control', `public, max-age=${settings.maxAge}`);
       res.setHeader('Content-Type', 'application/json; charset=utf-8');
       res.send(`{"${locale}":${JSON.stringify(locales[locale])}}`);

From 5718c8b360eb25d4edc81078e3a3c7864c294bc1 Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Sun, 21 Feb 2021 20:10:47 +0000
Subject: [PATCH 059/115] lint: AbsolutePaths.js

---
 src/node/utils/AbsolutePaths.js | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/node/utils/AbsolutePaths.js b/src/node/utils/AbsolutePaths.js
index 8ca17ba1..73a96bb6 100644
--- a/src/node/utils/AbsolutePaths.js
+++ b/src/node/utils/AbsolutePaths.js
@@ -43,8 +43,9 @@ let etherpadRoot = null;
  */
 const popIfEndsWith = (stringArray, lastDesiredElements) => {
   if (stringArray.length <= lastDesiredElements.length) {
-    absPathLogger.debug(`In order to pop "${lastDesiredElements.join(path.sep)}" from "${stringArray.join(path.sep)}", it should contain at least ${lastDesiredElements.length + 1} elements`);
-
+    absPathLogger.debug(`In order to pop "${lastDesiredElements.join(path.sep)}" ` +
+                        `from "${stringArray.join(path.sep)}", it should contain at least ` +
+                        `${lastDesiredElements.length + 1} elements`);
     return false;
   }
 
@@ -54,7 +55,8 @@ const popIfEndsWith = (stringArray, lastDesiredElements) => {
     return _.initial(stringArray, lastDesiredElements.length);
   }
 
-  absPathLogger.debug(`${stringArray.join(path.sep)} does not end with "${lastDesiredElements.join(path.sep)}"`);
+  absPathLogger.debug(
+      `${stringArray.join(path.sep)} does not end with "${lastDesiredElements.join(path.sep)}"`);
   return false;
 };
 
@@ -102,7 +104,8 @@ exports.findEtherpadRoot = () => {
   }
 
   if (maybeEtherpadRoot === false) {
-    absPathLogger.error(`Could not identity Etherpad base path in this ${process.platform} installation in "${foundRoot}"`);
+    absPathLogger.error('Could not identity Etherpad base path in this ' +
+                        `${process.platform} installation in "${foundRoot}"`);
     process.exit(1);
   }
 
@@ -113,7 +116,8 @@ exports.findEtherpadRoot = () => {
     return etherpadRoot;
   }
 
-  absPathLogger.error(`To run, Etherpad has to identify an absolute base path. This is not: "${etherpadRoot}"`);
+  absPathLogger.error(
+      `To run, Etherpad has to identify an absolute base path. This is not: "${etherpadRoot}"`);
   process.exit(1);
 };
 

From d2359be08b3deea0753d9bdbd4ea7c647919af18 Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Sun, 21 Feb 2021 20:14:14 +0000
Subject: [PATCH 060/115] lint: ExportHtml.js

---
 src/node/utils/ExportHtml.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/node/utils/ExportHtml.js b/src/node/utils/ExportHtml.js
index 999b2263..9d40111e 100644
--- a/src/node/utils/ExportHtml.js
+++ b/src/node/utils/ExportHtml.js
@@ -75,7 +75,7 @@ const getHTMLFromAtext = async (pad, atext, authorColors) => {
   if (authorColors) {
     css += '<style>\n';
 
-    for (const a in apool.numToAttrib) {
+    for (const a of Object.keys(apool.numToAttrib)) {
       const attr = apool.numToAttrib[a];
 
       // skip non author attributes
@@ -106,7 +106,7 @@ const getHTMLFromAtext = async (pad, atext, authorColors) => {
   // this pad, and if yes puts its attrib id->props value into anumMap
   props.forEach((propName, i) => {
     let attrib = [propName, true];
-    if (_.isArray(propName)) {
+    if (Array.isArray(propName)) {
       // propName can be in the form of ['color', 'red'],
       // see hook exportHtmlAdditionalTagsWithData
       attrib = propName;
@@ -135,7 +135,7 @@ const getHTMLFromAtext = async (pad, atext, authorColors) => {
 
       // we are not insterested on properties in the form of ['color', 'red'],
       // see hook exportHtmlAdditionalTagsWithData
-      if (_.isArray(property)) {
+      if (Array.isArray(property)) {
         return false;
       }
 
@@ -154,7 +154,7 @@ const getHTMLFromAtext = async (pad, atext, authorColors) => {
     // data attributes
     const isSpanWithData = (i) => {
       const property = props[i];
-      return _.isArray(property);
+      return Array.isArray(property);
     };
 
     const emitOpenTag = (i) => {

From 613c7d85456be7dae0088d7152a903881c1cb389 Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Sun, 21 Feb 2021 20:15:45 +0000
Subject: [PATCH 061/115] lint: ExportTxt.js

---
 src/node/utils/ExportTxt.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/node/utils/ExportTxt.js b/src/node/utils/ExportTxt.js
index ead3637f..0ff7ded8 100644
--- a/src/node/utils/ExportTxt.js
+++ b/src/node/utils/ExportTxt.js
@@ -202,7 +202,7 @@ const getTXTFromAtext = (pad, atext, authorColors) => {
 
     if (line.listTypeName !== 'number') {
       // We're no longer in an OL so we can reset counting
-      for (const key in listNumbers) {
+      for (const key of Object.keys(listNumbers)) {
         delete listNumbers[key];
       }
     }

From 7352dc7571a14c6ce0ae25d3ce6045ab8e135819 Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Sun, 21 Feb 2021 20:19:18 +0000
Subject: [PATCH 062/115] lint: ImportEtherpad.js

---
 src/node/utils/ImportEtherpad.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/node/utils/ImportEtherpad.js b/src/node/utils/ImportEtherpad.js
index 6494da56..7f5c2ab2 100644
--- a/src/node/utils/ImportEtherpad.js
+++ b/src/node/utils/ImportEtherpad.js
@@ -65,7 +65,7 @@ exports.setPadRaw = (padId, r) => {
       if (value.pool) {
         for (const attrib of Object.keys(value.pool.numToAttrib)) {
           const attribName = value.pool.numToAttrib[attrib][0];
-          if(blockElems.indexOf(attribName) === -1) {
+          if (blockElems.indexOf(attribName) === -1) {
             console.warn('Plugin missing: ' +
                 `You might want to install a plugin to support this node name: ${attribName}`);
           }

From 435562299fe38757911f0d2189ca2aec210f2d7f Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Sun, 21 Feb 2021 20:28:11 +0000
Subject: [PATCH 063/115] lint: NodeVersion.js

---
 src/node/utils/NodeVersion.js | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/node/utils/NodeVersion.js b/src/node/utils/NodeVersion.js
index f4f8f257..ca5412f2 100644
--- a/src/node/utils/NodeVersion.js
+++ b/src/node/utils/NodeVersion.js
@@ -32,11 +32,13 @@ exports.enforceMinNodeVersion = (minNodeVersion) => {
   // we cannot use template literals, since we still do not know if we are
   // running under Node >= 4.0
   if (semver.lt(currentNodeVersion, minNodeVersion)) {
-    console.error(`Running Etherpad on Node ${currentNodeVersion} is not supported. Please upgrade at least to Node ${minNodeVersion}`);
+    console.error(`Running Etherpad on Node ${currentNodeVersion} is not supported. ` +
+                  `Please upgrade at least to Node ${minNodeVersion}`);
     process.exit(1);
   }
 
-  console.debug(`Running on Node ${currentNodeVersion} (minimum required Node version: ${minNodeVersion})`);
+  console.debug(`Running on Node ${currentNodeVersion} ` +
+                `(minimum required Node version: ${minNodeVersion})`);
 };
 
 /**
@@ -51,6 +53,8 @@ exports.checkDeprecationStatus = (lowestNonDeprecatedNodeVersion, epRemovalVersi
   const currentNodeVersion = process.version;
 
   if (semver.lt(currentNodeVersion, lowestNonDeprecatedNodeVersion)) {
-    console.warn(`Support for Node ${currentNodeVersion} will be removed in Etherpad ${epRemovalVersion}. Please consider updating at least to Node ${lowestNonDeprecatedNodeVersion}`);
+    console.warn(
+        `Support for Node ${currentNodeVersion} will be removed in Etherpad ${epRemovalVersion}. ` +
+        `Please consider updating at least to Node ${lowestNonDeprecatedNodeVersion}`);
   }
 };

From 029729a3864cbc3b3146985d1372d141292c150c Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Sun, 21 Feb 2021 20:28:19 +0000
Subject: [PATCH 064/115] lint: Settings.js

---
 src/node/utils/Settings.js | 61 ++++++++++++++++++++++++++------------
 1 file changed, 42 insertions(+), 19 deletions(-)

diff --git a/src/node/utils/Settings.js b/src/node/utils/Settings.js
index 70e9bb45..0333f797 100644
--- a/src/node/utils/Settings.js
+++ b/src/node/utils/Settings.js
@@ -35,12 +35,14 @@ const argv = require('./Cli').argv;
 const jsonminify = require('jsonminify');
 const log4js = require('log4js');
 const randomString = require('./randomstring');
-const suppressDisableMsg = ' -- To suppress these warning messages change suppressErrorsInPadText to true in your settings.json\n';
+const suppressDisableMsg = ' -- To suppress these warning messages change ' +
+    'suppressErrorsInPadText to true in your settings.json\n';
 const _ = require('underscore');
 
 /* Root path of the installation */
 exports.root = absolutePaths.findEtherpadRoot();
-console.log(`All relative paths will be interpreted relative to the identified Etherpad base dir: ${exports.root}`);
+console.log('All relative paths will be interpreted relative to the identified ' +
+            `Etherpad base dir: ${exports.root}`);
 
 /**
  * The app title, visible e.g. in the browser window
@@ -114,7 +116,14 @@ exports.dbSettings = {filename: path.join(exports.root, 'var/dirty.db')};
 /**
  * The default Text of a new pad
  */
-exports.defaultPadText = 'Welcome to Etherpad!\n\nThis pad text is synchronized as you type, so that everyone viewing this page sees the same text. This allows you to collaborate seamlessly on documents!\n\nEtherpad on Github: https:\/\/github.com\/ether\/etherpad-lite\n';
+exports.defaultPadText = [
+  'Welcome to Etherpad!',
+  '',
+  'This pad text is synchronized as you type, so that everyone viewing this page sees the same ' +
+      'text. This allows you to collaborate seamlessly on documents!',
+  '',
+  'Etherpad on Github: https://github.com/ether/etherpad-lite',
+].join('\n');
 
 /**
  * The default Pad Settings for a user (Can be overridden by changing the setting
@@ -460,7 +469,7 @@ const storeSettings = (settingsObj) => {
     // we know this setting, so we overwrite it
     // or it's a settings hash, specific to a plugin
     if (exports[i] !== undefined || i.indexOf('ep_') === 0) {
-      if (_.isObject(settingsObj[i]) && !_.isArray(settingsObj[i])) {
+      if (_.isObject(settingsObj[i]) && !Array.isArray(settingsObj[i])) {
         exports[i] = _.defaults(settingsObj[i], exports[i]);
       } else {
         exports[i] = settingsObj[i];
@@ -587,7 +596,8 @@ const lookupEnvironmentVariables = (obj) => {
     const defaultValue = match[3];
 
     if ((envVarValue === undefined) && (defaultValue === undefined)) {
-      console.warn(`Environment variable "${envVarName}" does not contain any value for configuration key "${key}", and no default was given. Returning null.`);
+      console.warn(`Environment variable "${envVarName}" does not contain any value for `+
+                   `configuration key "${key}", and no default was given. Returning null.`);
 
       /*
        * We have to return null, because if we just returned undefined, the
@@ -597,7 +607,8 @@ const lookupEnvironmentVariables = (obj) => {
     }
 
     if ((envVarValue === undefined) && (defaultValue !== undefined)) {
-      console.debug(`Environment variable "${envVarName}" not found for configuration key "${key}". Falling back to default value.`);
+      console.debug(`Environment variable "${envVarName}" not found for ` +
+                    `configuration key "${key}". Falling back to default value.`);
 
       return coerceValue(defaultValue);
     }
@@ -608,7 +619,8 @@ const lookupEnvironmentVariables = (obj) => {
      * For numeric and boolean strings let's convert it to proper types before
      * returning it, in order to maintain backward compatibility.
      */
-    console.debug(`Configuration key "${key}" will be read from environment variable "${envVarName}"`);
+    console.debug(
+        `Configuration key "${key}" will be read from environment variable "${envVarName}"`);
 
     return coerceValue(envVarValue);
   });
@@ -662,7 +674,8 @@ const parseSettings = (settingsFilename, isSettings) => {
 
     return replacedSettings;
   } catch (e) {
-    console.error(`There was an error processing your ${settingsType} file from ${settingsFilename}: ${e.message}`);
+    console.error(`There was an error processing your ${settingsType} ` +
+                  `file from ${settingsFilename}: ${e.message}`);
 
     process.exit(1);
   }
@@ -689,7 +702,8 @@ exports.reloadSettings = () => {
   log4js.replaceConsole();
 
   if (!exports.skinName) {
-    console.warn('No "skinName" parameter found. Please check out settings.json.template and update your settings.json. Falling back to the default "colibris".');
+    console.warn('No "skinName" parameter found. Please check out settings.json.template and ' +
+                 'update your settings.json. Falling back to the default "colibris".');
     exports.skinName = 'colibris';
   }
 
@@ -699,7 +713,8 @@ exports.reloadSettings = () => {
     const countPieces = exports.skinName.split(path.sep).length;
 
     if (countPieces !== 1) {
-      console.error(`skinName must be the name of a directory under "${skinBasePath}". This is not valid: "${exports.skinName}". Falling back to the default "colibris".`);
+      console.error(`skinName must be the name of a directory under "${skinBasePath}". This is ` +
+                    `not valid: "${exports.skinName}". Falling back to the default "colibris".`);
 
       exports.skinName = 'colibris';
     }
@@ -709,14 +724,16 @@ exports.reloadSettings = () => {
 
     // what if someone sets skinName == ".." or "."? We catch him!
     if (absolutePaths.isSubdir(skinBasePath, skinPath) === false) {
-      console.error(`Skin path ${skinPath} must be a subdirectory of ${skinBasePath}. Falling back to the default "colibris".`);
+      console.error(`Skin path ${skinPath} must be a subdirectory of ${skinBasePath}. ` +
+                    'Falling back to the default "colibris".');
 
       exports.skinName = 'colibris';
       skinPath = path.join(skinBasePath, exports.skinName);
     }
 
     if (fs.existsSync(skinPath) === false) {
-      console.error(`Skin path ${skinPath} does not exist. Falling back to the default "colibris".`);
+      console.error(
+          `Skin path ${skinPath} does not exist. Falling back to the default "colibris".`);
       exports.skinName = 'colibris';
       skinPath = path.join(skinBasePath, exports.skinName);
     }
@@ -731,7 +748,7 @@ exports.reloadSettings = () => {
         if (!exists) {
           const abiwordError = 'Abiword does not exist at this path, check your settings file.';
           if (!exports.suppressErrorsInPadText) {
-            exports.defaultPadText = `${exports.defaultPadText}\nError: ${abiwordError}${suppressDisableMsg}`;
+            exports.defaultPadText += `\nError: ${abiwordError}${suppressDisableMsg}`;
           }
           console.error(`${abiwordError} File location: ${exports.abiword}`);
           exports.abiword = null;
@@ -743,10 +760,11 @@ exports.reloadSettings = () => {
   if (exports.soffice) {
     fs.exists(exports.soffice, (exists) => {
       if (!exists) {
-        const sofficeError = 'soffice (libreoffice) does not exist at this path, check your settings file.';
+        const sofficeError =
+            'soffice (libreoffice) does not exist at this path, check your settings file.';
 
         if (!exports.suppressErrorsInPadText) {
-          exports.defaultPadText = `${exports.defaultPadText}\nError: ${sofficeError}${suppressDisableMsg}`;
+          exports.defaultPadText += `\nError: ${sofficeError}${suppressDisableMsg}`;
         }
         console.error(`${sofficeError} File location: ${exports.soffice}`);
         exports.soffice = null;
@@ -760,18 +778,22 @@ exports.reloadSettings = () => {
       exports.sessionKey = fs.readFileSync(sessionkeyFilename, 'utf8');
       console.info(`Session key loaded from: ${sessionkeyFilename}`);
     } catch (e) {
-      console.info(`Session key file "${sessionkeyFilename}" not found. Creating with random contents.`);
+      console.info(
+          `Session key file "${sessionkeyFilename}" not found. Creating with random contents.`);
       exports.sessionKey = randomString(32);
       fs.writeFileSync(sessionkeyFilename, exports.sessionKey, 'utf8');
     }
   } else {
-    console.warn('Declaring the sessionKey in the settings.json is deprecated. This value is auto-generated now. Please remove the setting from the file. -- If you are seeing this error after restarting using the Admin User Interface then you can ignore this message.');
+    console.warn('Declaring the sessionKey in the settings.json is deprecated. ' +
+                 'This value is auto-generated now. Please remove the setting from the file. -- ' +
+                 'If you are seeing this error after restarting using the Admin User ' +
+                 'Interface then you can ignore this message.');
   }
 
   if (exports.dbType === 'dirty') {
     const dirtyWarning = 'DirtyDB is used. This is not recommended for production.';
     if (!exports.suppressErrorsInPadText) {
-      exports.defaultPadText = `${exports.defaultPadText}\nWarning: ${dirtyWarning}${suppressDisableMsg}`;
+      exports.defaultPadText += `\nWarning: ${dirtyWarning}${suppressDisableMsg}`;
     }
 
     exports.dbSettings.filename = absolutePaths.makeAbsolute(exports.dbSettings.filename);
@@ -780,7 +802,8 @@ exports.reloadSettings = () => {
 
   if (exports.ip === '') {
     // using Unix socket for connectivity
-    console.warn('The settings file contains an empty string ("") for the "ip" parameter. The "port" parameter will be interpreted as the path to a Unix socket to bind at.');
+    console.warn('The settings file contains an empty string ("") for the "ip" parameter. The ' +
+                 '"port" parameter will be interpreted as the path to a Unix socket to bind at.');
   }
 
   /*

From 40d7480d5bbdb7035aa5ba3dade980dfe878e1cb Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Sun, 21 Feb 2021 20:33:20 +0000
Subject: [PATCH 065/115] lint: padaccess.js

---
 src/node/padaccess.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/node/padaccess.js b/src/node/padaccess.js
index 24130285..5ca5641b 100644
--- a/src/node/padaccess.js
+++ b/src/node/padaccess.js
@@ -2,7 +2,7 @@
 const securityManager = require('./db/SecurityManager');
 
 // checks for padAccess
-module.exports = async function (req, res) {
+module.exports = async (req, res) => {
   try {
     const {session: {user} = {}} = req;
     const accessObj = await securityManager.checkAccess(

From de186fbe369a75d127095e6e3225556d01510c33 Mon Sep 17 00:00:00 2001
From: Stefan <stefan@stefans-entwicklerecke.de>
Date: Mon, 22 Feb 2021 07:34:34 +0100
Subject: [PATCH 066/115] Update node in docker to version 14 (#4844)

---
 Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index f0fa3ceb..29e2b5ab 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,7 +4,7 @@
 #
 # Author: muxator
 
-FROM node:10-buster-slim
+FROM node:14-buster-slim
 LABEL maintainer="Etherpad team, https://github.com/ether/etherpad-lite"
 
 # plugins to install while building the container. By default no plugins are
@@ -74,4 +74,4 @@ COPY --chown=etherpad:0 ./settings.json.docker /opt/etherpad-lite/settings.json
 RUN chmod -R g=u .
 
 EXPOSE 9001
-CMD ["node", "--experimental-worker", "src/node/server.js"]
+CMD ["node", "src/node/server.js"]

From ce83181ac3c1b377ddbf122740c65728ed0fc82e Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Mon, 22 Feb 2021 08:26:35 +0000
Subject: [PATCH 067/115] Lgtm bugfixes (#4838)

* code tidy up: always evaluates

* tidy up: is always true

* tidy up: remove unused code

* always true/false variables

* unused variable

* tidy up: remove unused code in caretPosition.js

* for squash: Revert "tidy up: remove unused code in caretPosition.js"

The `if` condition was previously always true, so the body should be
preserved. If the body is preserved, other logic can be deleted. I
opened PR #4845 to clean it all up.

This reverts commit 75b03e5a7dc1ff9a8728ed2341fd9fe970d0615f.

* for squash: simplify

* for squash: Explain that the getter is used for its side effects

It's very weird to call a getter without using its return value. Add a
comment explaining why this is done so that the reader doesn't get
confused.

* for squash: Revert "tidy up: remove unused code"

The exception test was the purpose of the code.

This reverts commit 85153b167613b2513fff99e22b8ded8ea1e4547b.

* for squash: Log the tsort results

Co-authored-by: Richard Hansen <rhansen@rhansen.org>
---
 src/node/db/API.js                | 2 +-
 src/node/db/Pad.js                | 2 +-
 src/node/utils/ExportHtml.js      | 4 ++--
 src/static/js/AttributeManager.js | 4 +---
 src/static/js/Changeset.js        | 2 +-
 src/static/js/ace2_inner.js       | 2 +-
 src/static/js/contentcollector.js | 2 +-
 src/static/js/pluginfw/tsort.js   | 1 +
 8 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/node/db/API.js b/src/node/db/API.js
index ea77ac7d..c262e078 100644
--- a/src/node/db/API.js
+++ b/src/node/db/API.js
@@ -722,7 +722,7 @@ Example returns:
 */
 
 exports.sendClientsMessage = async (padID, msg) => {
-  const pad = await getPadSafe(padID, true);
+  await getPadSafe(padID, true); // Throw if the padID is invalid or if the pad does not exist.
   padMessageHandler.handleCustomMessage(padID, msg);
 };
 
diff --git a/src/node/db/Pad.js b/src/node/db/Pad.js
index 965f2793..a3466898 100644
--- a/src/node/db/Pad.js
+++ b/src/node/db/Pad.js
@@ -87,7 +87,7 @@ Pad.prototype.appendRevision = async function appendRevision(aChangeset, author)
 
   // ex. getNumForAuthor
   if (author !== '') {
-    this.pool.putAttrib(['author', author || '']);
+    this.pool.putAttrib(['author', author]);
   }
 
   if (newRev % 100 === 0) {
diff --git a/src/node/utils/ExportHtml.js b/src/node/utils/ExportHtml.js
index 9d40111e..38e5fb1a 100644
--- a/src/node/utils/ExportHtml.js
+++ b/src/node/utils/ExportHtml.js
@@ -314,7 +314,7 @@ const getHTMLFromAtext = async (pad, atext, authorColors) => {
       await hooks.aCallAll('getLineHTMLForExport', context);
       // To create list parent elements
       if ((!prevLine || prevLine.listLevel !== line.listLevel) ||
-          (prevLine && line.listTypeName !== prevLine.listTypeName)) {
+          (line.listTypeName !== prevLine.listTypeName)) {
         const exists = _.find(openLists, (item) => (
           item.level === line.listLevel && item.type === line.listTypeName)
         );
@@ -414,7 +414,7 @@ const getHTMLFromAtext = async (pad, atext, authorColors) => {
       if ((!nextLine ||
            !nextLine.listLevel ||
            nextLine.listLevel < line.listLevel) ||
-          (nextLine && line.listTypeName !== nextLine.listTypeName)) {
+          (line.listTypeName !== nextLine.listTypeName)) {
         let nextLevel = 0;
         if (nextLine && nextLine.listLevel) {
           nextLevel = nextLine.listLevel;
diff --git a/src/static/js/AttributeManager.js b/src/static/js/AttributeManager.js
index 1d8bd937..6cda86c4 100644
--- a/src/static/js/AttributeManager.js
+++ b/src/static/js/AttributeManager.js
@@ -209,10 +209,8 @@ AttributeManager.prototype = _(AttributeManager.prototype).extend({
       if (selStart[1] === selEnd[1] && selStart[0] === selEnd[0]) return false;
 
       if (selStart[0] !== selEnd[0]) { // -> More than one line selected
-        let hasAttrib = true;
-
         // from selStart to the end of the first line
-        hasAttrib = hasAttrib && rangeHasAttrib(
+        let hasAttrib = rangeHasAttrib(
             selStart, [selStart[0], rep.lines.atIndex(selStart[0]).text.length]);
 
         // for all lines in between
diff --git a/src/static/js/Changeset.js b/src/static/js/Changeset.js
index 75bb92b2..b47979c1 100644
--- a/src/static/js/Changeset.js
+++ b/src/static/js/Changeset.js
@@ -1759,7 +1759,7 @@ exports.makeAttribsString = (opcode, attribs, pool) => {
     return '';
   } else if ((typeof attribs) === 'string') {
     return attribs;
-  } else if (pool && attribs && attribs.length) {
+  } else if (pool && attribs.length) {
     if (attribs.length > 1) {
       attribs = attribs.slice();
       attribs.sort();
diff --git a/src/static/js/ace2_inner.js b/src/static/js/ace2_inner.js
index 429fef7c..4858aa1b 100644
--- a/src/static/js/ace2_inner.js
+++ b/src/static/js/ace2_inner.js
@@ -3782,7 +3782,7 @@ function Ace2Inner() {
 
   // We apply the height of a line in the doc body, to the corresponding sidediv line number
   const updateLineNumbers = () => {
-    if (!currentCallStack || currentCallStack && !currentCallStack.domClean) return;
+    if (!currentCallStack || !currentCallStack.domClean) return;
 
     // Refs #4228, to avoid layout trashing, we need to first calculate all the heights,
     // and then apply at once all new height to div elements
diff --git a/src/static/js/contentcollector.js b/src/static/js/contentcollector.js
index 1c601cc5..c250008b 100644
--- a/src/static/js/contentcollector.js
+++ b/src/static/js/contentcollector.js
@@ -195,7 +195,7 @@ const makeContentCollector = (collectStyles, abrowser, apool, className2Author)
       }
     }
 
-    if (listType === 'none' || !listType) {
+    if (listType === 'none') {
       delete state.lineAttributes.list;
     } else {
       state.lineAttributes.list = listType;
diff --git a/src/static/js/pluginfw/tsort.js b/src/static/js/pluginfw/tsort.js
index e584ada2..117f8555 100644
--- a/src/static/js/pluginfw/tsort.js
+++ b/src/static/js/pluginfw/tsort.js
@@ -81,6 +81,7 @@ const tsortTest = () => {
 
   try {
     sorted = tsort(edges);
+    console.log('succeeded', sorted);
   } catch (e) {
     console.log(e.message);
   }

From 14a9749b755552e42b1d17cca192340ebb4e9357 Mon Sep 17 00:00:00 2001
From: webzwo0i <webzwo0i@c3d2.de>
Date: Mon, 15 Feb 2021 16:14:33 +0100
Subject: [PATCH 068/115] tests: add assert helper for supporting node 10.x

---
 src/tests/backend/assert-legacy.js            | 48 +++++++++++++++++++
 src/tests/backend/specs/caching_middleware.js |  2 +-
 src/tests/backend/specs/hooks.js              |  2 +-
 3 files changed, 50 insertions(+), 2 deletions(-)
 create mode 100644 src/tests/backend/assert-legacy.js

diff --git a/src/tests/backend/assert-legacy.js b/src/tests/backend/assert-legacy.js
new file mode 100644
index 00000000..b3760da9
--- /dev/null
+++ b/src/tests/backend/assert-legacy.js
@@ -0,0 +1,48 @@
+'use strict';
+// support for older node versions (<12)
+const assert = require('assert');
+
+const internalMatch = (string, regexp, message, fn) => {
+  if (!regexp.test) {
+    throw new Error('regexp parameter is not a RegExp');
+  }
+  if (typeof string !== 'string') {
+    throw new Error('string parameter is not a string');
+  }
+  const match = fn.name === 'match';
+
+  const result = string.match(regexp);
+  if (match && !result) {
+    if (message) {
+      throw message;
+    } else {
+      throw new Error(`${string} does not match regex ${regexp}`);
+    }
+  }
+  if (!match && result) {
+    if (message) {
+      throw message;
+    } else {
+      throw new Error(`${string} does match regex ${regexp}`);
+    }
+  }
+};
+
+
+if (!assert.match) {
+  const match = (string, regexp, message) => {
+    internalMatch(string, regexp, message, match);
+  };
+  assert.match = match;
+}
+if (!assert.strict.match) assert.strict.match = assert.match;
+
+if (!assert.doesNotMatch) {
+  const doesNotMatch = (string, regexp, message) => {
+    internalMatch(string, regexp, message, doesNotMatch);
+  };
+  assert.doesNotMatch = doesNotMatch;
+}
+if (!assert.strict.doesNotMatch) assert.strict.doesNotMatch = assert.doesNotMatch;
+
+module.exports = assert;
diff --git a/src/tests/backend/specs/caching_middleware.js b/src/tests/backend/specs/caching_middleware.js
index a40ada7d..e3eef98b 100644
--- a/src/tests/backend/specs/caching_middleware.js
+++ b/src/tests/backend/specs/caching_middleware.js
@@ -7,7 +7,7 @@
  */
 
 const common = require('../common');
-const assert = require('assert').strict;
+const assert = require('../assert-legacy').strict;
 const queryString = require('querystring');
 const settings = require('../../../node/utils/Settings');
 
diff --git a/src/tests/backend/specs/hooks.js b/src/tests/backend/specs/hooks.js
index 9dbf6974..e601c934 100644
--- a/src/tests/backend/specs/hooks.js
+++ b/src/tests/backend/specs/hooks.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const assert = require('assert').strict;
+const assert = require('../assert-legacy').strict;
 const hooks = require('../../../static/js/pluginfw/hooks');
 const plugins = require('../../../static/js/pluginfw/plugin_defs');
 const sinon = require('sinon');

From 5ea66701f777e8c709835153ce489024bc978b55 Mon Sep 17 00:00:00 2001
From: Richard Hansen <rhansen@rhansen.org>
Date: Fri, 19 Feb 2021 02:16:55 -0500
Subject: [PATCH 069/115] tests: Use `--no-save` when installing plugins on
 Windows

---
 .github/workflows/backend-tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/backend-tests.yml b/.github/workflows/backend-tests.yml
index fc488256..9adbf901 100644
--- a/.github/workflows/backend-tests.yml
+++ b/.github/workflows/backend-tests.yml
@@ -135,7 +135,7 @@ jobs:
 
     - name: Install Etherpad plugins
       run: >
-        npm install
+        npm install --no-save
         ep_align
         ep_author_hover
         ep_cursortrace

From 588b73f3664241711071913cba000863fb3caf3f Mon Sep 17 00:00:00 2001
From: Richard Hansen <rhansen@rhansen.org>
Date: Fri, 19 Feb 2021 02:15:08 -0500
Subject: [PATCH 070/115] tests: Install deps after installing plugins

---
 .github/workflows/frontend-admin-tests.yml | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/frontend-admin-tests.yml b/.github/workflows/frontend-admin-tests.yml
index bbe3d23f..c8d064c8 100644
--- a/.github/workflows/frontend-admin-tests.yml
+++ b/.github/workflows/frontend-admin-tests.yml
@@ -21,14 +21,21 @@ jobs:
         accessKey: ${{ secrets.SAUCE_ACCESS_KEY }}
         tunnelIdentifier: ${{ github.run_id }}-${{ github.run_number }}-${{ github.job }}
 
+    - name: Install etherpad plugins
+      # We intentionally install an old ep_align version to test upgrades to the minor version number.
+      run: npm install --no-save ep_align@0.2.27
+
+    # This must be run after installing the plugins, otherwise npm will try to
+    # hoist common dependencies by removing them from src/node_modules and
+    # installing them in the top-level node_modules. As of v6.14.10, npm's hoist
+    # logic appears to be buggy, because it sometimes removes dependencies from
+    # src/node_modules but fails to add them to the top-level node_modules. Even
+    # if npm correctly hoists the dependencies, the hoisting seems to confuse
+    # tools such as `npm outdated`, `npm update`, and some ESLint rules.
     - name: Install all dependencies and symlink for ep_etherpad-lite
       run: src/bin/installDeps.sh
 
-      # We intentionally install a much old ep_align version to test update minor versions
-    - name: Install etherpad plugins
-      run: npm install --no-save ep_align@0.2.27
-
-      # Nuke plugin tests
+    # Nuke plugin tests
     - name: Install etherpad plugins
       run: rm -Rf node_modules/ep_align/static/tests/*
 

From 6198e92706f3af80db52cd2a8c4956346b1ab34a Mon Sep 17 00:00:00 2001
From: Richard Hansen <rhansen@rhansen.org>
Date: Mon, 15 Feb 2021 19:10:55 -0500
Subject: [PATCH 071/115] tests: Pass `--legacy-peer-deps` flag to work around
 npm v7 bug

This flag is unknown to npm v6, but npm v6 silently ignores unknown
flags.
---
 .github/workflows/backend-tests.yml        | 8 ++++++--
 .github/workflows/frontend-admin-tests.yml | 4 +++-
 .github/workflows/frontend-tests.yml       | 4 +++-
 .github/workflows/load-test.yml            | 4 +++-
 .travis.yml                                | 4 +++-
 README.md                                  | 2 +-
 doc/plugins.md                             | 4 ++--
 src/bin/plugins/lib/README.md              | 2 +-
 src/static/js/pluginfw/installer.js        | 8 ++++++--
 9 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/backend-tests.yml b/.github/workflows/backend-tests.yml
index 9adbf901..6f4b4cc5 100644
--- a/.github/workflows/backend-tests.yml
+++ b/.github/workflows/backend-tests.yml
@@ -57,8 +57,10 @@ jobs:
         sudo apt install -y --no-install-recommends libreoffice libreoffice-pdfimport
 
     - name: Install Etherpad plugins
+      # The --legacy-peer-deps flag is required to work around a bug in npm v7:
+      # https://github.com/npm/cli/issues/2199
       run: >
-        npm install --no-save
+        npm install --no-save --legacy-peer-deps
         ep_align
         ep_author_hover
         ep_cursortrace
@@ -134,8 +136,10 @@ jobs:
         node-version: 12
 
     - name: Install Etherpad plugins
+      # The --legacy-peer-deps flag is required to work around a bug in npm v7:
+      # https://github.com/npm/cli/issues/2199
       run: >
-        npm install --no-save
+        npm install --no-save --legacy-peer-deps
         ep_align
         ep_author_hover
         ep_cursortrace
diff --git a/.github/workflows/frontend-admin-tests.yml b/.github/workflows/frontend-admin-tests.yml
index c8d064c8..92a9daa4 100644
--- a/.github/workflows/frontend-admin-tests.yml
+++ b/.github/workflows/frontend-admin-tests.yml
@@ -23,7 +23,9 @@ jobs:
 
     - name: Install etherpad plugins
       # We intentionally install an old ep_align version to test upgrades to the minor version number.
-      run: npm install --no-save ep_align@0.2.27
+      # The --legacy-peer-deps flag is required to work around a bug in npm v7:
+      # https://github.com/npm/cli/issues/2199
+      run: npm install --no-save --legacy-peer-deps ep_align@0.2.27
 
     # This must be run after installing the plugins, otherwise npm will try to
     # hoist common dependencies by removing them from src/node_modules and
diff --git a/.github/workflows/frontend-tests.yml b/.github/workflows/frontend-tests.yml
index 6ddd9cf6..9b0f7e22 100644
--- a/.github/workflows/frontend-tests.yml
+++ b/.github/workflows/frontend-tests.yml
@@ -62,8 +62,10 @@ jobs:
       run: src/tests/frontend/travis/sauce_tunnel.sh
 
     - name: Install Etherpad plugins
+      # The --legacy-peer-deps flag is required to work around a bug in npm v7:
+      # https://github.com/npm/cli/issues/2199
       run: >
-        npm install --no-save
+        npm install --no-save --legacy-peer-deps
         ep_align
         ep_author_hover
         ep_cursortrace
diff --git a/.github/workflows/load-test.yml b/.github/workflows/load-test.yml
index 2dbe9815..787ef1dd 100644
--- a/.github/workflows/load-test.yml
+++ b/.github/workflows/load-test.yml
@@ -51,8 +51,10 @@ jobs:
       run: sudo npm install -g etherpad-load-test
 
     - name: Install etherpad plugins
+      # The --legacy-peer-deps flag is required to work around a bug in npm v7:
+      # https://github.com/npm/cli/issues/2199
       run: >
-        npm install --no-save
+        npm install --no-save --legacy-peer-deps
         ep_align
         ep_author_hover
         ep_cursortrace
diff --git a/.travis.yml b/.travis.yml
index 5048d7f7..44a8693b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,8 +28,10 @@ _install_libreoffice: &install_libreoffice >-
   sudo apt-get update &&
   sudo apt-get -y install libreoffice libreoffice-pdfimport
 
+# The --legacy-peer-deps flag is required to work around a bug in npm v7:
+# https://github.com/npm/cli/issues/2199
 _install_plugins: &install_plugins >-
-  npm install --no-save
+  npm install --no-save --legacy-peer-deps
   ep_align
   ep_author_hover
   ep_cursortrace
diff --git a/README.md b/README.md
index c06a9931..0e6c492f 100644
--- a/README.md
+++ b/README.md
@@ -115,7 +115,7 @@ Etherpad is very customizable through plugins. Instructions for installing theme
 Run the following command in your Etherpad folder to get all of the features visible in the demo gif:
 
 ```
-npm install --no-save ep_headings2 ep_markdown ep_comments_page ep_align ep_font_color ep_webrtc ep_embedded_hyperlinks2
+npm install --no-save --legacy-peer-deps ep_headings2 ep_markdown ep_comments_page ep_align ep_font_color ep_webrtc ep_embedded_hyperlinks2
 ```
 
 ## Customize the style with skin variants
diff --git a/doc/plugins.md b/doc/plugins.md
index 1df620f9..1ed0c4f1 100644
--- a/doc/plugins.md
+++ b/doc/plugins.md
@@ -7,8 +7,8 @@ execute its own functionality based on these events.
 Publicly available plugins can be found in the npm registry (see
 <https://npmjs.org>). Etherpad's naming convention for plugins is to prefix your
 plugins with `ep_`. So, e.g. it's `ep_flubberworms`. Thus you can install
-plugins from npm, using `npm install --no-save ep_flubberworm` in Etherpad's
-root directory.
+plugins from npm, using `npm install --no-save --legacy-peer-deps
+ep_flubberworm` in Etherpad's root directory.
 
 You can also browse to `http://yourEtherpadInstan.ce/admin/plugins`, which will
 list all installed plugins and those available on npm. It even provides
diff --git a/src/bin/plugins/lib/README.md b/src/bin/plugins/lib/README.md
index d2457b5f..e17a23ed 100755
--- a/src/bin/plugins/lib/README.md
+++ b/src/bin/plugins/lib/README.md
@@ -9,7 +9,7 @@ Explain what your plugin does and who it's useful for.
 ## Installing
 
 ```
-npm install --no-save [plugin_name]
+npm install --no-save --legacy-peer-deps [plugin_name]
 ```
 
 or Use the Etherpad ``/admin`` interface.
diff --git a/src/static/js/pluginfw/installer.js b/src/static/js/pluginfw/installer.js
index 104777d3..dd3dddc8 100644
--- a/src/static/js/pluginfw/installer.js
+++ b/src/static/js/pluginfw/installer.js
@@ -32,7 +32,9 @@ exports.uninstall = async (pluginName, cb = null) => {
   logger.info(`Uninstalling plugin ${pluginName}...`);
   try {
     // The --no-save flag prevents npm from creating package.json or package-lock.json.
-    await runCmd(['npm', 'uninstall', '--no-save', pluginName]);
+    // The --legacy-peer-deps flag is required to work around a bug in npm v7:
+    // https://github.com/npm/cli/issues/2199
+    await runCmd(['npm', 'uninstall', '--no-save', '--legacy-peer-deps', pluginName]);
   } catch (err) {
     logger.error(`Failed to uninstall plugin ${pluginName}`);
     cb(err || new Error(err));
@@ -49,7 +51,9 @@ exports.install = async (pluginName, cb = null) => {
   logger.info(`Installing plugin ${pluginName}...`);
   try {
     // The --no-save flag prevents npm from creating package.json or package-lock.json.
-    await runCmd(['npm', 'install', '--no-save', pluginName]);
+    // The --legacy-peer-deps flag is required to work around a bug in npm v7:
+    // https://github.com/npm/cli/issues/2199
+    await runCmd(['npm', 'install', '--no-save', '--legacy-peer-deps', pluginName]);
   } catch (err) {
     logger.error(`Failed to install plugin ${pluginName}`);
     cb(err || new Error(err));

From 29afb91b3e5a211cc87f4a1d4bcc2a7e70e3b6b7 Mon Sep 17 00:00:00 2001
From: webzwo0i <webzwo0i@c3d2.de>
Date: Mon, 15 Feb 2021 16:35:04 +0100
Subject: [PATCH 072/115] tests: delay setting up saucelabs tunnel

---
 .github/workflows/frontend-admin-tests.yml | 12 +++++-----
 .github/workflows/frontend-tests.yml       | 26 ++++++++++------------
 2 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/frontend-admin-tests.yml b/.github/workflows/frontend-admin-tests.yml
index 92a9daa4..3cfd39f5 100644
--- a/.github/workflows/frontend-admin-tests.yml
+++ b/.github/workflows/frontend-admin-tests.yml
@@ -15,12 +15,6 @@ jobs:
       with:
         node-version: 12
 
-    - uses: saucelabs/sauce-connect-action@v1.1.2
-      with:
-        username: ${{ secrets.SAUCE_USERNAME }}
-        accessKey: ${{ secrets.SAUCE_ACCESS_KEY }}
-        tunnelIdentifier: ${{ github.run_id }}-${{ github.run_number }}-${{ github.job }}
-
     - name: Install etherpad plugins
       # We intentionally install an old ep_align version to test upgrades to the minor version number.
       # The --legacy-peer-deps flag is required to work around a bug in npm v7:
@@ -54,6 +48,12 @@ jobs:
     - name: Remove standard frontend test files, so only admin tests are run
       run: mv src/tests/frontend/specs/* /tmp && mv /tmp/admin*.js src/tests/frontend/specs
 
+    - uses: saucelabs/sauce-connect-action@v1.1.2
+      with:
+        username: ${{ secrets.SAUCE_USERNAME }}
+        accessKey: ${{ secrets.SAUCE_ACCESS_KEY }}
+        tunnelIdentifier: ${{ github.run_id }}-${{ github.run_number }}-${{ github.job }}
+
     - name: Run the frontend admin tests
       shell: bash
       env:
diff --git a/.github/workflows/frontend-tests.yml b/.github/workflows/frontend-tests.yml
index 9b0f7e22..7841f670 100644
--- a/.github/workflows/frontend-tests.yml
+++ b/.github/workflows/frontend-tests.yml
@@ -15,12 +15,6 @@ jobs:
       with:
         node-version: 12
 
-    - uses: saucelabs/sauce-connect-action@v1.1.2
-      with:
-        username: ${{ secrets.SAUCE_USERNAME }}
-        accessKey: ${{ secrets.SAUCE_ACCESS_KEY }}
-        tunnelIdentifier: ${{ github.run_id }}-${{ github.run_number }}-${{ github.job }}
-
     - name: Install all dependencies and symlink for ep_etherpad-lite
       run: src/bin/installDeps.sh
 
@@ -31,6 +25,12 @@ jobs:
     - name: Write custom settings.json with loglevel WARN
       run: "sed 's/\"loglevel\": \"INFO\",/\"loglevel\": \"WARN\",/' < settings.json.template > settings.json"
 
+    - uses: saucelabs/sauce-connect-action@v1.1.2
+      with:
+        username: ${{ secrets.SAUCE_USERNAME }}
+        accessKey: ${{ secrets.SAUCE_ACCESS_KEY }}
+        tunnelIdentifier: ${{ github.run_id }}-${{ github.run_number }}-${{ github.job }}
+
     - name: Run the frontend tests
       shell: bash
       env:
@@ -53,14 +53,6 @@ jobs:
       with:
         node-version: 12
 
-    - name: Run sauce-connect-action
-      shell: bash
-      env:
-        SAUCE_USERNAME: ${{ secrets.SAUCE_USERNAME }}
-        SAUCE_ACCESS_KEY: ${{ secrets.SAUCE_ACCESS_KEY }}
-        TRAVIS_JOB_NUMBER: ${{ github.run_id }}-${{ github.run_number }}-${{ github.job }}
-      run: src/tests/frontend/travis/sauce_tunnel.sh
-
     - name: Install Etherpad plugins
       # The --legacy-peer-deps flag is required to work around a bug in npm v7:
       # https://github.com/npm/cli/issues/2199
@@ -104,6 +96,12 @@ jobs:
     - name: Remove standard frontend test files, so only plugin tests are run
       run: rm src/tests/frontend/specs/*
 
+    - uses: saucelabs/sauce-connect-action@v1.1.2
+      with:
+        username: ${{ secrets.SAUCE_USERNAME }}
+        accessKey: ${{ secrets.SAUCE_ACCESS_KEY }}
+        tunnelIdentifier: ${{ github.run_id }}-${{ github.run_number }}-${{ github.job }}
+
     - name: Run the frontend tests
       shell: bash
       env:

From 2994ef3c3c3a905d834732c253caa3788f64e88d Mon Sep 17 00:00:00 2001
From: webzwo0i <webzwo0i@c3d2.de>
Date: Fri, 12 Feb 2021 02:00:28 +0100
Subject: [PATCH 073/115] tests: try all supported node versions

---
 .github/workflows/backend-tests.yml        | 14 ++++++++++++--
 .github/workflows/frontend-admin-tests.yml | 16 +++++++++++++---
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/backend-tests.yml b/.github/workflows/backend-tests.yml
index 6f4b4cc5..a7c25404 100644
--- a/.github/workflows/backend-tests.yml
+++ b/.github/workflows/backend-tests.yml
@@ -13,13 +13,18 @@ jobs:
     name: Linux without plugins
     runs-on: ubuntu-latest
 
+    strategy:
+      fail-fast: false
+      matrix:
+        node: [10, 12, 14, 15]
+
     steps:
     - name: Checkout repository
       uses: actions/checkout@v2
 
     - uses: actions/setup-node@v2
       with:
-        node-version: 12
+        node-version: ${{ matrix.node }}
 
     - name: Install libreoffice
       run: |
@@ -42,13 +47,18 @@ jobs:
     name: Linux with Plugins
     runs-on: ubuntu-latest
 
+    strategy:
+      fail-fast: false
+      matrix:
+        node: [10, 12, 14, 15]
+
     steps:
     - name: Checkout repository
       uses: actions/checkout@v2
 
     - uses: actions/setup-node@v2
       with:
-        node-version: 12
+        node-version: ${{ matrix.node }}
 
     - name: Install libreoffice
       run: |
diff --git a/.github/workflows/frontend-admin-tests.yml b/.github/workflows/frontend-admin-tests.yml
index 3cfd39f5..73cf7ab6 100644
--- a/.github/workflows/frontend-admin-tests.yml
+++ b/.github/workflows/frontend-admin-tests.yml
@@ -7,13 +7,23 @@ jobs:
     name: with plugins
     runs-on: ubuntu-latest
 
+    strategy:
+      fail-fast: false
+      matrix:
+        node: [10, 12, 14, 15]
+
     steps:
+    - name: Generate Sauce Labs strings
+      id: sauce_strings
+      run: |
+        printf %s\\n '::set-output name=tunnel_id::${{ github.run_id }}-${{ github.run_number }}-${{ github.job }}-node${{ matrix.node }}'
+
     - name: Checkout repository
       uses: actions/checkout@v2
 
     - uses: actions/setup-node@v2
       with:
-        node-version: 12
+        node-version: ${{ matrix.node }}
 
     - name: Install etherpad plugins
       # We intentionally install an old ep_align version to test upgrades to the minor version number.
@@ -52,14 +62,14 @@ jobs:
       with:
         username: ${{ secrets.SAUCE_USERNAME }}
         accessKey: ${{ secrets.SAUCE_ACCESS_KEY }}
-        tunnelIdentifier: ${{ github.run_id }}-${{ github.run_number }}-${{ github.job }}
+        tunnelIdentifier: ${{ steps.sauce_strings.outputs.tunnel_id }}
 
     - name: Run the frontend admin tests
       shell: bash
       env:
         SAUCE_USERNAME: ${{ secrets.SAUCE_USERNAME }}
         SAUCE_ACCESS_KEY: ${{ secrets.SAUCE_ACCESS_KEY }}
-        TRAVIS_JOB_NUMBER: ${{ github.run_id }}-${{ github.run_number }}-${{ github.job }}
+        TRAVIS_JOB_NUMBER: ${{ steps.sauce_strings.outputs.tunnel_id }}
         GIT_HASH: ${{ steps.environment.outputs.sha_short }}
       run: |
         src/tests/frontend/travis/adminrunner.sh

From 85231cb7749a3d3436f4a845421623f4cf8b4126 Mon Sep 17 00:00:00 2001
From: Richard Hansen <rhansen@rhansen.org>
Date: Wed, 17 Feb 2021 04:30:15 -0500
Subject: [PATCH 074/115] tests: More descriptive Sauce Labs name

---
 .github/workflows/frontend-admin-tests.yml |  2 ++
 .github/workflows/frontend-tests.yml       | 22 ++++++++++++++++++----
 src/tests/frontend/travis/remote_runner.js |  6 +++---
 3 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/frontend-admin-tests.yml b/.github/workflows/frontend-admin-tests.yml
index 73cf7ab6..8a61b224 100644
--- a/.github/workflows/frontend-admin-tests.yml
+++ b/.github/workflows/frontend-admin-tests.yml
@@ -16,6 +16,7 @@ jobs:
     - name: Generate Sauce Labs strings
       id: sauce_strings
       run: |
+        printf %s\\n '::set-output name=name::${{ github.workflow }} - ${{ github.job }} - Node ${{ matrix.node }}'
         printf %s\\n '::set-output name=tunnel_id::${{ github.run_id }}-${{ github.run_number }}-${{ github.job }}-node${{ matrix.node }}'
 
     - name: Checkout repository
@@ -69,6 +70,7 @@ jobs:
       env:
         SAUCE_USERNAME: ${{ secrets.SAUCE_USERNAME }}
         SAUCE_ACCESS_KEY: ${{ secrets.SAUCE_ACCESS_KEY }}
+        SAUCE_NAME: ${{ steps.sauce_strings.outputs.name }}
         TRAVIS_JOB_NUMBER: ${{ steps.sauce_strings.outputs.tunnel_id }}
         GIT_HASH: ${{ steps.environment.outputs.sha_short }}
       run: |
diff --git a/.github/workflows/frontend-tests.yml b/.github/workflows/frontend-tests.yml
index 7841f670..99d7bd0f 100644
--- a/.github/workflows/frontend-tests.yml
+++ b/.github/workflows/frontend-tests.yml
@@ -8,6 +8,12 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
+    - name: Generate Sauce Labs strings
+      id: sauce_strings
+      run: |
+        printf %s\\n '::set-output name=name::${{ github.workflow }} - ${{ github.job }}'
+        printf %s\\n '::set-output name=tunnel_id::${{ github.run_id }}-${{ github.run_number }}-${{ github.job }}'
+
     - name: Checkout repository
       uses: actions/checkout@v2
 
@@ -29,14 +35,15 @@ jobs:
       with:
         username: ${{ secrets.SAUCE_USERNAME }}
         accessKey: ${{ secrets.SAUCE_ACCESS_KEY }}
-        tunnelIdentifier: ${{ github.run_id }}-${{ github.run_number }}-${{ github.job }}
+        tunnelIdentifier: ${{ steps.sauce_strings.outputs.tunnel_id }}
 
     - name: Run the frontend tests
       shell: bash
       env:
         SAUCE_USERNAME: ${{ secrets.SAUCE_USERNAME }}
         SAUCE_ACCESS_KEY: ${{ secrets.SAUCE_ACCESS_KEY }}
-        TRAVIS_JOB_NUMBER: ${{ github.run_id }}-${{ github.run_number }}-${{ github.job }}
+        SAUCE_NAME: ${{ steps.sauce_strings.outputs.name }}
+        TRAVIS_JOB_NUMBER: ${{ steps.sauce_strings.outputs.tunnel_id }}
         GIT_HASH: ${{ steps.environment.outputs.sha_short }}
       run: |
         src/tests/frontend/travis/runner.sh
@@ -46,6 +53,12 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
+    - name: Generate Sauce Labs strings
+      id: sauce_strings
+      run: |
+        printf %s\\n '::set-output name=name::${{ github.workflow }} - ${{ github.job }}'
+        printf %s\\n '::set-output name=tunnel_id::${{ github.run_id }}-${{ github.run_number }}-${{ github.job }}'
+
     - name: Checkout repository
       uses: actions/checkout@v2
 
@@ -100,14 +113,15 @@ jobs:
       with:
         username: ${{ secrets.SAUCE_USERNAME }}
         accessKey: ${{ secrets.SAUCE_ACCESS_KEY }}
-        tunnelIdentifier: ${{ github.run_id }}-${{ github.run_number }}-${{ github.job }}
+        tunnelIdentifier: ${{ steps.sauce_strings.outputs.tunnel_id }}
 
     - name: Run the frontend tests
       shell: bash
       env:
         SAUCE_USERNAME: ${{ secrets.SAUCE_USERNAME }}
         SAUCE_ACCESS_KEY: ${{ secrets.SAUCE_ACCESS_KEY }}
-        TRAVIS_JOB_NUMBER: ${{ github.run_id }}-${{ github.run_number }}-${{ github.job }}
+        SAUCE_NAME: ${{ steps.sauce_strings.outputs.name }}
+        TRAVIS_JOB_NUMBER: ${{ steps.sauce_strings.outputs.tunnel_id }}
         GIT_HASH: ${{ steps.environment.outputs.sha_short }}
       run: |
         src/tests/frontend/travis/runner.sh
diff --git a/src/tests/frontend/travis/remote_runner.js b/src/tests/frontend/travis/remote_runner.js
index 5a75dbe6..0f08a145 100644
--- a/src/tests/frontend/travis/remote_runner.js
+++ b/src/tests/frontend/travis/remote_runner.js
@@ -27,9 +27,9 @@ process.on('exit', (code) => {
 const sauceTestWorker = async.queue((testSettings, callback) => {
   const browser = wd.promiseChainRemote(
       config.host, config.port, config.username, config.accessKey);
-  const name =
-      `${process.env.GIT_HASH} - ${testSettings.browserName} ` +
-      `${testSettings.version}, ${testSettings.platform}`;
+  const name = [process.env.GIT_HASH].concat(process.env.SAUCE_NAME || []).concat([
+    `${testSettings.browserName} ${testSettings.version}, ${testSettings.platform}`,
+  ]).join(' - ');
   testSettings.name = name;
   testSettings.public = true;
   testSettings.build = process.env.GIT_HASH;

From 0f16e518ff6c0a1edc33fd36fdc9d7ef3d3e732a Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Mon, 22 Feb 2021 09:10:02 +0000
Subject: [PATCH 075/115] api: drop JSONP (#4835)

* api: drop JSONP

* docs: drop JSONP

* tests: drop JSONP

* api: remove isValidJSONPName require
---
 doc/api/http_api.md                        |  8 --
 src/node/hooks/express/isValidJSONPName.js | 85 ----------------------
 src/node/hooks/express/openapi.js          |  7 --
 src/tests/backend/specs/api/api.js         |  9 ---
 4 files changed, 109 deletions(-)
 delete mode 100644 src/node/hooks/express/isValidJSONPName.js

diff --git a/doc/api/http_api.md b/doc/api/http_api.md
index 0cfc85a0..9cab7f56 100644
--- a/doc/api/http_api.md
+++ b/doc/api/http_api.md
@@ -134,13 +134,6 @@ Authentication works via a token that is sent with each request as a post parame
 
 All functions will also be available through a node module accessible from other node.js applications.
 
-### JSONP
-
-The API provides _JSONP_ support to allow requests from a server in a different domain.
-Simply add `&jsonp=?` to the API call.
-
-Example usage: https://api.jquery.com/jQuery.getJSON/
-
 ## API Methods
 
 ### Groups
@@ -636,4 +629,3 @@ get stats of the etherpad instance
 
 *Example returns*
  * `{"code":0,"message":"ok","data":{"totalPads":3,"totalSessions": 2,"totalActivePads": 1}}`
-
diff --git a/src/node/hooks/express/isValidJSONPName.js b/src/node/hooks/express/isValidJSONPName.js
deleted file mode 100644
index c8ca5bea..00000000
--- a/src/node/hooks/express/isValidJSONPName.js
+++ /dev/null
@@ -1,85 +0,0 @@
-'use strict';
-
-const RESERVED_WORDS = [
-  'abstract',
-  'arguments',
-  'await',
-  'boolean',
-  'break',
-  'byte',
-  'case',
-  'catch',
-  'char',
-  'class',
-  'const',
-  'continue',
-  'debugger',
-  'default',
-  'delete',
-  'do',
-  'double',
-  'else',
-  'enum',
-  'eval',
-  'export',
-  'extends',
-  'false',
-  'final',
-  'finally',
-  'float',
-  'for',
-  'function',
-  'goto',
-  'if',
-  'implements',
-  'import',
-  'in',
-  'instanceof',
-  'int',
-  'interface',
-  'let',
-  'long',
-  'native',
-  'new',
-  'null',
-  'package',
-  'private',
-  'protected',
-  'public',
-  'return',
-  'short',
-  'static',
-  'super',
-  'switch',
-  'synchronized',
-  'this',
-  'throw',
-  'throws',
-  'transient',
-  'true',
-  'try',
-  'typeof',
-  'var',
-  'void',
-  'volatile',
-  'while',
-  'with',
-  'yield',
-];
-
-const regex = /^[a-zA-Z_$][0-9a-zA-Z_$]*(?:\[(?:".+"|'.+'|\d+)\])*?$/;
-
-module.exports.check = (inputStr) => {
-  let isValid = true;
-  inputStr.split('.').forEach((part) => {
-    if (!regex.test(part)) {
-      isValid = false;
-    }
-
-    if (RESERVED_WORDS.indexOf(part) !== -1) {
-      isValid = false;
-    }
-  });
-
-  return isValid;
-};
diff --git a/src/node/hooks/express/openapi.js b/src/node/hooks/express/openapi.js
index 4dc335ce..c4c1ccf5 100644
--- a/src/node/hooks/express/openapi.js
+++ b/src/node/hooks/express/openapi.js
@@ -22,7 +22,6 @@ const createHTTPError = require('http-errors');
 
 const apiHandler = require('../../handler/APIHandler');
 const settings = require('../../utils/Settings');
-const isValidJSONPName = require('./isValidJSONPName');
 
 const log4js = require('log4js');
 const logger = log4js.getLogger('API');
@@ -686,12 +685,6 @@ exports.expressCreateServer = (hookName, args, cb) => {
           }
         }
 
-        // support jsonp response format
-        if (req.query.jsonp && isValidJSONPName.check(req.query.jsonp)) {
-          res.header('Content-Type', 'application/javascript');
-          response = `${req.query.jsonp}(${JSON.stringify(response)})`;
-        }
-
         // send response
         return res.send(response);
       });
diff --git a/src/tests/backend/specs/api/api.js b/src/tests/backend/specs/api/api.js
index cd850651..d05a9989 100644
--- a/src/tests/backend/specs/api/api.js
+++ b/src/tests/backend/specs/api/api.js
@@ -56,13 +56,4 @@ describe(__filename, function () {
         });
   });
 
-  it('supports jsonp calls', async function () {
-    this.timeout(150);
-    await agent.get(`${endPoint('createPad')}&jsonp=jsonp_1&padID=${testPadId}`)
-        .expect(200)
-        .expect('Content-Type', /javascript/)
-        .expect((res) => {
-          if (!res.text.match('jsonp_1')) throw new Error('no jsonp call seen');
-        });
-  });
 });

From b7958b915a2cdb55346665ec4d50e86e966ae009 Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Mon, 22 Feb 2021 09:28:37 +0000
Subject: [PATCH 076/115] docs: Badge polish

---
 README.md | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 0e6c492f..be87d45b 100644
--- a/README.md
+++ b/README.md
@@ -10,15 +10,14 @@ Etherpad is a real-time collaborative editor [scalable to thousands of simultane
 # Project Status
 
 ### Code Quality
-[![Code Quality](https://github.com/ether/etherpad-lite/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/ether/etherpad-lite/actions/workflows/codeql-analysis.yml) [![Total alerts](https://img.shields.io/lgtm/alerts/g/ether/etherpad-lite.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/ether/etherpad-lite/alerts/) [![Language grade: JavaScript](https://img.shields.io/lgtm/grade/javascript/g/ether/etherpad-lite.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/ether/etherpad-lite/context:javascript) [![package.lock](https://github.com/ether/etherpad-lite/actions/workflows/lint-package-lock.yml/badge.svg)](https://github.com/ether/etherpad-lite/actions/workflows/lint-package-lock.yml)
+[![Code Quality](https://github.com/ether/etherpad-lite/actions/workflows/codeql-analysis.yml/badge.svg?color=%2344b492)](https://github.com/ether/etherpad-lite/actions/workflows/codeql-analysis.yml) [![Total alerts](https://img.shields.io/lgtm/alerts/g/ether/etherpad-lite.svg?logo=lgtm&logoWidth=18&color=%2344b492)](https://lgtm.com/projects/g/ether/etherpad-lite/alerts/) [![Language grade: JavaScript](https://img.shields.io/lgtm/grade/javascript/g/ether/etherpad-lite.svg?logo=lgtm&logoWidth=18&color=%2344b492)](https://lgtm.com/projects/g/ether/etherpad-lite/context:javascript) [![package.lock](https://github.com/ether/etherpad-lite/actions/workflows/lint-package-lock.yml/badge.svg?color=%2344b492)](https://github.com/ether/etherpad-lite/actions/workflows/lint-package-lock.yml)
 
 ### Testing
-[![Backend tests](https://github.com/ether/etherpad-lite/actions/workflows/backend-tests.yml/badge.svg)](https://github.com/ether/etherpad-lite/actions/workflows/backend-tests.yml) [![Simulated Load](https://github.com/ether/etherpad-lite/actions/workflows/load-test.yml/badge.svg)](https://github.com/ether/etherpad-lite/actions/workflows/load-test.yml) [![Rate Limit](https://github.com/ether/etherpad-lite/actions/workflows/rate-limit.yml/badge.svg)](https://github.com/ether/etherpad-lite/actions/workflows/rate-limit.yml) [![Windows Zip](https://github.com/ether/etherpad-lite/actions/workflows/windows-zip.yml/badge.svg)](https://github.com/ether/etherpad-lite/actions/workflows/windows-zip.yml) [![Docker file](https://github.com/ether/etherpad-lite/actions/workflows/dockerfile.yml/badge.svg)](https://github.com/ether/etherpad-lite/actions/workflows/dockerfile.yml)
-[![Frontend admin tests](https://github.com/ether/etherpad-lite/actions/workflows/frontend-admin-tests.yml/badge.svg)](https://github.com/ether/etherpad-lite/actions/workflows/frontend-admin-tests.yml) [![Frontend tests](https://github.com/ether/etherpad-lite/actions/workflows/frontend-tests.yml/badge.svg)](https://github.com/ether/etherpad-lite/actions/workflows/frontend-tests.yml)
+[![Backend tests](https://github.com/ether/etherpad-lite/actions/workflows/backend-tests.yml/badge.svg?color=%2344b492)](https://github.com/ether/etherpad-lite/actions/workflows/backend-tests.yml) [![Simulated Load](https://github.com/ether/etherpad-lite/actions/workflows/load-test.yml/badge.svg?color=%2344b492)](https://github.com/ether/etherpad-lite/actions/workflows/load-test.yml) [![Rate Limit](https://github.com/ether/etherpad-lite/actions/workflows/rate-limit.yml/badge.svg?color=%2344b492)](https://github.com/ether/etherpad-lite/actions/workflows/rate-limit.yml) [![Windows Zip](https://github.com/ether/etherpad-lite/actions/workflows/windows-zip.yml/badge.svg?color=%2344b492)](https://github.com/ether/etherpad-lite/actions/workflows/windows-zip.yml) [![Docker file](https://github.com/ether/etherpad-lite/actions/workflows/dockerfile.yml/badge.svg?color=%2344b492)](https://github.com/ether/etherpad-lite/actions/workflows/dockerfile.yml)
+[![Frontend admin tests](https://github.com/ether/etherpad-lite/actions/workflows/frontend-admin-tests.yml/badge.svg?color=%2344b492)](https://github.com/ether/etherpad-lite/actions/workflows/frontend-admin-tests.yml) [![Frontend tests](https://github.com/ether/etherpad-lite/actions/workflows/frontend-tests.yml/badge.svg?color=%2344b492)](https://github.com/ether/etherpad-lite/actions/workflows/frontend-tests.yml)
 
 ### Engagement
-<a href="https://hub.docker.com/r/etherpad/etherpad"><img alt="Docker Pulls" src="https://img.shields.io/docker/pulls/etherpad/etherpad"></a>
-![GitHub all releases](https://img.shields.io/github/downloads/ether/etherpad-lite/total) ![Discord](https://img.shields.io/discord/741309013593030667) ![Etherpad plugins](https://img.shields.io/endpoint?url=https%3A%2F%2Fstatic.etherpad.org%2Fshields.json "Etherpad plugins")
+<a href="https://hub.docker.com/r/etherpad/etherpad"><img alt="Docker Pulls" src="https://img.shields.io/docker/pulls/etherpad/etherpad?color=%2344b492"></a> ![Discord](https://img.shields.io/discord/741309013593030667?color=%2344b492) ![Etherpad plugins](https://img.shields.io/endpoint?url=https%3A%2F%2Fstatic.etherpad.org%2Fshields.json&color=%2344b492 "Etherpad plugins") ![Languages](https://img.shields.io/static/v1?label=Languages&message=105&color=#44b492) ![Translation Coverage](https://img.shields.io/static/v1?label=Languages&message=98%&color=#44b492)
 
 # Installation
 

From a102bbfbef82fadc404b1d0f5ea18165ed250312 Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Mon, 22 Feb 2021 09:37:30 +0000
Subject: [PATCH 077/115] badges: color fix

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index be87d45b..119e6b17 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ Etherpad is a real-time collaborative editor [scalable to thousands of simultane
 [![Frontend admin tests](https://github.com/ether/etherpad-lite/actions/workflows/frontend-admin-tests.yml/badge.svg?color=%2344b492)](https://github.com/ether/etherpad-lite/actions/workflows/frontend-admin-tests.yml) [![Frontend tests](https://github.com/ether/etherpad-lite/actions/workflows/frontend-tests.yml/badge.svg?color=%2344b492)](https://github.com/ether/etherpad-lite/actions/workflows/frontend-tests.yml)
 
 ### Engagement
-<a href="https://hub.docker.com/r/etherpad/etherpad"><img alt="Docker Pulls" src="https://img.shields.io/docker/pulls/etherpad/etherpad?color=%2344b492"></a> ![Discord](https://img.shields.io/discord/741309013593030667?color=%2344b492) ![Etherpad plugins](https://img.shields.io/endpoint?url=https%3A%2F%2Fstatic.etherpad.org%2Fshields.json&color=%2344b492 "Etherpad plugins") ![Languages](https://img.shields.io/static/v1?label=Languages&message=105&color=#44b492) ![Translation Coverage](https://img.shields.io/static/v1?label=Languages&message=98%&color=#44b492)
+<a href="https://hub.docker.com/r/etherpad/etherpad"><img alt="Docker Pulls" src="https://img.shields.io/docker/pulls/etherpad/etherpad?color=%2344b492"></a> ![Discord](https://img.shields.io/discord/741309013593030667?color=%2344b492) ![Etherpad plugins](https://img.shields.io/endpoint?url=https%3A%2F%2Fstatic.etherpad.org%2Fshields.json&color=%2344b492 "Etherpad plugins") ![Languages](https://img.shields.io/static/v1?label=Languages&message=105&color=%2344b492) ![Translation Coverage](https://img.shields.io/static/v1?label=Languages&message=98%&color=%2344b492)
 
 # Installation
 

From d9c2778d17caed89bf249d132f734e72b52441fb Mon Sep 17 00:00:00 2001
From: Richard Hansen <rhansen@rhansen.org>
Date: Mon, 22 Feb 2021 04:30:52 -0500
Subject: [PATCH 078/115] plugins: Better fix for LGTM security warning

---
 src/static/js/admin/plugins.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/static/js/admin/plugins.js b/src/static/js/admin/plugins.js
index 613df368..d3636dfd 100644
--- a/src/static/js/admin/plugins.js
+++ b/src/static/js/admin/plugins.js
@@ -84,12 +84,12 @@ $(document).ready(() => {
 
       for (const attr in plugin) {
         if (attr === 'name') { // Hack to rewrite URLS into name
-          const link = $('<a href="">'); // intentional null href
-          link.attr('href', `https://npmjs.org/package/${plugin.name}`);
-          link.attr('plugin', 'Plugin details');
-          link.attr('rel', 'noopener noreferrer');
-          link.attr('target', '_blank');
-          link.text(plugin.name.substr(3));
+          const link = $('<a>')
+              .attr('href', `https://npmjs.org/package/${plugin.name}`)
+              .attr('plugin', 'Plugin details')
+              .attr('rel', 'noopener noreferrer')
+              .attr('target', '_blank')
+              .text(plugin.name.substr(3));
           row.find('.name').append(link);
         } else {
           row.find(`.${attr}`).text(plugin[attr]);

From c6cd4c38fd39df795bd1f745f0bed93e2502e378 Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Mon, 22 Feb 2021 09:46:14 +0000
Subject: [PATCH 079/115] Update CHANGELOG.md

---
 CHANGELOG.md | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c94227fc..b6056860 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,9 @@
-# 1.8.9
+# 1.8.10
+
+### Compatibility changes
+
+* JSONP API has been removed in favor of using the mature OpenAPI implementation.
+* Node 14 is now required for Docker Deployments
 
 ### Notable fixes
 

From ed8a8eb590c653ddc4d0f97d3e47f92699776e72 Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Mon, 22 Feb 2021 10:06:13 +0000
Subject: [PATCH 080/115] Rename lgtm.yml to .lgtm.yml

---
 lgtm.yml => .lgtm.yml | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename lgtm.yml => .lgtm.yml (100%)

diff --git a/lgtm.yml b/.lgtm.yml
similarity index 100%
rename from lgtm.yml
rename to .lgtm.yml

From 9b03f8f6abde2c57a675dd75af3c9331bab8205a Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Mon, 22 Feb 2021 10:40:38 +0000
Subject: [PATCH 081/115] tests: fix importexport frontend tests (#4827)

* CI: Leave log level at INFO for frontend tests

* CI: Disable frontend admin tests for non-admin workflow

* CI: Disable import/export rate limiting for frontend tests

* tests: fix importexport tests

The testing approach was redone to fix numerous issues:
  * Even if the tests had been working, none of them would have caught
    https://github.com/ether/etherpad-lite/issues/4808 because they
    didn't exercise the client-side import logic. Now they do.
  * Follow-up logic was not in the `helper.waitFor()` callback like it
    should have been. Now the code uses `async` and `await` to ensure
    proper execution order.
  * All `$.ajax()` calls used `async: false`. Now they're properly
    asynchronous.
  * The `helper.waitFor()` condition callbacks threw instead of
    returning false.
  * The string comparisons didn't allow for different attribute
    order (e.g., `<ol start="1" class="list-number1">` vs. `<ol
    class="list-number1" start="1">`). Now `Node.isEqualNode()` is
    used to reduce fragility. (`Node.isEqualNode()` is not perfect, so
    the tests are still a bit fragile: If class names or style strings
    are in a different order then `Node.isEqualNode()` will return
    false even if the nodes are semantically equivalent.)

Co-authored-by: Richard Hansen <rhansen@rhansen.org>

Co-authored-by: Richard Hansen <rhansen@rhansen.org>
---
 .github/workflows/frontend-admin-tests.yml |   4 +-
 .github/workflows/frontend-tests.yml       |  17 +-
 src/tests/frontend/specs/importexport.js   | 917 +++++++++++++--------
 3 files changed, 609 insertions(+), 329 deletions(-)

diff --git a/.github/workflows/frontend-admin-tests.yml b/.github/workflows/frontend-admin-tests.yml
index 8a61b224..f2e2215a 100644
--- a/.github/workflows/frontend-admin-tests.yml
+++ b/.github/workflows/frontend-admin-tests.yml
@@ -50,8 +50,8 @@ jobs:
       id: environment
       run: echo "::set-output name=sha_short::$(git rev-parse --short ${{ github.sha }})"
 
-    - name: Write custom settings.json with loglevel WARN
-      run: "sed 's/\"loglevel\": \"INFO\",/\"loglevel\": \"WARN\",/' < settings.json.template > settings.json"
+    - name: Create settings.json
+      run: cp settings.json.template settings.json
 
     - name: Write custom settings.json that enables the Admin UI tests
       run: "sed -i 's/\"enableAdminUITests\": false/\"enableAdminUITests\": true,\\n\"users\":{\"admin\":{\"password\":\"changeme\",\"is_admin\":true}}/' settings.json"
diff --git a/.github/workflows/frontend-tests.yml b/.github/workflows/frontend-tests.yml
index 99d7bd0f..1b57f651 100644
--- a/.github/workflows/frontend-tests.yml
+++ b/.github/workflows/frontend-tests.yml
@@ -28,8 +28,12 @@ jobs:
       id: environment
       run: echo "::set-output name=sha_short::$(git rev-parse --short ${{ github.sha }})"
 
-    - name: Write custom settings.json with loglevel WARN
-      run: "sed 's/\"loglevel\": \"INFO\",/\"loglevel\": \"WARN\",/' < settings.json.template > settings.json"
+    - name: Create settings.json
+      run: cp settings.json.template settings.json
+
+    - name: Disable import/export rate limiting
+      run: |
+        sed -e '/^ *"importExportRateLimiting":/,/^ *\}/ s/"max":.*/"max": 0/' -i settings.json
 
     - uses: saucelabs/sauce-connect-action@v1.1.2
       with:
@@ -99,11 +103,12 @@ jobs:
       id: environment
       run: echo "::set-output name=sha_short::$(git rev-parse --short ${{ github.sha }})"
 
-    - name: Write custom settings.json with loglevel WARN
-      run: "sed 's/\"loglevel\": \"INFO\",/\"loglevel\": \"WARN\",/' < settings.json.template > settings.json"
+    - name: Create settings.json
+      run: cp settings.json.template settings.json
 
-    - name: Write custom settings.json that enables the Admin UI tests
-      run: "sed -i 's/\"enableAdminUITests\": false/\"enableAdminUITests\": true,\\n\"users\":{\"admin\":{\"password\":\"changeme\",\"is_admin\":true}}/' settings.json"
+    - name: Disable import/export rate limiting
+      run: |
+        sed -e '/^ *"importExportRateLimiting":/,/^ *\}/ s/"max":.*/"max": 0/' -i settings.json
 
       # XXX we should probably run all tests, because plugins could effect their results
     - name: Remove standard frontend test files, so only plugin tests are run
diff --git a/src/tests/frontend/specs/importexport.js b/src/tests/frontend/specs/importexport.js
index 4eb95eeb..73798eca 100644
--- a/src/tests/frontend/specs/importexport.js
+++ b/src/tests/frontend/specs/importexport.js
@@ -1,329 +1,604 @@
 'use strict';
 
-describe('import functionality', function () {
-  beforeEach(function (cb) {
-    helper.newPad(cb); // creates a new pad
-    this.timeout(60000);
-  });
-
-  function getinnertext() {
-    const inner = helper.padInner$;
-    if (!inner) {
-      return '';
-    }
-    let newtext = '';
-    inner('div').each((line, el) => {
-      newtext += `${el.innerHTML}\n`;
-    });
-    return newtext;
-  }
-  function importrequest(data, importurl, type) {
-    let error;
-    const result = $.ajax({
-      url: importurl,
-      type: 'post',
-      processData: false,
-      async: false,
-      contentType: 'multipart/form-data; boundary=boundary',
-      accepts: {
-        text: 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8',
-      },
-      data: [
-        'Content-Type: multipart/form-data; boundary=--boundary',
-        '',
-        '--boundary',
-        `Content-Disposition: form-data; name="file"; filename="import.${type}"`,
-        'Content-Type: text/plain',
-        '',
-        data,
-        '',
-        '--boundary',
-      ].join('\r\n'),
-      error(res) {
-        error = res;
-      },
-    });
-    expect(error).to.be(undefined);
-    return result;
-  }
-  function exportfunc(link) {
-    const exportresults = [];
-    $.ajaxSetup({
-      async: false,
-    });
-    $.get(`${link}/export/html`, (data) => {
-      const start = data.indexOf('<body>');
-      const end = data.indexOf('</body>');
-      const html = data.substr(start + 6, end - start - 6);
-      exportresults.push(['html', html]);
-    });
-    $.get(`${link}/export/txt`, (data) => {
-      exportresults.push(['txt', data]);
-    });
-    return exportresults;
-  }
-
-  xit('import a pad with newlines from txt', function (done) {
-    const importurl = `${helper.padChrome$.window.location.href}/import`;
-    const textWithNewLines = 'imported text\nnewline';
-    importrequest(textWithNewLines, importurl, 'txt');
-    helper.waitFor(() => expect(getinnertext())
-        .to.be('<span class="">imported text</span>\n<span class="">newline</span>\n<br>\n'));
-    const results = exportfunc(helper.padChrome$.window.location.href);
-    expect(results[0][1]).to.be('imported text<br>newline<br><br>');
-    expect(results[1][1]).to.be('imported text\nnewline\n\n');
-    done();
-  });
-  xit('import a pad with newlines from html', function (done) {
-    const importurl = `${helper.padChrome$.window.location.href}/import`;
-    const htmlWithNewLines = '<html><body>htmltext<br/>newline</body></html>';
-    importrequest(htmlWithNewLines, importurl, 'html');
-    helper.waitFor(() => expect(getinnertext())
-        .to.be('<span class="">htmltext</span>\n<span class="">newline</span>\n<br>\n'));
-    const results = exportfunc(helper.padChrome$.window.location.href);
-    expect(results[0][1]).to.be('htmltext<br>newline<br><br>');
-    expect(results[1][1]).to.be('htmltext\nnewline\n\n');
-    done();
-  });
-  xit('import a pad with attributes from html', function (done) {
-    const importurl = `${helper.padChrome$.window.location.href}/import`;
-    const htmlWithNewLines = '<html><body>htmltext<br/><span class="b s i u">' +
-        '<b><i><s><u>newline</u></s></i></b></body></html>';
-    importrequest(htmlWithNewLines, importurl, 'html');
-    helper.waitFor(() => expect(getinnertext())
-        .to.be('<span class="">htmltext</span>\n<span class="b i s u">' +
-          '<b><i><s><u>newline</u></s></i></b></span>\n<br>\n'));
-    const results = exportfunc(helper.padChrome$.window.location.href);
-    expect(results[0][1])
-        .to.be('htmltext<br><strong><em><s><u>newline</u></s></em></strong><br><br>');
-    expect(results[1][1]).to.be('htmltext\nnewline\n\n');
-    done();
-  });
-  xit('import a pad with bullets from html', function (done) {
-    const importurl = `${helper.padChrome$.window.location.href}/import`;
-    const htmlWithBullets = '<html><body><ul class="list-bullet1"><li>bullet line 1</li>' +
-      '<li>bullet line 2</li><ul class="list-bullet2"><li>bullet2 line 1</li>' +
-      '<li>bullet2 line 2</li></ul></ul></body></html>';
-    importrequest(htmlWithBullets, importurl, 'html');
-    helper.waitFor(() => expect(getinnertext()).to.be(
-        '<ul class="list-bullet1"><li><span class="">bullet line 1</span></li></ul>\n' +
-        '<ul class="list-bullet1"><li><span class="">bullet line 2</span></li></ul>\n' +
-        '<ul class="list-bullet2"><li><span class="">bullet2 line 1</span></li></ul>\n' +
-        '<ul class="list-bullet2"><li><span class="">bullet2 line 2</span></li></ul>\n' +
-        '<br>\n'));
-    const results = exportfunc(helper.padChrome$.window.location.href);
-    expect(results[0][1]).to.be(
-        '<ul class="bullet"><li>bullet line 1</li><li>bullet line 2</li>' +
-        '<ul class="bullet"><li>bullet2 line 1</li><li>bullet2 line 2</li></ul></ul><br>');
-    expect(results[1][1])
-        .to.be('\t* bullet line 1\n\t* bullet line 2\n' +
-        '\t\t* bullet2 line 1\n\t\t* bullet2 line 2\n\n');
-    done();
-  });
-  xit('import a pad with bullets and newlines from html', function (done) {
-    const importurl = `${helper.padChrome$.window.location.href}/import`;
-    const htmlWithBullets = '<html><body><ul class="list-bullet1"><li>bullet line 1</li>' +
-        '</ul><br/><ul class="list-bullet1"><li>bullet line 2</li><ul class="list-bullet2">' +
-        '<li>bullet2 line 1</li></ul></ul><br/><ul class="list-bullet1">' +
-        '<ul class="list-bullet2"><li>bullet2 line 2</li></ul></ul></body></html>';
-    importrequest(htmlWithBullets, importurl, 'html');
-    helper.waitFor(() => expect(getinnertext()).to.be(
-        '<ul class="list-bullet1"><li><span class="">bullet line 1</span></li></ul>\n' +
-        '<br>\n' +
-        '<ul class="list-bullet1"><li><span class="">bullet line 2</span></li></ul>\n' +
-        '<ul class="list-bullet2"><li><span class="">bullet2 line 1</span></li></ul>\n' +
-        '<br>\n' +
-        '<ul class="list-bullet2"><li><span class="">bullet2 line 2</span></li></ul>\n' +
-        '<br>\n'));
-    const results = exportfunc(helper.padChrome$.window.location.href);
-    expect(results[0][1]).to.be(
-        '<ul class="bullet"><li>bullet line 1</li></ul><br><ul class="bullet">' +
-        '<li>bullet line 2</li><ul class="bullet"><li>bullet2 line 1</li></ul>' +
-        '</ul><br><ul><ul class="bullet"><li>bullet2 line 2</li></ul></ul><br>');
-    expect(results[1][1]).to.be(
-        '\t* bullet line 1\n\n\t* bullet line 2\n\t\t* bullet2 line 1\n\n\t\t* bullet2 line 2\n\n');
-    done();
-  });
-  xit('import a pad with bullets and newlines and attributes from html', function (done) {
-    const importurl = `${helper.padChrome$.window.location.href}/import`;
-    const htmlWithBullets = '<html><body><ul class="list-bullet1"><li>bullet line 1</li>' +
-        '</ul><br/><ul class="list-bullet1"><li>bullet line 2</li>' +
-        '<ul class="list-bullet2"><li>bullet2 line 1</li></ul></ul>' +
-        '<br/><ul class="list-bullet1"><ul class="list-bullet2"><ul class="list-bullet3">' +
-        '<ul class="list-bullet4"><li><span class="b s i u"><b><i>' +
-        '<s><u>bullet4 line 2 bisu</u></s></i></b></span></li><li>' +
-        '<span class="b s "><b><s>bullet4 line 2 bs</s></b></span></li>' +
-        '<li><span class="u"><u>bullet4 line 2 u</u></span><span class="u i s">' +
-        '<i><s><u>uis</u></s></i></span></li></ul></ul></ul></ul></body></html>';
-    importrequest(htmlWithBullets, importurl, 'html');
-    helper.waitFor(() => expect(getinnertext()).to.be(
-        '<ul class="list-bullet1"><li><span class="">bullet line 1</span></li></ul>\n<br>\n' +
-        '<ul class="list-bullet1"><li><span class="">bullet line 2</span></li></ul>\n' +
-        '<ul class="list-bullet2"><li><span class="">bullet2 line 1</span></li></ul>\n<br>\n' +
-        '<ul class="list-bullet4"><li><span class="b i s u">' +
-        '<b><i><s><u>bullet4 line 2 bisu</u></s></i></b></span></li></ul>\n' +
-        '<ul class="list-bullet4"><li><span class="b s">' +
-        '<b><s>bullet4 line 2 bs</s></b></span></li></ul>\n' +
-        '<ul class="list-bullet4"><li><span class="u"><u>bullet4 line 2 u</u>' +
-        '</span><span class="i s u"><i><s><u>uis</u></s></i></span></li></ul>\n' +
-        '<br>\n'));
-    const results = exportfunc(helper.padChrome$.window.location.href);
-    expect(results[0][1]).to.be(
-        '<ul class="bullet"><li>bullet line 1</li></ul>' +
-        '<br><ul class="bullet"><li>bullet line 2</li><ul class="bullet"><li>bullet2 line 1</li>' +
-        '</ul></ul><br><ul><ul><ul><ul class="bullet"><li><strong><em><s><u>bullet4 line 2 bisu' +
-        '</u></s></em></strong></li><li><strong><s>bullet4 line 2 bs</s></strong>' +
-        '</li><li><u>bullet4 line 2 u<em><s>uis</s></em></u></li></ul></ul></ul></ul><br>');
-    expect(results[1][1]).to.be(
-        '\t* bullet line 1\n\n\t* bullet line 2\n\t\t* bullet2 line 1\n\n\t\t\t\t* bullet4 line 2' +
-        ' bisu\n\t\t\t\t* bullet4 line 2 bs\n\t\t\t\t* bullet4 line 2 uuis\n\n');
-    done();
-  });
-  xit('import a pad with nested bullets from html', function (done) {
-    const importurl = `${helper.padChrome$.window.location.href}/import`;
-    const htmlWithBullets = '<html><body><ul class="list-bullet1"><li>bullet line 1</li>' +
-    '</ul><ul class="list-bullet1"><li>bullet line 2</li><ul class="list-bullet2">' +
-    '<li>bullet2 line 1</li></ul></ul><ul class="list-bullet1"><ul class="list-bullet2">' +
-    '<ul class="list-bullet3"><ul class="list-bullet4"><li>bullet4 line 2</li>' +
-    '<li>bullet4 line 2</li><li>bullet4 line 2</li></ul><li>bullet3 line 1</li></ul>' +
-    '</ul><li>bullet2 line 1</li></ul></body></html>';
-    importrequest(htmlWithBullets, importurl, 'html');
-    const oldtext = getinnertext();
-    helper.waitFor(() => oldtext !== getinnertext()
-        //      return expect(getinnertext()).to.be('\
-        // <ul class="list-bullet1"><li><span class="">bullet line 1</span></li></ul>\n\
-        // <ul class="list-bullet1"><li><span class="">bullet line 2</span></li></ul>\n\
-        // <ul class="list-bullet2"><li><span class="">bullet2 line 1</span></li></ul>\n\
-        // <ul class="list-bullet4"><li><span class="">bullet4 line 2</span></li></ul>\n\
-        // <ul class="list-bullet4"><li><span class="">bullet4 line 2</span></li></ul>\n\
-        // <ul class="list-bullet4"><li><span class="">bullet4 line 2</span></li></ul>\n\
-        // <br>\n')
-    );
-
-    const results = exportfunc(helper.padChrome$.window.location.href);
-    expect(results[0][1]).to.be(
-        '<ul class="bullet"><li>bullet line 1</li><li>bullet line 2</li>' +
-        '<ul class="bullet"><li>bullet2 line 1</li><ul><ul class="bullet"><li>bullet4 line 2</li>' +
-        '<li>bullet4 line 2</li><li>bullet4 line 2</li></ul><li>bullet3 line 1</li></ul></ul>' +
-        '<li>bullet2 line 1</li></ul><br>');
-    expect(results[1][1]).to.be(
-        '\t* bullet line 1\n\t* bullet line 2\n\t\t* bullet2 line 1\n\t\t\t\t* bullet4 line 2' +
-        '\n\t\t\t\t* bullet4 line 2\n\t\t\t\t* bullet4 line 2\n\t\t\t* bullet3 line 1' +
-        '\n\t* bullet2 line 1\n\n');
-    done();
-  });
-  xit('import with 8 levels of bullets and newlines and attributes from html', function (done) {
-    const importurl = `${helper.padChrome$.window.location.href}/import`;
-    const htmlWithBullets =
-        '<html><body><ul class="list-bullet1"><li>bullet line 1</li>' +
-        '</ul><br/><ul class="list-bullet1"><li>bullet line 2</li><ul class="list-bullet2"><li>' +
-        'bullet2 line 1</li></ul></ul><br/><ul class="list-bullet1"><ul class="list-bullet2">' +
-        '<ul class="list-bullet3"><ul class="list-bullet4"><li><span class="b s i u"><b><i>' +
-        '<s><u>bullet4 line 2 bisu</u></s></i></b></span></li><li><span class="b s "><b><s>' +
-        'bullet4 line 2 bs</s></b></span></li><li><span class="u"><u>bullet4 line 2 u' +
-        '</u></span><span class="u i s"><i><s><u>uis</u></s></i></span></li>' +
-        '<ul class="list-bullet5"><ul class="list-bullet6"><ul class="list-bullet7">' +
-        '<ul class="list-bullet8"><li><span class="">foo</span></li><li><span class="b s">' +
-        '<b><s>foobar bs</b></s></span></li></ul></ul></ul></ul><ul class="list-bullet5">' +
-        '<li>foobar</li></ul></ul></ul></ul></body></html>';
-    importrequest(htmlWithBullets, importurl, 'html');
-    helper.waitFor(() => expect(getinnertext()).to.be(
-        '<ul class="list-bullet1"><li><span class="">bullet line 1</span></li></ul>\n<br>\n' +
-        '<ul class="list-bullet1"><li><span class="">bullet line 2</span></li></ul>\n' +
-        '<ul class="list-bullet2"><li><span class="">bullet2 line 1</span></li></ul>\n<br>\n' +
-        '<ul class="list-bullet4"><li><span class="b i s u"><b><i><s><u>bullet4 line 2 bisu</u>' +
-        '</s></i></b></span></li></ul>\n' +
-        '<ul class="list-bullet4"><li><span class="b s"><b><s>bullet4 line 2 bs</s></b>' +
-        '</span></li></ul>\n' +
+describe('importexport.js', function () {
+  const testCases = [
+    {
+      name: 'text with newlines',
+      inputText: [
+        'imported text\n',
+        'newline',
+      ].join(''),
+      wantPadLines: [
+        '<span class="">imported text</span>',
+        '<span class="">newline</span>',
+      ],
+      wantExportHtmlBody: [
+        'imported text<br>',
+        'newline<br>',
+      ].join(''),
+      wantExportText: [
+        'imported text\n',
+        'newline\n',
+      ].join(''),
+    },
+    {
+      name: 'HTML with newlines',
+      inputHtmlBody: [
+        'htmltext<br>',
+        'newline',
+      ].join(''),
+      wantPadLines: [
+        '<span class="">htmltext</span>',
+        '<span class="">newline</span>',
+        '<br>',
+      ],
+      wantExportHtmlBody: [
+        'htmltext<br>',
+        'newline<br>',
+        '<br>',
+      ].join(''),
+      wantExportText: [
+        'htmltext\n',
+        'newline\n',
+        '\n',
+      ].join(''),
+    },
+    {
+      name: 'HTML with attributes',
+      inputHtmlBody: [
+        'htmltext<br>',
+        '<span class="b s i u"><b><i><s><u>newline</u></s></i></b>',
+      ].join(''),
+      wantPadLines: [
+        '<span class="">htmltext</span>',
+        '<span class="b i s u"><b><i><s><u>newline</u></s></i></b></span>',
+        '<br>',
+      ],
+      wantExportHtmlBody: [
+        'htmltext<br>',
+        '<strong><em><s><u>newline</u></s></em></strong><br>',
+        '<br>',
+      ].join(''),
+      wantExportText: [
+        'htmltext\n',
+        'newline\n',
+        '\n',
+      ].join(''),
+    },
+    {
+      name: 'HTML with bullets',
+      inputHtmlBody: [
+        '<ul class="list-bullet1">',
+        ' <li>bullet line 1</li>',
+        ' <li>bullet line 2',
+        '  <ul class="list-bullet2">',
+        '   <li>bullet2 line 1</li>',
+        '   <li>bullet2 line 2</li>',
+        '  </ul>',
+        ' </li>',
+        '</ul>',
+      ].join(''),
+      wantPadLines: [
+        '<ul class="list-bullet1"><li><span class="">bullet line 1</span></li></ul>',
+        '<ul class="list-bullet1"><li><span class="">bullet line 2</span></li></ul>',
+        '<ul class="list-bullet2"><li><span class="">bullet2 line 1</span></li></ul>',
+        '<ul class="list-bullet2"><li><span class="">bullet2 line 2</span></li></ul>',
+        '<br>',
+      ],
+      wantExportHtmlBody: [
+        '<ul class=bullet>',
+        ' <li>bullet line 1</li>',
+        ' <li>bullet line 2',
+        '  <ul class=bullet>',
+        '   <li>bullet2 line 1</li>',
+        '   <li>bullet2 line 2</li>',
+        '  </ul>',
+        ' </li>',
+        '</ul>',
+        '<br>',
+      ].map((l) => l.replace(/^\s+/, '')).join(''),
+      wantExportText: [
+        '\t* bullet line 1\n',
+        '\t* bullet line 2\n',
+        '\t\t* bullet2 line 1\n',
+        '\t\t* bullet2 line 2\n',
+        '\n',
+      ].join(''),
+    },
+    {
+      name: 'HTML with bullets and newlines',
+      inputHtmlBody: [
+        '<ul class="list-bullet1">',
+        ' <li>bullet line 1</li>',
+        '</ul>',
+        '<br>',
+        '<ul class="list-bullet1">',
+        ' <li>bullet line 2',
+        '  <ul class="list-bullet2">',
+        '   <li>bullet2 line 1</li>',
+        '  </ul>',
+        ' </li>',
+        '</ul>',
+        '<br>',
+        '<ul class="list-bullet1">',
+        ' <li>',
+        '  <ul class="list-bullet2">',
+        '   <li>bullet2 line 2</li>',
+        '  </ul>',
+        ' </li>',
+        '</ul>',
+      ].join(''),
+      wantPadLines: [
+        '<ul class="list-bullet1"><li><span class="">bullet line 1</span></li></ul>',
+        '<br>',
+        '<ul class="list-bullet1"><li><span class="">bullet line 2</span></li></ul>',
+        '<ul class="list-bullet2"><li><span class="">bullet2 line 1</span></li></ul>',
+        '<br>',
+        '<ul class="list-bullet2"><li><span class="">bullet2 line 2</span></li></ul>',
+        '<br>',
+      ],
+      wantExportHtmlBody: [
+        '<ul class=bullet>',
+        ' <li>bullet line 1</li>',
+        '</ul>',
+        '<br>',
+        '<ul class=bullet>',
+        ' <li>bullet line 2',
+        '  <ul class=bullet>',
+        '   <li>bullet2 line 1</li>',
+        '  </ul>',
+        ' </li>',
+        '</ul>',
+        '<br>',
+        '<ul class=bullet>',
+        ' <li>',
+        '  <ul class=bullet>',
+        '   <li>bullet2 line 2</li>',
+        '  </ul>',
+        ' </li>',
+        '</ul>',
+        '<br>',
+      ].map((l) => l.replace(/^\s+/, '')).join(''),
+      wantExportText: [
+        '\t* bullet line 1\n',
+        '\n',
+        '\t* bullet line 2\n',
+        '\t\t* bullet2 line 1\n',
+        '\n',
+        '\t\t* bullet2 line 2\n',
+        '\n',
+      ].join(''),
+    },
+    {
+      name: 'HTML with bullets, newlines, and attributes',
+      inputHtmlBody: [
+        '<ul class="list-bullet1">',
+        ' <li>bullet line 1</li>',
+        '</ul>',
+        '<br>',
+        '<ul class="list-bullet1">',
+        ' <li>bullet line 2',
+        '  <ul class="list-bullet2">',
+        '   <li>bullet2 line 1</li>',
+        '  </ul>',
+        ' </li>',
+        '</ul>',
+        '<br>',
+        '<ul class="list-bullet1">',
+        ' <li>',
+        '  <ul class="list-bullet2">',
+        '   <li>',
+        '    <ul class="list-bullet3">',
+        '     <li>',
+        '      <ul class="list-bullet4">',
+        '       <li><span class="b s i u"><b><i><s><u>bullet4 line 2 bisu</u>' +
+                   '</s></i></b></span></li>',
+        '       <li><span class="b s "><b><s>bullet4 line 2 bs</s></b></span></li>',
+        '       <li><span class="u"><u>bullet4 line 2 u</u></span>' +
+                   '<span class="u i s"><i><s><u>uis</u></s></i></span></li>',
+        '      </ul>',
+        '     </li>',
+        '    </ul>',
+        '   </li>',
+        '  </ul>',
+        ' </li>',
+        '</ul>',
+      ].join(''),
+      wantPadLines: [
+        '<ul class="list-bullet1"><li><span class="">bullet line 1</span></li></ul>',
+        '<br>',
+        '<ul class="list-bullet1"><li><span class="">bullet line 2</span></li></ul>',
+        '<ul class="list-bullet2"><li><span class="">bullet2 line 1</span></li></ul>',
+        '<br>',
+        '<ul class="list-bullet4"><li><span class="b i s u"><b><i><s><u>' +
+            'bullet4 line 2 bisu</u></s></i></b></span></li></ul>',
+        '<ul class="list-bullet4"><li><span class="b s"><b><s>bullet4 line 2 bs</s>' +
+            '</b></span></li></ul>',
         '<ul class="list-bullet4"><li><span class="u"><u>bullet4 line 2 u</u></span>' +
-        '<span class="i s u"><i><s><u>uis</u></s>' +
-        '</i></span></li></ul>\n' +
-        '<ul class="list-bullet8"><li><span class="">foo</span></li></ul>\n' +
-        '<ul class="list-bullet8"><li><span class="b s"><b><s>foobar bs</s></b>' +
-        '</span></li></ul>\n' +
-        '<ul class="list-bullet5"><li><span class="">foobar</span></li></ul>\n' +
-        '<br>\n'));
-    const results = exportfunc(helper.padChrome$.window.location.href);
-    expect(results[0][1]).to.be(
-        '<ul class="bullet"><li>bullet line 1</li></ul><br><ul class="bullet">' +
-        '<li>bullet line 2</li><ul class="bullet"><li>bullet2 line 1</li></ul></ul>' +
-        '<br><ul><ul><ul><ul class="bullet"><li><strong><em><s><u>' +
-        'bullet4 line 2 bisu</u></s></em></strong></li><li><strong><s>' +
-        'bullet4 line 2 bs</s></strong></li><li><u>bullet4 line 2 u<em>' +
-        '<s>uis</s></em></u></li><ul><ul><ul><ul class="bullet"><li>foo</li>' +
-        '<li><strong><s>foobar bs</s></strong></li></ul></ul></ul><li>foobar</li>' +
-        '</ul></ul></ul></ul></ul><br>');
-    expect(results[1][1]).to.be(
-        '\t* bullet line 1\n\n\t* bullet line 2\n\t\t* ' +
-        'bullet2 line 1\n\n\t\t\t\t* bullet4 line 2 bisu\n\t\t\t\t* bullet4 line 2 ' +
-        'bs\n\t\t\t\t* bullet4 line 2 uuis\n\t\t\t\t\t\t\t\t* foo\n\t\t\t\t\t\t\t\t* ' +
-        'foobar bs\n\t\t\t\t\t* foobar\n\n');
-    done();
+            '<span class="i s u"><i><s><u>uis</u></s></i></span></li></ul>',
+        '<br>',
+      ],
+      wantExportHtmlBody: [
+        '<ul class=bullet><li>bullet line 1</li></ul>',
+        '<br>',
+        '<ul class=bullet>',
+        ' <li>bullet line 2',
+        '  <ul class=bullet><li>bullet2 line 1</li></ul>',
+        ' </li>',
+        '</ul>',
+        '<br>',
+        '<ul class=bullet>',
+        ' <li>',
+        '  <ul class=bullet>',
+        '   <li>',
+        '    <ul class=bullet>',
+        '     <li>',
+        '      <ul class=bullet>',
+        '       <li><strong><em><s><u>bullet4 line 2 bisu</u></s></em></strong></li>',
+        '       <li><strong><s>bullet4 line 2 bs</s></strong></li>',
+        '       <li><u>bullet4 line 2 u<em><s>uis</s></em></u></li>',
+        '      </ul>',
+        '     </li>',
+        '    </ul>',
+        '   </li>',
+        '  </ul>',
+        ' </li>',
+        '</ul>',
+        '<br>',
+      ].map((l) => l.replace(/^\s+/, '')).join(''),
+      wantExportText: [
+        '\t* bullet line 1\n',
+        '\n',
+        '\t* bullet line 2\n',
+        '\t\t* bullet2 line 1\n',
+        '\n',
+        '\t\t\t\t* bullet4 line 2 bisu\n',
+        '\t\t\t\t* bullet4 line 2 bs\n',
+        '\t\t\t\t* bullet4 line 2 uuis\n',
+        '\n',
+      ].join(''),
+    },
+    {
+      name: 'HTML with nested bullets',
+      inputHtmlBody: [
+        '<ul class="list-bullet1"><li>bullet line 1</li></ul>',
+        '<ul class="list-bullet1">',
+        ' <li>bullet line 2',
+        '  <ul class="list-bullet2">',
+        '   <li>bullet2 line 1</li>',
+        '  </ul>',
+        ' </li>',
+        '</ul>',
+        '<ul class="list-bullet1">',
+        ' <li>',
+        '  <ul class="list-bullet2">',
+        '   <li>',
+        '    <ul class="list-bullet3">',
+        '     <li>',
+        '      <ul class="list-bullet4">',
+        '       <li>bullet4 line 2</li>',
+        '       <li>bullet4 line 2</li>',
+        '       <li>bullet4 line 2</li>',
+        '      </ul>',
+        '     </li>',
+        '     <li>bullet3 line 1</li>',
+        '    </ul>',
+        '   </li>',
+        '  </ul>',
+        ' </li>',
+        '</ul>',
+      ].join(''),
+      wantPadLines: [
+        '<ul class="list-bullet1"><li><span class="">bullet line 1</span></li></ul>',
+        '<ul class="list-bullet1"><li><span class="">bullet line 2</span></li></ul>',
+        '<ul class="list-bullet2"><li><span class="">bullet2 line 1</span></li></ul>',
+        '<ul class="list-bullet4"><li><span class="">bullet4 line 2</span></li></ul>',
+        '<ul class="list-bullet4"><li><span class="">bullet4 line 2</span></li></ul>',
+        '<ul class="list-bullet4"><li><span class="">bullet4 line 2</span></li></ul>',
+        '<ul class="list-bullet3"><li><span class="">bullet3 line 1</span></li></ul>',
+        '<br>',
+      ],
+      wantExportHtmlBody: [
+        '<ul class=bullet>',
+        ' <li>bullet line 1</li>',
+        ' <li>bullet line 2',
+        '  <ul class=bullet>',
+        '   <li>bullet2 line 1',
+        '    <ul class=bullet>',
+        '     <li>',
+        '      <ul class=bullet>',
+        '       <li>bullet4 line 2</li>',
+        '       <li>bullet4 line 2</li>',
+        '       <li>bullet4 line 2</li>',
+        '      </ul>',
+        '     </li>',
+        '     <li>bullet3 line 1</li>',
+        '    </ul>',
+        '   </li>',
+        '  </ul>',
+        ' </li>',
+        '</ul>',
+        '<br>',
+      ].map((l) => l.replace(/^\s+/, '')).join(''),
+      wantExportText: [
+        '\t* bullet line 1\n',
+        '\t* bullet line 2\n',
+        '\t\t* bullet2 line 1\n',
+        '\t\t\t\t* bullet4 line 2\n',
+        '\t\t\t\t* bullet4 line 2\n',
+        '\t\t\t\t* bullet4 line 2\n',
+        '\t\t\t* bullet3 line 1\n',
+        '\n',
+      ].join(''),
+    },
+    {
+      name: 'HTML with 8 levels of bullets, newlines, and attributes',
+      inputHtmlBody: [
+        '<ul class="list-bullet1">',
+        ' <li>bullet line 1</li>',
+        '</ul>',
+        '<br>',
+        '<ul class="list-bullet1">',
+        ' <li>bullet line 2',
+        '  <ul class="list-bullet2">',
+        '   <li>bullet2 line 1</li>',
+        '  </ul>',
+        ' </li>',
+        '</ul>',
+        '<br>',
+        '<ul class="list-bullet1">',
+        ' <li>',
+        '  <ul class="list-bullet2">',
+        '   <li>',
+        '    <ul class="list-bullet3">',
+        '     <li>',
+        '      <ul class="list-bullet4">',
+        '       <li><span class="b s i u"><b><i><s><u>bullet4 line 2 bisu' +
+                   '</u></s></i></b></span></li>',
+        '       <li><span class="b s "><b><s>bullet4 line 2 bs</s></b></span></li>',
+        '       <li><span class="u"><u>bullet4 line 2 u</u></span>' +
+                   '<span class="u i s"><i><s><u>uis</u></s></i></span></li>',
+        '       <li>',
+        '        <ul class="list-bullet5">',
+        '         <li>',
+        '          <ul class="list-bullet6">',
+        '           <li>',
+        '            <ul class="list-bullet7">',
+        '             <li>',
+        '              <ul class="list-bullet8">',
+        '               <li><span class="">foo</span></li>',
+        '               <li><span class="b s"><b><s>foobar bs</b></s></span></li>',
+        '              </ul>',
+        '             </li>',
+        '            </ul>',
+        '           </li>',
+        '          </ul>',
+        '         </li>',
+        '        </ul>',
+        '       </li>',
+        '       <li>',
+        '        <ul class="list-bullet5">',
+        '         <li>foobar</li>',
+        '        </ul>',
+        '       </li>',
+        '      </ul>',
+        '     </li>',
+        '    </ul>',
+        '   </li>',
+        '  </ul>',
+        ' </li>',
+        '</ul>',
+      ].join(''),
+      wantPadLines: [
+        '<ul class="list-bullet1"><li><span class="">bullet line 1</span></li></ul>',
+        '<br>',
+        '<ul class="list-bullet1"><li><span class="">bullet line 2</span></li></ul>',
+        '<ul class="list-bullet2"><li><span class="">bullet2 line 1</span></li></ul>',
+        '<br>',
+        '<ul class="list-bullet4"><li><span class="b i s u"><b><i><s><u>' +
+            'bullet4 line 2 bisu</u></s></i></b></span></li></ul>',
+        '<ul class="list-bullet4"><li><span class="b s"><b><s>bullet4 line 2 bs</s>' +
+            '</b></span></li></ul>',
+        '<ul class="list-bullet4"><li><span class="u"><u>bullet4 line 2 u</u></span>' +
+            '<span class="i s u"><i><s><u>uis</u></s></i></span></li></ul>',
+        '<ul class="list-bullet8"><li><span class="">foo</span></li></ul>',
+        '<ul class="list-bullet8"><li><span class="b s"><b><s>foobar bs</s></b></span></li></ul>',
+        '<ul class="list-bullet5"><li><span class="">foobar</span></li></ul>',
+        '<br>',
+      ],
+      wantExportHtmlBody: [
+        '<ul class=bullet>',
+        ' <li>bullet line 1</li>',
+        '</ul>',
+        '<br>',
+        '<ul class=bullet>',
+        ' <li>bullet line 2',
+        '  <ul class=bullet>',
+        '   <li>bullet2 line 1</li>',
+        '  </ul>',
+        ' </li>',
+        '</ul>',
+        '<br>',
+        '<ul class=bullet>',
+        ' <li>',
+        '  <ul class=bullet>',
+        '   <li>',
+        '    <ul class=bullet>',
+        '     <li>',
+        '      <ul class=bullet>',
+        '       <li><strong><em><s><u>bullet4 line 2 bisu</u></s></em></strong></li>',
+        '       <li><strong><s>bullet4 line 2 bs</s></strong></li>',
+        '       <li><u>bullet4 line 2 u<em><s>uis</s></em></u>',
+        '        <ul class=bullet>',
+        '         <li>',
+        '          <ul class=bullet>',
+        '           <li>',
+        '            <ul class=bullet>',
+        '             <li>',
+        '              <ul class=bullet>',
+        '               <li>foo</li>',
+        '               <li><strong><s>foobar bs</s></strong></li>',
+        '              </ul>',
+        '             </li>',
+        '            </ul>',
+        '           </li>',
+        '          </ul>',
+        '         </li>',
+        '         <li>foobar</li>',
+        '        </ul>',
+        '       </li>',
+        '      </ul>',
+        '     </li>',
+        '    </ul>',
+        '   </li>',
+        '  </ul>',
+        ' </li>',
+        '</ul>',
+        '<br>',
+      ].map((l) => l.replace(/^\s+/, '')).join(''),
+      wantExportText: [
+        '\t* bullet line 1\n',
+        '\n',
+        '\t* bullet line 2\n',
+        '\t\t* bullet2 line 1\n',
+        '\n',
+        '\t\t\t\t* bullet4 line 2 bisu\n',
+        '\t\t\t\t* bullet4 line 2 bs\n',
+        '\t\t\t\t* bullet4 line 2 uuis\n',
+        '\t\t\t\t\t\t\t\t* foo\n',
+        '\t\t\t\t\t\t\t\t* foobar bs\n',
+        '\t\t\t\t\t* foobar\n',
+        '\n',
+      ].join(''),
+    },
+    {
+      name: 'HTML with ordered lists',
+      inputHtmlBody: [
+        '<ol class="list-number1" start="1"><li>number 1 line 1</li></ol>',
+        '<ol class="list-number1" start="2"><li>number 2 line 2</li></ol>',
+      ].join(''),
+      wantPadLines: [
+        '<ol start="1" class="list-number1"><li><span class="">number 1 line 1</span></li></ol>',
+        '<ol start="2" class="list-number1"><li><span class="">number 2 line 2</span></li></ol>',
+        '<br>',
+      ],
+      wantExportHtmlBody: [
+        '<ol start=1 class=number>',
+        ' <li>number 1 line 1</li>',
+        ' <li>number 2 line 2</li>',
+        '</ol>',
+        '<br>',
+      ].map((l) => l.replace(/^\s+/, '')).join(''),
+      wantExportText: [
+        '\t1. number 1 line 1\n',
+        '\t2. number 2 line 2\n',
+        '\n',
+      ].join(''),
+    },
+  ];
+
+  let confirm;
+  before(async function () {
+    this.timeout(60000);
+    await new Promise(
+        (resolve, reject) => helper.newPad((err) => err != null ? reject(err) : resolve()));
+    confirm = helper.padChrome$.window.confirm;
+    helper.padChrome$.window.confirm = () => true;
+    // As of 2021-02-22 a mutable FileList cannot be directly created so DataTransfer is used as a
+    // hack to access a mutable FileList for testing the '<input type="file">' element. DataTransfer
+    // itself is quite new so support for it is tested here. See:
+    //   * https://github.com/whatwg/html/issues/3269
+    //   * https://stackoverflow.com/q/47119426
+    try {
+      const dt = new DataTransfer();
+      dt.items.add(new File(['testing'], 'file.txt', {type: 'text/plain'}));
+      // Supposedly all modern browsers support a settable HTMLInputElement.files property, but
+      // Firefox 52 complains.
+      helper.padChrome$('#importform input[type=file]')[0].files = dt.files;
+    } catch (err) {
+      return this.skip();
+    }
   });
 
-  xit('import a pad with ordered lists from html', function (done) {
-    const importurl = `${helper.padChrome$.window.location.href}/import`;
-    const htmlWithBullets = '<html><body><ol class="list-number1" start="1">' +
-    '<li>number 1 line 1</li></ol><ol class="list-number1" start="2">' +
-    '<li>number 2 line 2</li></ol></body></html>';
-    importrequest(htmlWithBullets, importurl, 'html');
-    console.error(getinnertext());
-    expect(getinnertext()).to.be(
-        '<ol class="list-number1" start="1"><li><span class="">number 1 line 1</span></li></ol>\n' +
-        '<ol class="list-number1" start="2"><li><span class="">number 2 line 2</span></li></ol>\n' +
-        '<br>\n');
-    const results = exportfunc(helper.padChrome$.window.location.href);
-    expect(results[0][1]).to.be(
-        '<ol class="list-number1" start="1"><li>number 1 line 1</li>' +
-        '</ol><ol class="list-number1" start="2"><li>number 2 line 2</li></ol>');
-    expect(results[1][1]).to.be('');
-    done();
+  after(async function () {
+    helper.padChrome$.window.confirm = confirm;
   });
-  xit('import a pad with ordered lists and newlines from html', function (done) {
-    const importurl = `${helper.padChrome$.window.location.href}/import`;
-    const htmlWithBullets = '<html><body><ol class="list-number1" start="1">' +
-    '<li>number 9 line 1</li></ol><br/><ol class="list-number1" start="2">' +
-    '<li>number 10 line 2</li><ol class="list-number2">' +
-    '<li>number 2 times line 1</li></ol></ol><br/><ol class="list-bullet1">' +
-    '<ol class="list-number2"><li>number 2 times line 2</li></ol></ol></body></html>';
-    importrequest(htmlWithBullets, importurl, 'html');
-    expect(getinnertext()).to.be(
-        '<ol class="list-number1" start="1"><li><span class="">number 9 line 1</span></li></ol>\n' +
-        '<br>\n' +
-        '<ol class="list-number1" start="2"><li><span class="">number 10 line 2</span></li>' +
-        '</ol>\n' +
-        '<ol class="list-number2"><li><span class="">number 2 times line 1</span></li></ol>\n' +
-        '<br>\n' +
-        '<ol class="list-number2"><li><span class="">number 2 times line 2</span></li></ol>\n' +
-        '<br>\n');
-    const results = exportfunc(helper.padChrome$.window.location.href);
-    console.error(results);
-    done();
-  });
-  xit('import with nested ordered lists and attributes and newlines from html', function (done) {
-    const importurl = `${helper.padChrome$.window.location.href}/import`;
-    const htmlWithBullets = '<html><body><ol class="list-number1" start="1"><li>' +
-        '<span class="b s i u"><b><i><s><u>bold strikethrough italics underline</u>' +
-        '</s><i/></b></span> line <span class="b"><b>1bold</b></span></li>' +
-        '</ol><br/><span class="i"><i><ol class="list-number1" start="2">' +
-        '<li>number 10 line 2</li><ol class="list-number2">' +
-        '<li>number 2 times line 1</li></ol></ol></i></span><br/>' +
-        '<ol class="list-bullet1"><ol class="list-number2">' +
-        '<li>number 2 times line 2</li></ol></ol></body></html>';
-    importrequest(htmlWithBullets, importurl, 'html');
-    expect(getinnertext()).to.be(
-        '<ol class="list-number1"><li><span class="b i s u"><b><i><s><u>' +
-        'bold strikethrough italics underline</u></s></i></b></span><span class="">' +
-        ' line </span><span class="b"><b>1bold</b></span></li></ol>\n' +
-        '<br>\n' +
-        '<ol class="list-number1"><li><span class="i"><i>number 10 line 2</i></span></li></ol>\n' +
-        '<ol class="list-number2"><li><span class="i">' +
-        '<i>number 2 times line 1</i></span></li></ol>\n' +
-        '<br>\n' +
-        '<ol class="list-number2"><li><span class="">number 2 times line 2</span></li></ol>\n' +
-        '<br>\n');
-    const results = exportfunc(helper.padChrome$.window.location.href);
-    console.error(results);
-    done();
+
+  beforeEach(async function () {
+    const popup = helper.padChrome$('#import_export');
+    const isVisible = () => popup.hasClass('popup-show');
+    if (isVisible()) return;
+    const button = helper.padChrome$('button[data-l10n-id="pad.toolbar.import_export.title"]');
+    button.click();
+    await helper.waitForPromise(isVisible);
   });
+
+  const docToHtml = (() => {
+    const s = new XMLSerializer();
+    return (doc) => s.serializeToString(doc);
+  })();
+
+  const htmlToDoc = (() => {
+    const p = new DOMParser();
+    return (html) => p.parseFromString(html, 'text/html');
+  })();
+
+  const htmlBodyToDoc = (htmlBody) => {
+    const doc = document.implementation.createHTMLDocument();
+    $('body', doc).html(htmlBody);
+    return doc;
+  };
+
+  for (const tc of testCases) {
+    describe(tc.name, function () {
+      it('import', async function () {
+        const ext = tc.inputHtmlBody ? 'html' : 'txt';
+        const contents = ext === 'html' ? docToHtml(htmlBodyToDoc(tc.inputHtmlBody)) : tc.inputText;
+        // DataTransfer is used as a hacky way to get a mutable FileList. For details, see:
+        // https://stackoverflow.com/q/47119426
+        const dt = new DataTransfer();
+        dt.items.add(new File([contents], `file.${ext}`, {type: 'text/plain'}));
+        const form = helper.padChrome$('#importform');
+        form.find('input[type=file]')[0].files = dt.files;
+        form.find('#importsubmitinput').submit();
+        try {
+          await helper.waitForPromise(() => {
+            const got = helper.linesDiv();
+            if (got.length !== tc.wantPadLines.length) return false;
+            for (let i = 0; i < got.length; i++) {
+              const gotDiv = $('<div>').html(got[i].html());
+              const wantDiv = $('<div>').html(tc.wantPadLines[i]);
+              if (!gotDiv[0].isEqualNode(wantDiv[0])) return false;
+            }
+            return true;
+          });
+        } catch (err) {
+          const formatLine = (l) => `  ${JSON.stringify(l)}`;
+          const g = helper.linesDiv().map((div) => formatLine(div.html())).join('\n');
+          const w = tc.wantPadLines.map(formatLine).join('\n');
+          throw new Error(`Import failed. Got pad lines:\n${g}\nWant pad lines:\n${w}`);
+        }
+      });
+
+      it('export to HTML', async function () {
+        const link = helper.padChrome$('#exporthtmla').attr('href');
+        const url = new URL(link, helper.padChrome$.window.location.href).href;
+        const gotHtml = await $.ajax({url, dataType: 'html'});
+        const gotBody = $('body', htmlToDoc(gotHtml));
+        gotBody.html(gotBody.html().replace(/^\s+|\s+$/g, ''));
+        const wantBody = $('body', htmlBodyToDoc(tc.wantExportHtmlBody));
+        if (!gotBody[0].isEqualNode(wantBody[0])) {
+          throw new Error(`Got exported HTML body:\n  ${JSON.stringify(gotBody.html())}\n` +
+                          `Want HTML body:\n  ${JSON.stringify(wantBody.html())}`);
+        }
+      });
+
+      it('export to text', async function () {
+        const link = helper.padChrome$('#exportplaina').attr('href');
+        const url = new URL(link, helper.padChrome$.window.location.href).href;
+        const got = await $.ajax({url, dataType: 'text'});
+        expect(got).to.be(tc.wantExportText);
+      });
+    });
+  }
 });

From 773959ec5759b62d0c748eaab800fa348b1ebbb5 Mon Sep 17 00:00:00 2001
From: Richard Hansen <rhansen@rhansen.org>
Date: Mon, 22 Feb 2021 04:37:57 -0500
Subject: [PATCH 082/115] CI: Delete old Sauce Connect logic

---
 src/tests/frontend/travis/adminrunner.sh  |  4 ---
 src/tests/frontend/travis/runner.sh       |  4 ---
 src/tests/frontend/travis/sauce_tunnel.sh | 37 -----------------------
 3 files changed, 45 deletions(-)
 delete mode 100755 src/tests/frontend/travis/sauce_tunnel.sh

diff --git a/src/tests/frontend/travis/adminrunner.sh b/src/tests/frontend/travis/adminrunner.sh
index 8f57ac6f..9ed6d5e7 100755
--- a/src/tests/frontend/travis/adminrunner.sh
+++ b/src/tests/frontend/travis/adminrunner.sh
@@ -6,9 +6,6 @@ error() { log "ERROR: $@" >&2; }
 fatal() { error "$@"; exit 1; }
 try() { "$@" || fatal "'$@' failed"; }
 
-[ -n "${SAUCE_USERNAME}" ] || fatal "SAUCE_USERNAME is unset - exiting"
-[ -n "${SAUCE_ACCESS_KEY}" ] || fatal "SAUCE_ACCESS_KEY is unset - exiting"
-
 # Move to the Etherpad base directory.
 MY_DIR=$(try cd "${0%/*}" && try pwd -P) || exit 1
 try cd "${MY_DIR}/../../../.."
@@ -38,7 +35,6 @@ log "Starting the remote runner..."
 node remote_runner.js admin
 exit_code=$?
 
-kill "$(cat /tmp/sauce.pid)"
 kill "$ep_pid" && wait "$ep_pid"
 log "Done."
 exit "$exit_code"
diff --git a/src/tests/frontend/travis/runner.sh b/src/tests/frontend/travis/runner.sh
index 5a16ccce..23bc13ed 100755
--- a/src/tests/frontend/travis/runner.sh
+++ b/src/tests/frontend/travis/runner.sh
@@ -6,9 +6,6 @@ error() { log "ERROR: $@" >&2; }
 fatal() { error "$@"; exit 1; }
 try() { "$@" || fatal "'$@' failed"; }
 
-[ -n "${SAUCE_USERNAME}" ] || fatal "SAUCE_USERNAME is unset - exiting"
-[ -n "${SAUCE_ACCESS_KEY}" ] || fatal "SAUCE_ACCESS_KEY is unset - exiting"
-
 # Move to the Etherpad base directory.
 MY_DIR=$(try cd "${0%/*}" && try pwd -P) || exit 1
 try cd "${MY_DIR}/../../../.."
@@ -38,7 +35,6 @@ log "Starting the remote runner..."
 node remote_runner.js
 exit_code=$?
 
-kill "$(cat /tmp/sauce.pid)"
 kill "$ep_pid" && wait "$ep_pid"
 log "Done."
 exit "$exit_code"
diff --git a/src/tests/frontend/travis/sauce_tunnel.sh b/src/tests/frontend/travis/sauce_tunnel.sh
deleted file mode 100755
index 45827d31..00000000
--- a/src/tests/frontend/travis/sauce_tunnel.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-
-pecho() { printf %s\\n "$*"; }
-log() { pecho "$@"; }
-error() { log "ERROR: $@" >&2; }
-fatal() { error "$@"; exit 1; }
-try() { "$@" || fatal "'$@' failed"; }
-
-[ -n "${SAUCE_USERNAME}" ] || fatal "SAUCE_USERNAME is unset - exiting"
-[ -n "${SAUCE_ACCESS_KEY}" ] || fatal "SAUCE_ACCESS_KEY is unset - exiting"
-
-# download and unzip the sauce connector
-#
-# ACHTUNG: as of 2019-12-21, downloading sc-latest-linux.tar.gz does not work.
-# It is necessary to explicitly download a specific version, for example
-# https://saucelabs.com/downloads/sc-4.5.4-linux.tar.gz Supported versions are
-# currently listed at:
-# https://wiki.saucelabs.com/display/DOCS/Downloading+Sauce+Connect+Proxy
-try curl -o /tmp/sauce.tar.gz \
-    https://saucelabs.com/downloads/sc-4.6.2-linux.tar.gz
-try tar zxf /tmp/sauce.tar.gz --directory /tmp
-try mv /tmp/sc-*-linux /tmp/sauce_connect
-
-# start the sauce connector in background and make sure it doesn't output the
-# secret key
-try rm -f /tmp/tunnel
-/tmp/sauce_connect/bin/sc \
-    --user "${SAUCE_USERNAME}" \
-    --key "${SAUCE_ACCESS_KEY}" \
-    -i "${TRAVIS_JOB_NUMBER}" \
-    --pidfile /tmp/sauce.pid \
-    --readyfile /tmp/tunnel >/dev/null &
-
-# wait for the tunnel to build up
-while ! [ -e "/tmp/tunnel" ]; do
-    sleep 1
-done

From 02fd0048bf89076eb19686b27387805bfa522dd2 Mon Sep 17 00:00:00 2001
From: Richard Hansen <rhansen@rhansen.org>
Date: Mon, 22 Feb 2021 02:17:49 -0500
Subject: [PATCH 083/115] caretPosition: Invert condition in `getPosition()`
 for readability

---
 src/static/js/caretPosition.js | 47 ++++++++++++++++------------------
 1 file changed, 22 insertions(+), 25 deletions(-)

diff --git a/src/static/js/caretPosition.js b/src/static/js/caretPosition.js
index 32f6d919..dbab9926 100644
--- a/src/static/js/caretPosition.js
+++ b/src/static/js/caretPosition.js
@@ -4,36 +4,33 @@
 // This function is useful to get the caret position of the line as
 // is represented by the browser
 exports.getPosition = () => {
-  let rect, line;
   const range = getSelectionRange();
-  const isSelectionInsideTheEditor = range &&
-      $(range.endContainer).closest('body')[0].id === 'innerdocbody';
+  if (!range || $(range.endContainer).closest('body')[0].id !== 'innerdocbody') return null;
+  let rect, line;
 
-  if (isSelectionInsideTheEditor) {
-    // when we have the caret in an empty line, e.g. a line with only a <br>,
-    // getBoundingClientRect() returns all dimensions value as 0
-    const selectionIsInTheBeginningOfLine = range.endOffset > 0;
-    if (selectionIsInTheBeginningOfLine) {
-      const clonedRange = createSelectionRange(range);
-      line = getPositionOfElementOrSelection(clonedRange);
-      clonedRange.detach();
-    }
+  // when we have the caret in an empty line, e.g. a line with only a <br>,
+  // getBoundingClientRect() returns all dimensions value as 0
+  const selectionIsInTheBeginningOfLine = range.endOffset > 0;
+  if (selectionIsInTheBeginningOfLine) {
+    const clonedRange = createSelectionRange(range);
+    line = getPositionOfElementOrSelection(clonedRange);
+    clonedRange.detach();
+  }
 
-    // when there's a <br> or any element that has no height, we can't get
-    // the dimension of the element where the caret is
-    if (!rect || rect.height === 0) {
-      const clonedRange = createSelectionRange(range);
+  // when there's a <br> or any element that has no height, we can't get
+  // the dimension of the element where the caret is
+  if (!rect || rect.height === 0) {
+    const clonedRange = createSelectionRange(range);
 
-      // as we can't get the element height, we create a text node to get the dimensions
-      // on the position
-      const shadowCaret = $(document.createTextNode('|'));
-      clonedRange.insertNode(shadowCaret[0]);
-      clonedRange.selectNode(shadowCaret[0]);
+    // as we can't get the element height, we create a text node to get the dimensions
+    // on the position
+    const shadowCaret = $(document.createTextNode('|'));
+    clonedRange.insertNode(shadowCaret[0]);
+    clonedRange.selectNode(shadowCaret[0]);
 
-      line = getPositionOfElementOrSelection(clonedRange);
-      clonedRange.detach();
-      shadowCaret.remove();
-    }
+    line = getPositionOfElementOrSelection(clonedRange);
+    clonedRange.detach();
+    shadowCaret.remove();
   }
   return line;
 };

From 5e731dfbfd9d40da6d963bb3534827de533a4aba Mon Sep 17 00:00:00 2001
From: Richard Hansen <rhansen@rhansen.org>
Date: Mon, 22 Feb 2021 02:21:02 -0500
Subject: [PATCH 084/115] caretPosition: Delete unused var in `getPosition()`

---
 src/static/js/caretPosition.js | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/static/js/caretPosition.js b/src/static/js/caretPosition.js
index dbab9926..1610219d 100644
--- a/src/static/js/caretPosition.js
+++ b/src/static/js/caretPosition.js
@@ -6,7 +6,7 @@
 exports.getPosition = () => {
   const range = getSelectionRange();
   if (!range || $(range.endContainer).closest('body')[0].id !== 'innerdocbody') return null;
-  let rect, line;
+  let line;
 
   // when we have the caret in an empty line, e.g. a line with only a <br>,
   // getBoundingClientRect() returns all dimensions value as 0
@@ -19,19 +19,17 @@ exports.getPosition = () => {
 
   // when there's a <br> or any element that has no height, we can't get
   // the dimension of the element where the caret is
-  if (!rect || rect.height === 0) {
-    const clonedRange = createSelectionRange(range);
+  const clonedRange = createSelectionRange(range);
 
-    // as we can't get the element height, we create a text node to get the dimensions
-    // on the position
-    const shadowCaret = $(document.createTextNode('|'));
-    clonedRange.insertNode(shadowCaret[0]);
-    clonedRange.selectNode(shadowCaret[0]);
+  // as we can't get the element height, we create a text node to get the dimensions
+  // on the position
+  const shadowCaret = $(document.createTextNode('|'));
+  clonedRange.insertNode(shadowCaret[0]);
+  clonedRange.selectNode(shadowCaret[0]);
 
-    line = getPositionOfElementOrSelection(clonedRange);
-    clonedRange.detach();
-    shadowCaret.remove();
-  }
+  line = getPositionOfElementOrSelection(clonedRange);
+  clonedRange.detach();
+  shadowCaret.remove();
   return line;
 };
 

From 1dbdaf93d79e58366eb0389a5052476dadfcbf43 Mon Sep 17 00:00:00 2001
From: Richard Hansen <rhansen@rhansen.org>
Date: Mon, 22 Feb 2021 02:22:17 -0500
Subject: [PATCH 085/115] caretPosition: Delete no-op `Range.detach()` call

---
 src/static/js/caretPosition.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/static/js/caretPosition.js b/src/static/js/caretPosition.js
index 1610219d..2b80b987 100644
--- a/src/static/js/caretPosition.js
+++ b/src/static/js/caretPosition.js
@@ -14,7 +14,6 @@ exports.getPosition = () => {
   if (selectionIsInTheBeginningOfLine) {
     const clonedRange = createSelectionRange(range);
     line = getPositionOfElementOrSelection(clonedRange);
-    clonedRange.detach();
   }
 
   // when there's a <br> or any element that has no height, we can't get
@@ -28,7 +27,6 @@ exports.getPosition = () => {
   clonedRange.selectNode(shadowCaret[0]);
 
   line = getPositionOfElementOrSelection(clonedRange);
-  clonedRange.detach();
   shadowCaret.remove();
   return line;
 };

From 91955609af92480d8dd74889d233982c2ca03f97 Mon Sep 17 00:00:00 2001
From: Richard Hansen <rhansen@rhansen.org>
Date: Mon, 22 Feb 2021 02:24:04 -0500
Subject: [PATCH 086/115] caretPosition: Delete pointless logic in
 `getPosition()`

The `line` variable is unconditionally overwritten later, and the
function calls do not have side effects, so it is safe to delete this
logic.
---
 src/static/js/caretPosition.js | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/static/js/caretPosition.js b/src/static/js/caretPosition.js
index 2b80b987..1149b54b 100644
--- a/src/static/js/caretPosition.js
+++ b/src/static/js/caretPosition.js
@@ -6,15 +6,6 @@
 exports.getPosition = () => {
   const range = getSelectionRange();
   if (!range || $(range.endContainer).closest('body')[0].id !== 'innerdocbody') return null;
-  let line;
-
-  // when we have the caret in an empty line, e.g. a line with only a <br>,
-  // getBoundingClientRect() returns all dimensions value as 0
-  const selectionIsInTheBeginningOfLine = range.endOffset > 0;
-  if (selectionIsInTheBeginningOfLine) {
-    const clonedRange = createSelectionRange(range);
-    line = getPositionOfElementOrSelection(clonedRange);
-  }
 
   // when there's a <br> or any element that has no height, we can't get
   // the dimension of the element where the caret is
@@ -26,7 +17,7 @@ exports.getPosition = () => {
   clonedRange.insertNode(shadowCaret[0]);
   clonedRange.selectNode(shadowCaret[0]);
 
-  line = getPositionOfElementOrSelection(clonedRange);
+  const line = getPositionOfElementOrSelection(clonedRange);
   shadowCaret.remove();
   return line;
 };

From 1908bedabef6a9d5b4d7a0f0ceda42013fba3ae5 Mon Sep 17 00:00:00 2001
From: Richard Hansen <rhansen@rhansen.org>
Date: Mon, 22 Feb 2021 02:28:05 -0500
Subject: [PATCH 087/115] caretPosition: Clarify comment in `getPosition()`

---
 src/static/js/caretPosition.js | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/static/js/caretPosition.js b/src/static/js/caretPosition.js
index 1149b54b..077fe58f 100644
--- a/src/static/js/caretPosition.js
+++ b/src/static/js/caretPosition.js
@@ -6,17 +6,13 @@
 exports.getPosition = () => {
   const range = getSelectionRange();
   if (!range || $(range.endContainer).closest('body')[0].id !== 'innerdocbody') return null;
-
-  // when there's a <br> or any element that has no height, we can't get
-  // the dimension of the element where the caret is
+  // When there's a <br> or any element that has no height, we can't get the dimension of the
+  // element where the caret is. As we can't get the element height, we create a text node to get
+  // the dimensions on the position.
   const clonedRange = createSelectionRange(range);
-
-  // as we can't get the element height, we create a text node to get the dimensions
-  // on the position
   const shadowCaret = $(document.createTextNode('|'));
   clonedRange.insertNode(shadowCaret[0]);
   clonedRange.selectNode(shadowCaret[0]);
-
   const line = getPositionOfElementOrSelection(clonedRange);
   shadowCaret.remove();
   return line;

From 0ac33d2085c73eaaacaac0ecba788f81a1c894ae Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Mon, 22 Feb 2021 12:54:53 +0000
Subject: [PATCH 088/115] tests: timeslider_follow increase test timeout for
 firefox.

---
 src/tests/frontend/specs/timeslider_follow.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/tests/frontend/specs/timeslider_follow.js b/src/tests/frontend/specs/timeslider_follow.js
index eaa3cd7e..d093a9cb 100644
--- a/src/tests/frontend/specs/timeslider_follow.js
+++ b/src/tests/frontend/specs/timeslider_follow.js
@@ -9,7 +9,7 @@ describe('timeslider follow', function () {
   // TODO needs test if content is also followed, when user a makes edits
   // while user b is in the timeslider
   it("content as it's added to timeslider", async function () {
-    this.timeout(10000);
+    this.timeout(20000);
     // send 6 revisions
     const revs = 6;
     const message = 'a\n\n\n\n\n\n\n\n\n\n';

From f246d1b476c25a581b3175c2c41847e2d270e6a4 Mon Sep 17 00:00:00 2001
From: "translatewiki.net" <l10n-bot@translatewiki.net>
Date: Mon, 22 Feb 2021 16:37:36 +0100
Subject: [PATCH 089/115] Localisation updates from https://translatewiki.net.

---
 src/locales/sq.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/locales/sq.json b/src/locales/sq.json
index 09088946..f71a7b44 100644
--- a/src/locales/sq.json
+++ b/src/locales/sq.json
@@ -2,10 +2,12 @@
 	"@metadata": {
 		"authors": [
 			"Besnik b",
+			"Eraldkerciku",
 			"Kosovastar",
 			"Liridon"
 		]
 	},
+	"admin.page-title": "Paneli i Administratorit - Etherpad",
 	"admin_plugins": "Përgjegjës shtojcash",
 	"admin_plugins.available": "Shtojca të gatshme",
 	"admin_plugins.available_not-found": "S’u gjetën shtojca.",

From 3ca15898854bfe6815fda48841da378fae84e8fd Mon Sep 17 00:00:00 2001
From: Richard Hansen <rhansen@rhansen.org>
Date: Mon, 22 Feb 2021 18:19:48 -0500
Subject: [PATCH 090/115] Revert "tests: fix importexport frontend tests
 (#4827)"

I'm going to split this into separate commits.

This reverts commit 9b03f8f6abde2c57a675dd75af3c9331bab8205a.
---
 .github/workflows/frontend-admin-tests.yml |   4 +-
 .github/workflows/frontend-tests.yml       |  17 +-
 src/tests/frontend/specs/importexport.js   | 919 ++++++++-------------
 3 files changed, 330 insertions(+), 610 deletions(-)

diff --git a/.github/workflows/frontend-admin-tests.yml b/.github/workflows/frontend-admin-tests.yml
index f2e2215a..8a61b224 100644
--- a/.github/workflows/frontend-admin-tests.yml
+++ b/.github/workflows/frontend-admin-tests.yml
@@ -50,8 +50,8 @@ jobs:
       id: environment
       run: echo "::set-output name=sha_short::$(git rev-parse --short ${{ github.sha }})"
 
-    - name: Create settings.json
-      run: cp settings.json.template settings.json
+    - name: Write custom settings.json with loglevel WARN
+      run: "sed 's/\"loglevel\": \"INFO\",/\"loglevel\": \"WARN\",/' < settings.json.template > settings.json"
 
     - name: Write custom settings.json that enables the Admin UI tests
       run: "sed -i 's/\"enableAdminUITests\": false/\"enableAdminUITests\": true,\\n\"users\":{\"admin\":{\"password\":\"changeme\",\"is_admin\":true}}/' settings.json"
diff --git a/.github/workflows/frontend-tests.yml b/.github/workflows/frontend-tests.yml
index 1b57f651..99d7bd0f 100644
--- a/.github/workflows/frontend-tests.yml
+++ b/.github/workflows/frontend-tests.yml
@@ -28,12 +28,8 @@ jobs:
       id: environment
       run: echo "::set-output name=sha_short::$(git rev-parse --short ${{ github.sha }})"
 
-    - name: Create settings.json
-      run: cp settings.json.template settings.json
-
-    - name: Disable import/export rate limiting
-      run: |
-        sed -e '/^ *"importExportRateLimiting":/,/^ *\}/ s/"max":.*/"max": 0/' -i settings.json
+    - name: Write custom settings.json with loglevel WARN
+      run: "sed 's/\"loglevel\": \"INFO\",/\"loglevel\": \"WARN\",/' < settings.json.template > settings.json"
 
     - uses: saucelabs/sauce-connect-action@v1.1.2
       with:
@@ -103,12 +99,11 @@ jobs:
       id: environment
       run: echo "::set-output name=sha_short::$(git rev-parse --short ${{ github.sha }})"
 
-    - name: Create settings.json
-      run: cp settings.json.template settings.json
+    - name: Write custom settings.json with loglevel WARN
+      run: "sed 's/\"loglevel\": \"INFO\",/\"loglevel\": \"WARN\",/' < settings.json.template > settings.json"
 
-    - name: Disable import/export rate limiting
-      run: |
-        sed -e '/^ *"importExportRateLimiting":/,/^ *\}/ s/"max":.*/"max": 0/' -i settings.json
+    - name: Write custom settings.json that enables the Admin UI tests
+      run: "sed -i 's/\"enableAdminUITests\": false/\"enableAdminUITests\": true,\\n\"users\":{\"admin\":{\"password\":\"changeme\",\"is_admin\":true}}/' settings.json"
 
       # XXX we should probably run all tests, because plugins could effect their results
     - name: Remove standard frontend test files, so only plugin tests are run
diff --git a/src/tests/frontend/specs/importexport.js b/src/tests/frontend/specs/importexport.js
index 73798eca..4eb95eeb 100644
--- a/src/tests/frontend/specs/importexport.js
+++ b/src/tests/frontend/specs/importexport.js
@@ -1,604 +1,329 @@
 'use strict';
 
-describe('importexport.js', function () {
-  const testCases = [
-    {
-      name: 'text with newlines',
-      inputText: [
-        'imported text\n',
-        'newline',
-      ].join(''),
-      wantPadLines: [
-        '<span class="">imported text</span>',
-        '<span class="">newline</span>',
-      ],
-      wantExportHtmlBody: [
-        'imported text<br>',
-        'newline<br>',
-      ].join(''),
-      wantExportText: [
-        'imported text\n',
-        'newline\n',
-      ].join(''),
-    },
-    {
-      name: 'HTML with newlines',
-      inputHtmlBody: [
-        'htmltext<br>',
-        'newline',
-      ].join(''),
-      wantPadLines: [
-        '<span class="">htmltext</span>',
-        '<span class="">newline</span>',
-        '<br>',
-      ],
-      wantExportHtmlBody: [
-        'htmltext<br>',
-        'newline<br>',
-        '<br>',
-      ].join(''),
-      wantExportText: [
-        'htmltext\n',
-        'newline\n',
-        '\n',
-      ].join(''),
-    },
-    {
-      name: 'HTML with attributes',
-      inputHtmlBody: [
-        'htmltext<br>',
-        '<span class="b s i u"><b><i><s><u>newline</u></s></i></b>',
-      ].join(''),
-      wantPadLines: [
-        '<span class="">htmltext</span>',
-        '<span class="b i s u"><b><i><s><u>newline</u></s></i></b></span>',
-        '<br>',
-      ],
-      wantExportHtmlBody: [
-        'htmltext<br>',
-        '<strong><em><s><u>newline</u></s></em></strong><br>',
-        '<br>',
-      ].join(''),
-      wantExportText: [
-        'htmltext\n',
-        'newline\n',
-        '\n',
-      ].join(''),
-    },
-    {
-      name: 'HTML with bullets',
-      inputHtmlBody: [
-        '<ul class="list-bullet1">',
-        ' <li>bullet line 1</li>',
-        ' <li>bullet line 2',
-        '  <ul class="list-bullet2">',
-        '   <li>bullet2 line 1</li>',
-        '   <li>bullet2 line 2</li>',
-        '  </ul>',
-        ' </li>',
-        '</ul>',
-      ].join(''),
-      wantPadLines: [
-        '<ul class="list-bullet1"><li><span class="">bullet line 1</span></li></ul>',
-        '<ul class="list-bullet1"><li><span class="">bullet line 2</span></li></ul>',
-        '<ul class="list-bullet2"><li><span class="">bullet2 line 1</span></li></ul>',
-        '<ul class="list-bullet2"><li><span class="">bullet2 line 2</span></li></ul>',
-        '<br>',
-      ],
-      wantExportHtmlBody: [
-        '<ul class=bullet>',
-        ' <li>bullet line 1</li>',
-        ' <li>bullet line 2',
-        '  <ul class=bullet>',
-        '   <li>bullet2 line 1</li>',
-        '   <li>bullet2 line 2</li>',
-        '  </ul>',
-        ' </li>',
-        '</ul>',
-        '<br>',
-      ].map((l) => l.replace(/^\s+/, '')).join(''),
-      wantExportText: [
-        '\t* bullet line 1\n',
-        '\t* bullet line 2\n',
-        '\t\t* bullet2 line 1\n',
-        '\t\t* bullet2 line 2\n',
-        '\n',
-      ].join(''),
-    },
-    {
-      name: 'HTML with bullets and newlines',
-      inputHtmlBody: [
-        '<ul class="list-bullet1">',
-        ' <li>bullet line 1</li>',
-        '</ul>',
-        '<br>',
-        '<ul class="list-bullet1">',
-        ' <li>bullet line 2',
-        '  <ul class="list-bullet2">',
-        '   <li>bullet2 line 1</li>',
-        '  </ul>',
-        ' </li>',
-        '</ul>',
-        '<br>',
-        '<ul class="list-bullet1">',
-        ' <li>',
-        '  <ul class="list-bullet2">',
-        '   <li>bullet2 line 2</li>',
-        '  </ul>',
-        ' </li>',
-        '</ul>',
-      ].join(''),
-      wantPadLines: [
-        '<ul class="list-bullet1"><li><span class="">bullet line 1</span></li></ul>',
-        '<br>',
-        '<ul class="list-bullet1"><li><span class="">bullet line 2</span></li></ul>',
-        '<ul class="list-bullet2"><li><span class="">bullet2 line 1</span></li></ul>',
-        '<br>',
-        '<ul class="list-bullet2"><li><span class="">bullet2 line 2</span></li></ul>',
-        '<br>',
-      ],
-      wantExportHtmlBody: [
-        '<ul class=bullet>',
-        ' <li>bullet line 1</li>',
-        '</ul>',
-        '<br>',
-        '<ul class=bullet>',
-        ' <li>bullet line 2',
-        '  <ul class=bullet>',
-        '   <li>bullet2 line 1</li>',
-        '  </ul>',
-        ' </li>',
-        '</ul>',
-        '<br>',
-        '<ul class=bullet>',
-        ' <li>',
-        '  <ul class=bullet>',
-        '   <li>bullet2 line 2</li>',
-        '  </ul>',
-        ' </li>',
-        '</ul>',
-        '<br>',
-      ].map((l) => l.replace(/^\s+/, '')).join(''),
-      wantExportText: [
-        '\t* bullet line 1\n',
-        '\n',
-        '\t* bullet line 2\n',
-        '\t\t* bullet2 line 1\n',
-        '\n',
-        '\t\t* bullet2 line 2\n',
-        '\n',
-      ].join(''),
-    },
-    {
-      name: 'HTML with bullets, newlines, and attributes',
-      inputHtmlBody: [
-        '<ul class="list-bullet1">',
-        ' <li>bullet line 1</li>',
-        '</ul>',
-        '<br>',
-        '<ul class="list-bullet1">',
-        ' <li>bullet line 2',
-        '  <ul class="list-bullet2">',
-        '   <li>bullet2 line 1</li>',
-        '  </ul>',
-        ' </li>',
-        '</ul>',
-        '<br>',
-        '<ul class="list-bullet1">',
-        ' <li>',
-        '  <ul class="list-bullet2">',
-        '   <li>',
-        '    <ul class="list-bullet3">',
-        '     <li>',
-        '      <ul class="list-bullet4">',
-        '       <li><span class="b s i u"><b><i><s><u>bullet4 line 2 bisu</u>' +
-                   '</s></i></b></span></li>',
-        '       <li><span class="b s "><b><s>bullet4 line 2 bs</s></b></span></li>',
-        '       <li><span class="u"><u>bullet4 line 2 u</u></span>' +
-                   '<span class="u i s"><i><s><u>uis</u></s></i></span></li>',
-        '      </ul>',
-        '     </li>',
-        '    </ul>',
-        '   </li>',
-        '  </ul>',
-        ' </li>',
-        '</ul>',
-      ].join(''),
-      wantPadLines: [
-        '<ul class="list-bullet1"><li><span class="">bullet line 1</span></li></ul>',
-        '<br>',
-        '<ul class="list-bullet1"><li><span class="">bullet line 2</span></li></ul>',
-        '<ul class="list-bullet2"><li><span class="">bullet2 line 1</span></li></ul>',
-        '<br>',
-        '<ul class="list-bullet4"><li><span class="b i s u"><b><i><s><u>' +
-            'bullet4 line 2 bisu</u></s></i></b></span></li></ul>',
-        '<ul class="list-bullet4"><li><span class="b s"><b><s>bullet4 line 2 bs</s>' +
-            '</b></span></li></ul>',
-        '<ul class="list-bullet4"><li><span class="u"><u>bullet4 line 2 u</u></span>' +
-            '<span class="i s u"><i><s><u>uis</u></s></i></span></li></ul>',
-        '<br>',
-      ],
-      wantExportHtmlBody: [
-        '<ul class=bullet><li>bullet line 1</li></ul>',
-        '<br>',
-        '<ul class=bullet>',
-        ' <li>bullet line 2',
-        '  <ul class=bullet><li>bullet2 line 1</li></ul>',
-        ' </li>',
-        '</ul>',
-        '<br>',
-        '<ul class=bullet>',
-        ' <li>',
-        '  <ul class=bullet>',
-        '   <li>',
-        '    <ul class=bullet>',
-        '     <li>',
-        '      <ul class=bullet>',
-        '       <li><strong><em><s><u>bullet4 line 2 bisu</u></s></em></strong></li>',
-        '       <li><strong><s>bullet4 line 2 bs</s></strong></li>',
-        '       <li><u>bullet4 line 2 u<em><s>uis</s></em></u></li>',
-        '      </ul>',
-        '     </li>',
-        '    </ul>',
-        '   </li>',
-        '  </ul>',
-        ' </li>',
-        '</ul>',
-        '<br>',
-      ].map((l) => l.replace(/^\s+/, '')).join(''),
-      wantExportText: [
-        '\t* bullet line 1\n',
-        '\n',
-        '\t* bullet line 2\n',
-        '\t\t* bullet2 line 1\n',
-        '\n',
-        '\t\t\t\t* bullet4 line 2 bisu\n',
-        '\t\t\t\t* bullet4 line 2 bs\n',
-        '\t\t\t\t* bullet4 line 2 uuis\n',
-        '\n',
-      ].join(''),
-    },
-    {
-      name: 'HTML with nested bullets',
-      inputHtmlBody: [
-        '<ul class="list-bullet1"><li>bullet line 1</li></ul>',
-        '<ul class="list-bullet1">',
-        ' <li>bullet line 2',
-        '  <ul class="list-bullet2">',
-        '   <li>bullet2 line 1</li>',
-        '  </ul>',
-        ' </li>',
-        '</ul>',
-        '<ul class="list-bullet1">',
-        ' <li>',
-        '  <ul class="list-bullet2">',
-        '   <li>',
-        '    <ul class="list-bullet3">',
-        '     <li>',
-        '      <ul class="list-bullet4">',
-        '       <li>bullet4 line 2</li>',
-        '       <li>bullet4 line 2</li>',
-        '       <li>bullet4 line 2</li>',
-        '      </ul>',
-        '     </li>',
-        '     <li>bullet3 line 1</li>',
-        '    </ul>',
-        '   </li>',
-        '  </ul>',
-        ' </li>',
-        '</ul>',
-      ].join(''),
-      wantPadLines: [
-        '<ul class="list-bullet1"><li><span class="">bullet line 1</span></li></ul>',
-        '<ul class="list-bullet1"><li><span class="">bullet line 2</span></li></ul>',
-        '<ul class="list-bullet2"><li><span class="">bullet2 line 1</span></li></ul>',
-        '<ul class="list-bullet4"><li><span class="">bullet4 line 2</span></li></ul>',
-        '<ul class="list-bullet4"><li><span class="">bullet4 line 2</span></li></ul>',
-        '<ul class="list-bullet4"><li><span class="">bullet4 line 2</span></li></ul>',
-        '<ul class="list-bullet3"><li><span class="">bullet3 line 1</span></li></ul>',
-        '<br>',
-      ],
-      wantExportHtmlBody: [
-        '<ul class=bullet>',
-        ' <li>bullet line 1</li>',
-        ' <li>bullet line 2',
-        '  <ul class=bullet>',
-        '   <li>bullet2 line 1',
-        '    <ul class=bullet>',
-        '     <li>',
-        '      <ul class=bullet>',
-        '       <li>bullet4 line 2</li>',
-        '       <li>bullet4 line 2</li>',
-        '       <li>bullet4 line 2</li>',
-        '      </ul>',
-        '     </li>',
-        '     <li>bullet3 line 1</li>',
-        '    </ul>',
-        '   </li>',
-        '  </ul>',
-        ' </li>',
-        '</ul>',
-        '<br>',
-      ].map((l) => l.replace(/^\s+/, '')).join(''),
-      wantExportText: [
-        '\t* bullet line 1\n',
-        '\t* bullet line 2\n',
-        '\t\t* bullet2 line 1\n',
-        '\t\t\t\t* bullet4 line 2\n',
-        '\t\t\t\t* bullet4 line 2\n',
-        '\t\t\t\t* bullet4 line 2\n',
-        '\t\t\t* bullet3 line 1\n',
-        '\n',
-      ].join(''),
-    },
-    {
-      name: 'HTML with 8 levels of bullets, newlines, and attributes',
-      inputHtmlBody: [
-        '<ul class="list-bullet1">',
-        ' <li>bullet line 1</li>',
-        '</ul>',
-        '<br>',
-        '<ul class="list-bullet1">',
-        ' <li>bullet line 2',
-        '  <ul class="list-bullet2">',
-        '   <li>bullet2 line 1</li>',
-        '  </ul>',
-        ' </li>',
-        '</ul>',
-        '<br>',
-        '<ul class="list-bullet1">',
-        ' <li>',
-        '  <ul class="list-bullet2">',
-        '   <li>',
-        '    <ul class="list-bullet3">',
-        '     <li>',
-        '      <ul class="list-bullet4">',
-        '       <li><span class="b s i u"><b><i><s><u>bullet4 line 2 bisu' +
-                   '</u></s></i></b></span></li>',
-        '       <li><span class="b s "><b><s>bullet4 line 2 bs</s></b></span></li>',
-        '       <li><span class="u"><u>bullet4 line 2 u</u></span>' +
-                   '<span class="u i s"><i><s><u>uis</u></s></i></span></li>',
-        '       <li>',
-        '        <ul class="list-bullet5">',
-        '         <li>',
-        '          <ul class="list-bullet6">',
-        '           <li>',
-        '            <ul class="list-bullet7">',
-        '             <li>',
-        '              <ul class="list-bullet8">',
-        '               <li><span class="">foo</span></li>',
-        '               <li><span class="b s"><b><s>foobar bs</b></s></span></li>',
-        '              </ul>',
-        '             </li>',
-        '            </ul>',
-        '           </li>',
-        '          </ul>',
-        '         </li>',
-        '        </ul>',
-        '       </li>',
-        '       <li>',
-        '        <ul class="list-bullet5">',
-        '         <li>foobar</li>',
-        '        </ul>',
-        '       </li>',
-        '      </ul>',
-        '     </li>',
-        '    </ul>',
-        '   </li>',
-        '  </ul>',
-        ' </li>',
-        '</ul>',
-      ].join(''),
-      wantPadLines: [
-        '<ul class="list-bullet1"><li><span class="">bullet line 1</span></li></ul>',
-        '<br>',
-        '<ul class="list-bullet1"><li><span class="">bullet line 2</span></li></ul>',
-        '<ul class="list-bullet2"><li><span class="">bullet2 line 1</span></li></ul>',
-        '<br>',
-        '<ul class="list-bullet4"><li><span class="b i s u"><b><i><s><u>' +
-            'bullet4 line 2 bisu</u></s></i></b></span></li></ul>',
-        '<ul class="list-bullet4"><li><span class="b s"><b><s>bullet4 line 2 bs</s>' +
-            '</b></span></li></ul>',
-        '<ul class="list-bullet4"><li><span class="u"><u>bullet4 line 2 u</u></span>' +
-            '<span class="i s u"><i><s><u>uis</u></s></i></span></li></ul>',
-        '<ul class="list-bullet8"><li><span class="">foo</span></li></ul>',
-        '<ul class="list-bullet8"><li><span class="b s"><b><s>foobar bs</s></b></span></li></ul>',
-        '<ul class="list-bullet5"><li><span class="">foobar</span></li></ul>',
-        '<br>',
-      ],
-      wantExportHtmlBody: [
-        '<ul class=bullet>',
-        ' <li>bullet line 1</li>',
-        '</ul>',
-        '<br>',
-        '<ul class=bullet>',
-        ' <li>bullet line 2',
-        '  <ul class=bullet>',
-        '   <li>bullet2 line 1</li>',
-        '  </ul>',
-        ' </li>',
-        '</ul>',
-        '<br>',
-        '<ul class=bullet>',
-        ' <li>',
-        '  <ul class=bullet>',
-        '   <li>',
-        '    <ul class=bullet>',
-        '     <li>',
-        '      <ul class=bullet>',
-        '       <li><strong><em><s><u>bullet4 line 2 bisu</u></s></em></strong></li>',
-        '       <li><strong><s>bullet4 line 2 bs</s></strong></li>',
-        '       <li><u>bullet4 line 2 u<em><s>uis</s></em></u>',
-        '        <ul class=bullet>',
-        '         <li>',
-        '          <ul class=bullet>',
-        '           <li>',
-        '            <ul class=bullet>',
-        '             <li>',
-        '              <ul class=bullet>',
-        '               <li>foo</li>',
-        '               <li><strong><s>foobar bs</s></strong></li>',
-        '              </ul>',
-        '             </li>',
-        '            </ul>',
-        '           </li>',
-        '          </ul>',
-        '         </li>',
-        '         <li>foobar</li>',
-        '        </ul>',
-        '       </li>',
-        '      </ul>',
-        '     </li>',
-        '    </ul>',
-        '   </li>',
-        '  </ul>',
-        ' </li>',
-        '</ul>',
-        '<br>',
-      ].map((l) => l.replace(/^\s+/, '')).join(''),
-      wantExportText: [
-        '\t* bullet line 1\n',
-        '\n',
-        '\t* bullet line 2\n',
-        '\t\t* bullet2 line 1\n',
-        '\n',
-        '\t\t\t\t* bullet4 line 2 bisu\n',
-        '\t\t\t\t* bullet4 line 2 bs\n',
-        '\t\t\t\t* bullet4 line 2 uuis\n',
-        '\t\t\t\t\t\t\t\t* foo\n',
-        '\t\t\t\t\t\t\t\t* foobar bs\n',
-        '\t\t\t\t\t* foobar\n',
-        '\n',
-      ].join(''),
-    },
-    {
-      name: 'HTML with ordered lists',
-      inputHtmlBody: [
-        '<ol class="list-number1" start="1"><li>number 1 line 1</li></ol>',
-        '<ol class="list-number1" start="2"><li>number 2 line 2</li></ol>',
-      ].join(''),
-      wantPadLines: [
-        '<ol start="1" class="list-number1"><li><span class="">number 1 line 1</span></li></ol>',
-        '<ol start="2" class="list-number1"><li><span class="">number 2 line 2</span></li></ol>',
-        '<br>',
-      ],
-      wantExportHtmlBody: [
-        '<ol start=1 class=number>',
-        ' <li>number 1 line 1</li>',
-        ' <li>number 2 line 2</li>',
-        '</ol>',
-        '<br>',
-      ].map((l) => l.replace(/^\s+/, '')).join(''),
-      wantExportText: [
-        '\t1. number 1 line 1\n',
-        '\t2. number 2 line 2\n',
-        '\n',
-      ].join(''),
-    },
-  ];
-
-  let confirm;
-  before(async function () {
+describe('import functionality', function () {
+  beforeEach(function (cb) {
+    helper.newPad(cb); // creates a new pad
     this.timeout(60000);
-    await new Promise(
-        (resolve, reject) => helper.newPad((err) => err != null ? reject(err) : resolve()));
-    confirm = helper.padChrome$.window.confirm;
-    helper.padChrome$.window.confirm = () => true;
-    // As of 2021-02-22 a mutable FileList cannot be directly created so DataTransfer is used as a
-    // hack to access a mutable FileList for testing the '<input type="file">' element. DataTransfer
-    // itself is quite new so support for it is tested here. See:
-    //   * https://github.com/whatwg/html/issues/3269
-    //   * https://stackoverflow.com/q/47119426
-    try {
-      const dt = new DataTransfer();
-      dt.items.add(new File(['testing'], 'file.txt', {type: 'text/plain'}));
-      // Supposedly all modern browsers support a settable HTMLInputElement.files property, but
-      // Firefox 52 complains.
-      helper.padChrome$('#importform input[type=file]')[0].files = dt.files;
-    } catch (err) {
-      return this.skip();
+  });
+
+  function getinnertext() {
+    const inner = helper.padInner$;
+    if (!inner) {
+      return '';
     }
-  });
-
-  after(async function () {
-    helper.padChrome$.window.confirm = confirm;
-  });
-
-  beforeEach(async function () {
-    const popup = helper.padChrome$('#import_export');
-    const isVisible = () => popup.hasClass('popup-show');
-    if (isVisible()) return;
-    const button = helper.padChrome$('button[data-l10n-id="pad.toolbar.import_export.title"]');
-    button.click();
-    await helper.waitForPromise(isVisible);
-  });
-
-  const docToHtml = (() => {
-    const s = new XMLSerializer();
-    return (doc) => s.serializeToString(doc);
-  })();
-
-  const htmlToDoc = (() => {
-    const p = new DOMParser();
-    return (html) => p.parseFromString(html, 'text/html');
-  })();
-
-  const htmlBodyToDoc = (htmlBody) => {
-    const doc = document.implementation.createHTMLDocument();
-    $('body', doc).html(htmlBody);
-    return doc;
-  };
-
-  for (const tc of testCases) {
-    describe(tc.name, function () {
-      it('import', async function () {
-        const ext = tc.inputHtmlBody ? 'html' : 'txt';
-        const contents = ext === 'html' ? docToHtml(htmlBodyToDoc(tc.inputHtmlBody)) : tc.inputText;
-        // DataTransfer is used as a hacky way to get a mutable FileList. For details, see:
-        // https://stackoverflow.com/q/47119426
-        const dt = new DataTransfer();
-        dt.items.add(new File([contents], `file.${ext}`, {type: 'text/plain'}));
-        const form = helper.padChrome$('#importform');
-        form.find('input[type=file]')[0].files = dt.files;
-        form.find('#importsubmitinput').submit();
-        try {
-          await helper.waitForPromise(() => {
-            const got = helper.linesDiv();
-            if (got.length !== tc.wantPadLines.length) return false;
-            for (let i = 0; i < got.length; i++) {
-              const gotDiv = $('<div>').html(got[i].html());
-              const wantDiv = $('<div>').html(tc.wantPadLines[i]);
-              if (!gotDiv[0].isEqualNode(wantDiv[0])) return false;
-            }
-            return true;
-          });
-        } catch (err) {
-          const formatLine = (l) => `  ${JSON.stringify(l)}`;
-          const g = helper.linesDiv().map((div) => formatLine(div.html())).join('\n');
-          const w = tc.wantPadLines.map(formatLine).join('\n');
-          throw new Error(`Import failed. Got pad lines:\n${g}\nWant pad lines:\n${w}`);
-        }
-      });
-
-      it('export to HTML', async function () {
-        const link = helper.padChrome$('#exporthtmla').attr('href');
-        const url = new URL(link, helper.padChrome$.window.location.href).href;
-        const gotHtml = await $.ajax({url, dataType: 'html'});
-        const gotBody = $('body', htmlToDoc(gotHtml));
-        gotBody.html(gotBody.html().replace(/^\s+|\s+$/g, ''));
-        const wantBody = $('body', htmlBodyToDoc(tc.wantExportHtmlBody));
-        if (!gotBody[0].isEqualNode(wantBody[0])) {
-          throw new Error(`Got exported HTML body:\n  ${JSON.stringify(gotBody.html())}\n` +
-                          `Want HTML body:\n  ${JSON.stringify(wantBody.html())}`);
-        }
-      });
-
-      it('export to text', async function () {
-        const link = helper.padChrome$('#exportplaina').attr('href');
-        const url = new URL(link, helper.padChrome$.window.location.href).href;
-        const got = await $.ajax({url, dataType: 'text'});
-        expect(got).to.be(tc.wantExportText);
-      });
+    let newtext = '';
+    inner('div').each((line, el) => {
+      newtext += `${el.innerHTML}\n`;
     });
+    return newtext;
   }
+  function importrequest(data, importurl, type) {
+    let error;
+    const result = $.ajax({
+      url: importurl,
+      type: 'post',
+      processData: false,
+      async: false,
+      contentType: 'multipart/form-data; boundary=boundary',
+      accepts: {
+        text: 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8',
+      },
+      data: [
+        'Content-Type: multipart/form-data; boundary=--boundary',
+        '',
+        '--boundary',
+        `Content-Disposition: form-data; name="file"; filename="import.${type}"`,
+        'Content-Type: text/plain',
+        '',
+        data,
+        '',
+        '--boundary',
+      ].join('\r\n'),
+      error(res) {
+        error = res;
+      },
+    });
+    expect(error).to.be(undefined);
+    return result;
+  }
+  function exportfunc(link) {
+    const exportresults = [];
+    $.ajaxSetup({
+      async: false,
+    });
+    $.get(`${link}/export/html`, (data) => {
+      const start = data.indexOf('<body>');
+      const end = data.indexOf('</body>');
+      const html = data.substr(start + 6, end - start - 6);
+      exportresults.push(['html', html]);
+    });
+    $.get(`${link}/export/txt`, (data) => {
+      exportresults.push(['txt', data]);
+    });
+    return exportresults;
+  }
+
+  xit('import a pad with newlines from txt', function (done) {
+    const importurl = `${helper.padChrome$.window.location.href}/import`;
+    const textWithNewLines = 'imported text\nnewline';
+    importrequest(textWithNewLines, importurl, 'txt');
+    helper.waitFor(() => expect(getinnertext())
+        .to.be('<span class="">imported text</span>\n<span class="">newline</span>\n<br>\n'));
+    const results = exportfunc(helper.padChrome$.window.location.href);
+    expect(results[0][1]).to.be('imported text<br>newline<br><br>');
+    expect(results[1][1]).to.be('imported text\nnewline\n\n');
+    done();
+  });
+  xit('import a pad with newlines from html', function (done) {
+    const importurl = `${helper.padChrome$.window.location.href}/import`;
+    const htmlWithNewLines = '<html><body>htmltext<br/>newline</body></html>';
+    importrequest(htmlWithNewLines, importurl, 'html');
+    helper.waitFor(() => expect(getinnertext())
+        .to.be('<span class="">htmltext</span>\n<span class="">newline</span>\n<br>\n'));
+    const results = exportfunc(helper.padChrome$.window.location.href);
+    expect(results[0][1]).to.be('htmltext<br>newline<br><br>');
+    expect(results[1][1]).to.be('htmltext\nnewline\n\n');
+    done();
+  });
+  xit('import a pad with attributes from html', function (done) {
+    const importurl = `${helper.padChrome$.window.location.href}/import`;
+    const htmlWithNewLines = '<html><body>htmltext<br/><span class="b s i u">' +
+        '<b><i><s><u>newline</u></s></i></b></body></html>';
+    importrequest(htmlWithNewLines, importurl, 'html');
+    helper.waitFor(() => expect(getinnertext())
+        .to.be('<span class="">htmltext</span>\n<span class="b i s u">' +
+          '<b><i><s><u>newline</u></s></i></b></span>\n<br>\n'));
+    const results = exportfunc(helper.padChrome$.window.location.href);
+    expect(results[0][1])
+        .to.be('htmltext<br><strong><em><s><u>newline</u></s></em></strong><br><br>');
+    expect(results[1][1]).to.be('htmltext\nnewline\n\n');
+    done();
+  });
+  xit('import a pad with bullets from html', function (done) {
+    const importurl = `${helper.padChrome$.window.location.href}/import`;
+    const htmlWithBullets = '<html><body><ul class="list-bullet1"><li>bullet line 1</li>' +
+      '<li>bullet line 2</li><ul class="list-bullet2"><li>bullet2 line 1</li>' +
+      '<li>bullet2 line 2</li></ul></ul></body></html>';
+    importrequest(htmlWithBullets, importurl, 'html');
+    helper.waitFor(() => expect(getinnertext()).to.be(
+        '<ul class="list-bullet1"><li><span class="">bullet line 1</span></li></ul>\n' +
+        '<ul class="list-bullet1"><li><span class="">bullet line 2</span></li></ul>\n' +
+        '<ul class="list-bullet2"><li><span class="">bullet2 line 1</span></li></ul>\n' +
+        '<ul class="list-bullet2"><li><span class="">bullet2 line 2</span></li></ul>\n' +
+        '<br>\n'));
+    const results = exportfunc(helper.padChrome$.window.location.href);
+    expect(results[0][1]).to.be(
+        '<ul class="bullet"><li>bullet line 1</li><li>bullet line 2</li>' +
+        '<ul class="bullet"><li>bullet2 line 1</li><li>bullet2 line 2</li></ul></ul><br>');
+    expect(results[1][1])
+        .to.be('\t* bullet line 1\n\t* bullet line 2\n' +
+        '\t\t* bullet2 line 1\n\t\t* bullet2 line 2\n\n');
+    done();
+  });
+  xit('import a pad with bullets and newlines from html', function (done) {
+    const importurl = `${helper.padChrome$.window.location.href}/import`;
+    const htmlWithBullets = '<html><body><ul class="list-bullet1"><li>bullet line 1</li>' +
+        '</ul><br/><ul class="list-bullet1"><li>bullet line 2</li><ul class="list-bullet2">' +
+        '<li>bullet2 line 1</li></ul></ul><br/><ul class="list-bullet1">' +
+        '<ul class="list-bullet2"><li>bullet2 line 2</li></ul></ul></body></html>';
+    importrequest(htmlWithBullets, importurl, 'html');
+    helper.waitFor(() => expect(getinnertext()).to.be(
+        '<ul class="list-bullet1"><li><span class="">bullet line 1</span></li></ul>\n' +
+        '<br>\n' +
+        '<ul class="list-bullet1"><li><span class="">bullet line 2</span></li></ul>\n' +
+        '<ul class="list-bullet2"><li><span class="">bullet2 line 1</span></li></ul>\n' +
+        '<br>\n' +
+        '<ul class="list-bullet2"><li><span class="">bullet2 line 2</span></li></ul>\n' +
+        '<br>\n'));
+    const results = exportfunc(helper.padChrome$.window.location.href);
+    expect(results[0][1]).to.be(
+        '<ul class="bullet"><li>bullet line 1</li></ul><br><ul class="bullet">' +
+        '<li>bullet line 2</li><ul class="bullet"><li>bullet2 line 1</li></ul>' +
+        '</ul><br><ul><ul class="bullet"><li>bullet2 line 2</li></ul></ul><br>');
+    expect(results[1][1]).to.be(
+        '\t* bullet line 1\n\n\t* bullet line 2\n\t\t* bullet2 line 1\n\n\t\t* bullet2 line 2\n\n');
+    done();
+  });
+  xit('import a pad with bullets and newlines and attributes from html', function (done) {
+    const importurl = `${helper.padChrome$.window.location.href}/import`;
+    const htmlWithBullets = '<html><body><ul class="list-bullet1"><li>bullet line 1</li>' +
+        '</ul><br/><ul class="list-bullet1"><li>bullet line 2</li>' +
+        '<ul class="list-bullet2"><li>bullet2 line 1</li></ul></ul>' +
+        '<br/><ul class="list-bullet1"><ul class="list-bullet2"><ul class="list-bullet3">' +
+        '<ul class="list-bullet4"><li><span class="b s i u"><b><i>' +
+        '<s><u>bullet4 line 2 bisu</u></s></i></b></span></li><li>' +
+        '<span class="b s "><b><s>bullet4 line 2 bs</s></b></span></li>' +
+        '<li><span class="u"><u>bullet4 line 2 u</u></span><span class="u i s">' +
+        '<i><s><u>uis</u></s></i></span></li></ul></ul></ul></ul></body></html>';
+    importrequest(htmlWithBullets, importurl, 'html');
+    helper.waitFor(() => expect(getinnertext()).to.be(
+        '<ul class="list-bullet1"><li><span class="">bullet line 1</span></li></ul>\n<br>\n' +
+        '<ul class="list-bullet1"><li><span class="">bullet line 2</span></li></ul>\n' +
+        '<ul class="list-bullet2"><li><span class="">bullet2 line 1</span></li></ul>\n<br>\n' +
+        '<ul class="list-bullet4"><li><span class="b i s u">' +
+        '<b><i><s><u>bullet4 line 2 bisu</u></s></i></b></span></li></ul>\n' +
+        '<ul class="list-bullet4"><li><span class="b s">' +
+        '<b><s>bullet4 line 2 bs</s></b></span></li></ul>\n' +
+        '<ul class="list-bullet4"><li><span class="u"><u>bullet4 line 2 u</u>' +
+        '</span><span class="i s u"><i><s><u>uis</u></s></i></span></li></ul>\n' +
+        '<br>\n'));
+    const results = exportfunc(helper.padChrome$.window.location.href);
+    expect(results[0][1]).to.be(
+        '<ul class="bullet"><li>bullet line 1</li></ul>' +
+        '<br><ul class="bullet"><li>bullet line 2</li><ul class="bullet"><li>bullet2 line 1</li>' +
+        '</ul></ul><br><ul><ul><ul><ul class="bullet"><li><strong><em><s><u>bullet4 line 2 bisu' +
+        '</u></s></em></strong></li><li><strong><s>bullet4 line 2 bs</s></strong>' +
+        '</li><li><u>bullet4 line 2 u<em><s>uis</s></em></u></li></ul></ul></ul></ul><br>');
+    expect(results[1][1]).to.be(
+        '\t* bullet line 1\n\n\t* bullet line 2\n\t\t* bullet2 line 1\n\n\t\t\t\t* bullet4 line 2' +
+        ' bisu\n\t\t\t\t* bullet4 line 2 bs\n\t\t\t\t* bullet4 line 2 uuis\n\n');
+    done();
+  });
+  xit('import a pad with nested bullets from html', function (done) {
+    const importurl = `${helper.padChrome$.window.location.href}/import`;
+    const htmlWithBullets = '<html><body><ul class="list-bullet1"><li>bullet line 1</li>' +
+    '</ul><ul class="list-bullet1"><li>bullet line 2</li><ul class="list-bullet2">' +
+    '<li>bullet2 line 1</li></ul></ul><ul class="list-bullet1"><ul class="list-bullet2">' +
+    '<ul class="list-bullet3"><ul class="list-bullet4"><li>bullet4 line 2</li>' +
+    '<li>bullet4 line 2</li><li>bullet4 line 2</li></ul><li>bullet3 line 1</li></ul>' +
+    '</ul><li>bullet2 line 1</li></ul></body></html>';
+    importrequest(htmlWithBullets, importurl, 'html');
+    const oldtext = getinnertext();
+    helper.waitFor(() => oldtext !== getinnertext()
+        //      return expect(getinnertext()).to.be('\
+        // <ul class="list-bullet1"><li><span class="">bullet line 1</span></li></ul>\n\
+        // <ul class="list-bullet1"><li><span class="">bullet line 2</span></li></ul>\n\
+        // <ul class="list-bullet2"><li><span class="">bullet2 line 1</span></li></ul>\n\
+        // <ul class="list-bullet4"><li><span class="">bullet4 line 2</span></li></ul>\n\
+        // <ul class="list-bullet4"><li><span class="">bullet4 line 2</span></li></ul>\n\
+        // <ul class="list-bullet4"><li><span class="">bullet4 line 2</span></li></ul>\n\
+        // <br>\n')
+    );
+
+    const results = exportfunc(helper.padChrome$.window.location.href);
+    expect(results[0][1]).to.be(
+        '<ul class="bullet"><li>bullet line 1</li><li>bullet line 2</li>' +
+        '<ul class="bullet"><li>bullet2 line 1</li><ul><ul class="bullet"><li>bullet4 line 2</li>' +
+        '<li>bullet4 line 2</li><li>bullet4 line 2</li></ul><li>bullet3 line 1</li></ul></ul>' +
+        '<li>bullet2 line 1</li></ul><br>');
+    expect(results[1][1]).to.be(
+        '\t* bullet line 1\n\t* bullet line 2\n\t\t* bullet2 line 1\n\t\t\t\t* bullet4 line 2' +
+        '\n\t\t\t\t* bullet4 line 2\n\t\t\t\t* bullet4 line 2\n\t\t\t* bullet3 line 1' +
+        '\n\t* bullet2 line 1\n\n');
+    done();
+  });
+  xit('import with 8 levels of bullets and newlines and attributes from html', function (done) {
+    const importurl = `${helper.padChrome$.window.location.href}/import`;
+    const htmlWithBullets =
+        '<html><body><ul class="list-bullet1"><li>bullet line 1</li>' +
+        '</ul><br/><ul class="list-bullet1"><li>bullet line 2</li><ul class="list-bullet2"><li>' +
+        'bullet2 line 1</li></ul></ul><br/><ul class="list-bullet1"><ul class="list-bullet2">' +
+        '<ul class="list-bullet3"><ul class="list-bullet4"><li><span class="b s i u"><b><i>' +
+        '<s><u>bullet4 line 2 bisu</u></s></i></b></span></li><li><span class="b s "><b><s>' +
+        'bullet4 line 2 bs</s></b></span></li><li><span class="u"><u>bullet4 line 2 u' +
+        '</u></span><span class="u i s"><i><s><u>uis</u></s></i></span></li>' +
+        '<ul class="list-bullet5"><ul class="list-bullet6"><ul class="list-bullet7">' +
+        '<ul class="list-bullet8"><li><span class="">foo</span></li><li><span class="b s">' +
+        '<b><s>foobar bs</b></s></span></li></ul></ul></ul></ul><ul class="list-bullet5">' +
+        '<li>foobar</li></ul></ul></ul></ul></body></html>';
+    importrequest(htmlWithBullets, importurl, 'html');
+    helper.waitFor(() => expect(getinnertext()).to.be(
+        '<ul class="list-bullet1"><li><span class="">bullet line 1</span></li></ul>\n<br>\n' +
+        '<ul class="list-bullet1"><li><span class="">bullet line 2</span></li></ul>\n' +
+        '<ul class="list-bullet2"><li><span class="">bullet2 line 1</span></li></ul>\n<br>\n' +
+        '<ul class="list-bullet4"><li><span class="b i s u"><b><i><s><u>bullet4 line 2 bisu</u>' +
+        '</s></i></b></span></li></ul>\n' +
+        '<ul class="list-bullet4"><li><span class="b s"><b><s>bullet4 line 2 bs</s></b>' +
+        '</span></li></ul>\n' +
+        '<ul class="list-bullet4"><li><span class="u"><u>bullet4 line 2 u</u></span>' +
+        '<span class="i s u"><i><s><u>uis</u></s>' +
+        '</i></span></li></ul>\n' +
+        '<ul class="list-bullet8"><li><span class="">foo</span></li></ul>\n' +
+        '<ul class="list-bullet8"><li><span class="b s"><b><s>foobar bs</s></b>' +
+        '</span></li></ul>\n' +
+        '<ul class="list-bullet5"><li><span class="">foobar</span></li></ul>\n' +
+        '<br>\n'));
+    const results = exportfunc(helper.padChrome$.window.location.href);
+    expect(results[0][1]).to.be(
+        '<ul class="bullet"><li>bullet line 1</li></ul><br><ul class="bullet">' +
+        '<li>bullet line 2</li><ul class="bullet"><li>bullet2 line 1</li></ul></ul>' +
+        '<br><ul><ul><ul><ul class="bullet"><li><strong><em><s><u>' +
+        'bullet4 line 2 bisu</u></s></em></strong></li><li><strong><s>' +
+        'bullet4 line 2 bs</s></strong></li><li><u>bullet4 line 2 u<em>' +
+        '<s>uis</s></em></u></li><ul><ul><ul><ul class="bullet"><li>foo</li>' +
+        '<li><strong><s>foobar bs</s></strong></li></ul></ul></ul><li>foobar</li>' +
+        '</ul></ul></ul></ul></ul><br>');
+    expect(results[1][1]).to.be(
+        '\t* bullet line 1\n\n\t* bullet line 2\n\t\t* ' +
+        'bullet2 line 1\n\n\t\t\t\t* bullet4 line 2 bisu\n\t\t\t\t* bullet4 line 2 ' +
+        'bs\n\t\t\t\t* bullet4 line 2 uuis\n\t\t\t\t\t\t\t\t* foo\n\t\t\t\t\t\t\t\t* ' +
+        'foobar bs\n\t\t\t\t\t* foobar\n\n');
+    done();
+  });
+
+  xit('import a pad with ordered lists from html', function (done) {
+    const importurl = `${helper.padChrome$.window.location.href}/import`;
+    const htmlWithBullets = '<html><body><ol class="list-number1" start="1">' +
+    '<li>number 1 line 1</li></ol><ol class="list-number1" start="2">' +
+    '<li>number 2 line 2</li></ol></body></html>';
+    importrequest(htmlWithBullets, importurl, 'html');
+    console.error(getinnertext());
+    expect(getinnertext()).to.be(
+        '<ol class="list-number1" start="1"><li><span class="">number 1 line 1</span></li></ol>\n' +
+        '<ol class="list-number1" start="2"><li><span class="">number 2 line 2</span></li></ol>\n' +
+        '<br>\n');
+    const results = exportfunc(helper.padChrome$.window.location.href);
+    expect(results[0][1]).to.be(
+        '<ol class="list-number1" start="1"><li>number 1 line 1</li>' +
+        '</ol><ol class="list-number1" start="2"><li>number 2 line 2</li></ol>');
+    expect(results[1][1]).to.be('');
+    done();
+  });
+  xit('import a pad with ordered lists and newlines from html', function (done) {
+    const importurl = `${helper.padChrome$.window.location.href}/import`;
+    const htmlWithBullets = '<html><body><ol class="list-number1" start="1">' +
+    '<li>number 9 line 1</li></ol><br/><ol class="list-number1" start="2">' +
+    '<li>number 10 line 2</li><ol class="list-number2">' +
+    '<li>number 2 times line 1</li></ol></ol><br/><ol class="list-bullet1">' +
+    '<ol class="list-number2"><li>number 2 times line 2</li></ol></ol></body></html>';
+    importrequest(htmlWithBullets, importurl, 'html');
+    expect(getinnertext()).to.be(
+        '<ol class="list-number1" start="1"><li><span class="">number 9 line 1</span></li></ol>\n' +
+        '<br>\n' +
+        '<ol class="list-number1" start="2"><li><span class="">number 10 line 2</span></li>' +
+        '</ol>\n' +
+        '<ol class="list-number2"><li><span class="">number 2 times line 1</span></li></ol>\n' +
+        '<br>\n' +
+        '<ol class="list-number2"><li><span class="">number 2 times line 2</span></li></ol>\n' +
+        '<br>\n');
+    const results = exportfunc(helper.padChrome$.window.location.href);
+    console.error(results);
+    done();
+  });
+  xit('import with nested ordered lists and attributes and newlines from html', function (done) {
+    const importurl = `${helper.padChrome$.window.location.href}/import`;
+    const htmlWithBullets = '<html><body><ol class="list-number1" start="1"><li>' +
+        '<span class="b s i u"><b><i><s><u>bold strikethrough italics underline</u>' +
+        '</s><i/></b></span> line <span class="b"><b>1bold</b></span></li>' +
+        '</ol><br/><span class="i"><i><ol class="list-number1" start="2">' +
+        '<li>number 10 line 2</li><ol class="list-number2">' +
+        '<li>number 2 times line 1</li></ol></ol></i></span><br/>' +
+        '<ol class="list-bullet1"><ol class="list-number2">' +
+        '<li>number 2 times line 2</li></ol></ol></body></html>';
+    importrequest(htmlWithBullets, importurl, 'html');
+    expect(getinnertext()).to.be(
+        '<ol class="list-number1"><li><span class="b i s u"><b><i><s><u>' +
+        'bold strikethrough italics underline</u></s></i></b></span><span class="">' +
+        ' line </span><span class="b"><b>1bold</b></span></li></ol>\n' +
+        '<br>\n' +
+        '<ol class="list-number1"><li><span class="i"><i>number 10 line 2</i></span></li></ol>\n' +
+        '<ol class="list-number2"><li><span class="i">' +
+        '<i>number 2 times line 1</i></span></li></ol>\n' +
+        '<br>\n' +
+        '<ol class="list-number2"><li><span class="">number 2 times line 2</span></li></ol>\n' +
+        '<br>\n');
+    const results = exportfunc(helper.padChrome$.window.location.href);
+    console.error(results);
+    done();
+  });
 });

From a354b03633609e15108a60cba58aad832a164c0f Mon Sep 17 00:00:00 2001
From: Richard Hansen <rhansen@rhansen.org>
Date: Mon, 22 Feb 2021 04:06:58 -0500
Subject: [PATCH 091/115] CI: Leave log level at INFO for frontend tests

---
 .github/workflows/frontend-admin-tests.yml | 4 ++--
 .github/workflows/frontend-tests.yml       | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/frontend-admin-tests.yml b/.github/workflows/frontend-admin-tests.yml
index 8a61b224..f2e2215a 100644
--- a/.github/workflows/frontend-admin-tests.yml
+++ b/.github/workflows/frontend-admin-tests.yml
@@ -50,8 +50,8 @@ jobs:
       id: environment
       run: echo "::set-output name=sha_short::$(git rev-parse --short ${{ github.sha }})"
 
-    - name: Write custom settings.json with loglevel WARN
-      run: "sed 's/\"loglevel\": \"INFO\",/\"loglevel\": \"WARN\",/' < settings.json.template > settings.json"
+    - name: Create settings.json
+      run: cp settings.json.template settings.json
 
     - name: Write custom settings.json that enables the Admin UI tests
       run: "sed -i 's/\"enableAdminUITests\": false/\"enableAdminUITests\": true,\\n\"users\":{\"admin\":{\"password\":\"changeme\",\"is_admin\":true}}/' settings.json"
diff --git a/.github/workflows/frontend-tests.yml b/.github/workflows/frontend-tests.yml
index 99d7bd0f..c5c99bd7 100644
--- a/.github/workflows/frontend-tests.yml
+++ b/.github/workflows/frontend-tests.yml
@@ -28,8 +28,8 @@ jobs:
       id: environment
       run: echo "::set-output name=sha_short::$(git rev-parse --short ${{ github.sha }})"
 
-    - name: Write custom settings.json with loglevel WARN
-      run: "sed 's/\"loglevel\": \"INFO\",/\"loglevel\": \"WARN\",/' < settings.json.template > settings.json"
+    - name: Create settings.json
+      run: cp settings.json.template settings.json
 
     - uses: saucelabs/sauce-connect-action@v1.1.2
       with:
@@ -99,8 +99,8 @@ jobs:
       id: environment
       run: echo "::set-output name=sha_short::$(git rev-parse --short ${{ github.sha }})"
 
-    - name: Write custom settings.json with loglevel WARN
-      run: "sed 's/\"loglevel\": \"INFO\",/\"loglevel\": \"WARN\",/' < settings.json.template > settings.json"
+    - name: Create settings.json
+      run: cp settings.json.template settings.json
 
     - name: Write custom settings.json that enables the Admin UI tests
       run: "sed -i 's/\"enableAdminUITests\": false/\"enableAdminUITests\": true,\\n\"users\":{\"admin\":{\"password\":\"changeme\",\"is_admin\":true}}/' settings.json"

From 644c8e6195de161b709b377651533666c5bfa044 Mon Sep 17 00:00:00 2001
From: Richard Hansen <rhansen@rhansen.org>
Date: Mon, 22 Feb 2021 04:10:49 -0500
Subject: [PATCH 092/115] CI: Disable frontend admin tests for non-admin
 workflow

---
 .github/workflows/frontend-tests.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.github/workflows/frontend-tests.yml b/.github/workflows/frontend-tests.yml
index c5c99bd7..df67d3f6 100644
--- a/.github/workflows/frontend-tests.yml
+++ b/.github/workflows/frontend-tests.yml
@@ -102,9 +102,6 @@ jobs:
     - name: Create settings.json
       run: cp settings.json.template settings.json
 
-    - name: Write custom settings.json that enables the Admin UI tests
-      run: "sed -i 's/\"enableAdminUITests\": false/\"enableAdminUITests\": true,\\n\"users\":{\"admin\":{\"password\":\"changeme\",\"is_admin\":true}}/' settings.json"
-
       # XXX we should probably run all tests, because plugins could effect their results
     - name: Remove standard frontend test files, so only plugin tests are run
       run: rm src/tests/frontend/specs/*

From e9cb1692eb14f3d67f0dee3c728ea1f4fa54670a Mon Sep 17 00:00:00 2001
From: Richard Hansen <rhansen@rhansen.org>
Date: Mon, 22 Feb 2021 04:12:33 -0500
Subject: [PATCH 093/115] CI: Disable import/export rate limiting for frontend
 tests

---
 .github/workflows/frontend-tests.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.github/workflows/frontend-tests.yml b/.github/workflows/frontend-tests.yml
index df67d3f6..1b57f651 100644
--- a/.github/workflows/frontend-tests.yml
+++ b/.github/workflows/frontend-tests.yml
@@ -31,6 +31,10 @@ jobs:
     - name: Create settings.json
       run: cp settings.json.template settings.json
 
+    - name: Disable import/export rate limiting
+      run: |
+        sed -e '/^ *"importExportRateLimiting":/,/^ *\}/ s/"max":.*/"max": 0/' -i settings.json
+
     - uses: saucelabs/sauce-connect-action@v1.1.2
       with:
         username: ${{ secrets.SAUCE_USERNAME }}
@@ -102,6 +106,10 @@ jobs:
     - name: Create settings.json
       run: cp settings.json.template settings.json
 
+    - name: Disable import/export rate limiting
+      run: |
+        sed -e '/^ *"importExportRateLimiting":/,/^ *\}/ s/"max":.*/"max": 0/' -i settings.json
+
       # XXX we should probably run all tests, because plugins could effect their results
     - name: Remove standard frontend test files, so only plugin tests are run
       run: rm src/tests/frontend/specs/*

From 8364546e70f15e3581ab47cc5f20de7f43b6350f Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Fri, 19 Feb 2021 13:24:54 +0000
Subject: [PATCH 094/115] tests: fix importexport tests

The testing approach was redone to fix numerous issues:
  * Even if the tests had been working, none of them would have caught
    https://github.com/ether/etherpad-lite/issues/4808 because they
    didn't exercise the client-side import logic. Now they do.
  * Follow-up logic was not in the `helper.waitFor()` callback like it
    should have been. Now the code uses `async` and `await` to ensure
    proper execution order.
  * All `$.ajax()` calls used `async: false`. Now they're properly
    asynchronous.
  * The `helper.waitFor()` condition callbacks threw instead of
    returning false.
  * The string comparisons didn't allow for different attribute
    order (e.g., `<ol start="1" class="list-number1">` vs. `<ol
    class="list-number1" start="1">`). Now `Node.isEqualNode()` is
    used to reduce fragility. (`Node.isEqualNode()` is not perfect, so
    the tests are still a bit fragile: If class names or style strings
    are in a different order then `Node.isEqualNode()` will return
    false even if the nodes are semantically equivalent.)

Co-authored-by: Richard Hansen <rhansen@rhansen.org>
---
 src/tests/frontend/specs/importexport.js | 917 +++++++++++++++--------
 1 file changed, 596 insertions(+), 321 deletions(-)

diff --git a/src/tests/frontend/specs/importexport.js b/src/tests/frontend/specs/importexport.js
index 4eb95eeb..73798eca 100644
--- a/src/tests/frontend/specs/importexport.js
+++ b/src/tests/frontend/specs/importexport.js
@@ -1,329 +1,604 @@
 'use strict';
 
-describe('import functionality', function () {
-  beforeEach(function (cb) {
-    helper.newPad(cb); // creates a new pad
-    this.timeout(60000);
-  });
-
-  function getinnertext() {
-    const inner = helper.padInner$;
-    if (!inner) {
-      return '';
-    }
-    let newtext = '';
-    inner('div').each((line, el) => {
-      newtext += `${el.innerHTML}\n`;
-    });
-    return newtext;
-  }
-  function importrequest(data, importurl, type) {
-    let error;
-    const result = $.ajax({
-      url: importurl,
-      type: 'post',
-      processData: false,
-      async: false,
-      contentType: 'multipart/form-data; boundary=boundary',
-      accepts: {
-        text: 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8',
-      },
-      data: [
-        'Content-Type: multipart/form-data; boundary=--boundary',
-        '',
-        '--boundary',
-        `Content-Disposition: form-data; name="file"; filename="import.${type}"`,
-        'Content-Type: text/plain',
-        '',
-        data,
-        '',
-        '--boundary',
-      ].join('\r\n'),
-      error(res) {
-        error = res;
-      },
-    });
-    expect(error).to.be(undefined);
-    return result;
-  }
-  function exportfunc(link) {
-    const exportresults = [];
-    $.ajaxSetup({
-      async: false,
-    });
-    $.get(`${link}/export/html`, (data) => {
-      const start = data.indexOf('<body>');
-      const end = data.indexOf('</body>');
-      const html = data.substr(start + 6, end - start - 6);
-      exportresults.push(['html', html]);
-    });
-    $.get(`${link}/export/txt`, (data) => {
-      exportresults.push(['txt', data]);
-    });
-    return exportresults;
-  }
-
-  xit('import a pad with newlines from txt', function (done) {
-    const importurl = `${helper.padChrome$.window.location.href}/import`;
-    const textWithNewLines = 'imported text\nnewline';
-    importrequest(textWithNewLines, importurl, 'txt');
-    helper.waitFor(() => expect(getinnertext())
-        .to.be('<span class="">imported text</span>\n<span class="">newline</span>\n<br>\n'));
-    const results = exportfunc(helper.padChrome$.window.location.href);
-    expect(results[0][1]).to.be('imported text<br>newline<br><br>');
-    expect(results[1][1]).to.be('imported text\nnewline\n\n');
-    done();
-  });
-  xit('import a pad with newlines from html', function (done) {
-    const importurl = `${helper.padChrome$.window.location.href}/import`;
-    const htmlWithNewLines = '<html><body>htmltext<br/>newline</body></html>';
-    importrequest(htmlWithNewLines, importurl, 'html');
-    helper.waitFor(() => expect(getinnertext())
-        .to.be('<span class="">htmltext</span>\n<span class="">newline</span>\n<br>\n'));
-    const results = exportfunc(helper.padChrome$.window.location.href);
-    expect(results[0][1]).to.be('htmltext<br>newline<br><br>');
-    expect(results[1][1]).to.be('htmltext\nnewline\n\n');
-    done();
-  });
-  xit('import a pad with attributes from html', function (done) {
-    const importurl = `${helper.padChrome$.window.location.href}/import`;
-    const htmlWithNewLines = '<html><body>htmltext<br/><span class="b s i u">' +
-        '<b><i><s><u>newline</u></s></i></b></body></html>';
-    importrequest(htmlWithNewLines, importurl, 'html');
-    helper.waitFor(() => expect(getinnertext())
-        .to.be('<span class="">htmltext</span>\n<span class="b i s u">' +
-          '<b><i><s><u>newline</u></s></i></b></span>\n<br>\n'));
-    const results = exportfunc(helper.padChrome$.window.location.href);
-    expect(results[0][1])
-        .to.be('htmltext<br><strong><em><s><u>newline</u></s></em></strong><br><br>');
-    expect(results[1][1]).to.be('htmltext\nnewline\n\n');
-    done();
-  });
-  xit('import a pad with bullets from html', function (done) {
-    const importurl = `${helper.padChrome$.window.location.href}/import`;
-    const htmlWithBullets = '<html><body><ul class="list-bullet1"><li>bullet line 1</li>' +
-      '<li>bullet line 2</li><ul class="list-bullet2"><li>bullet2 line 1</li>' +
-      '<li>bullet2 line 2</li></ul></ul></body></html>';
-    importrequest(htmlWithBullets, importurl, 'html');
-    helper.waitFor(() => expect(getinnertext()).to.be(
-        '<ul class="list-bullet1"><li><span class="">bullet line 1</span></li></ul>\n' +
-        '<ul class="list-bullet1"><li><span class="">bullet line 2</span></li></ul>\n' +
-        '<ul class="list-bullet2"><li><span class="">bullet2 line 1</span></li></ul>\n' +
-        '<ul class="list-bullet2"><li><span class="">bullet2 line 2</span></li></ul>\n' +
-        '<br>\n'));
-    const results = exportfunc(helper.padChrome$.window.location.href);
-    expect(results[0][1]).to.be(
-        '<ul class="bullet"><li>bullet line 1</li><li>bullet line 2</li>' +
-        '<ul class="bullet"><li>bullet2 line 1</li><li>bullet2 line 2</li></ul></ul><br>');
-    expect(results[1][1])
-        .to.be('\t* bullet line 1\n\t* bullet line 2\n' +
-        '\t\t* bullet2 line 1\n\t\t* bullet2 line 2\n\n');
-    done();
-  });
-  xit('import a pad with bullets and newlines from html', function (done) {
-    const importurl = `${helper.padChrome$.window.location.href}/import`;
-    const htmlWithBullets = '<html><body><ul class="list-bullet1"><li>bullet line 1</li>' +
-        '</ul><br/><ul class="list-bullet1"><li>bullet line 2</li><ul class="list-bullet2">' +
-        '<li>bullet2 line 1</li></ul></ul><br/><ul class="list-bullet1">' +
-        '<ul class="list-bullet2"><li>bullet2 line 2</li></ul></ul></body></html>';
-    importrequest(htmlWithBullets, importurl, 'html');
-    helper.waitFor(() => expect(getinnertext()).to.be(
-        '<ul class="list-bullet1"><li><span class="">bullet line 1</span></li></ul>\n' +
-        '<br>\n' +
-        '<ul class="list-bullet1"><li><span class="">bullet line 2</span></li></ul>\n' +
-        '<ul class="list-bullet2"><li><span class="">bullet2 line 1</span></li></ul>\n' +
-        '<br>\n' +
-        '<ul class="list-bullet2"><li><span class="">bullet2 line 2</span></li></ul>\n' +
-        '<br>\n'));
-    const results = exportfunc(helper.padChrome$.window.location.href);
-    expect(results[0][1]).to.be(
-        '<ul class="bullet"><li>bullet line 1</li></ul><br><ul class="bullet">' +
-        '<li>bullet line 2</li><ul class="bullet"><li>bullet2 line 1</li></ul>' +
-        '</ul><br><ul><ul class="bullet"><li>bullet2 line 2</li></ul></ul><br>');
-    expect(results[1][1]).to.be(
-        '\t* bullet line 1\n\n\t* bullet line 2\n\t\t* bullet2 line 1\n\n\t\t* bullet2 line 2\n\n');
-    done();
-  });
-  xit('import a pad with bullets and newlines and attributes from html', function (done) {
-    const importurl = `${helper.padChrome$.window.location.href}/import`;
-    const htmlWithBullets = '<html><body><ul class="list-bullet1"><li>bullet line 1</li>' +
-        '</ul><br/><ul class="list-bullet1"><li>bullet line 2</li>' +
-        '<ul class="list-bullet2"><li>bullet2 line 1</li></ul></ul>' +
-        '<br/><ul class="list-bullet1"><ul class="list-bullet2"><ul class="list-bullet3">' +
-        '<ul class="list-bullet4"><li><span class="b s i u"><b><i>' +
-        '<s><u>bullet4 line 2 bisu</u></s></i></b></span></li><li>' +
-        '<span class="b s "><b><s>bullet4 line 2 bs</s></b></span></li>' +
-        '<li><span class="u"><u>bullet4 line 2 u</u></span><span class="u i s">' +
-        '<i><s><u>uis</u></s></i></span></li></ul></ul></ul></ul></body></html>';
-    importrequest(htmlWithBullets, importurl, 'html');
-    helper.waitFor(() => expect(getinnertext()).to.be(
-        '<ul class="list-bullet1"><li><span class="">bullet line 1</span></li></ul>\n<br>\n' +
-        '<ul class="list-bullet1"><li><span class="">bullet line 2</span></li></ul>\n' +
-        '<ul class="list-bullet2"><li><span class="">bullet2 line 1</span></li></ul>\n<br>\n' +
-        '<ul class="list-bullet4"><li><span class="b i s u">' +
-        '<b><i><s><u>bullet4 line 2 bisu</u></s></i></b></span></li></ul>\n' +
-        '<ul class="list-bullet4"><li><span class="b s">' +
-        '<b><s>bullet4 line 2 bs</s></b></span></li></ul>\n' +
-        '<ul class="list-bullet4"><li><span class="u"><u>bullet4 line 2 u</u>' +
-        '</span><span class="i s u"><i><s><u>uis</u></s></i></span></li></ul>\n' +
-        '<br>\n'));
-    const results = exportfunc(helper.padChrome$.window.location.href);
-    expect(results[0][1]).to.be(
-        '<ul class="bullet"><li>bullet line 1</li></ul>' +
-        '<br><ul class="bullet"><li>bullet line 2</li><ul class="bullet"><li>bullet2 line 1</li>' +
-        '</ul></ul><br><ul><ul><ul><ul class="bullet"><li><strong><em><s><u>bullet4 line 2 bisu' +
-        '</u></s></em></strong></li><li><strong><s>bullet4 line 2 bs</s></strong>' +
-        '</li><li><u>bullet4 line 2 u<em><s>uis</s></em></u></li></ul></ul></ul></ul><br>');
-    expect(results[1][1]).to.be(
-        '\t* bullet line 1\n\n\t* bullet line 2\n\t\t* bullet2 line 1\n\n\t\t\t\t* bullet4 line 2' +
-        ' bisu\n\t\t\t\t* bullet4 line 2 bs\n\t\t\t\t* bullet4 line 2 uuis\n\n');
-    done();
-  });
-  xit('import a pad with nested bullets from html', function (done) {
-    const importurl = `${helper.padChrome$.window.location.href}/import`;
-    const htmlWithBullets = '<html><body><ul class="list-bullet1"><li>bullet line 1</li>' +
-    '</ul><ul class="list-bullet1"><li>bullet line 2</li><ul class="list-bullet2">' +
-    '<li>bullet2 line 1</li></ul></ul><ul class="list-bullet1"><ul class="list-bullet2">' +
-    '<ul class="list-bullet3"><ul class="list-bullet4"><li>bullet4 line 2</li>' +
-    '<li>bullet4 line 2</li><li>bullet4 line 2</li></ul><li>bullet3 line 1</li></ul>' +
-    '</ul><li>bullet2 line 1</li></ul></body></html>';
-    importrequest(htmlWithBullets, importurl, 'html');
-    const oldtext = getinnertext();
-    helper.waitFor(() => oldtext !== getinnertext()
-        //      return expect(getinnertext()).to.be('\
-        // <ul class="list-bullet1"><li><span class="">bullet line 1</span></li></ul>\n\
-        // <ul class="list-bullet1"><li><span class="">bullet line 2</span></li></ul>\n\
-        // <ul class="list-bullet2"><li><span class="">bullet2 line 1</span></li></ul>\n\
-        // <ul class="list-bullet4"><li><span class="">bullet4 line 2</span></li></ul>\n\
-        // <ul class="list-bullet4"><li><span class="">bullet4 line 2</span></li></ul>\n\
-        // <ul class="list-bullet4"><li><span class="">bullet4 line 2</span></li></ul>\n\
-        // <br>\n')
-    );
-
-    const results = exportfunc(helper.padChrome$.window.location.href);
-    expect(results[0][1]).to.be(
-        '<ul class="bullet"><li>bullet line 1</li><li>bullet line 2</li>' +
-        '<ul class="bullet"><li>bullet2 line 1</li><ul><ul class="bullet"><li>bullet4 line 2</li>' +
-        '<li>bullet4 line 2</li><li>bullet4 line 2</li></ul><li>bullet3 line 1</li></ul></ul>' +
-        '<li>bullet2 line 1</li></ul><br>');
-    expect(results[1][1]).to.be(
-        '\t* bullet line 1\n\t* bullet line 2\n\t\t* bullet2 line 1\n\t\t\t\t* bullet4 line 2' +
-        '\n\t\t\t\t* bullet4 line 2\n\t\t\t\t* bullet4 line 2\n\t\t\t* bullet3 line 1' +
-        '\n\t* bullet2 line 1\n\n');
-    done();
-  });
-  xit('import with 8 levels of bullets and newlines and attributes from html', function (done) {
-    const importurl = `${helper.padChrome$.window.location.href}/import`;
-    const htmlWithBullets =
-        '<html><body><ul class="list-bullet1"><li>bullet line 1</li>' +
-        '</ul><br/><ul class="list-bullet1"><li>bullet line 2</li><ul class="list-bullet2"><li>' +
-        'bullet2 line 1</li></ul></ul><br/><ul class="list-bullet1"><ul class="list-bullet2">' +
-        '<ul class="list-bullet3"><ul class="list-bullet4"><li><span class="b s i u"><b><i>' +
-        '<s><u>bullet4 line 2 bisu</u></s></i></b></span></li><li><span class="b s "><b><s>' +
-        'bullet4 line 2 bs</s></b></span></li><li><span class="u"><u>bullet4 line 2 u' +
-        '</u></span><span class="u i s"><i><s><u>uis</u></s></i></span></li>' +
-        '<ul class="list-bullet5"><ul class="list-bullet6"><ul class="list-bullet7">' +
-        '<ul class="list-bullet8"><li><span class="">foo</span></li><li><span class="b s">' +
-        '<b><s>foobar bs</b></s></span></li></ul></ul></ul></ul><ul class="list-bullet5">' +
-        '<li>foobar</li></ul></ul></ul></ul></body></html>';
-    importrequest(htmlWithBullets, importurl, 'html');
-    helper.waitFor(() => expect(getinnertext()).to.be(
-        '<ul class="list-bullet1"><li><span class="">bullet line 1</span></li></ul>\n<br>\n' +
-        '<ul class="list-bullet1"><li><span class="">bullet line 2</span></li></ul>\n' +
-        '<ul class="list-bullet2"><li><span class="">bullet2 line 1</span></li></ul>\n<br>\n' +
-        '<ul class="list-bullet4"><li><span class="b i s u"><b><i><s><u>bullet4 line 2 bisu</u>' +
-        '</s></i></b></span></li></ul>\n' +
-        '<ul class="list-bullet4"><li><span class="b s"><b><s>bullet4 line 2 bs</s></b>' +
-        '</span></li></ul>\n' +
+describe('importexport.js', function () {
+  const testCases = [
+    {
+      name: 'text with newlines',
+      inputText: [
+        'imported text\n',
+        'newline',
+      ].join(''),
+      wantPadLines: [
+        '<span class="">imported text</span>',
+        '<span class="">newline</span>',
+      ],
+      wantExportHtmlBody: [
+        'imported text<br>',
+        'newline<br>',
+      ].join(''),
+      wantExportText: [
+        'imported text\n',
+        'newline\n',
+      ].join(''),
+    },
+    {
+      name: 'HTML with newlines',
+      inputHtmlBody: [
+        'htmltext<br>',
+        'newline',
+      ].join(''),
+      wantPadLines: [
+        '<span class="">htmltext</span>',
+        '<span class="">newline</span>',
+        '<br>',
+      ],
+      wantExportHtmlBody: [
+        'htmltext<br>',
+        'newline<br>',
+        '<br>',
+      ].join(''),
+      wantExportText: [
+        'htmltext\n',
+        'newline\n',
+        '\n',
+      ].join(''),
+    },
+    {
+      name: 'HTML with attributes',
+      inputHtmlBody: [
+        'htmltext<br>',
+        '<span class="b s i u"><b><i><s><u>newline</u></s></i></b>',
+      ].join(''),
+      wantPadLines: [
+        '<span class="">htmltext</span>',
+        '<span class="b i s u"><b><i><s><u>newline</u></s></i></b></span>',
+        '<br>',
+      ],
+      wantExportHtmlBody: [
+        'htmltext<br>',
+        '<strong><em><s><u>newline</u></s></em></strong><br>',
+        '<br>',
+      ].join(''),
+      wantExportText: [
+        'htmltext\n',
+        'newline\n',
+        '\n',
+      ].join(''),
+    },
+    {
+      name: 'HTML with bullets',
+      inputHtmlBody: [
+        '<ul class="list-bullet1">',
+        ' <li>bullet line 1</li>',
+        ' <li>bullet line 2',
+        '  <ul class="list-bullet2">',
+        '   <li>bullet2 line 1</li>',
+        '   <li>bullet2 line 2</li>',
+        '  </ul>',
+        ' </li>',
+        '</ul>',
+      ].join(''),
+      wantPadLines: [
+        '<ul class="list-bullet1"><li><span class="">bullet line 1</span></li></ul>',
+        '<ul class="list-bullet1"><li><span class="">bullet line 2</span></li></ul>',
+        '<ul class="list-bullet2"><li><span class="">bullet2 line 1</span></li></ul>',
+        '<ul class="list-bullet2"><li><span class="">bullet2 line 2</span></li></ul>',
+        '<br>',
+      ],
+      wantExportHtmlBody: [
+        '<ul class=bullet>',
+        ' <li>bullet line 1</li>',
+        ' <li>bullet line 2',
+        '  <ul class=bullet>',
+        '   <li>bullet2 line 1</li>',
+        '   <li>bullet2 line 2</li>',
+        '  </ul>',
+        ' </li>',
+        '</ul>',
+        '<br>',
+      ].map((l) => l.replace(/^\s+/, '')).join(''),
+      wantExportText: [
+        '\t* bullet line 1\n',
+        '\t* bullet line 2\n',
+        '\t\t* bullet2 line 1\n',
+        '\t\t* bullet2 line 2\n',
+        '\n',
+      ].join(''),
+    },
+    {
+      name: 'HTML with bullets and newlines',
+      inputHtmlBody: [
+        '<ul class="list-bullet1">',
+        ' <li>bullet line 1</li>',
+        '</ul>',
+        '<br>',
+        '<ul class="list-bullet1">',
+        ' <li>bullet line 2',
+        '  <ul class="list-bullet2">',
+        '   <li>bullet2 line 1</li>',
+        '  </ul>',
+        ' </li>',
+        '</ul>',
+        '<br>',
+        '<ul class="list-bullet1">',
+        ' <li>',
+        '  <ul class="list-bullet2">',
+        '   <li>bullet2 line 2</li>',
+        '  </ul>',
+        ' </li>',
+        '</ul>',
+      ].join(''),
+      wantPadLines: [
+        '<ul class="list-bullet1"><li><span class="">bullet line 1</span></li></ul>',
+        '<br>',
+        '<ul class="list-bullet1"><li><span class="">bullet line 2</span></li></ul>',
+        '<ul class="list-bullet2"><li><span class="">bullet2 line 1</span></li></ul>',
+        '<br>',
+        '<ul class="list-bullet2"><li><span class="">bullet2 line 2</span></li></ul>',
+        '<br>',
+      ],
+      wantExportHtmlBody: [
+        '<ul class=bullet>',
+        ' <li>bullet line 1</li>',
+        '</ul>',
+        '<br>',
+        '<ul class=bullet>',
+        ' <li>bullet line 2',
+        '  <ul class=bullet>',
+        '   <li>bullet2 line 1</li>',
+        '  </ul>',
+        ' </li>',
+        '</ul>',
+        '<br>',
+        '<ul class=bullet>',
+        ' <li>',
+        '  <ul class=bullet>',
+        '   <li>bullet2 line 2</li>',
+        '  </ul>',
+        ' </li>',
+        '</ul>',
+        '<br>',
+      ].map((l) => l.replace(/^\s+/, '')).join(''),
+      wantExportText: [
+        '\t* bullet line 1\n',
+        '\n',
+        '\t* bullet line 2\n',
+        '\t\t* bullet2 line 1\n',
+        '\n',
+        '\t\t* bullet2 line 2\n',
+        '\n',
+      ].join(''),
+    },
+    {
+      name: 'HTML with bullets, newlines, and attributes',
+      inputHtmlBody: [
+        '<ul class="list-bullet1">',
+        ' <li>bullet line 1</li>',
+        '</ul>',
+        '<br>',
+        '<ul class="list-bullet1">',
+        ' <li>bullet line 2',
+        '  <ul class="list-bullet2">',
+        '   <li>bullet2 line 1</li>',
+        '  </ul>',
+        ' </li>',
+        '</ul>',
+        '<br>',
+        '<ul class="list-bullet1">',
+        ' <li>',
+        '  <ul class="list-bullet2">',
+        '   <li>',
+        '    <ul class="list-bullet3">',
+        '     <li>',
+        '      <ul class="list-bullet4">',
+        '       <li><span class="b s i u"><b><i><s><u>bullet4 line 2 bisu</u>' +
+                   '</s></i></b></span></li>',
+        '       <li><span class="b s "><b><s>bullet4 line 2 bs</s></b></span></li>',
+        '       <li><span class="u"><u>bullet4 line 2 u</u></span>' +
+                   '<span class="u i s"><i><s><u>uis</u></s></i></span></li>',
+        '      </ul>',
+        '     </li>',
+        '    </ul>',
+        '   </li>',
+        '  </ul>',
+        ' </li>',
+        '</ul>',
+      ].join(''),
+      wantPadLines: [
+        '<ul class="list-bullet1"><li><span class="">bullet line 1</span></li></ul>',
+        '<br>',
+        '<ul class="list-bullet1"><li><span class="">bullet line 2</span></li></ul>',
+        '<ul class="list-bullet2"><li><span class="">bullet2 line 1</span></li></ul>',
+        '<br>',
+        '<ul class="list-bullet4"><li><span class="b i s u"><b><i><s><u>' +
+            'bullet4 line 2 bisu</u></s></i></b></span></li></ul>',
+        '<ul class="list-bullet4"><li><span class="b s"><b><s>bullet4 line 2 bs</s>' +
+            '</b></span></li></ul>',
         '<ul class="list-bullet4"><li><span class="u"><u>bullet4 line 2 u</u></span>' +
-        '<span class="i s u"><i><s><u>uis</u></s>' +
-        '</i></span></li></ul>\n' +
-        '<ul class="list-bullet8"><li><span class="">foo</span></li></ul>\n' +
-        '<ul class="list-bullet8"><li><span class="b s"><b><s>foobar bs</s></b>' +
-        '</span></li></ul>\n' +
-        '<ul class="list-bullet5"><li><span class="">foobar</span></li></ul>\n' +
-        '<br>\n'));
-    const results = exportfunc(helper.padChrome$.window.location.href);
-    expect(results[0][1]).to.be(
-        '<ul class="bullet"><li>bullet line 1</li></ul><br><ul class="bullet">' +
-        '<li>bullet line 2</li><ul class="bullet"><li>bullet2 line 1</li></ul></ul>' +
-        '<br><ul><ul><ul><ul class="bullet"><li><strong><em><s><u>' +
-        'bullet4 line 2 bisu</u></s></em></strong></li><li><strong><s>' +
-        'bullet4 line 2 bs</s></strong></li><li><u>bullet4 line 2 u<em>' +
-        '<s>uis</s></em></u></li><ul><ul><ul><ul class="bullet"><li>foo</li>' +
-        '<li><strong><s>foobar bs</s></strong></li></ul></ul></ul><li>foobar</li>' +
-        '</ul></ul></ul></ul></ul><br>');
-    expect(results[1][1]).to.be(
-        '\t* bullet line 1\n\n\t* bullet line 2\n\t\t* ' +
-        'bullet2 line 1\n\n\t\t\t\t* bullet4 line 2 bisu\n\t\t\t\t* bullet4 line 2 ' +
-        'bs\n\t\t\t\t* bullet4 line 2 uuis\n\t\t\t\t\t\t\t\t* foo\n\t\t\t\t\t\t\t\t* ' +
-        'foobar bs\n\t\t\t\t\t* foobar\n\n');
-    done();
+            '<span class="i s u"><i><s><u>uis</u></s></i></span></li></ul>',
+        '<br>',
+      ],
+      wantExportHtmlBody: [
+        '<ul class=bullet><li>bullet line 1</li></ul>',
+        '<br>',
+        '<ul class=bullet>',
+        ' <li>bullet line 2',
+        '  <ul class=bullet><li>bullet2 line 1</li></ul>',
+        ' </li>',
+        '</ul>',
+        '<br>',
+        '<ul class=bullet>',
+        ' <li>',
+        '  <ul class=bullet>',
+        '   <li>',
+        '    <ul class=bullet>',
+        '     <li>',
+        '      <ul class=bullet>',
+        '       <li><strong><em><s><u>bullet4 line 2 bisu</u></s></em></strong></li>',
+        '       <li><strong><s>bullet4 line 2 bs</s></strong></li>',
+        '       <li><u>bullet4 line 2 u<em><s>uis</s></em></u></li>',
+        '      </ul>',
+        '     </li>',
+        '    </ul>',
+        '   </li>',
+        '  </ul>',
+        ' </li>',
+        '</ul>',
+        '<br>',
+      ].map((l) => l.replace(/^\s+/, '')).join(''),
+      wantExportText: [
+        '\t* bullet line 1\n',
+        '\n',
+        '\t* bullet line 2\n',
+        '\t\t* bullet2 line 1\n',
+        '\n',
+        '\t\t\t\t* bullet4 line 2 bisu\n',
+        '\t\t\t\t* bullet4 line 2 bs\n',
+        '\t\t\t\t* bullet4 line 2 uuis\n',
+        '\n',
+      ].join(''),
+    },
+    {
+      name: 'HTML with nested bullets',
+      inputHtmlBody: [
+        '<ul class="list-bullet1"><li>bullet line 1</li></ul>',
+        '<ul class="list-bullet1">',
+        ' <li>bullet line 2',
+        '  <ul class="list-bullet2">',
+        '   <li>bullet2 line 1</li>',
+        '  </ul>',
+        ' </li>',
+        '</ul>',
+        '<ul class="list-bullet1">',
+        ' <li>',
+        '  <ul class="list-bullet2">',
+        '   <li>',
+        '    <ul class="list-bullet3">',
+        '     <li>',
+        '      <ul class="list-bullet4">',
+        '       <li>bullet4 line 2</li>',
+        '       <li>bullet4 line 2</li>',
+        '       <li>bullet4 line 2</li>',
+        '      </ul>',
+        '     </li>',
+        '     <li>bullet3 line 1</li>',
+        '    </ul>',
+        '   </li>',
+        '  </ul>',
+        ' </li>',
+        '</ul>',
+      ].join(''),
+      wantPadLines: [
+        '<ul class="list-bullet1"><li><span class="">bullet line 1</span></li></ul>',
+        '<ul class="list-bullet1"><li><span class="">bullet line 2</span></li></ul>',
+        '<ul class="list-bullet2"><li><span class="">bullet2 line 1</span></li></ul>',
+        '<ul class="list-bullet4"><li><span class="">bullet4 line 2</span></li></ul>',
+        '<ul class="list-bullet4"><li><span class="">bullet4 line 2</span></li></ul>',
+        '<ul class="list-bullet4"><li><span class="">bullet4 line 2</span></li></ul>',
+        '<ul class="list-bullet3"><li><span class="">bullet3 line 1</span></li></ul>',
+        '<br>',
+      ],
+      wantExportHtmlBody: [
+        '<ul class=bullet>',
+        ' <li>bullet line 1</li>',
+        ' <li>bullet line 2',
+        '  <ul class=bullet>',
+        '   <li>bullet2 line 1',
+        '    <ul class=bullet>',
+        '     <li>',
+        '      <ul class=bullet>',
+        '       <li>bullet4 line 2</li>',
+        '       <li>bullet4 line 2</li>',
+        '       <li>bullet4 line 2</li>',
+        '      </ul>',
+        '     </li>',
+        '     <li>bullet3 line 1</li>',
+        '    </ul>',
+        '   </li>',
+        '  </ul>',
+        ' </li>',
+        '</ul>',
+        '<br>',
+      ].map((l) => l.replace(/^\s+/, '')).join(''),
+      wantExportText: [
+        '\t* bullet line 1\n',
+        '\t* bullet line 2\n',
+        '\t\t* bullet2 line 1\n',
+        '\t\t\t\t* bullet4 line 2\n',
+        '\t\t\t\t* bullet4 line 2\n',
+        '\t\t\t\t* bullet4 line 2\n',
+        '\t\t\t* bullet3 line 1\n',
+        '\n',
+      ].join(''),
+    },
+    {
+      name: 'HTML with 8 levels of bullets, newlines, and attributes',
+      inputHtmlBody: [
+        '<ul class="list-bullet1">',
+        ' <li>bullet line 1</li>',
+        '</ul>',
+        '<br>',
+        '<ul class="list-bullet1">',
+        ' <li>bullet line 2',
+        '  <ul class="list-bullet2">',
+        '   <li>bullet2 line 1</li>',
+        '  </ul>',
+        ' </li>',
+        '</ul>',
+        '<br>',
+        '<ul class="list-bullet1">',
+        ' <li>',
+        '  <ul class="list-bullet2">',
+        '   <li>',
+        '    <ul class="list-bullet3">',
+        '     <li>',
+        '      <ul class="list-bullet4">',
+        '       <li><span class="b s i u"><b><i><s><u>bullet4 line 2 bisu' +
+                   '</u></s></i></b></span></li>',
+        '       <li><span class="b s "><b><s>bullet4 line 2 bs</s></b></span></li>',
+        '       <li><span class="u"><u>bullet4 line 2 u</u></span>' +
+                   '<span class="u i s"><i><s><u>uis</u></s></i></span></li>',
+        '       <li>',
+        '        <ul class="list-bullet5">',
+        '         <li>',
+        '          <ul class="list-bullet6">',
+        '           <li>',
+        '            <ul class="list-bullet7">',
+        '             <li>',
+        '              <ul class="list-bullet8">',
+        '               <li><span class="">foo</span></li>',
+        '               <li><span class="b s"><b><s>foobar bs</b></s></span></li>',
+        '              </ul>',
+        '             </li>',
+        '            </ul>',
+        '           </li>',
+        '          </ul>',
+        '         </li>',
+        '        </ul>',
+        '       </li>',
+        '       <li>',
+        '        <ul class="list-bullet5">',
+        '         <li>foobar</li>',
+        '        </ul>',
+        '       </li>',
+        '      </ul>',
+        '     </li>',
+        '    </ul>',
+        '   </li>',
+        '  </ul>',
+        ' </li>',
+        '</ul>',
+      ].join(''),
+      wantPadLines: [
+        '<ul class="list-bullet1"><li><span class="">bullet line 1</span></li></ul>',
+        '<br>',
+        '<ul class="list-bullet1"><li><span class="">bullet line 2</span></li></ul>',
+        '<ul class="list-bullet2"><li><span class="">bullet2 line 1</span></li></ul>',
+        '<br>',
+        '<ul class="list-bullet4"><li><span class="b i s u"><b><i><s><u>' +
+            'bullet4 line 2 bisu</u></s></i></b></span></li></ul>',
+        '<ul class="list-bullet4"><li><span class="b s"><b><s>bullet4 line 2 bs</s>' +
+            '</b></span></li></ul>',
+        '<ul class="list-bullet4"><li><span class="u"><u>bullet4 line 2 u</u></span>' +
+            '<span class="i s u"><i><s><u>uis</u></s></i></span></li></ul>',
+        '<ul class="list-bullet8"><li><span class="">foo</span></li></ul>',
+        '<ul class="list-bullet8"><li><span class="b s"><b><s>foobar bs</s></b></span></li></ul>',
+        '<ul class="list-bullet5"><li><span class="">foobar</span></li></ul>',
+        '<br>',
+      ],
+      wantExportHtmlBody: [
+        '<ul class=bullet>',
+        ' <li>bullet line 1</li>',
+        '</ul>',
+        '<br>',
+        '<ul class=bullet>',
+        ' <li>bullet line 2',
+        '  <ul class=bullet>',
+        '   <li>bullet2 line 1</li>',
+        '  </ul>',
+        ' </li>',
+        '</ul>',
+        '<br>',
+        '<ul class=bullet>',
+        ' <li>',
+        '  <ul class=bullet>',
+        '   <li>',
+        '    <ul class=bullet>',
+        '     <li>',
+        '      <ul class=bullet>',
+        '       <li><strong><em><s><u>bullet4 line 2 bisu</u></s></em></strong></li>',
+        '       <li><strong><s>bullet4 line 2 bs</s></strong></li>',
+        '       <li><u>bullet4 line 2 u<em><s>uis</s></em></u>',
+        '        <ul class=bullet>',
+        '         <li>',
+        '          <ul class=bullet>',
+        '           <li>',
+        '            <ul class=bullet>',
+        '             <li>',
+        '              <ul class=bullet>',
+        '               <li>foo</li>',
+        '               <li><strong><s>foobar bs</s></strong></li>',
+        '              </ul>',
+        '             </li>',
+        '            </ul>',
+        '           </li>',
+        '          </ul>',
+        '         </li>',
+        '         <li>foobar</li>',
+        '        </ul>',
+        '       </li>',
+        '      </ul>',
+        '     </li>',
+        '    </ul>',
+        '   </li>',
+        '  </ul>',
+        ' </li>',
+        '</ul>',
+        '<br>',
+      ].map((l) => l.replace(/^\s+/, '')).join(''),
+      wantExportText: [
+        '\t* bullet line 1\n',
+        '\n',
+        '\t* bullet line 2\n',
+        '\t\t* bullet2 line 1\n',
+        '\n',
+        '\t\t\t\t* bullet4 line 2 bisu\n',
+        '\t\t\t\t* bullet4 line 2 bs\n',
+        '\t\t\t\t* bullet4 line 2 uuis\n',
+        '\t\t\t\t\t\t\t\t* foo\n',
+        '\t\t\t\t\t\t\t\t* foobar bs\n',
+        '\t\t\t\t\t* foobar\n',
+        '\n',
+      ].join(''),
+    },
+    {
+      name: 'HTML with ordered lists',
+      inputHtmlBody: [
+        '<ol class="list-number1" start="1"><li>number 1 line 1</li></ol>',
+        '<ol class="list-number1" start="2"><li>number 2 line 2</li></ol>',
+      ].join(''),
+      wantPadLines: [
+        '<ol start="1" class="list-number1"><li><span class="">number 1 line 1</span></li></ol>',
+        '<ol start="2" class="list-number1"><li><span class="">number 2 line 2</span></li></ol>',
+        '<br>',
+      ],
+      wantExportHtmlBody: [
+        '<ol start=1 class=number>',
+        ' <li>number 1 line 1</li>',
+        ' <li>number 2 line 2</li>',
+        '</ol>',
+        '<br>',
+      ].map((l) => l.replace(/^\s+/, '')).join(''),
+      wantExportText: [
+        '\t1. number 1 line 1\n',
+        '\t2. number 2 line 2\n',
+        '\n',
+      ].join(''),
+    },
+  ];
+
+  let confirm;
+  before(async function () {
+    this.timeout(60000);
+    await new Promise(
+        (resolve, reject) => helper.newPad((err) => err != null ? reject(err) : resolve()));
+    confirm = helper.padChrome$.window.confirm;
+    helper.padChrome$.window.confirm = () => true;
+    // As of 2021-02-22 a mutable FileList cannot be directly created so DataTransfer is used as a
+    // hack to access a mutable FileList for testing the '<input type="file">' element. DataTransfer
+    // itself is quite new so support for it is tested here. See:
+    //   * https://github.com/whatwg/html/issues/3269
+    //   * https://stackoverflow.com/q/47119426
+    try {
+      const dt = new DataTransfer();
+      dt.items.add(new File(['testing'], 'file.txt', {type: 'text/plain'}));
+      // Supposedly all modern browsers support a settable HTMLInputElement.files property, but
+      // Firefox 52 complains.
+      helper.padChrome$('#importform input[type=file]')[0].files = dt.files;
+    } catch (err) {
+      return this.skip();
+    }
   });
 
-  xit('import a pad with ordered lists from html', function (done) {
-    const importurl = `${helper.padChrome$.window.location.href}/import`;
-    const htmlWithBullets = '<html><body><ol class="list-number1" start="1">' +
-    '<li>number 1 line 1</li></ol><ol class="list-number1" start="2">' +
-    '<li>number 2 line 2</li></ol></body></html>';
-    importrequest(htmlWithBullets, importurl, 'html');
-    console.error(getinnertext());
-    expect(getinnertext()).to.be(
-        '<ol class="list-number1" start="1"><li><span class="">number 1 line 1</span></li></ol>\n' +
-        '<ol class="list-number1" start="2"><li><span class="">number 2 line 2</span></li></ol>\n' +
-        '<br>\n');
-    const results = exportfunc(helper.padChrome$.window.location.href);
-    expect(results[0][1]).to.be(
-        '<ol class="list-number1" start="1"><li>number 1 line 1</li>' +
-        '</ol><ol class="list-number1" start="2"><li>number 2 line 2</li></ol>');
-    expect(results[1][1]).to.be('');
-    done();
+  after(async function () {
+    helper.padChrome$.window.confirm = confirm;
   });
-  xit('import a pad with ordered lists and newlines from html', function (done) {
-    const importurl = `${helper.padChrome$.window.location.href}/import`;
-    const htmlWithBullets = '<html><body><ol class="list-number1" start="1">' +
-    '<li>number 9 line 1</li></ol><br/><ol class="list-number1" start="2">' +
-    '<li>number 10 line 2</li><ol class="list-number2">' +
-    '<li>number 2 times line 1</li></ol></ol><br/><ol class="list-bullet1">' +
-    '<ol class="list-number2"><li>number 2 times line 2</li></ol></ol></body></html>';
-    importrequest(htmlWithBullets, importurl, 'html');
-    expect(getinnertext()).to.be(
-        '<ol class="list-number1" start="1"><li><span class="">number 9 line 1</span></li></ol>\n' +
-        '<br>\n' +
-        '<ol class="list-number1" start="2"><li><span class="">number 10 line 2</span></li>' +
-        '</ol>\n' +
-        '<ol class="list-number2"><li><span class="">number 2 times line 1</span></li></ol>\n' +
-        '<br>\n' +
-        '<ol class="list-number2"><li><span class="">number 2 times line 2</span></li></ol>\n' +
-        '<br>\n');
-    const results = exportfunc(helper.padChrome$.window.location.href);
-    console.error(results);
-    done();
-  });
-  xit('import with nested ordered lists and attributes and newlines from html', function (done) {
-    const importurl = `${helper.padChrome$.window.location.href}/import`;
-    const htmlWithBullets = '<html><body><ol class="list-number1" start="1"><li>' +
-        '<span class="b s i u"><b><i><s><u>bold strikethrough italics underline</u>' +
-        '</s><i/></b></span> line <span class="b"><b>1bold</b></span></li>' +
-        '</ol><br/><span class="i"><i><ol class="list-number1" start="2">' +
-        '<li>number 10 line 2</li><ol class="list-number2">' +
-        '<li>number 2 times line 1</li></ol></ol></i></span><br/>' +
-        '<ol class="list-bullet1"><ol class="list-number2">' +
-        '<li>number 2 times line 2</li></ol></ol></body></html>';
-    importrequest(htmlWithBullets, importurl, 'html');
-    expect(getinnertext()).to.be(
-        '<ol class="list-number1"><li><span class="b i s u"><b><i><s><u>' +
-        'bold strikethrough italics underline</u></s></i></b></span><span class="">' +
-        ' line </span><span class="b"><b>1bold</b></span></li></ol>\n' +
-        '<br>\n' +
-        '<ol class="list-number1"><li><span class="i"><i>number 10 line 2</i></span></li></ol>\n' +
-        '<ol class="list-number2"><li><span class="i">' +
-        '<i>number 2 times line 1</i></span></li></ol>\n' +
-        '<br>\n' +
-        '<ol class="list-number2"><li><span class="">number 2 times line 2</span></li></ol>\n' +
-        '<br>\n');
-    const results = exportfunc(helper.padChrome$.window.location.href);
-    console.error(results);
-    done();
+
+  beforeEach(async function () {
+    const popup = helper.padChrome$('#import_export');
+    const isVisible = () => popup.hasClass('popup-show');
+    if (isVisible()) return;
+    const button = helper.padChrome$('button[data-l10n-id="pad.toolbar.import_export.title"]');
+    button.click();
+    await helper.waitForPromise(isVisible);
   });
+
+  const docToHtml = (() => {
+    const s = new XMLSerializer();
+    return (doc) => s.serializeToString(doc);
+  })();
+
+  const htmlToDoc = (() => {
+    const p = new DOMParser();
+    return (html) => p.parseFromString(html, 'text/html');
+  })();
+
+  const htmlBodyToDoc = (htmlBody) => {
+    const doc = document.implementation.createHTMLDocument();
+    $('body', doc).html(htmlBody);
+    return doc;
+  };
+
+  for (const tc of testCases) {
+    describe(tc.name, function () {
+      it('import', async function () {
+        const ext = tc.inputHtmlBody ? 'html' : 'txt';
+        const contents = ext === 'html' ? docToHtml(htmlBodyToDoc(tc.inputHtmlBody)) : tc.inputText;
+        // DataTransfer is used as a hacky way to get a mutable FileList. For details, see:
+        // https://stackoverflow.com/q/47119426
+        const dt = new DataTransfer();
+        dt.items.add(new File([contents], `file.${ext}`, {type: 'text/plain'}));
+        const form = helper.padChrome$('#importform');
+        form.find('input[type=file]')[0].files = dt.files;
+        form.find('#importsubmitinput').submit();
+        try {
+          await helper.waitForPromise(() => {
+            const got = helper.linesDiv();
+            if (got.length !== tc.wantPadLines.length) return false;
+            for (let i = 0; i < got.length; i++) {
+              const gotDiv = $('<div>').html(got[i].html());
+              const wantDiv = $('<div>').html(tc.wantPadLines[i]);
+              if (!gotDiv[0].isEqualNode(wantDiv[0])) return false;
+            }
+            return true;
+          });
+        } catch (err) {
+          const formatLine = (l) => `  ${JSON.stringify(l)}`;
+          const g = helper.linesDiv().map((div) => formatLine(div.html())).join('\n');
+          const w = tc.wantPadLines.map(formatLine).join('\n');
+          throw new Error(`Import failed. Got pad lines:\n${g}\nWant pad lines:\n${w}`);
+        }
+      });
+
+      it('export to HTML', async function () {
+        const link = helper.padChrome$('#exporthtmla').attr('href');
+        const url = new URL(link, helper.padChrome$.window.location.href).href;
+        const gotHtml = await $.ajax({url, dataType: 'html'});
+        const gotBody = $('body', htmlToDoc(gotHtml));
+        gotBody.html(gotBody.html().replace(/^\s+|\s+$/g, ''));
+        const wantBody = $('body', htmlBodyToDoc(tc.wantExportHtmlBody));
+        if (!gotBody[0].isEqualNode(wantBody[0])) {
+          throw new Error(`Got exported HTML body:\n  ${JSON.stringify(gotBody.html())}\n` +
+                          `Want HTML body:\n  ${JSON.stringify(wantBody.html())}`);
+        }
+      });
+
+      it('export to text', async function () {
+        const link = helper.padChrome$('#exportplaina').attr('href');
+        const url = new URL(link, helper.padChrome$.window.location.href).href;
+        const got = await $.ajax({url, dataType: 'text'});
+        expect(got).to.be(tc.wantExportText);
+      });
+    });
+  }
 });

From 1a9709bb879235756fad06ee4457f416fe5b20a2 Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Tue, 23 Feb 2021 07:24:39 +0000
Subject: [PATCH 095/115] Update README.md

---
 README.md | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 119e6b17..0e24792a 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,16 @@
 # About
 Etherpad is a real-time collaborative editor [scalable to thousands of simultaneous real time users](http://scale.etherpad.org/). It provides [full data export](https://github.com/ether/etherpad-lite/wiki/Understanding-Etherpad's-Full-Data-Export-capabilities) capabilities, and runs on _your_ server, under _your_ control.
 
-**[Try it out](https://video.etherpad.com)**
+# Try it out
+Etherpad is extremely flexible providing you the means to modify it to solve whatever problem your community has.  We provide some demo instances for you try different experiences available within Etherpad.  Pad content is automatically removed after 24 hours.
+
+* [Rich Editing](https://rich.etherpad.com) - A full rich text WYSIWYG editor.
+* [Minimalist editor](https://minimalist.etherpad.com) - A minimalist editor that can be embedded within your tool.
+* [Dark Mode](https://dark.etherpad.com) - Theme settings to have Etherpad start in dark mode, ideal for using Etherpad at night or for long durations.
+* [Images](https://image.etherpad.com) - Plugins to improve provide Image support within a pad.
+* [Video Chat](https://video.etherpad.com) - Plugins to enable Video and Audio chat in a pad.
+* [Collaboration++](https://collab.etherpad.com) - Plugins to improve the really-real time collaboration experience, suitable for busy pads.
+* [Document Analysis](https://analysis.etherpad.com) - Plugins to improve author and document analysis during and post creation.
 
 # Project Status
 

From 72d9c8fef96c72a3c720f7ee815ca4676cf55530 Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Tue, 23 Feb 2021 18:47:33 +0000
Subject: [PATCH 096/115] tests: Use more modern relevant Firefox version in
 Sauce Labs

Firefox 52 has issues with rendering SVG animations which caused random tests to fail.  Less than 2% of total Firefox users now use Firefox 52 so we're safe to drop testing for it.
---
 src/tests/frontend/travis/remote_runner.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/tests/frontend/travis/remote_runner.js b/src/tests/frontend/travis/remote_runner.js
index 0f08a145..13498e4e 100644
--- a/src/tests/frontend/travis/remote_runner.js
+++ b/src/tests/frontend/travis/remote_runner.js
@@ -131,9 +131,9 @@ const sauceTestWorker = async.queue((testSettings, callback) => {
 if (!isAdminRunner) {
   // 1) Firefox on Linux
   sauceTestWorker.push({
-    platform: 'Windows 7',
+    platform: 'Windows 10',
     browserName: 'firefox',
-    version: '52.0',
+    version: '84.0',
   });
 
   // 2) Chrome on Linux

From c7511b2f2e851fee36c58b1f6ae623632ea129a1 Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Tue, 23 Feb 2021 19:23:17 +0000
Subject: [PATCH 097/115] tests: change timeout on bold and embed_value test to
 support Win10 FF84

---
 src/tests/frontend/specs/bold.js        | 4 ++--
 src/tests/frontend/specs/embed_value.js | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/tests/frontend/specs/bold.js b/src/tests/frontend/specs/bold.js
index 61d8133a..7aac2e36 100644
--- a/src/tests/frontend/specs/bold.js
+++ b/src/tests/frontend/specs/bold.js
@@ -8,7 +8,7 @@ describe('bold button', function () {
   });
 
   it('makes text bold on click', function (done) {
-    this.timeout(100);
+    this.timeout(200);
     const inner$ = helper.padInner$;
     const chrome$ = helper.padChrome$;
 
@@ -37,7 +37,7 @@ describe('bold button', function () {
   });
 
   it('makes text bold on keypress', function (done) {
-    this.timeout(100);
+    this.timeout(200);
     const inner$ = helper.padInner$;
 
     // get the first text element out of the inner iframe
diff --git a/src/tests/frontend/specs/embed_value.js b/src/tests/frontend/specs/embed_value.js
index ee1bf896..74c8d5dd 100644
--- a/src/tests/frontend/specs/embed_value.js
+++ b/src/tests/frontend/specs/embed_value.js
@@ -57,7 +57,7 @@ describe('embed links', function () {
 
     describe('the share link', function () {
       it('is the actual pad url', function (done) {
-        this.timeout(50);
+        this.timeout(100);
         const chrome$ = helper.padChrome$;
 
         // open share dropdown

From dabff9be778d770865dd2feee8566e86e38cd022 Mon Sep 17 00:00:00 2001
From: Richard Hansen <rhansen@rhansen.org>
Date: Tue, 23 Feb 2021 21:41:32 -0500
Subject: [PATCH 098/115] run_cmd: Fix PATH debug log message

---
 src/node/utils/run_cmd.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/node/utils/run_cmd.js b/src/node/utils/run_cmd.js
index f4bc59bd..bf5515c8 100644
--- a/src/node/utils/run_cmd.js
+++ b/src/node/utils/run_cmd.js
@@ -112,7 +112,7 @@ module.exports = exports = (args, opts = {}) => {
       ...(PATH ? PATH.split(path.delimiter) : []),
     ].join(path.delimiter),
   };
-  logger.debug(`${pathVarName}=${env[pathVarName]}`);
+  logger.debug(`${pathVarName}=${opts.env[pathVarName]}`);
 
   // Create an error object to use in case the process fails. This is done here rather than in the
   // process's `exit` handler so that we get a useful stack trace.

From 6f17d2f913d78711c7460cd3b83508e4b98973af Mon Sep 17 00:00:00 2001
From: Richard Hansen <rhansen@rhansen.org>
Date: Tue, 23 Feb 2021 22:13:00 -0500
Subject: [PATCH 099/115] CI: Use Windows to build the Windows zip

npm might do something different on Windows when setting up the
executables in `src/node_modules/.bin`.
---
 .github/workflows/windows-zip.yml | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/windows-zip.yml b/.github/workflows/windows-zip.yml
index 8e52dc06..6e5f80bd 100644
--- a/.github/workflows/windows-zip.yml
+++ b/.github/workflows/windows-zip.yml
@@ -10,10 +10,16 @@ jobs:
     if: |
          (github.event_name != 'pull_request')
          || (github.event.pull_request.head.repo.id != github.event.pull_request.base.repo.id)
-    name: Building Windows Zip on Linux without plugins
-    runs-on: ubuntu-latest
+    name: Build
+    runs-on: windows-latest
 
     steps:
+    - uses: msys2/setup-msys2@v2
+      with:
+        path-type: inherit
+        install: >-
+          zip
+
     - name: Checkout repository
       uses: actions/checkout@v2
 
@@ -22,12 +28,15 @@ jobs:
         node-version: 12
 
     - name: Install all dependencies and symlink for ep_etherpad-lite
+      shell: msys2 {0}
       run: src/bin/installDeps.sh
 
     - name: Run the backend tests
+      shell: msys2 {0}
       run: cd src && npm test
 
     - name: Build the .zip
+      shell: msys2 {0}
       run: src/bin/buildForWindows.sh
 
     - name: Archive production artifacts
@@ -43,7 +52,7 @@ jobs:
     if: |
          (github.event_name != 'pull_request')
          || (github.event.pull_request.head.repo.id != github.event.pull_request.base.repo.id)
-    name: Deploy Windows Zip on Windows
+    name: Deploy
     needs: build
     runs-on: windows-latest
 

From b2ffd8c95cdcaf81a670fb80479be2eba70d9fea Mon Sep 17 00:00:00 2001
From: Richard Hansen <rhansen@rhansen.org>
Date: Wed, 24 Feb 2021 04:00:12 -0500
Subject: [PATCH 100/115] lint: Update ESLint dependencies

---
 src/bin/plugins/checkPlugin.js |  8 ++---
 src/package-lock.json          | 54 +++++++++++++++++-----------------
 src/package.json               |  8 ++---
 3 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/src/bin/plugins/checkPlugin.js b/src/bin/plugins/checkPlugin.js
index ee96d63c..0bf3d25b 100755
--- a/src/bin/plugins/checkPlugin.js
+++ b/src/bin/plugins/checkPlugin.js
@@ -220,14 +220,14 @@ fs.readdir(pluginPath, (err, rootFiles) => {
     }
 
     updateDeps(parsedPackageJSON, 'devDependencies', {
-      'eslint': '^7.18.0',
-      'eslint-config-etherpad': '^1.0.24',
+      'eslint': '^7.20.0',
+      'eslint-config-etherpad': '^1.0.25',
       'eslint-plugin-eslint-comments': '^3.2.0',
       'eslint-plugin-mocha': '^8.0.0',
       'eslint-plugin-node': '^11.1.0',
       'eslint-plugin-prefer-arrow': '^1.2.3',
-      'eslint-plugin-promise': '^4.2.1',
-      'eslint-plugin-you-dont-need-lodash-underscore': '^6.10.0',
+      'eslint-plugin-promise': '^4.3.1',
+      'eslint-plugin-you-dont-need-lodash-underscore': '^6.11.0',
     });
 
     updateDeps(parsedPackageJSON, 'peerDependencies', {
diff --git a/src/package-lock.json b/src/package-lock.json
index 8a343b52..da11d631 100644
--- a/src/package-lock.json
+++ b/src/package-lock.json
@@ -84,12 +84,12 @@
       "dev": true
     },
     "@babel/highlight": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
-      "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.12.13.tgz",
+      "integrity": "sha512-kocDQvIbgMKlWxXe9fof3TQ+gkIPOUSEYhJjqUjvKMez3krV7vbzYCDq39Oj11UAVK7JqPVGQPlgE85dPNlQww==",
       "dev": true,
       "requires": {
-        "@babel/helper-validator-identifier": "^7.10.4",
+        "@babel/helper-validator-identifier": "^7.12.11",
         "chalk": "^2.0.0",
         "js-tokens": "^4.0.0"
       },
@@ -1630,12 +1630,12 @@
       "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
     },
     "eslint": {
-      "version": "7.18.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.18.0.tgz",
-      "integrity": "sha512-fbgTiE8BfUJZuBeq2Yi7J3RB3WGUQ9PNuNbmgi6jt9Iv8qrkxfy19Ds3OpL1Pm7zg3BtTVhvcUZbIRQ0wmSjAQ==",
+      "version": "7.20.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.20.0.tgz",
+      "integrity": "sha512-qGi0CTcOGP2OtCQBgWZlQjcTuP0XkIpYFj25XtRTQSHC+umNnp7UMshr2G8SLsRFYDdAPFeHOsiteadmMH02Yw==",
       "dev": true,
       "requires": {
-        "@babel/code-frame": "^7.0.0",
+        "@babel/code-frame": "7.12.11",
         "@eslint/eslintrc": "^0.3.0",
         "ajv": "^6.10.0",
         "chalk": "^4.0.0",
@@ -1647,7 +1647,7 @@
         "eslint-utils": "^2.1.0",
         "eslint-visitor-keys": "^2.0.0",
         "espree": "^7.3.1",
-        "esquery": "^1.2.0",
+        "esquery": "^1.4.0",
         "esutils": "^2.0.2",
         "file-entry-cache": "^6.0.0",
         "functional-red-black-tree": "^1.0.1",
@@ -1771,9 +1771,9 @@
       }
     },
     "eslint-config-etherpad": {
-      "version": "1.0.24",
-      "resolved": "https://registry.npmjs.org/eslint-config-etherpad/-/eslint-config-etherpad-1.0.24.tgz",
-      "integrity": "sha512-zM92/lricP0ALURQWhSFKk8gwDUVkgNiup/Gv5lly6bHj9OIMpK86SlLv/NPkQZYM609pyQjKIeiObsiCSdQsw==",
+      "version": "1.0.25",
+      "resolved": "https://registry.npmjs.org/eslint-config-etherpad/-/eslint-config-etherpad-1.0.25.tgz",
+      "integrity": "sha512-KYTGf08dlwvsg05Y2hm0zurCwVMyZrsxGRnPEhL2wclk26xhnPYfNfruQQqk7nghfWFLrAL+VscnkZLCQEPBXQ==",
       "dev": true
     },
     "eslint-plugin-es": {
@@ -1859,15 +1859,15 @@
       "dev": true
     },
     "eslint-plugin-promise": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-4.2.1.tgz",
-      "integrity": "sha512-VoM09vT7bfA7D+upt+FjeBO5eHIJQBUWki1aPvB+vbNiHS3+oGIJGIeyBtKQTME6UPXXy3vV07OL1tHd3ANuDw==",
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-4.3.1.tgz",
+      "integrity": "sha512-bY2sGqyptzFBDLh/GMbAxfdJC+b0f23ME63FOE4+Jao0oZ3E1LEwFtWJX/1pGMJLiTtrSSern2CRM/g+dfc0eQ==",
       "dev": true
     },
     "eslint-plugin-you-dont-need-lodash-underscore": {
-      "version": "6.10.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-you-dont-need-lodash-underscore/-/eslint-plugin-you-dont-need-lodash-underscore-6.10.0.tgz",
-      "integrity": "sha512-Zu1KbHiWKf+alVvT+kFX2M5HW1gmtnkfF1l2cjmFozMnG0gbGgXo8oqK7lwk+ygeOXDmVfOyijqBd7SUub9AEQ==",
+      "version": "6.11.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-you-dont-need-lodash-underscore/-/eslint-plugin-you-dont-need-lodash-underscore-6.11.0.tgz",
+      "integrity": "sha512-cIprUmcACzxBg5rUrrCMbyAI3O0jYsB80+9PGq8XsvRTrxDSIzLitNhBetu9erb3TDxyW6OPseyOZzfQdR8oow==",
       "dev": true,
       "requires": {
         "kebab-case": "^1.0.0"
@@ -1936,9 +1936,9 @@
       "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="
     },
     "esquery": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.3.1.tgz",
-      "integrity": "sha512-olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ==",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
+      "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
       "dev": true,
       "requires": {
         "estraverse": "^5.1.0"
@@ -2114,9 +2114,9 @@
       "dev": true
     },
     "file-entry-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.0.tgz",
-      "integrity": "sha512-fqoO76jZ3ZnYrXLDRxBR1YvOvc0k844kcOg40bgsPrE25LAb/PDqTY+ho64Xh2c8ZXgIKldchCFHczG2UVRcWA==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
+      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
       "dev": true,
       "requires": {
         "flat-cache": "^3.0.4"
@@ -8099,9 +8099,9 @@
       },
       "dependencies": {
         "ajv": {
-          "version": "7.0.3",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-7.0.3.tgz",
-          "integrity": "sha512-R50QRlXSxqXcQP5SvKUrw8VZeypvo12i2IX0EeR5PiZ7bEKeHWgzgo264LDadUsCU42lTJVhFikTqJwNeH34gQ==",
+          "version": "7.1.1",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-7.1.1.tgz",
+          "integrity": "sha512-ga/aqDYnUy/o7vbsRTFhhTsNeXiYb5JWDIcRIeZfwRNCefwjNTVYCGdGSUrEmiu3yDK3vFvNbgJxvrQW4JXrYQ==",
           "dev": true,
           "requires": {
             "fast-deep-equal": "^3.1.1",
diff --git a/src/package.json b/src/package.json
index 5580380d..89c2077a 100644
--- a/src/package.json
+++ b/src/package.json
@@ -78,14 +78,14 @@
     "etherpad-lite": "node/server.js"
   },
   "devDependencies": {
-    "eslint": "^7.18.0",
-    "eslint-config-etherpad": "^1.0.24",
+    "eslint": "^7.20.0",
+    "eslint-config-etherpad": "^1.0.25",
     "eslint-plugin-eslint-comments": "^3.2.0",
     "eslint-plugin-mocha": "^8.0.0",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prefer-arrow": "^1.2.3",
-    "eslint-plugin-promise": "^4.2.1",
-    "eslint-plugin-you-dont-need-lodash-underscore": "^6.10.0",
+    "eslint-plugin-promise": "^4.3.1",
+    "eslint-plugin-you-dont-need-lodash-underscore": "^6.11.0",
     "etherpad-cli-client": "0.0.9",
     "mocha": "7.1.2",
     "mocha-froth": "^0.2.10",

From 79fee9e79619a3e20d8d467cffe75337e142e9ff Mon Sep 17 00:00:00 2001
From: Dan Sonntag <daniel.sonntag@outlook.com>
Date: Wed, 24 Feb 2021 16:51:39 +0100
Subject: [PATCH 101/115] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 0e24792a..db092414 100644
--- a/README.md
+++ b/README.md
@@ -61,7 +61,7 @@ start with `src/bin/run.sh` will update the dependencies.
 ## Windows
 
 ### Prebuilt Windows package
-This package runs on any Windows machine, but for development purposes, please do a manual install.
+This package runs on any Windows machine. You can perform a manual installation via git for development purposes, but as this uses symlinks which performs unreliably on Windows, please stick to the prebuilt package if possible.
 
 1. [Download the latest Windows package](https://etherpad.org/#download)
 2. Extract the folder

From 41ec7fe3fcf04a3308ed6f3aeb6cf17e75bca51a Mon Sep 17 00:00:00 2001
From: Richard Hansen <rhansen@rhansen.org>
Date: Wed, 24 Feb 2021 01:28:34 -0500
Subject: [PATCH 102/115] deps: Update ueberdb2 to work around dirty DB bug

---
 src/package-lock.json | 106 ++++++++++++++++++++++++++++--------------
 src/package.json      |   2 +-
 2 files changed, 73 insertions(+), 35 deletions(-)

diff --git a/src/package-lock.json b/src/package-lock.json
index da11d631..1487badb 100644
--- a/src/package-lock.json
+++ b/src/package-lock.json
@@ -14,16 +14,48 @@
         "js-yaml": "^3.13.1"
       }
     },
+    "@azure/abort-controller": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/@azure/abort-controller/-/abort-controller-1.0.3.tgz",
+      "integrity": "sha512-kCibMwqffnwlw3c+e879rCE1Am1I2BfhjOeO54XNA8i/cEuzktnBQbTrzh67XwibHO05YuNgZzSWy9ocVfFAGw==",
+      "requires": {
+        "tslib": "^2.0.0"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz",
+          "integrity": "sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A=="
+        }
+      }
+    },
+    "@azure/core-auth": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@azure/core-auth/-/core-auth-1.2.0.tgz",
+      "integrity": "sha512-KUl+Nwn/Sm6Lw5d3U90m1jZfNSL087SPcqHLxwn2T6PupNKmcgsEbDjHB25gDvHO4h7pBsTlrdJAY7dz+Qk8GA==",
+      "requires": {
+        "@azure/abort-controller": "^1.0.0",
+        "tslib": "^2.0.0"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz",
+          "integrity": "sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A=="
+        }
+      }
+    },
     "@azure/ms-rest-azure-env": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/@azure/ms-rest-azure-env/-/ms-rest-azure-env-2.0.0.tgz",
       "integrity": "sha512-dG76W7ElfLi+fbTjnZVGj+M9e0BIEJmRxU6fHaUQ12bZBe8EJKYb2GV50YWNaP2uJiVQ5+7nXEVj1VN1UQtaEw=="
     },
     "@azure/ms-rest-js": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/@azure/ms-rest-js/-/ms-rest-js-2.1.0.tgz",
-      "integrity": "sha512-4BXLVImYRt+jcUmEJ5LUWglI8RBNVQndY6IcyvQ4U8O4kIXdmlRz3cJdA/RpXf5rKT38KOoTO2T6Z1f6Z1HDBg==",
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/@azure/ms-rest-js/-/ms-rest-js-2.2.3.tgz",
+      "integrity": "sha512-sXOhOu/37Tr8428f32Jwuwga975Xw64pYg1UeUwOBMhkNgtn5vUuNRa3fhmem+I6f8EKoi6hOsYDFlaHeZ52jA==",
       "requires": {
+        "@azure/core-auth": "^1.1.4",
         "@types/node-fetch": "^2.3.7",
         "@types/tunnel": "0.0.1",
         "abort-controller": "^3.0.0",
@@ -59,9 +91,9 @@
       }
     },
     "@azure/ms-rest-nodeauth": {
-      "version": "3.0.6",
-      "resolved": "https://registry.npmjs.org/@azure/ms-rest-nodeauth/-/ms-rest-nodeauth-3.0.6.tgz",
-      "integrity": "sha512-2twuzsXHdKMzEFI2+Sr82o6yS4ppNGZceYwil8PFo+rJxOZIoBm9e0//YC+dKilV/3F+6K/HuW8LdskDrJEQWA==",
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/@azure/ms-rest-nodeauth/-/ms-rest-nodeauth-3.0.7.tgz",
+      "integrity": "sha512-7Q1MyMB+eqUQy8JO+virSIzAjqR2UbKXE/YQZe+53gC8yakm8WOQ5OzGfPP+eyHqeRs6bQESyw2IC5feLWlT2A==",
       "requires": {
         "@azure/ms-rest-azure-env": "^2.0.0",
         "@azure/ms-rest-js": "^2.0.4",
@@ -239,6 +271,11 @@
       "integrity": "sha512-+iTbntw2IZPb/anVDbypzfQa+ay64MW0Zo8aJ8gZPWMMK6/OubMVb6lUPMagqjOPnmtauXnFCACVl3O7ogjeqQ==",
       "dev": true
     },
+    "@tediousjs/connection-string": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/@tediousjs/connection-string/-/connection-string-0.3.0.tgz",
+      "integrity": "sha512-d/keJiNKfpHo+GmSB8QcsAwBx8h+V1UbdozA5TD+eSLXprNY53JAYub47J9evsSKWDdNG5uVj0FiMozLKuzowQ=="
+    },
     "@types/caseless": {
       "version": "0.12.2",
       "resolved": "https://registry.npmjs.org/@types/caseless/-/caseless-0.12.2.tgz",
@@ -250,9 +287,9 @@
       "integrity": "sha512-5tXH6Bx/kNGd3MgffdmP4dy2Z+G4eaXw0SE81Tq3BNadtnMR5/ySMzX4SLEzHJzSmPNn4HIdpQsBvXMUykr58w=="
     },
     "@types/node": {
-      "version": "14.14.22",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.22.tgz",
-      "integrity": "sha512-g+f/qj/cNcqKkc3tFqlXOYjrmZA+jNBiDzbP3kH+B+otKFqAdPgVTGP1IeKRdMml/aE69as5S4FqtxAbl+LaMw=="
+      "version": "14.14.31",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.31.tgz",
+      "integrity": "sha512-vFHy/ezP5qI0rFgJ7aQnjDXwAMrG0KqqIH7tQG5PPv3BWBayOPIQNBjVc/P6hhdZfMx51REc6tfDNXHUio893g=="
     },
     "@types/node-fetch": {
       "version": "2.5.8",
@@ -264,9 +301,9 @@
       },
       "dependencies": {
         "form-data": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.0.tgz",
-          "integrity": "sha512-CKMFDglpbMi6PyN+brwB9Q/GOw0eAnsrEZDgcsH5Krhz5Od/haKHAX0NmQfha2zPPz0JpWzA7GJHGSnvCRLWsg==",
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz",
+          "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==",
           "requires": {
             "asynckit": "^0.4.0",
             "combined-stream": "^1.0.8",
@@ -3407,9 +3444,9 @@
       }
     },
     "mongodb": {
-      "version": "3.6.3",
-      "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-3.6.3.tgz",
-      "integrity": "sha512-rOZuR0QkodZiM+UbQE5kDsJykBqWi0CL4Ec2i1nrGrUI3KO11r6Fbxskqmq3JK2NH7aW4dcccBuUujAP0ERl5w==",
+      "version": "3.6.4",
+      "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-3.6.4.tgz",
+      "integrity": "sha512-Y+Ki9iXE9jI+n9bVtbTOOdK0B95d6wVGSucwtBkvQ+HIvVdTCfpVRp01FDC24uhC/Q2WXQ8Lpq3/zwtB5Op9Qw==",
       "requires": {
         "bl": "^2.2.1",
         "bson": "^1.1.4",
@@ -3425,10 +3462,11 @@
       "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
     },
     "mssql": {
-      "version": "7.0.0-beta.2",
-      "resolved": "https://registry.npmjs.org/mssql/-/mssql-7.0.0-beta.2.tgz",
-      "integrity": "sha512-7fOp+QzFf24ir/gGeSvyyGlQKfxZj6tx88vsk4UiQw/t/zpJ9PLjOBOoi6Ff+Tw/CZ1aJTa83MPm+CRYJ/UCQA==",
+      "version": "7.0.0-beta.3",
+      "resolved": "https://registry.npmjs.org/mssql/-/mssql-7.0.0-beta.3.tgz",
+      "integrity": "sha512-Jn/q64Dg2UjbNTqsBwCHFdMjxs4xIVqgWQ1hmDKvBR0T8ebHfPnGTzfNl4oE/VwqP1m0As+v2CMjyqOi9WneuQ==",
       "requires": {
+        "@tediousjs/connection-string": "^0.3.0",
         "debug": "^4",
         "tarn": "^3.0.1",
         "tedious": "^9.2.3"
@@ -7352,9 +7390,9 @@
       }
     },
     "redis-commands": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/redis-commands/-/redis-commands-1.6.0.tgz",
-      "integrity": "sha512-2jnZ0IkjZxvguITjFTrGiLyzQZcTvaw8DAaCXxZq/dsHXz7KfMQ3OUJy7Tz9vnRtZRVz6VRCPDvruvU8Ts44wQ=="
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/redis-commands/-/redis-commands-1.7.0.tgz",
+      "integrity": "sha512-nJWqw3bTFy21hX/CPKHth6sfhZbdiHP6bTawSgQBlKOVRG7EZkfHbbHwQJnrE4vsQf0CMNE+3gJ4Fmm16vdVlQ=="
     },
     "redis-errors": {
       "version": "1.2.0",
@@ -7634,19 +7672,19 @@
       "optional": true
     },
     "simple-git": {
-      "version": "2.31.0",
-      "resolved": "https://registry.npmjs.org/simple-git/-/simple-git-2.31.0.tgz",
-      "integrity": "sha512-/+rmE7dYZMbRAfEmn8EUIOwlM2G7UdzpkC60KF86YAfXGnmGtsPrKsym0hKvLBdFLLW019C+aZld1+6iIVy5xA==",
+      "version": "2.35.2",
+      "resolved": "https://registry.npmjs.org/simple-git/-/simple-git-2.35.2.tgz",
+      "integrity": "sha512-UjOKsrz92Bx7z00Wla5V6qLSf5X2XSp0sL2gzKw1Bh7iJfDPDaU7gK5avIup0yo1/sMOSUMQer2b9GcnF6nmTQ==",
       "requires": {
         "@kwsites/file-exists": "^1.1.1",
         "@kwsites/promise-deferred": "^1.1.1",
-        "debug": "^4.3.1"
+        "debug": "^4.3.2"
       },
       "dependencies": {
         "debug": {
-          "version": "4.3.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+          "version": "4.3.2",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
+          "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
           "requires": {
             "ms": "2.1.2"
           }
@@ -7891,9 +7929,9 @@
       "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw="
     },
     "sqlite3": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/sqlite3/-/sqlite3-5.0.1.tgz",
-      "integrity": "sha512-kh2lTIcYNfmVcvhVJihsYuPj9U0xzBbh6bmqILO2hkryWSC9RRhzYmkIDtJkJ+d8Kg4wZRJ0T1reyHUEspICfg==",
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/sqlite3/-/sqlite3-5.0.2.tgz",
+      "integrity": "sha512-1SdTNo+BVU211Xj1csWa8lV6KM0CtucDwRyA0VHl91wEH1Mgh7RxUpI4rVvG7OhHrzCSGaVyW5g8vKvlrk9DJA==",
       "optional": true,
       "requires": {
         "node-addon-api": "^3.0.0",
@@ -8381,9 +8419,9 @@
       }
     },
     "ueberdb2": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/ueberdb2/-/ueberdb2-1.2.5.tgz",
-      "integrity": "sha512-Bts6kmVvhVDWiZjD1JAT1qYknHHK6t9L7kGIFIedGAZRNQ3lRw2XJdf9hKbFpN2HM0J3S/aJoLrZO5BLk3UiaA==",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/ueberdb2/-/ueberdb2-1.3.1.tgz",
+      "integrity": "sha512-uhUSJfI5sNWdiXxae0kOg88scaMIKcV0CVeojwPQzgm93vQVuGyCqS1g1i3gTZel6SwmXRFtYtfmtAmiEe+HBQ==",
       "requires": {
         "async": "^3.2.0",
         "cassandra-driver": "^4.5.1",
diff --git a/src/package.json b/src/package.json
index 89c2077a..45006e9f 100644
--- a/src/package.json
+++ b/src/package.json
@@ -69,7 +69,7 @@
     "threads": "^1.4.0",
     "tiny-worker": "^2.3.0",
     "tinycon": "0.6.8",
-    "ueberdb2": "^1.2.5",
+    "ueberdb2": "^1.3.1",
     "underscore": "1.12.0",
     "unorm": "1.6.0",
     "wtfnode": "^0.8.4"

From 4a65acf417848a1f75d06e6019da9b26a19deeab Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Thu, 25 Feb 2021 09:01:45 +0000
Subject: [PATCH 103/115] docs: fix links from TOC to Headings and improve
 appearance of docs (a little) (#4866)

* docs: fix links from TOC to Headings
* docs: Styling

Just a little modernisation of the appearance of the documentation

* Update src/bin/doc/package.json

Co-authored-by: Richard Hansen <rhansen@rhansen.org>

Co-authored-by: Richard Hansen <rhansen@rhansen.org>
---
 doc/assets/style.css          | 69 +++++++++++------------------------
 src/bin/doc/html.js           |  6 +++
 src/bin/doc/package-lock.json | 13 -------
 src/bin/doc/package.json      |  2 +-
 4 files changed, 28 insertions(+), 62 deletions(-)
 delete mode 100644 src/bin/doc/package-lock.json

diff --git a/doc/assets/style.css b/doc/assets/style.css
index 95034c90..8c6720fa 100644
--- a/doc/assets/style.css
+++ b/doc/assets/style.css
@@ -1,62 +1,35 @@
-html {
-  border-top: solid green 5pt;
-}
-
-body.apidoc {
-  width: 60%;
-  min-width: 10cm;
+body{
+  border-top: solid #44b492 5pt;
+  line-height:150%;
+  font-family: 'Quicksand',sans-serif;
+  color: #313b4a;
+  max-width:800px;
   margin: 0 auto;
+  padding: 20px;
 }
 
-#header {
-  padding: 1pc 0;
-  color: #111;
+a{
+  color: #555;
 }
 
-a,
-a:active {
-  color: #272;
-}
-a:focus,
-a:hover {
-  color: #050;
+h1{
+  color: #44b492;
+  line-height:100%;
 }
 
-#apicontent a.mark,
-#apicontent a.mark:active {
-  float: right;
-  color: #BBB;
-  font-size: 0.7cm;
-  text-decoration: none;
-}
-#apicontent a.mark:focus,
-#apicontent a.mark:hover {
-  color: #AAA;
+a:hover{
+  color: #44b492;
 }
 
-#apicontent code {
-  padding: 1px;
-  background-color: #EEE;
-  border-radius: 4px;
-  border: 1px solid #DDD;
-}
-#apicontent pre>code {
-  display: block;
-  overflow: auto;
-  padding: 5px;
+pre{
+  background-color: #e0e0e0;
+  padding:20px;
 }
 
-table, th, td {
-  text-align: left;
-  border: 1px solid gray;
-  border-collapse: collapse;
+code{
+  background-color: #e0e0e0;
 }
 
-th {
-  padding: 0.5em;
-  background: #EEE;
-}
-
-td {
-  padding: 0.5em;
+img {
+  max-width: 100%;
 }
diff --git a/src/bin/doc/html.js b/src/bin/doc/html.js
index 2c38aec2..f4be7ce1 100644
--- a/src/bin/doc/html.js
+++ b/src/bin/doc/html.js
@@ -137,6 +137,12 @@ const getSection = (lexed) => {
 const buildToc = (lexed, filename, cb) => {
   let toc = [];
   let depth = 0;
+
+  marked.setOptions({
+    headerIds: true,
+    headerPrefix: `${filename}_`,
+  });
+
   lexed.forEach((tok) => {
     if (tok.type !== 'heading') return;
     if (tok.depth - depth > 1) {
diff --git a/src/bin/doc/package-lock.json b/src/bin/doc/package-lock.json
deleted file mode 100644
index 2058974e..00000000
--- a/src/bin/doc/package-lock.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "name": "node-doc-generator",
-  "version": "0.0.0",
-  "lockfileVersion": 1,
-  "requires": true,
-  "dependencies": {
-    "marked": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/marked/-/marked-1.1.1.tgz",
-      "integrity": "sha512-mJzT8D2yPxoPh7h0UXkB+dBj4FykPJ2OIfxAWeIHrvoHDkFxukV/29QxoFQoPM6RLEwhIFdJpmKBlqVM3s2ZIw=="
-    }
-  }
-}
diff --git a/src/bin/doc/package.json b/src/bin/doc/package.json
index f484a5c6..a1a83423 100644
--- a/src/bin/doc/package.json
+++ b/src/bin/doc/package.json
@@ -7,7 +7,7 @@
     "node": ">=10.17.0"
   },
   "dependencies": {
-    "marked": "1.1.1"
+    "marked": "^2.0.0"
   },
   "devDependencies": {},
   "optionalDependencies": {},

From fc7acad84646b642d9e6a1ca106af5c6dddd7760 Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Thu, 25 Feb 2021 10:00:33 +0000
Subject: [PATCH 104/115] artifacts: Windows CI Installer

* Windows CI Installer

This PR introduces CI builds of a windows installer(using NSIS) .

It builds an executable that installs Etherpad and runs it.

There are obvious steps to make once this has been merged. But I'd suggest on each release we include both the .zip and the .exe and allow users to have a portable zip or an installed executable.

https://github.com/ether/etherpad_nsis

This was a relatively rushed project (4 hours) and I didn't want to spend any more time on it so it will need a foster parent to maintain it :)

props to @joncloud for https://github.com/joncloud/makensis-action-test and the nsis team that while have a horrible UX make relatively easy to use and rapid tools.

Note for review: I'm using linux to build the windows executable, this may need to be reviewed and we might want to switch to Windows if we can confirm building on linux causes a problem.

* CI: Use Windows to build the .zip
---
 .github/workflows/windows-installer.yml | 61 +++++++++++++++++++++++++
 1 file changed, 61 insertions(+)
 create mode 100644 .github/workflows/windows-installer.yml

diff --git a/.github/workflows/windows-installer.yml b/.github/workflows/windows-installer.yml
new file mode 100644
index 00000000..37d86a9a
--- /dev/null
+++ b/.github/workflows/windows-installer.yml
@@ -0,0 +1,61 @@
+name: "Windows Installer"
+
+# any branch is useful for testing before a PR is submitted
+on: [push, pull_request]
+
+jobs:
+  build:
+    # run on pushes to any branch
+    # run on PRs from external forks
+    if: |
+         (github.event_name != 'pull_request')
+         || (github.event.pull_request.head.repo.id != github.event.pull_request.base.repo.id)
+
+    name: Build Zip & Exe
+    runs-on: windows-latest
+
+    steps:
+    - uses: msys2/setup-msys2@v2
+      with:
+        path-type: inherit
+        install: >-
+          zip
+
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    - uses: actions/setup-node@v2
+      with:
+        node-version: 12
+
+    - name: Install all dependencies and symlink for ep_etherpad-lite
+      shell: msys2 {0}
+      run: src/bin/installDeps.sh
+
+    - name: Run the backend tests
+      shell: msys2 {0}
+      run: cd src && npm test
+
+    - name: Build the .zip
+      shell: msys2 {0}
+      run: src/bin/buildForWindows.sh
+
+    - name: Extract the .zip into folder
+      run: 7z x etherpad-lite-win.zip -oetherpad-lite-new
+
+    - name: Grab nsis config
+      run: git clone https://github.com/ether/etherpad_nsis.git
+
+    - name: Create installer
+      uses: joncloud/makensis-action@v3.4
+      with:
+        script-file: 'etherpad_nsis/etherpad.nsi'
+
+    - name: Check something..
+      run: ls etherpad_nsis
+
+    - name: Archive production artifacts
+      uses: actions/upload-artifact@v2
+      with:
+        name: etherpad-server-windows.exe
+        path: etherpad_nsis/etherpad-server-windows.exe

From f845f21ba51945693c58122d1a76bf30456e4892 Mon Sep 17 00:00:00 2001
From: Richard Hansen <rhansen@rhansen.org>
Date: Wed, 24 Feb 2021 18:57:21 -0500
Subject: [PATCH 105/115] /static/tests.html: Fix `jquery.js` path

See commit 1b8cd0747dc76b7a46f7e00201b2b73b1591e456.
---
 src/static/tests.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/static/tests.html b/src/static/tests.html
index 3c1f71c1..41594438 100644
--- a/src/static/tests.html
+++ b/src/static/tests.html
@@ -3,7 +3,7 @@
 <head>
   <meta charset="utf-8">
   <title>API Test and Examples Page</title>
-  <script type="text/javascript" src="js/jquery.js"></script>
+  <script type="text/javascript" src="js/vendors/jquery.js"></script>
   <style type="text/css">
     body {
       font-size:9pt;

From 0cce4ae53600e6e373ddae73293a0912d22ae7a8 Mon Sep 17 00:00:00 2001
From: Richard Hansen <rhansen@rhansen.org>
Date: Wed, 24 Feb 2021 18:58:27 -0500
Subject: [PATCH 106/115] Minify: Also serve `jquery.js` from old path for
 compatibility

---
 src/node/utils/Minify.js | 7 +++++++
 src/node/utils/tar.json  | 1 +
 2 files changed, 8 insertions(+)

diff --git a/src/node/utils/Minify.js b/src/node/utils/Minify.js
index bf25787a..0b64bfec 100644
--- a/src/node/utils/Minify.js
+++ b/src/node/utils/Minify.js
@@ -113,6 +113,13 @@ const minify = async (req, res) => {
     return;
   }
 
+  // Backward compatibility for plugins that were written when jQuery lived at
+  // src/static/js/jquery.js.
+  if (['js/jquery.js', 'plugins/ep_etherpad-lite/static/js/jquery.js'].indexOf(filename) !== -1) {
+    logger.warn(`request for deprecated jQuery path: ${filename}`);
+    filename = 'js/vendors/jquery.js';
+  }
+
   /* Handle static files for plugins/libraries:
      paths like "plugins/ep_myplugin/static/js/test.js"
      are rewritten into ROOT_PATH_OF_MYPLUGIN/static/js/test.js,
diff --git a/src/node/utils/tar.json b/src/node/utils/tar.json
index 63944f85..04ac8604 100644
--- a/src/node/utils/tar.json
+++ b/src/node/utils/tar.json
@@ -82,4 +82,5 @@
   , "pluginfw/shared.js"
   , "pluginfw/hooks.js"
   ]
+, "jquery.js": ["jquery.js"]
 }

From 2d3469e3eeb224a134a3593da89eb178b907f154 Mon Sep 17 00:00:00 2001
From: Richard Hansen <rhansen@rhansen.org>
Date: Thu, 25 Feb 2021 00:38:14 -0500
Subject: [PATCH 107/115] Minify: Improve pathname sanitization

For context, see:
https://nvd.nist.gov/vuln/detail/CVE-2015-3297
https://github.com/ether/etherpad-lite/commit/9d4e5f6e35153129377206ef545d4965afae627d
https://github.com/ether/etherpad-lite/issues/2614
---
 src/node/utils/Minify.js | 52 ++++++++++++++++++++++++++++++++--------
 1 file changed, 42 insertions(+), 10 deletions(-)

diff --git a/src/node/utils/Minify.js b/src/node/utils/Minify.js
index 0b64bfec..c4e11a66 100644
--- a/src/node/utils/Minify.js
+++ b/src/node/utils/Minify.js
@@ -21,6 +21,7 @@
  * limitations under the License.
  */
 
+const assert = require('assert').strict;
 const settings = require('./Settings');
 const fs = require('fs').promises;
 const path = require('path');
@@ -92,6 +93,36 @@ const requestURIs = (locations, method, headers, callback) => {
   });
 };
 
+const sanitizePathname = (p) => {
+  // Replace all backslashes with forward slashes to support Windows. This MUST be done BEFORE path
+  // normalization, otherwise an attacker will be able to read arbitrary files anywhere on the
+  // filesystem. See https://nvd.nist.gov/vuln/detail/CVE-2015-3297. Node.js treats both the
+  // backlash and the forward slash characters as pathname component separators on Windows so this
+  // does not change the meaning of the pathname.
+  p = p.replace(/\\/g, '/');
+  // The Node.js documentation says that path.join() normalizes, and the documentation for
+  // path.normalize() says that it resolves '..' and '.' components. The word "resolve" implies that
+  // it examines the filesystem to resolve symbolic links, so 'a/../b' might not be the same thing
+  // as 'b'. Most path normalization functions from other libraries (e.g. Python's
+  // os.path.normpath()) clearly state that they do not examine the filesystem -- they are simple
+  // string manipulations. Node.js's path.normalize() probably also does a simple string
+  // manipulation, but if not it must be given a real pathname. Join with ROOT_DIR here just in
+  // case. ROOT_DIR will be removed later.
+  p = path.join(ROOT_DIR, p);
+  // Prevent attempts to read outside of ROOT_DIR via extra '..' components. ROOT_DIR is assumed to
+  // be normalized.
+  assert(ROOT_DIR.endsWith(path.sep));
+  if (!p.startsWith(ROOT_DIR)) throw new Error(`attempt to read outside ROOT_DIR (${ROOT_DIR})`);
+  // Convert back to a relative pathname.
+  p = p.slice(ROOT_DIR.length);
+  // On Windows, path.normalize replaces forward slashes with backslashes. Convert back to forward
+  // slashes. THIS IS DANGEROUS UNLESS BACKSLASHES ARE REPLACED WITH FORWARD SLASHES BEFORE PATH
+  // NORMALIZATION, otherwise on POSIXish systems '..\\' in the input pathname would not be
+  // normalized away before being converted to '../'.
+  p = p.replace(/\\/g, '/');
+  return p;
+};
+
 /**
  * creates the minifed javascript for the given minified name
  * @param req the Express request
@@ -99,15 +130,10 @@ const requestURIs = (locations, method, headers, callback) => {
  */
 const minify = async (req, res) => {
   let filename = req.params.filename;
-
-  // No relative paths, especially if they may go up the file hierarchy.
-  filename = path.join(ROOT_DIR, filename);
-  filename = filename.replace(/\.\./g, '');
-
-  if (filename.indexOf(ROOT_DIR) === 0) {
-    filename = filename.slice(ROOT_DIR.length);
-    filename = filename.replace(/\\/g, '/');
-  } else {
+  try {
+    filename = sanitizePathname(filename);
+  } catch (err) {
+    logger.error(`sanitization of pathname "${filename}" failed: ${err.stack || err}`);
     res.writeHead(404, {});
     res.end();
     return;
@@ -134,7 +160,13 @@ const minify = async (req, res) => {
       const plugin = plugins.plugins[library];
       const pluginPath = plugin.package.realPath;
       filename = path.relative(ROOT_DIR, pluginPath + libraryPath);
-      filename = filename.replace(/\\/g, '/'); // windows path fix
+      // On Windows, path.relative converts forward slashes to backslashes. Convert them back
+      // because some of the code below assumes forward slashes. Node.js treats both the backlash
+      // and the forward slash characters as pathname component separators on Windows so this does
+      // not change the meaning of the pathname. This conversion does not introduce a directory
+      // traversal vulnerability because all '..\\' substrings have already been removed by
+      // sanitizePathname.
+      filename = filename.replace(/\\/g, '/');
     } else if (LIBRARY_WHITELIST.indexOf(library) !== -1) {
       // Go straight into node_modules
       // Avoid `require.resolve()`, since 'mustache' and 'mustache/index.js'

From ba5d8369bf14272b05e9acc81330644a8ae9cbc3 Mon Sep 17 00:00:00 2001
From: Richard Hansen <rhansen@rhansen.org>
Date: Thu, 25 Feb 2021 00:20:31 -0500
Subject: [PATCH 108/115] Minify: Consistently use `path.join()` to build
 pathnames

This defends against extraneous or missing slashes, and it might
improve the experience on Windows.
---
 src/node/utils/Minify.js | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/node/utils/Minify.js b/src/node/utils/Minify.js
index c4e11a66..32f33bf3 100644
--- a/src/node/utils/Minify.js
+++ b/src/node/utils/Minify.js
@@ -159,7 +159,7 @@ const minify = async (req, res) => {
     if (plugins.plugins[library] && match[3]) {
       const plugin = plugins.plugins[library];
       const pluginPath = plugin.package.realPath;
-      filename = path.relative(ROOT_DIR, pluginPath + libraryPath);
+      filename = path.relative(ROOT_DIR, path.join(pluginPath, libraryPath));
       // On Windows, path.relative converts forward slashes to backslashes. Convert them back
       // because some of the code below assumes forward slashes. Node.js treats both the backlash
       // and the forward slash characters as pathname component separators on Windows so this does
@@ -171,7 +171,7 @@ const minify = async (req, res) => {
       // Go straight into node_modules
       // Avoid `require.resolve()`, since 'mustache' and 'mustache/index.js'
       // would end up resolving to logically distinct resources.
-      filename = `../node_modules/${library}${libraryPath}`;
+      filename = path.join('../node_modules/', library, libraryPath);
     }
   }
 
@@ -213,7 +213,7 @@ const minify = async (req, res) => {
 
 // find all includes in ace.js and embed them.
 const getAceFile = async () => {
-  let data = await fs.readFile(`${ROOT_DIR}js/ace.js`, 'utf8');
+  let data = await fs.readFile(path.join(ROOT_DIR, 'js/ace.js'), 'utf8');
 
   // Find all includes in ace.js and embed them
   const filenames = [];
@@ -273,7 +273,7 @@ const statFile = async (filename, dirStatLimit) => {
   } else {
     let stats;
     try {
-      stats = await fs.stat(ROOT_DIR + filename);
+      stats = await fs.stat(path.join(ROOT_DIR, filename));
     } catch (err) {
       if (err.code === 'ENOENT') {
         // Stat the directory instead.
@@ -287,12 +287,12 @@ const statFile = async (filename, dirStatLimit) => {
 };
 
 const lastModifiedDateOfEverything = async () => {
-  const folders2check = [`${ROOT_DIR}js/`, `${ROOT_DIR}css/`];
+  const folders2check = [path.join(ROOT_DIR, 'js/'), path.join(ROOT_DIR, 'css/')];
   let latestModification = null;
   // go through this two folders
-  await Promise.all(folders2check.map(async (path) => {
+  await Promise.all(folders2check.map(async (dir) => {
     // read the files in the folder
-    const files = await fs.readdir(path);
+    const files = await fs.readdir(dir);
 
     // we wanna check the directory itself for changes too
     files.push('.');
@@ -300,7 +300,7 @@ const lastModifiedDateOfEverything = async () => {
     // go through all files in this folder
     await Promise.all(files.map(async (filename) => {
       // get the stat data of this file
-      const stats = await fs.stat(`${path}/${filename}`);
+      const stats = await fs.stat(path.join(dir, filename));
 
       // compare the modification time to the highest found
       if (latestModification == null || stats.mtime > latestModification) {
@@ -362,7 +362,7 @@ const getFileCompressed = async (filename, contentType) => {
 const getFile = async (filename) => {
   if (filename === 'js/ace.js') return await getAceFile();
   if (filename === 'js/require-kernel.js') return requireDefinition();
-  return await fs.readFile(ROOT_DIR + filename);
+  return await fs.readFile(path.join(ROOT_DIR, filename));
 };
 
 exports.minify = (req, res, next) => minify(req, res).catch((err) => next(err || new Error(err)));

From 9675a584ced6deee64fd758f86183fd7bb9a70bb Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Thu, 25 Feb 2021 10:44:00 +0000
Subject: [PATCH 109/115] Windows Installer Badge into README

Windows Installer Badge into README
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index db092414..02eeac3f 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,7 @@ Etherpad is extremely flexible providing you the means to modify it to solve wha
 
 ### Testing
 [![Backend tests](https://github.com/ether/etherpad-lite/actions/workflows/backend-tests.yml/badge.svg?color=%2344b492)](https://github.com/ether/etherpad-lite/actions/workflows/backend-tests.yml) [![Simulated Load](https://github.com/ether/etherpad-lite/actions/workflows/load-test.yml/badge.svg?color=%2344b492)](https://github.com/ether/etherpad-lite/actions/workflows/load-test.yml) [![Rate Limit](https://github.com/ether/etherpad-lite/actions/workflows/rate-limit.yml/badge.svg?color=%2344b492)](https://github.com/ether/etherpad-lite/actions/workflows/rate-limit.yml) [![Windows Zip](https://github.com/ether/etherpad-lite/actions/workflows/windows-zip.yml/badge.svg?color=%2344b492)](https://github.com/ether/etherpad-lite/actions/workflows/windows-zip.yml) [![Docker file](https://github.com/ether/etherpad-lite/actions/workflows/dockerfile.yml/badge.svg?color=%2344b492)](https://github.com/ether/etherpad-lite/actions/workflows/dockerfile.yml)
-[![Frontend admin tests](https://github.com/ether/etherpad-lite/actions/workflows/frontend-admin-tests.yml/badge.svg?color=%2344b492)](https://github.com/ether/etherpad-lite/actions/workflows/frontend-admin-tests.yml) [![Frontend tests](https://github.com/ether/etherpad-lite/actions/workflows/frontend-tests.yml/badge.svg?color=%2344b492)](https://github.com/ether/etherpad-lite/actions/workflows/frontend-tests.yml)
+[![Frontend admin tests](https://github.com/ether/etherpad-lite/actions/workflows/frontend-admin-tests.yml/badge.svg?color=%2344b492)](https://github.com/ether/etherpad-lite/actions/workflows/frontend-admin-tests.yml) [![Frontend tests](https://github.com/ether/etherpad-lite/actions/workflows/frontend-tests.yml/badge.svg?color=%2344b492)](https://github.com/ether/etherpad-lite/actions/workflows/frontend-tests.yml) [![Windows Installer](https://github.com/ether/etherpad-lite/actions/workflows/windows-installer.yml/badge.svg?color=%2344b492)](https://github.com/ether/etherpad-lite/actions/workflows/windows-installer.yml)
 
 ### Engagement
 <a href="https://hub.docker.com/r/etherpad/etherpad"><img alt="Docker Pulls" src="https://img.shields.io/docker/pulls/etherpad/etherpad?color=%2344b492"></a> ![Discord](https://img.shields.io/discord/741309013593030667?color=%2344b492) ![Etherpad plugins](https://img.shields.io/endpoint?url=https%3A%2F%2Fstatic.etherpad.org%2Fshields.json&color=%2344b492 "Etherpad plugins") ![Languages](https://img.shields.io/static/v1?label=Languages&message=105&color=%2344b492) ![Translation Coverage](https://img.shields.io/static/v1?label=Languages&message=98%&color=%2344b492)

From a77994ab6e55e030a586e993cbb88f7349ea706c Mon Sep 17 00:00:00 2001
From: webzwo0i <webzwo0i@c3d2.de>
Date: Wed, 17 Feb 2021 23:16:23 +0100
Subject: [PATCH 110/115] avoid pad_utils in pad.html

---
 src/templates/pad.html | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/templates/pad.html b/src/templates/pad.html
index de88b6f7..39815c72 100644
--- a/src/templates/pad.html
+++ b/src/templates/pad.html
@@ -444,20 +444,19 @@
 
   <script type="text/javascript" src="../static/js/require-kernel.js?v=<%=settings.randomVersionString%>"></script>
 
-  <!-- Include pad_utils manually -->
-  <script type="text/javascript" src="../javascripts/lib/ep_etherpad-lite/static/js/pad_utils.js?callback=require.define&v=<%=settings.randomVersionString%>"></script>
-
   <script type="text/javascript">
       // @license magnet:?xt=urn:btih:8e4f440f4c65981c5bf93c76d35135ba5064d8b7&dn=apache-2.0.txt
       (function() {
         // Display errors on page load to the user
         // (Gets overridden by padutils.setupGlobalExceptionHandler)
-        var originalHandler = window.onerror;
+        const originalHandler = window.onerror;
         window.onerror = function(msg, url, line) {
-          var box   = document.getElementById('editorloadingbox');
-          box.innerHTML = '<p><b>An error occurred while loading the pad</b></p>'
-                        + '<p><b>'+msg+'</b> '
-                        + '<small>in '+ padutils.escapeHTML(url) +' (line '+ line +')</small></p>';
+          const box   = document.getElementById('editorloadingbox');
+          const cleanMessage = msg.replace(/[^0-9a-zA-Z=\.?&:\/]+/,'');
+          const cleanSource = url.replace(/[^0-9a-zA-Z=\.?&:\/]+/,'');
+          const cleanLine = parseInt(line);
+          box.innerText = `An error occurred while loading the pad\n${cleanMessage} in
+            ${cleanSource} at line ${cleanLine}`
           // call original error handler
           if(typeof(originalHandler) == 'function') originalHandler.call(null, arguments);
         };

From 12c23d468c69df38ae84f12bad12d88c864d70f2 Mon Sep 17 00:00:00 2001
From: "translatewiki.net" <l10n-bot@translatewiki.net>
Date: Thu, 25 Feb 2021 16:17:56 +0100
Subject: [PATCH 111/115] Localisation updates from https://translatewiki.net.

---
 src/locales/az.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/locales/az.json b/src/locales/az.json
index f1b8d76f..6daaa471 100644
--- a/src/locales/az.json
+++ b/src/locales/az.json
@@ -7,6 +7,7 @@
 			"Mastizada",
 			"MuratTheTurkish",
 			"Mushviq Abdulla",
+			"NMW03",
 			"Neriman2003",
 			"Vesely35",
 			"Wertuose"

From fa29858a4e563cf2ede067ba927759c962fefef7 Mon Sep 17 00:00:00 2001
From: webzwo0i <webzwo0i@c3d2.de>
Date: Thu, 25 Feb 2021 14:17:36 +0100
Subject: [PATCH 112/115] avoid manually including require-kernel in ace.js

---
 src/node/utils/Minify.js |  2 --
 src/static/js/ace.js     | 11 ++---------
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/src/node/utils/Minify.js b/src/node/utils/Minify.js
index 32f33bf3..b5ac28b1 100644
--- a/src/node/utils/Minify.js
+++ b/src/node/utils/Minify.js
@@ -226,8 +226,6 @@ const getAceFile = async () => {
       filenames.push(matches[2]);
     }
   }
-  // Always include the require kernel.
-  filenames.push('../static/js/require-kernel.js');
 
   data += ';\n';
   data += 'Ace2Editor.EMBEDED = Ace2Editor.EMBEDED || {};\n';
diff --git a/src/static/js/ace.js b/src/static/js/ace.js
index e648df07..40b8625c 100644
--- a/src/static/js/ace.js
+++ b/src/static/js/ace.js
@@ -24,8 +24,6 @@
 // requires: top
 // requires: undefined
 
-const KERNEL_SOURCE = '../static/js/require-kernel.js';
-
 const hooks = require('./pluginfw/hooks');
 const pluginUtils = require('./pluginfw/shared');
 
@@ -196,15 +194,10 @@ const Ace2Editor = function () {
           `../static/skins/${clientVars.skinName}/pad.css?v=${clientVars.randomVersionString}`);
 
       pushStyleTagsFor(iframeHTML, includedCSS);
-
-      if (!Ace2Editor.EMBEDED || !Ace2Editor.EMBEDED[KERNEL_SOURCE]) {
-        // Remotely src'd script tag will not work in IE; it must be embedded, so
-        // throw an error if it is not.
-        throw new Error('Require kernel could not be found.');
-      }
+      iframeHTML.push(`<script type="text/javascript" src="../static/js/require-kernel.js?v=${clientVars.randomVersionString}"></script>`);
 
       iframeHTML.push(scriptTag(
-          `${Ace2Editor.EMBEDED[KERNEL_SOURCE]}\n\
+          `\n\
 require.setRootURI("../javascripts/src");\n\
 require.setLibraryURI("../javascripts/lib");\n\
 require.setGlobalKeyPath("require");\n\

From efd211bbc5616fd985548a8c6323a5f01d303c5a Mon Sep 17 00:00:00 2001
From: webzwo0i <webzwo0i@c3d2.de>
Date: Thu, 25 Feb 2021 14:23:11 +0100
Subject: [PATCH 113/115] remove useless semicolon

---
 src/node/utils/Minify.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/node/utils/Minify.js b/src/node/utils/Minify.js
index b5ac28b1..4874432b 100644
--- a/src/node/utils/Minify.js
+++ b/src/node/utils/Minify.js
@@ -227,7 +227,6 @@ const getAceFile = async () => {
     }
   }
 
-  data += ';\n';
   data += 'Ace2Editor.EMBEDED = Ace2Editor.EMBEDED || {};\n';
 
   // Request the contents of the included file on the server-side and write

From 6efa41ec238113c878efb6961cf5aba1226d7fa6 Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Thu, 25 Feb 2021 18:25:00 +0000
Subject: [PATCH 114/115] update Changelog 1.9.10

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b6056860..0bb356c9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # 1.8.10
 
+### Security Patches
+
+* Resolve potential ReDoS vulnerability in your project - GHSL-2020-359
+
 ### Compatibility changes
 
 * JSONP API has been removed in favor of using the mature OpenAPI implementation.
@@ -7,6 +11,8 @@
 
 ### Notable fixes
 
+* Various performance and stability fixes
+
 ### Notable enhancements
 
 * Improved line number alignment and user experience around line anchors

From 11f3b7232dfa4360ed9405242c6a689ecbac739a Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Thu, 25 Feb 2021 18:26:17 +0000
Subject: [PATCH 115/115] bump version

---
 src/package-lock.json | 2 +-
 src/package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/package-lock.json b/src/package-lock.json
index 1487badb..90481d15 100644
--- a/src/package-lock.json
+++ b/src/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "ep_etherpad-lite",
-  "version": "1.8.9",
+  "version": "1.8.10",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/src/package.json b/src/package.json
index 45006e9f..dee03f1f 100644
--- a/src/package.json
+++ b/src/package.json
@@ -237,6 +237,6 @@
     "test": "mocha --timeout 120000 --recursive tests/backend/specs ../node_modules/ep_*/static/tests/backend/specs",
     "test-container": "mocha --timeout 5000 tests/container/specs/api"
   },
-  "version": "1.8.9",
+  "version": "1.8.10",
   "license": "Apache-2.0"
 }