diff --git a/package-lock.json b/package-lock.json index 5aa0e457d..a3a0e9965 100644 --- a/package-lock.json +++ b/package-lock.json @@ -30,7 +30,7 @@ "ipaddr.js": "^2.0.1", "jsdom": "^21.1.0", "jsonwebtoken": "^9.0.0", - "ldapjs": "^3.0.1", + "ldapjs": "^2.3.3", "lodash": "^4.17.21", "moment": "^2.29.4", "moment-timezone": "^0.5.41", @@ -203,83 +203,6 @@ "uuid": "dist/bin/uuid" } }, - "node_modules/@ldapjs/asn1": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@ldapjs/asn1/-/asn1-2.0.0.tgz", - "integrity": "sha512-G9+DkEOirNgdPmD0I8nu57ygQJKOOgFEMKknEuQvIHbGLwP3ny1mY+OTUYLCbCaGJP4sox5eYgBJRuSUpnAddA==" - }, - "node_modules/@ldapjs/attribute": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@ldapjs/attribute/-/attribute-1.0.0.tgz", - "integrity": "sha512-ptMl2d/5xJ0q+RgmnqOi3Zgwk/TMJYG7dYMC0Keko+yZU6n+oFM59MjQOUht5pxJeS4FWrImhu/LebX24vJNRQ==", - "dependencies": { - "@ldapjs/asn1": "2.0.0", - "@ldapjs/protocol": "^1.2.1", - "process-warning": "^2.1.0" - } - }, - "node_modules/@ldapjs/change": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@ldapjs/change/-/change-1.0.0.tgz", - "integrity": "sha512-EOQNFH1RIku3M1s0OAJOzGfAohuFYXFY4s73wOhRm4KFGhmQQ7MChOh2YtYu9Kwgvuq1B0xKciXVzHCGkB5V+Q==", - "dependencies": { - "@ldapjs/asn1": "2.0.0", - "@ldapjs/attribute": "1.0.0" - } - }, - "node_modules/@ldapjs/controls": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@ldapjs/controls/-/controls-2.0.0.tgz", - "integrity": "sha512-NpFmdIc2q83tYRGR2a3NDulKgU1e4YOgqjQmmMezCoN4Xz0tju4yB4eibQNC+Zg8YRW06KPwFPKbebDaCqFF0w==", - "dependencies": { - "@ldapjs/asn1": "^1.2.0", - "@ldapjs/protocol": "^1.2.1" - } - }, - "node_modules/@ldapjs/controls/node_modules/@ldapjs/asn1": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@ldapjs/asn1/-/asn1-1.2.0.tgz", - "integrity": "sha512-KX/qQJ2xxzvO2/WOvr1UdQ+8P5dVvuOLk/C9b1bIkXxZss8BaR28njXdPgFCpj5aHaf1t8PmuVnea+N9YG9YMw==" - }, - "node_modules/@ldapjs/dn": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@ldapjs/dn/-/dn-1.0.0.tgz", - "integrity": "sha512-qPsJDC5dQU2TSkA/IpswvPEg9MU6TIjjq0UOCHtuUeD3eWihTUjHuu/dith4NFRKjBvgFnqRQvo+t0YC+3z0Rw==", - "dependencies": { - "@ldapjs/asn1": "2.0.0", - "process-warning": "^2.1.0" - } - }, - "node_modules/@ldapjs/filter": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@ldapjs/filter/-/filter-2.0.0.tgz", - "integrity": "sha512-7hMv5DNlHJk4qoGzCFGbbSV0vgvn2A7hZ4mt15557xDhw+BXjhryBvs8ANTHUpyaWvESbU+oNOsbBobNLZ45Nw==", - "dependencies": { - "@ldapjs/asn1": "2.0.0", - "@ldapjs/protocol": "^1.2.1", - "process-warning": "^2.1.0" - } - }, - "node_modules/@ldapjs/messages": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@ldapjs/messages/-/messages-1.0.1.tgz", - "integrity": "sha512-1S/Y9QqyYTI97RJHuJqSnNTr8iXunY8KK+E0KDwNsT69X7ftxH2LIV+232/BV0KIMQ0yYTxroQAIdYmWTni1IA==", - "dependencies": { - "@ldapjs/asn1": "2.0.0", - "@ldapjs/attribute": "1.0.0", - "@ldapjs/change": "1.0.0", - "@ldapjs/controls": "2.0.0", - "@ldapjs/dn": "1.0.0", - "@ldapjs/filter": "2.0.0", - "@ldapjs/protocol": "1.2.1", - "process-warning": "^2.1.0" - } - }, - "node_modules/@ldapjs/protocol": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@ldapjs/protocol/-/protocol-1.2.1.tgz", - "integrity": "sha512-O89xFDLW2gBoZWNXuXpBSM32/KealKCTb3JGtJdtUQc7RjAk8XzrRgyz02cPAwGKwKPxy0ivuC7UP9bmN87egQ==" - }, "node_modules/@tootallnate/once": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz", @@ -2762,25 +2685,33 @@ "node": ">= 0.6" } }, - "node_modules/ldapjs": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/ldapjs/-/ldapjs-3.0.1.tgz", - "integrity": "sha512-/bOFimHRBBMalpApgBeDNBTdQcK9wf9OCpZ3jloqJ9EPnSqCpKbGJ8cp81qHMfjlodpq8V9zgJTqWZ0/Bv/eUg==", + "node_modules/ldap-filter": { + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/ldap-filter/-/ldap-filter-0.3.3.tgz", + "integrity": "sha512-/tFkx5WIn4HuO+6w9lsfxq4FN3O+fDZeO9Mek8dCD8rTUpqzRa766BOBO7BcGkn3X86m5+cBm1/2S/Shzz7gMg==", "dependencies": { - "@ldapjs/asn1": "2.0.0", - "@ldapjs/attribute": "1.0.0", - "@ldapjs/change": "1.0.0", - "@ldapjs/controls": "2.0.0", - "@ldapjs/dn": "1.0.0", - "@ldapjs/filter": "2.0.0", - "@ldapjs/messages": "1.0.1", - "@ldapjs/protocol": "^1.2.1", - "abstract-logging": "^2.0.1", + "assert-plus": "^1.0.0" + }, + "engines": { + "node": ">=0.8" + } + }, + "node_modules/ldapjs": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/ldapjs/-/ldapjs-2.3.3.tgz", + "integrity": "sha512-75QiiLJV/PQqtpH+HGls44dXweviFwQ6SiIK27EqzKQ5jU/7UFrl2E5nLdQ3IYRBzJ/AVFJI66u0MZ0uofKYwg==", + "dependencies": { + "abstract-logging": "^2.0.0", + "asn1": "^0.2.4", "assert-plus": "^1.0.0", "backoff": "^2.5.0", + "ldap-filter": "^0.3.3", "once": "^1.4.0", - "vasync": "^2.2.1", - "verror": "^1.10.1" + "vasync": "^2.2.0", + "verror": "^1.8.1" + }, + "engines": { + "node": ">=10.13.0" } }, "node_modules/levn": { @@ -3670,11 +3601,6 @@ "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==" }, - "node_modules/process-warning": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/process-warning/-/process-warning-2.1.0.tgz", - "integrity": "sha512-9C20RLxrZU/rFnxWncDkuF6O999NdIf3E1ws4B0ZeY3sRVPzWBMsYDE2lxjxhiXxg464cQTgKUGm8/i6y2YGXg==" - }, "node_modules/prompt": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/prompt/-/prompt-1.1.0.tgz", @@ -5242,85 +5168,6 @@ } } }, - "@ldapjs/asn1": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@ldapjs/asn1/-/asn1-2.0.0.tgz", - "integrity": "sha512-G9+DkEOirNgdPmD0I8nu57ygQJKOOgFEMKknEuQvIHbGLwP3ny1mY+OTUYLCbCaGJP4sox5eYgBJRuSUpnAddA==" - }, - "@ldapjs/attribute": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@ldapjs/attribute/-/attribute-1.0.0.tgz", - "integrity": "sha512-ptMl2d/5xJ0q+RgmnqOi3Zgwk/TMJYG7dYMC0Keko+yZU6n+oFM59MjQOUht5pxJeS4FWrImhu/LebX24vJNRQ==", - "requires": { - "@ldapjs/asn1": "2.0.0", - "@ldapjs/protocol": "^1.2.1", - "process-warning": "^2.1.0" - } - }, - "@ldapjs/change": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@ldapjs/change/-/change-1.0.0.tgz", - "integrity": "sha512-EOQNFH1RIku3M1s0OAJOzGfAohuFYXFY4s73wOhRm4KFGhmQQ7MChOh2YtYu9Kwgvuq1B0xKciXVzHCGkB5V+Q==", - "requires": { - "@ldapjs/asn1": "2.0.0", - "@ldapjs/attribute": "1.0.0" - } - }, - "@ldapjs/controls": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@ldapjs/controls/-/controls-2.0.0.tgz", - "integrity": "sha512-NpFmdIc2q83tYRGR2a3NDulKgU1e4YOgqjQmmMezCoN4Xz0tju4yB4eibQNC+Zg8YRW06KPwFPKbebDaCqFF0w==", - "requires": { - "@ldapjs/asn1": "^1.2.0", - "@ldapjs/protocol": "^1.2.1" - }, - "dependencies": { - "@ldapjs/asn1": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@ldapjs/asn1/-/asn1-1.2.0.tgz", - "integrity": "sha512-KX/qQJ2xxzvO2/WOvr1UdQ+8P5dVvuOLk/C9b1bIkXxZss8BaR28njXdPgFCpj5aHaf1t8PmuVnea+N9YG9YMw==" - } - } - }, - "@ldapjs/dn": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@ldapjs/dn/-/dn-1.0.0.tgz", - "integrity": "sha512-qPsJDC5dQU2TSkA/IpswvPEg9MU6TIjjq0UOCHtuUeD3eWihTUjHuu/dith4NFRKjBvgFnqRQvo+t0YC+3z0Rw==", - "requires": { - "@ldapjs/asn1": "2.0.0", - "process-warning": "^2.1.0" - } - }, - "@ldapjs/filter": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@ldapjs/filter/-/filter-2.0.0.tgz", - "integrity": "sha512-7hMv5DNlHJk4qoGzCFGbbSV0vgvn2A7hZ4mt15557xDhw+BXjhryBvs8ANTHUpyaWvESbU+oNOsbBobNLZ45Nw==", - "requires": { - "@ldapjs/asn1": "2.0.0", - "@ldapjs/protocol": "^1.2.1", - "process-warning": "^2.1.0" - } - }, - "@ldapjs/messages": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@ldapjs/messages/-/messages-1.0.1.tgz", - "integrity": "sha512-1S/Y9QqyYTI97RJHuJqSnNTr8iXunY8KK+E0KDwNsT69X7ftxH2LIV+232/BV0KIMQ0yYTxroQAIdYmWTni1IA==", - "requires": { - "@ldapjs/asn1": "2.0.0", - "@ldapjs/attribute": "1.0.0", - "@ldapjs/change": "1.0.0", - "@ldapjs/controls": "2.0.0", - "@ldapjs/dn": "1.0.0", - "@ldapjs/filter": "2.0.0", - "@ldapjs/protocol": "1.2.1", - "process-warning": "^2.1.0" - } - }, - "@ldapjs/protocol": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@ldapjs/protocol/-/protocol-1.2.1.tgz", - "integrity": "sha512-O89xFDLW2gBoZWNXuXpBSM32/KealKCTb3JGtJdtUQc7RjAk8XzrRgyz02cPAwGKwKPxy0ivuC7UP9bmN87egQ==" - }, "@tootallnate/once": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz", @@ -7260,25 +7107,27 @@ "tsscmp": "1.0.6" } }, - "ldapjs": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/ldapjs/-/ldapjs-3.0.1.tgz", - "integrity": "sha512-/bOFimHRBBMalpApgBeDNBTdQcK9wf9OCpZ3jloqJ9EPnSqCpKbGJ8cp81qHMfjlodpq8V9zgJTqWZ0/Bv/eUg==", + "ldap-filter": { + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/ldap-filter/-/ldap-filter-0.3.3.tgz", + "integrity": "sha512-/tFkx5WIn4HuO+6w9lsfxq4FN3O+fDZeO9Mek8dCD8rTUpqzRa766BOBO7BcGkn3X86m5+cBm1/2S/Shzz7gMg==", "requires": { - "@ldapjs/asn1": "2.0.0", - "@ldapjs/attribute": "1.0.0", - "@ldapjs/change": "1.0.0", - "@ldapjs/controls": "2.0.0", - "@ldapjs/dn": "1.0.0", - "@ldapjs/filter": "2.0.0", - "@ldapjs/messages": "1.0.1", - "@ldapjs/protocol": "^1.2.1", - "abstract-logging": "^2.0.1", + "assert-plus": "^1.0.0" + } + }, + "ldapjs": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/ldapjs/-/ldapjs-2.3.3.tgz", + "integrity": "sha512-75QiiLJV/PQqtpH+HGls44dXweviFwQ6SiIK27EqzKQ5jU/7UFrl2E5nLdQ3IYRBzJ/AVFJI66u0MZ0uofKYwg==", + "requires": { + "abstract-logging": "^2.0.0", + "asn1": "^0.2.4", "assert-plus": "^1.0.0", "backoff": "^2.5.0", + "ldap-filter": "^0.3.3", "once": "^1.4.0", - "vasync": "^2.2.1", - "verror": "^1.10.1" + "vasync": "^2.2.0", + "verror": "^1.8.1" } }, "levn": { @@ -7928,11 +7777,6 @@ "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==" }, - "process-warning": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/process-warning/-/process-warning-2.1.0.tgz", - "integrity": "sha512-9C20RLxrZU/rFnxWncDkuF6O999NdIf3E1ws4B0ZeY3sRVPzWBMsYDE2lxjxhiXxg464cQTgKUGm8/i6y2YGXg==" - }, "prompt": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/prompt/-/prompt-1.1.0.tgz", diff --git a/package.json b/package.json index e48e9ef67..f0e35d3e0 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "ipaddr.js": "^2.0.1", "jsdom": "^21.1.0", "jsonwebtoken": "^9.0.0", - "ldapjs": "^3.0.1", + "ldapjs": "^2.3.3", "lodash": "^4.17.21", "moment": "^2.29.4", "moment-timezone": "^0.5.41", diff --git a/run-tests b/run-tests index 340d12959..3e106a7ca 100755 --- a/run-tests +++ b/run-tests @@ -26,10 +26,6 @@ mkdir -p boxdata/box boxdata/mail boxdata/certs boxdata/mail/dkim/localhost boxd mkdir -p platformdata/addons/mail/banner platformdata/nginx/cert platformdata/nginx/applications/dashboard platformdata/collectd/collectd.conf.d platformdata/addons platformdata/logrotate.d platformdata/backup platformdata/logs/tasks platformdata/sftp/ssh platformdata/firewall platformdata/update sudo mkdir -p /mnt/cloudron-test-music /media/cloudron-test-music # volume test -# translations -mkdir -p box/dashboard/dist/translation -cp -r ${source_dir}/../dashboard/dist/translation/* box/dashboard/dist/translation - # put cert echo "=> Generating a localhost selfsigned cert" openssl req -x509 -newkey rsa:2048 -keyout platformdata/nginx/cert/host.key -out platformdata/nginx/cert/host.cert -days 3650 -subj '/CN=localhost' -nodes -config <(cat /etc/ssl/openssl.cnf <(printf "\n[SAN]\nsubjectAltName=DNS:*.localhost")) diff --git a/src/test/branding-test.js b/src/test/branding-test.js index 8587f791e..e541271b5 100644 --- a/src/test/branding-test.js +++ b/src/test/branding-test.js @@ -25,6 +25,6 @@ describe('Branding', function () { }); it('can render footer with YEAR', async function () { - expect(branding.renderFooter('BigFoot Inc %YEAR%')).to.be('BigFoot Inc 2022'); + expect(branding.renderFooter('BigFoot Inc %YEAR%')).to.be('BigFoot Inc 2023'); }); });