From 2d2e4a1641fc55d431c6f1378e414f652ba5ed32 Mon Sep 17 00:00:00 2001
From: Andris Reinman <andris@kreata.ee>
Date: Fri, 29 Dec 2017 10:29:29 +0200
Subject: [PATCH] fixed paging check

---
 lib/api/dkim.js  | 3 ++-
 lib/joi.js       | 2 +-
 package.json     | 9 ++++++---
 setup/install.sh | 2 +-
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/lib/api/dkim.js b/lib/api/dkim.js
index 02f57dbd..28419503 100644
--- a/lib/api/dkim.js
+++ b/lib/api/dkim.js
@@ -181,7 +181,8 @@ module.exports = (db, server) => {
      * @api {post} /dkim Create or update DKIM key for domain
      * @apiName PostDkim
      * @apiGroup DKIM
-     * @apiDescription Add a new DKIM key for a Domain or update existing one
+     * @apiDescription Add a new DKIM key for a Domain or update existing one. There can be single DKIM key
+     * registered for each domain name.
      * @apiHeaderExample {json} Header-Example:
      * {
      *   "X-Access-Token": "59fc66a03e54454869460e45"
diff --git a/lib/joi.js b/lib/joi.js
index d3aa4931..7b9346f6 100644
--- a/lib/joi.js
+++ b/lib/joi.js
@@ -23,7 +23,7 @@ const customJoi = Joi.extend(joi => ({
                     return this.createError('string.base64url', { v: value }, state, options);
                 }
                 try {
-                    EJSON.parse(value);
+                    EJSON.parse(Buffer.from(value, 'base64'));
                 } catch (E) {
                     return this.createError('string.ejson', { v: value }, state, options);
                 }
diff --git a/package.json b/package.json
index e7af5a33..a11ba84e 100644
--- a/package.json
+++ b/package.json
@@ -8,7 +8,10 @@
         "test": "mongo --eval 'db.dropDatabase()' wildduck-test && redis-cli -n 13 flushdb && NODE_ENV=test grunt",
         "apidoc": "apidoc -i lib/api/ -o docs/"
     },
-    "keywords": ["imap", "mail server"],
+    "keywords": [
+        "imap",
+        "mail server"
+    ],
     "author": "Andris Reinman",
     "license": "EUPL-1.1",
     "devDependencies": {
@@ -25,7 +28,7 @@
         "icedfrisby": "^1.5.0",
         "mailparser": "^2.1.0",
         "markdown-toc": "^1.2.0",
-        "mocha": "^4.0.1",
+        "mocha": "^4.1.0",
         "request": "^2.83.0"
     },
     "dependencies": {
@@ -56,7 +59,7 @@
         "nodemailer": "4.4.1",
         "npmlog": "4.1.2",
         "openpgp": "2.6.1",
-        "qrcode": "1.0.1",
+        "qrcode": "1.2.0",
         "restify": "6.3.4",
         "restify-logger": "2.0.1",
         "seq-index": "1.1.0",
diff --git a/setup/install.sh b/setup/install.sh
index ee0220da..e738979b 100755
--- a/setup/install.sh
+++ b/setup/install.sh
@@ -14,7 +14,7 @@ HOSTNAME="$1"
 
 WILDDUCK_COMMIT="34a3243a4d6d9a67d39d872c08f3969bd548683e"
 ZONEMTA_COMMIT="e058fccbf75a87c2d84df43e012ea579d2f9b481"
-WEBMAIL_COMMIT="be67abbad78c0f912394e0aaaf699629477e3985"
+WEBMAIL_COMMIT="fc2b8d52c972caa439fc1d0f9e1da42f6ea650cc"
 HARAKA_VERSION="2.8.14" # do not use 2.8.16
 HARAKA_PLUGIN_WILDDUCK_VERSION="1.7.1"