kuzzle 2.15.0 → 2.16.1

package/lib/core/storage/clientAdapter.js

@@ -270,7 +270,7 @@ class ClientAdapter {
       `core:storage:${this.scope}:collection:update`,
       (index, collection, changes) => {
         this.cache.assertCollectionExists(index, collection);
-        this.client.updateCollection(index, collection, changes);
+        return this.client.updateCollection(index, collection, changes);
       });
   }
 

package/lib/kuzzle/kuzzle.js

@@ -54,21 +54,25 @@ const realtime_1 = __importDefault(require("../core/realtime"));
 const cluster_1 = __importDefault(require("../cluster"));
 const package_json_1 = require("../../package.json");
 const BACKEND_IMPORT_KEY = 'backend:init:import';
-let _kuzzle = null;
+Reflect.defineProperty(global, '_kuzzle', {
+    value: null,
+    writable: true,
+});
+/* eslint-disable dot-notation */
 Reflect.defineProperty(global, 'kuzzle', {
     configurable: true,
     enumerable: false,
     get() {
-        if (_kuzzle === null) {
+        if (global['_kuzzle'] === null) {
             throw new Error('Kuzzle instance not found. Did you try to use a live-only feature before starting your application?');
         }
-        return _kuzzle;
+        return global['_kuzzle'];
     },
     set(value) {
-        if (_kuzzle !== null) {
+        if (global['_kuzzle'] !== null) {
             throw new Error('Cannot build a Kuzzle instance: another one already exists');
         }
-        _kuzzle = value;
+        global['_kuzzle'] = value;
     },
 });
 class Kuzzle extends kuzzleEventEmitter_1.default {

package/lib/service/storage/elasticsearch.js

@@ -128,12 +128,11 @@ class ElasticSearch extends Service {
       '_source_includes'
     ];
 
-    // Forbidden keys in a query
-    this.scriptKeys = [
-      'script',
-      '_script'
-    ];
-
+    /**
+     * Only allow stored-scripts in queries
+     */
+    this.scriptKeys = ['script', '_script'];
+    this.scriptAllowedArgs = ['id', 'params'];
 
     this.maxScrollDuration = this._loadMsConfig('maxScrollDuration');
 
@@ -2979,14 +2978,20 @@ class ElasticSearch extends Service {
   }
 
   /**
-   * Throw if any script keyword is contained in the object
+   * Throw if a script is used in the query.
+   *
+   * Only Stored Scripts are accepted
    *
    * @param {Object} object
    */
-  _scriptCheck(object) {
+  _scriptCheck (object) {
     for (const [key, value] of Object.entries(object)) {
       if (this.scriptKeys.includes(key)) {
-        throw kerror.get('invalid_query_keyword', key);
+        for (const scriptArg of Object.keys(value)) {
+          if (! this.scriptAllowedArgs.includes(scriptArg)) {
+            throw kerror.get('invalid_query_keyword', `${key}.${scriptArg}`);
+          }
+        }
       }
       // Every object must be checked here, even the ones nested into an array
       else if (typeof value === 'object' && value !== null) {

package/lib/util/readYamlFile.d.ts

@@ -0,0 +1,2 @@
+import { JSONObject } from '../../index';
+export declare function readYamlFile(path: string): JSONObject;

package/lib/util/readYamlFile.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.readYamlFile = void 0;
+const fs_1 = require("fs");
+const js_yaml_1 = require("js-yaml");
+function readYamlFile(path) {
+    return (0, js_yaml_1.load)((0, fs_1.readFileSync)(path, 'utf-8'));
+}
+exports.readYamlFile = readYamlFile;
+//# sourceMappingURL=readYamlFile.js.map