Haraka 3.1.2 → 3.1.4

package/package.json

@@ -9,7 +9,7 @@
     "server",
     "email"
   ],
-  "version": "3.1.2",
+  "version": "3.1.4",
   "homepage": "http://haraka.github.io",
   "repository": {
     "type": "git",
@@ -20,49 +20,47 @@
     "node": ">=20"
   },
   "dependencies": {
-    "address-rfc2821": "^2.1.3",
+    "address-rfc2821": "^2.1.5",
     "address-rfc2822": "^2.2.3",
-    "async": "^3.2.6",
     "daemon": "~1.1.0",
-    "haraka-config": "^1.4.2",
+    "haraka-config": "^1.5.0",
     "haraka-constants": "^1.0.7",
     "haraka-dsn": "^1.1.0",
-    "haraka-email-message": "^1.2.6",
-    "haraka-message-stream": "^1.3.2",
+    "haraka-email-message": "^1.3.1",
+    "haraka-message-stream": "^2.0.0",
     "haraka-net-utils": "^1.7.2",
     "haraka-notes": "^1.1.1",
     "haraka-plugin-redis": "^2.0.11",
-    "haraka-results": "^2.2.6",
-    "haraka-tld": "^1.2.4",
+    "haraka-results": "^2.3.0",
+    "haraka-tld": "^1.3.1",
     "haraka-utils": "^1.1.4",
     "ipaddr.js": "~2.3.0",
-    "node-gyp": "^12.1.0",
+    "node-gyp": "^12.2.0",
     "nopt": "^9.0.0",
     "npid": "~0.4.0",
-    "redis": "~5.10.0",
-    "semver": "^7.7.3",
+    "redis": "~5.11.0",
+    "semver": "^7.7.4",
     "sockaddr": "^1.0.1",
     "sprintf-js": "~1.1.3"
   },
   "optionalDependencies": {
     "haraka-plugin-access": "^1.1.10",
     "haraka-plugin-aliases": "^1.0.3",
-    "haraka-plugin-asn": "^2.0.5",
-    "haraka-plugin-attachment": "^1.1.5",
+    "haraka-plugin-asn": "^2.0.6",
+    "haraka-plugin-attachment": "^1.2.0",
     "haraka-plugin-avg": "^1.1.0",
-    "haraka-plugin-bounce": "^2.1.1",
+    "haraka-plugin-bounce": "^2.1.2",
     "haraka-plugin-clamd": "^1.0.2",
     "haraka-plugin-dcc": "^1.0.3",
     "haraka-plugin-dkim": "^1.0.11",
     "haraka-plugin-dns-list": "^1.2.4",
     "haraka-plugin-early_talker": "^1.0.2",
-    "haraka-plugin-elasticsearch": "^8.1.5",
+    "haraka-plugin-elasticsearch": "^8.1.6",
     "haraka-plugin-esets": "^1.0.1",
     "haraka-plugin-fcrdns": "^1.1.2",
-    "haraka-plugin-geoip": "^1.1.1",
-    "haraka-plugin-graph": "^1.0.5",
-    "haraka-plugin-greylist": "^1.0.1",
-    "haraka-plugin-headers": "^1.0.6",
+    "haraka-plugin-geoip": "^1.1.2",
+    "haraka-plugin-greylist": "^1.1.0",
+    "haraka-plugin-headers": "^1.1.0",
     "haraka-plugin-helo.checks": "^1.1.0",
     "haraka-plugin-karma": "^2.1.8",
     "haraka-plugin-known-senders": "^1.1.3",
@@ -70,23 +68,23 @@
     "haraka-plugin-mail_from.is_resolvable": "^1.1.0",
     "haraka-plugin-messagesniffer": "^1.0.1",
     "haraka-plugin-p0f": "^1.0.11",
-    "haraka-plugin-qmail-deliverable": "^1.2.5",
+    "haraka-plugin-qmail-deliverable": "^1.3.2",
     "haraka-plugin-recipient-routes": "^1.3.1",
     "haraka-plugin-relay": "^1.0.1",
     "haraka-plugin-rspamd": "^1.4.2",
     "haraka-plugin-spamassassin": "^1.0.3",
-    "haraka-plugin-spf": "^1.2.10",
+    "haraka-plugin-spf": "^1.2.11",
     "haraka-plugin-syslog": "^1.0.7",
     "haraka-plugin-uribl": "^1.0.10",
-    "haraka-plugin-watch": "^2.0.8",
+    "haraka-plugin-watch": "^2.0.9",
     "@techteamer/ocsp": "^1.0.1"
   },
   "devDependencies": {
-    "@haraka/eslint-config": "^2.0.3",
-    "haraka-test-fixtures": "^1.3.10",
+    "@haraka/eslint-config": "^2.0.4",
+    "haraka-test-fixtures": "^1.4.1",
     "mocha": "^11.7.5",
     "mock-require": "^3.0.3",
-    "nodemailer": "^7.0.12"
+    "nodemailer": "^8.0.4"
   },
   "bugs": {
     "mail": "haraka.mail@gmail.com",
@@ -97,19 +95,19 @@
     "haraka_grep": "./bin/haraka_grep"
   },
   "scripts": {
-    "format:NYET": "npm run prettier:fix && npm run lint:fix",
+    "format": "npm run prettier:fix && npm run lint:fix",
     "lint": "npx eslint *.js outbound plugins plugins/*/*.js test test/*/*.js test/*/*/*.js bin/haraka",
     "lint:fix": "npx eslint --fix *.js outbound plugins plugins/*/*.js test test/*/*.js test/*/*/*.js bin/haraka",
     "prettier": "npx prettier . --check",
     "prettier:fix": "npx prettier . --write --log-level=warn",
-    "test": "npx mocha --exit --timeout=4000 test test/outbound test/plugins/auth test/plugins/queue test/plugins",
-    "versions": "npx dependency-version-checker check",
-    "versions:fix": "npx dependency-version-checker update",
-    "format": "npm run prettier:fix && npm run lint:fix"
+    "test": "sh ./run_tests",
+    "versions": "npx npm-dep-mgr check",
+    "versions:fix": "npx npm-dep-mgr update",
+    "test:coverage": "npx c8 --reporter=text --reporter=text-summary npm test"
   },
   "prettier": {
     "singleQuote": true,
     "printWidth": 120,
     "semi": false
   }
-}
+}

package/plugins/prevent_credential_leaks.js

@@ -25,8 +25,8 @@ exports.hook_data_post = (next, connection) => {
     if (idx) {
         // If the username is qualified (e.g. user@domain.com)
         // then we make the @domain.com part optional in the regexp.
-        domain = user.substr(idx)
-        user = user.substr(0, idx)
+        domain = user.substring(idx)
+        user = user.substring(0, idx)
     }
     const passwd = connection.notes.auth_passwd
     const bound_regexp = '(?:\\b|\\B)'

package/plugins/process_title.js

@@ -1,6 +1,6 @@
 // process_title
 
-const outbound = require('./outbound')
+const outbound = require('../outbound')
 
 function setupInterval(title, server) {
     // Set up a timer to update title

package/plugins/queue/smtp_forward.js

@@ -6,7 +6,7 @@
 
 const url = require('node:url')
 
-const smtp_client_mod = require('./smtp_client')
+const smtp_client_mod = require('../../smtp_client')
 
 exports.register = function () {
     this.load_errs = []

package/plugins/status.js

@@ -92,8 +92,9 @@ exports.pool_list = (cb) => {
     cb(null, result)
 }
 
-exports.queue_list = function (cb) {
-    this.outbound.list_queue((err, qlist = []) => {
+exports.queue_list = async function (cb) {
+    try {
+        const qlist = await this.outbound.list_queue()
         const result = []
 
         for (const todo of qlist) {
@@ -107,8 +108,10 @@ exports.queue_list = function (cb) {
             })
         }
 
-        cb(err, result)
-    })
+        cb(null, result)
+    } catch (err) {
+        cb(err)
+    }
 }
 
 exports.queue_stats = function (cb) {
@@ -116,7 +119,7 @@ exports.queue_stats = function (cb) {
 }
 
 exports.queue_inspect = function (cb) {
-    const delivery_queue_items = this.outbound.delivery_queue._tasks.toArray()
+    const delivery_queue_items = this.outbound.delivery_queue.tasks
     const fail_queue_items = this.outbound.temp_fail_queue.queue
 
     cb(null, {

package/plugins/tls.js

@@ -4,7 +4,7 @@
 
 /* global server */
 
-const tls_socket = require('./tls_socket')
+const tls_socket = require('../tls_socket')
 
 // exported so tests can override config dir
 exports.net_utils = require('haraka-net-utils')

package/plugins.js

@@ -33,10 +33,6 @@ class Plugin {
         return require(`./${name}`)
     }
 
-    core_require(name) {
-        return this.haraka_require(name)
-    }
-
     _get_plugin_path() {
         /* From https://github.com/haraka/Haraka/pull/1278#issuecomment-168856528
         In Development mode, or install via a plain "git clone":
@@ -56,13 +52,13 @@ class Plugin {
         */
 
         this.hasPackageJson = false
-        const name = this.name.startsWith('haraka-plugin-') ? this.name.substr(14) : this.name
+        const name = this.name.startsWith('haraka-plugin-') ? this.name.slice(14) : this.name
         if (this.name !== name) this.name = name
 
         let paths = []
         if (process.env.HARAKA) {
             // Installed mode - started via bin/haraka
-            paths = paths.concat(plugin_search_paths(process.env.HARAKA, name))
+            paths = [...paths, ...plugin_search_paths(process.env.HARAKA, name)]
 
             // permit local "folder" plugins (/$name/package.json) (see #1649)
             paths.push(
@@ -72,7 +68,7 @@ class Plugin {
         }
 
         // development mode
-        paths = paths.concat(plugin_search_paths(__dirname, name))
+        paths = [...paths, ...plugin_search_paths(__dirname, name)]
         for (const pp of paths) {
             if (this.plugin_path) continue
             try {
@@ -91,11 +87,13 @@ class Plugin {
             // haraka/config folder for overrides
             return exports.config.module_config(path.dirname(this.plugin_path), process.env.HARAKA || __dirname)
         }
+
         if (process.env.HARAKA) {
             // Plain .js file, installed mode - look in core folder for defaults,
             // install dir for overrides
             return exports.config.module_config(__dirname, process.env.HARAKA)
         }
+
         if (process.env.HARAKA_TEST_DIR) {
             return exports.config.module_config(process.env.HARAKA_TEST_DIR)
         }
@@ -158,17 +156,19 @@ class Plugin {
                 return require(module)
             }
 
-            if (fs.existsSync(path.join(__dirname, `${module}.js`)) || fs.existsSync(path.join(__dirname, module))) {
-                return require(module)
+            for (const ext of [`${module}.js`, module]) {
+                if (fs.existsSync(path.join(__dirname, ext))) {
+                    return require(module)
+                }
             }
 
             return require(path.join(path.dirname(this.plugin_path), module))
         }
     }
 
-    _get_code(pp) {
+    _get_code(pi_path) {
         if (this.hasPackageJson) {
-            let packageDir = path.dirname(pp)
+            let packageDir = path.dirname(pi_path)
             if (/^win(32|64)/.test(process.platform)) {
                 // escape the c:\path\back\slashes else they disappear
                 packageDir = packageDir.replace(/\\/g, '\\\\')
@@ -177,7 +177,7 @@ class Plugin {
         }
 
         try {
-            return `"use strict";${fs.readFileSync(pp)}`
+            return `"use strict";${fs.readFileSync(pi_path)}`
         } catch (err) {
             if (exports.config.get('smtp.ini').main.ignore_bad_plugins) {
                 plugins.logcrit(`Loading ${this.name} failed: ${err}`)
@@ -241,8 +241,13 @@ process.on('message', (msg) => {
 
 function plugin_search_paths(prefix, name) {
     return [
+        // Haraka/plugins/*.js
         path.resolve(prefix, 'plugins', `${name}.js`),
+
+        // Haraka/node_modules/haraka-plugin-*/package.json
         path.resolve(prefix, 'node_modules', `haraka-plugin-${name}`, 'package.json'),
+
+        // global node_modules/haraka-plugin-*/package.json
         path.resolve(prefix, '..', `haraka-plugin-${name}`, 'package.json'),
     ]
 }
@@ -281,7 +286,7 @@ plugins.load_plugins = (override) => {
     }
 
     for (let plugin of plugin_list) {
-        if (plugin.startsWith('haraka-plugin-')) plugin = plugin.substr(14)
+        if (plugin.startsWith('haraka-plugin-')) plugin = plugin.substring(14)
         if (plugins.deprecated[plugin]) {
             plugins.lognotice(
                 `${plugin} has been replaced by '${plugins.deprecated[plugin]}'. Please update config/plugins`,
@@ -467,7 +472,7 @@ plugins.run_next_hook = (hook, object, params) => {
         }
 
         const respond_method = `${hook}_respond`
-        if (item && is_deny_retval(retval) && hook.substr(0, 5) !== 'init_') {
+        if (item && is_deny_retval(retval) && hook.substring(0, 5) !== 'init_') {
             object.deny_respond = get_denyfn(object, hook, params, retval, msg, respond_method)
             plugins.run_hooks('deny', object, [retval, msg, item[0].name, item[1], params, hook])
         } else {

package/rfc1869.js

@@ -33,7 +33,7 @@ exports.parse = (type, line, strict) => {
 
     while (1) {
         const old_length = line.length
-        line = line.replace(chew_regexp, function repl(str, p1) {
+        line = line.replace(chew_regexp, (str, p1) => {
             params.push(p1)
             return ''
         })
@@ -73,17 +73,17 @@ exports.parse = (type, line, strict) => {
             throw new Error('Syntax error in parameters')
         }
     } else {
-        // console.log(`Looking at ${line}``);
+        // console.log(`Looking at ${line}`);
         if (line.match(/@.*\s/)) {
             throw new Error('Syntax error in parameters')
-        } else {
-            if (line.match(/\s/)) {
-                throw new Error('Syntax error in parameters')
-            } else if (line.match(/@/)) {
-                if (!line.match(/^<.*>$/)) line = `<${line}>`
-            } else if (!line.match(/^<(postmaster|abuse)>$/i)) {
-                throw new Error(`Syntax error in address: ${line}`)
-            }
+        }
+        if (line.match(/\s/)) {
+            throw new Error('Syntax error in parameters')
+        }
+        if (line.match(/@/)) {
+            if (!line.match(/^<.*>$/)) line = `<${line}>`
+        } else if (!line.match(/^<(postmaster|abuse)>$/i)) {
+            throw new Error(`Syntax error in address: ${line}`)
         }
     }
 

package/run_tests

@@ -1,5 +1,23 @@
 #!/bin/sh
 
-TESTS=${1:-"test test/outbound test/plugins/auth test/plugins/queue test/plugins"}
+# Files using node:test
+NODE_TEST_FILES="test/transaction.js test/connection.js test/outbound/*.js"
 
-npx mocha --exit $TESTS
+# Mocha scans test/ but skips transaction.js, connection.js, and outbound/
+MOCHA_IGNORE="--ignore=test/transaction.js --ignore=test/connection.js"
+MOCHA_TESTS="test test/plugins/auth test/plugins/queue test/plugins"
+
+if [ -n "$1" ]; then
+    case "$1" in
+        test/transaction.js | test/connection.js | test/outbound/*)
+            node --test "$1"
+            ;;
+        *)
+            npx mocha --exit --timeout=4000 "$1"
+            ;;
+    esac
+else
+    # default, run 'em all
+    node --test --test-concurrency=1 $NODE_TEST_FILES && \
+    npx mocha --exit --timeout=4000 $MOCHA_IGNORE $MOCHA_TESTS
+fi

package/server.js

@@ -92,9 +92,9 @@ Server.daemonize = function () {
     }
 }
 
-Server.flushQueue = (domain) => {
+Server.flushQueue = async (domain) => {
     if (!Server.cluster) {
-        outbound.flush_queue(domain)
+        await outbound.flush_queue(domain)
         return
     }
 
@@ -506,7 +506,7 @@ Server.setup_http_listeners = async () => {
     app.use(Server.handle404)
 }
 
-Server.init_master_respond = (retval, msg) => {
+Server.init_master_respond = async (retval, msg) => {
     if (!(retval === constants.ok || retval === constants.cont)) {
         Server.logerror(`init_master returned error${msg ? `: ${msg}` : ''}`)
         return logger.dump_and_exit(1)
@@ -517,18 +517,20 @@ Server.init_master_respond = (retval, msg) => {
 
     // Load the queue if we're just one process
     if (!(cluster && c.nodes)) {
-        outbound.load_queue()
+        try {
+            await outbound.init_queue()
+        } catch (err) {
+            Server.logcrit('Loading queue failed. Shutting down.')
+            return logger.dump_and_exit(1)
+        }
         Server.setup_http_listeners()
         return
     }
 
     // Running under cluster, fork children here, so that
     // cluster events can be registered in init_master hooks.
-    outbound.scan_queue_pids((err, pids) => {
-        if (err) {
-            Server.logcrit('Scanning queue failed. Shutting down.')
-            return logger.dump_and_exit(1)
-        }
+    try {
+        const pids = await outbound.scan_queue_pids()
         Server.daemonize()
         // Fork workers
         const workers = c.nodes === 'cpus' ? os.cpus().length : c.nodes
@@ -552,7 +554,10 @@ Server.init_master_respond = (retval, msg) => {
             Server.lognotice(`worker ${worker.id} listening on ${endpoint(address)}`)
         })
         cluster.on('exit', cluster_exit_listener)
-    })
+    } catch (err) {
+        Server.logcrit('Scanning queue failed. Shutting down.')
+        logger.dump_and_exit(1)
+    }
 }
 
 function cluster_exit_listener(worker, code, signal) {

package/smtp_client.js

@@ -192,13 +192,8 @@ class SMTPClient extends events.EventEmitter {
         client.socket.on('end', closed('ended'))
     }
 
-    load_tls_config(opts) {
-        const tls_options = { servername: this.host }
-        if (opts) {
-            Object.assign(tls_options, opts)
-        }
-
-        this.tls_options = tls_options
+    load_tls_config(opts = {}) {
+        this.tls_options = { servername: this.host, ...opts }
     }
 
     send_command(command, data) {
@@ -212,10 +207,8 @@ class SMTPClient extends events.EventEmitter {
     start_data(data) {
         this.response = []
         this.command = 'dot'
-        // SUNSET: dot_stuffing was renamed to dot_stuffed, remove it after 2026-01
         data.pipe(this.socket, {
             dot_stuffed: false,
-            dot_stuffing: true,
             ending_dot: true,
             end: false,
         })

package/test/config/tls/haraka.local.pem

@@ -1,51 +1,51 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDcg5h5TVO1gECK
-yNCXbpJduNqJvhE6hyVb9q0WRR8zKHE7DnOog9JqOcrz4mv3TmszDZ2511mGxo/v
-j2dAYakU7HxEuSqKX1CsjbDP3xa7IvVCaKQbcMImq7dzmenXkCdPivuglZmooZen
-c18QZ6YkrunDeh/OcP8WAA+9yYXp82lmKPzKNkJETfGVXff0loXWR5SSjGXYvjqm
-XK6IXqPcuNriUTmylLx2149O6RWJPaZ2YYxTOHTeV5OMeEHjLpAOShCfZi4VYvAe
-GZSFq5UdMv5QD1k6BueS1Ruf6ChCLjfqkMcCAw8DOY8oxvzovgM/sgBcx3L00/pe
-QeSegG+3AgMBAAECggEAW9qJEcYvH0SMHgNmOB375ARTK9s7S/jti/Aly0gBpgqr
-l+D+NmyqokruikZ/mKVWrA546+eTSDu/yxcd+Eh16NxVKz9CRB9N+IKQ6xXPXyZB
-qWbzLOb8SKVwpjuvl3ZZmZ2YER0fw4mEJWE+cRPrtg4SG7XsN88DwoNGC1U9beSL
-vZ3lDuOMHNBNGx5k608i5HCV8Ty3Sz8ksvL9fPFwUpKAvRuG3lYgS+GxSrijH+KO
-vIwXAu3E+7MIPXdbsg14HBRRHEfyQlRGV8rj3e8neDLFarB8fXDVqIsko6/D5qZZ
-D/jXYW7pcafOGT0PTbHxUMrUxahhAjKKfPt3Y7JVcQKBgQDzIhmN7SbQvu2dl54X
-XezrgKteDVd4q7VYVpiAjNEZA+kNdBcXC6k2T5WMNPesNwyFIoDLDFWUg4FMG/Mc
-KA1eArBocGQ0gQvLlnlUxBy519e/AAj7jTspLi7gAwLqfTo0TGdTH/Hfq+1uCXys
-dd3BKYnDKc4aDPTQCEkRzfPHDwKBgQDoLw7MZecGnNNrqArqsOaOO1uUKFysW6pi
-2ZU7KKj1x6vKGIW88YmzNBPCj4LU8XlXbR1isaSs5TaWgc6N0aAEXwA6TN/8PXhq
-6IXarR1WJIq2DEDtdBrj2AiaPoF8Y6hsebsQs+EpyLx8MCGLaucYJvqyK87ep000
-mXQuyfgM2QKBgHCLy2qAaeRdTV8S7TKB3wcQ88LAyEnqqjJvO37eMHi076+zmnCn
-jDfA1UgmyLNmdBw44YeceQ0bZsHVek8BV1a6RfDCfhAz4ELor9eGRInemVcn7ACN
-2uHwJ/C4VCQ5vbSx3W6ELhHM40Z5i8XFddZRpRy7gFVcxAJ8o15jiMIPAoGAHiq3
-DoGS8b4AjjVILdQMMKCvtmFEITTLv4orpIMU6NInlNt4zOLJFFqI0reYtRgmvuAz
-eDZCgiBJ5mY5Mx3wX4EEY47Hb1uBQMqzUYU6kY2v5BVVfkSelcnk3D2Qz1uXb3il
-gHcOo0IskyohwZ6DJhUyb2HXwAAWvOXPPaEKNIkCgYAqWhzYCAoxZ6f7i2I3J1JO
-5OaMi4+9YR3ivTDcKVYp1ZOzANe0gsQlal/gf2fTjG35b9FyK3Lo5rp0QLKxv2vh
-6dR+sk+58jJhk8H1kPNIVzvA4SAd51YoE0x7edi7+5vDMwlz57yz5rwMQvN1wUOO
-5Ev9F9qrVJZFF4Ei+fRW9Q==
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDCdI9wQHH4zJzr
+Kjd4/a4AV8uPnvZwOHC/mhFnAS2V4+oPLgBZYG/yiktsmTcsYl3Cgf3n8X1eMsRl
+i91kdC1+2txMsn/Y6DDAxW+qbYWIvWWPQlCr+eweGAYf3HkWAd3nAiKB1qfnUvL5
+y0werjQFV9cAeK9xqtC7HqaTOYtNnAmipIGLK7y4RQfnzf20Qqu9yv3uC2Gaj3Vk
+EhGFRaIvKxVmnvCmRYa8UM3HKtF4q+ApkoeslJjqK68vSXtDQFZ6qHatotWeYVzt
+luX66f925pKBTU6AVJJQxrCWjQ/KLLLW7qbytaMjagz4IBpRNpb3Wfc7c7/51nDm
+TyECGKMnAgMBAAECggEAFbpmiLl6wr1CT3ixKCDYf4tP4KV3jgSQfKhfh233RQdp
+kPan7VS8TZKsaN8Z7iizp1dVIsS2KH9tuJcPTvk4WDNmaF+Nr5QKVo/5MUb5o9Td
+80sKrpzHiHlQveCp2w6sV/LCHlX4/v0iz0yrHcaDY5F0IcZafE4E8tOy80J70VkL
+NmWb9bP5CKFs7bAknGzXSGonhOVH1Yf7WTE7OYGi5XfBoLWLozTzL19YKez6Je4m
+KHlSzVSmXqmYgZ/48U+RIRp0m31zswAdvmkg6qGNr8F4kXcySDzhQjdeojIj8sho
+MVy9dl+qjSxIBGDjmZz/MfySyEfJABJVf6anx3JE4QKBgQDuQi3x3w/utdtmfI4l
+9n1SsgB3uu/eNl/5LuWyQBKoKO1iyR86LfGo9nqbsiFtg72IfuCy1QSklm5ZVFqL
+vyRb77YH1fbah0BM4JCj2JhKgJMPJTWJ3woC5tJu67nKO3W6yB9TjMOFFl1y41tl
+NJuvoVUNZO1dYMtDJynLJ0GI8QKBgQDQ72EMozJTvS3VDGemXDimkyJyYGKyqV/f
+KzCfW66lLUREPEYN6NaG49jwR/dQfPqBPtTQqLy/HA1ZYNeQR5QdeklQiRVWs0tn
+/Nfbb1DkSPZWebX2o+hPVPUH5XVVZXOR89v8oKvajVE37hKhYK7fHxKgC8gY1zkP
+H6kUD0atlwKBgG9RhF3ptmv1k9jCgTfDfrJQcF+Ae+n6xcSK4M7zmMPwu1jYVzq7
+lJk47/gmte+RCdDoVtu3I0Ay+MPL4bJBUB+UVBw9H+TiJGzGz01+OUk14X/GBsmv
+5+GLLu6cPGX8efkW32wN7JwV4vt2tpEGj2bzneVwLmbefpmVhrVgVgJBAoGAD/WZ
+BiwZFghnTdTKvgxhT2gBw5bVMyx45EUaS7HnHzrb8hJgj4Nvj5Ir6f61R3Kkd+bi
+vqWE9VwhMOiSzrSI/c9vdjViaeL8KY9ItbxFA4sHNgfJ/HL8tcKZjObcFY/QSh/E
+eAGV3vXYdFs9FRKbiPOIqqz7tdoKw7r5YUzhazUCgYBYWwvYgeccNBPeamROwt73
+C1hWbjcrHhMRrB84vcM0j6EHIk689HJu7VobwJooQOALvyh7VSlD1b5V2DstsBiX
+cD2uKAwdLlRJuThTxgq81qW4h8KnDpdFYrwFsevaA+r4c7ihy/2oeASY6SMqUC89
+jAJOkfhhCdoj6D85HLIMNw==
 -----END PRIVATE KEY-----
 -----BEGIN CERTIFICATE-----
-MIIDzzCCAregAwIBAgIJAOa6xwibkwczMA0GCSqGSIb3DQEBCwUAMH4xCzAJBgNV
-BAYTAlVTMRMwEQYDVQQIDApXYXNoaW5ndG9uMRAwDgYDVQQHDAdTZWF0dGxlMQ8w
-DQYDVQQKDAZIYXJha2ExFTATBgNVBAMMDGhhcmFrYS5sb2NhbDEgMB4GCSqGSIb3
-DQEJARYRbWF0dEBoYXJha2EubG9jYWwwHhcNMTcwMzA0MjMyODQ5WhcNMjMwMzAz
-MjMyODQ5WjB+MQswCQYDVQQGEwJVUzETMBEGA1UECAwKV2FzaGluZ3RvbjEQMA4G
-A1UEBwwHU2VhdHRsZTEPMA0GA1UECgwGSGFyYWthMRUwEwYDVQQDDAxoYXJha2Eu
-bG9jYWwxIDAeBgkqhkiG9w0BCQEWEW1hdHRAaGFyYWthLmxvY2FsMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3IOYeU1TtYBAisjQl26SXbjaib4ROocl
-W/atFkUfMyhxOw5zqIPSajnK8+Jr905rMw2duddZhsaP749nQGGpFOx8RLkqil9Q
-rI2wz98WuyL1QmikG3DCJqu3c5np15AnT4r7oJWZqKGXp3NfEGemJK7pw3ofznD/
-FgAPvcmF6fNpZij8yjZCRE3xlV339JaF1keUkoxl2L46plyuiF6j3Lja4lE5spS8
-dtePTukViT2mdmGMUzh03leTjHhB4y6QDkoQn2YuFWLwHhmUhauVHTL+UA9ZOgbn
-ktUbn+goQi436pDHAgMPAzmPKMb86L4DP7IAXMdy9NP6XkHknoBvtwIDAQABo1Aw
-TjAdBgNVHQ4EFgQUsfam5K8yKVyyJG7NQfKXjpr6gYEwHwYDVR0jBBgwFoAUsfam
-5K8yKVyyJG7NQfKXjpr6gYEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOC
-AQEAL7vMH/sYj/rDzo+pYn8qK9eZBpTPQLsuiotNYqoH/tOJzaOBI2cMSrbGM3zG
-aegTqKOduO6vpXun7MT4tGilOxt+1eve6RbsjKMeTkZr+A44rRRUZ4LHZe38oaGk
-A8jB6YHiiefH1mgfSN1igcT7SkOxv8WM4jsCyOCy3wG8b4V8wvDytOtJOJo041hX
-njmypWHaZ1IDYu1ybnb/Macnno0NMkEMx0uIlG/c3+KvJwpz2WHrKrKA5l5oGp/n
-+F3pt6NhSJCDG0cktax07LIvxMpAoOaJ6cYSfwB/v0HiYh2733bEXEiQ2jxO5vXo
-NS2fKRYBqs2ATDVHpzknBC1KcA==
+MIID3TCCAsWgAwIBAgIUaYxDRJxsA5vqHEHzLkRzYlYJhGwwDQYJKoZIhvcNAQEL
+BQAwfjELMAkGA1UEBhMCVVMxEzARBgNVBAgMCldhc2hpbmd0b24xEDAOBgNVBAcM
+B1NlYXR0bGUxDzANBgNVBAoMBkhhcmFrYTEVMBMGA1UEAwwMaGFyYWthLmxvY2Fs
+MSAwHgYJKoZIhvcNAQkBFhFtYXR0QGhhcmFrYS5sb2NhbDAeFw0yNjAzMjUwNDI1
+MzJaFw0yOTAzMjQwNDI1MzJaMH4xCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApXYXNo
+aW5ndG9uMRAwDgYDVQQHDAdTZWF0dGxlMQ8wDQYDVQQKDAZIYXJha2ExFTATBgNV
+BAMMDGhhcmFrYS5sb2NhbDEgMB4GCSqGSIb3DQEJARYRbWF0dEBoYXJha2EubG9j
+YWwwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDCdI9wQHH4zJzrKjd4
+/a4AV8uPnvZwOHC/mhFnAS2V4+oPLgBZYG/yiktsmTcsYl3Cgf3n8X1eMsRli91k
+dC1+2txMsn/Y6DDAxW+qbYWIvWWPQlCr+eweGAYf3HkWAd3nAiKB1qfnUvL5y0we
+rjQFV9cAeK9xqtC7HqaTOYtNnAmipIGLK7y4RQfnzf20Qqu9yv3uC2Gaj3VkEhGF
+RaIvKxVmnvCmRYa8UM3HKtF4q+ApkoeslJjqK68vSXtDQFZ6qHatotWeYVztluX6
+6f925pKBTU6AVJJQxrCWjQ/KLLLW7qbytaMjagz4IBpRNpb3Wfc7c7/51nDmTyEC
+GKMnAgMBAAGjUzBRMB0GA1UdDgQWBBSzcvDenCZgIgox2IXTubXgLv/6xTAfBgNV
+HSMEGDAWgBSzcvDenCZgIgox2IXTubXgLv/6xTAPBgNVHRMBAf8EBTADAQH/MA0G
+CSqGSIb3DQEBCwUAA4IBAQAQK28lJKzpDm7LZHPPxGczn4jaBYtSYZ2aM1SP+fRv
+TMyl6QEm4atyQCETWngVEHw9zM2uVH9lUvqxRQVLxQL0Hdi05l+PGc5c/UNGsOa6
+4LJSP8f0OPvvWiMc1coWAxM9UCtAByTiMWyqbdhm9huZ8XWCBWjZ6HJswMxrFFs8
+WE0Zrdh+lutDilL9af6FF0vI1PW7dyo8a5tKZ13tYI3C4feyQoao0xZZZSvw+v50
+Pq/HLEre2zfxy11QbKVTco8ipwxRVsF3XfKKco6Vh3APp03v3QhlRovbxJsV2ZE0
+F8a2QrvoPLEBqyDPFyRc5+EgJFJcNBzrbBYbGLGA7sJ+
 -----END CERTIFICATE-----