kuzzle 2.27.0 → 2.27.2

package/lib/core/network/protocols/httpwsProtocol.js

@@ -66,10 +66,10 @@ const JSON_ENDER = '"}';
 // Pre-computed messages & errors
 const WS_FORCED_TERMINATION_CODE = 1011;
 const WS_BACKPRESSURE_MESSAGE = Buffer.from(
-  "too much backpressure: client is too slow"
+  "too much backpressure: client is too slow",
 );
 const WS_GENERIC_CLOSE_MESSAGE = Buffer.from(
-  "Connection closed by remote host"
+  "Connection closed by remote host",
 );
 const WS_RATE_LIMIT_EXCEEDED_ERROR = kerrorWS.get("ratelimit_exceeded");
 const HTTP_REQUEST_TOO_LARGE_ERROR = kerrorHTTP.get("request_too_large");
@@ -84,7 +84,7 @@ const HTTP_ALLOWED_CONTENT_TYPES = [
 const HTTP_SKIPPED_HEADERS = ["content-length", "set-cookie"];
 const HTTP_HEADER_CONNECTION = Buffer.from("Connection");
 const HTTP_HEADER_ACCESS_CONTROL_ALLOW_ORIGIN = Buffer.from(
-  "Access-Control-Allow-Origin"
+  "Access-Control-Allow-Origin",
 );
 const HTTP_HEADER_SET_COOKIE = Buffer.from("Set-Cookie");
 const HTTP_HEADER_VARY = Buffer.from("Vary");
@@ -148,7 +148,7 @@ class HttpWsProtocol extends Protocol {
     this.server.listen(entrypoint.config.port, (socket) => {
       if (!socket) {
         throw new Error(
-          `[http/websocket] fatal: unable to listen to port ${entrypoint.config.port}`
+          `[http/websocket] fatal: unable to listen to port ${entrypoint.config.port}`,
         );
       }
     });
@@ -204,7 +204,7 @@ class HttpWsProtocol extends Protocol {
       debugWS(
         'Publishing to channel "realtime/%s": %s',
         channel,
-        payloadSafeCopy
+        payloadSafeCopy,
       );
       this.server.publish(`realtime/${channel}`, payloadSafeCopy, false);
     }
@@ -236,7 +236,7 @@ class HttpWsProtocol extends Protocol {
     debugWS(
       'Subscribing connection ID "%s" to channel "realtime/%s"',
       connectionId,
-      channel
+      channel,
     );
     socket.subscribe(`realtime/${channel}`);
   }
@@ -251,7 +251,7 @@ class HttpWsProtocol extends Protocol {
     debugWS(
       'Removing connection ID "%s" from channel "realtime/%s"',
       connectionId,
-      channel
+      channel,
     );
 
     socket.unsubscribe(`realtime/${channel}`);
@@ -268,7 +268,7 @@ class HttpWsProtocol extends Protocol {
 
     socket.end(
       WS_FORCED_TERMINATION_CODE,
-      message ? Buffer.from(message) : WS_GENERIC_CLOSE_MESSAGE
+      message ? Buffer.from(message) : WS_GENERIC_CLOSE_MESSAGE,
     );
   }
 
@@ -287,7 +287,7 @@ class HttpWsProtocol extends Protocol {
       req.getHeader("sec-websocket-key"),
       req.getHeader("sec-websocket-protocol"),
       req.getHeader("sec-websocket-extensions"),
-      context
+      context,
     );
   }
 
@@ -297,7 +297,7 @@ class HttpWsProtocol extends Protocol {
       this.name,
       [ip],
       socket.headers,
-      socket.internal
+      socket.internal,
     );
 
     this.entryPoint.newConnection(connection);
@@ -318,7 +318,7 @@ class HttpWsProtocol extends Protocol {
         "[%s] received a `close` event (CODE: %d, REASON: %s)",
         connection.id,
         code,
-        Buffer.from(message || "").toString()
+        Buffer.from(message || "").toString(),
       );
     }
     this.entryPoint.removeConnection(connection.id);
@@ -356,13 +356,13 @@ class HttpWsProtocol extends Protocol {
 
     ({ payload: message } = await global.kuzzle.pipe(
       "protocol:websocket:beforeParsingPayload",
-      { connection, payload: message }
+      { connection, payload: message },
     ));
 
     try {
       ({ payload: parsed } = await global.kuzzle.pipe(
         "protocol:websocket:afterParsingPayload",
-        { connection, payload: JSON.parse(message) }
+        { connection, payload: JSON.parse(message) },
       ));
     } catch (e) {
       /*
@@ -375,7 +375,7 @@ class HttpWsProtocol extends Protocol {
       this.wsSendError(
         socket,
         connection,
-        kerrorWS.getFrom(e, "unexpected_error", e.message)
+        kerrorWS.getFrom(e, "unexpected_error", e.message),
       );
       return;
     }
@@ -487,7 +487,7 @@ class HttpWsProtocol extends Protocol {
     const connection = new ClientConnection(
       "HTTP/1.1",
       getHttpIps(response, request),
-      request.headers
+      request.headers,
     );
     const message = new HttpMessage(connection, request);
 
@@ -498,29 +498,36 @@ class HttpWsProtocol extends Protocol {
       return;
     }
 
-    const contentType = message.headers["content-type"];
+    const contentTypeHeader = message.headers["content-type"];
 
-    if (
-      contentType &&
-      !this.httpConfig.opts.allowedContentTypes.some((allowed) =>
-        contentType.includes(allowed)
-      )
-    ) {
-      this.httpSendError(
-        message,
-        response,
-        kerrorHTTP.get("unsupported_content", contentType)
-      );
-      return;
+    if (contentTypeHeader) {
+      const contentTypeParamIndex = contentTypeHeader.indexOf(";");
+      const contentType =
+        contentTypeParamIndex !== -1
+          ? contentTypeHeader.slice(0, contentTypeParamIndex).trim()
+          : contentTypeHeader.trim();
+
+      if (
+        !this.httpConfig.opts.allowedContentTypes.some(
+          (allowed) => contentType === allowed,
+        )
+      ) {
+        this.httpSendError(
+          message,
+          response,
+          kerrorHTTP.get("unsupported_content", contentType),
+        );
+        return;
+      }
     }
 
-    const encoding = CHARSET_REGEX.exec(contentType);
+    const encoding = CHARSET_REGEX.exec(contentTypeHeader);
 
     if (encoding !== null && encoding[1].toLowerCase() !== "utf-8") {
       this.httpSendError(
         message,
         response,
-        kerrorHTTP.get("unsupported_charset", encoding[1].toLowerCase())
+        kerrorHTTP.get("unsupported_charset", encoding[1].toLowerCase()),
       );
       return;
     }
@@ -584,7 +591,7 @@ class HttpWsProtocol extends Protocol {
 
         const { payload: newPayload } = await global.kuzzle.pipe(
           "protocol:http:beforeParsingPayload",
-          { message, payload: inflated }
+          { message, payload: inflated },
         );
         await this.httpParseContent(message, newPayload, cb);
         resolve();
@@ -634,12 +641,12 @@ class HttpWsProtocol extends Protocol {
       try {
         const { payload } = await global.kuzzle.pipe(
           "protocol:http:afterParsingPayload",
-          { message, payload: JSON.parse(content.toString()) }
+          { message, payload: JSON.parse(content.toString()) },
         );
         message.content = payload;
       } catch (e) {
         cb(
-          kerrorHTTP.get("body_parse_failed", content.toString().slice(0, 50))
+          kerrorHTTP.get("body_parse_failed", content.toString().slice(0, 50)),
         );
         return;
       }
@@ -686,7 +693,7 @@ class HttpWsProtocol extends Protocol {
 
           const [success] = response.tryEnd(
             result.compressed,
-            result.compressed.length
+            result.compressed.length,
           );
 
           if (!success) {
@@ -694,7 +701,7 @@ class HttpWsProtocol extends Protocol {
               const retryData = result.compressed.subarray(offset);
               const [retrySuccess] = response.tryEnd(
                 retryData,
-                retryData.length
+                retryData.length,
               );
 
               return retrySuccess;
@@ -732,7 +739,7 @@ class HttpWsProtocol extends Protocol {
     ) {
       response.writeHeader(
         HTTP_HEADER_ACCESS_CONTROL_ALLOW_ORIGIN,
-        Buffer.from(message.headers.origin)
+        Buffer.from(message.headers.origin),
       );
 
       response.writeHeader(HTTP_HEADER_VARY, ORIGIN);
@@ -773,8 +780,8 @@ class HttpWsProtocol extends Protocol {
           "network",
           "http",
           "stream_errored",
-          httpStream.error.message
-        )
+          httpStream.error.message,
+        ),
       );
       return;
     }
@@ -783,7 +790,7 @@ class HttpWsProtocol extends Protocol {
       this.httpSendError(
         message,
         response,
-        kerror.get("network", "http", "stream_closed")
+        kerror.get("network", "http", "stream_closed"),
       );
       return;
     }
@@ -800,7 +807,7 @@ class HttpWsProtocol extends Protocol {
       // Make a copy of the array buffer
       const arrayBuffer = chunk.buffer.slice(
         chunk.byteOffset,
-        chunk.byteOffset + chunk.byteLength
+        chunk.byteOffset + chunk.byteLength,
       );
 
       const arrayBufferOffset = response.getWriteOffset();
@@ -815,7 +822,7 @@ class HttpWsProtocol extends Protocol {
       if (streamSizeFixed) {
         const [success, done] = response.tryEnd(
           arrayBuffer,
-          httpStream.totalBytes
+          httpStream.totalBytes,
         );
         backpressure = !success;
 
@@ -847,13 +854,13 @@ class HttpWsProtocol extends Protocol {
 
           let retryBackpressure = false;
           const remainingChunkData = response.arrayBuffer.slice(
-            offset - response.arrayBufferOffset
+            offset - response.arrayBufferOffset,
           );
 
           if (streamSizeFixed) {
             const [success] = response.tryEnd(
               remainingChunkData,
-              httpStream.totalBytes
+              httpStream.totalBytes,
             );
 
             retryBackpressure = !success;
@@ -892,7 +899,7 @@ class HttpWsProtocol extends Protocol {
       debugHTTP(
         "[%s] httpSendStream: %s",
         httpStream.connection.id,
-        err.message
+        err.message,
       );
     });
 
@@ -924,7 +931,7 @@ class HttpWsProtocol extends Protocol {
         connectionId: message.connection.id,
         error: kerr,
       }),
-      message
+      message,
     );
     this.entryPoint.removeConnection(message.connection.id);
 
@@ -944,12 +951,12 @@ class HttpWsProtocol extends Protocol {
         if (global.kuzzle.config.internal.allowAllOrigins) {
           response.writeHeader(
             HTTP_HEADER_ACCESS_CONTROL_ALLOW_ORIGIN,
-            WILDCARD
+            WILDCARD,
           );
         } else {
           response.writeHeader(
             HTTP_HEADER_ACCESS_CONTROL_ALLOW_ORIGIN,
-            Buffer.from(message.headers.origin)
+            Buffer.from(message.headers.origin),
           );
           response.writeHeader(HTTP_HEADER_VARY, ORIGIN);
         }
@@ -1057,7 +1064,7 @@ class HttpWsProtocol extends Protocol {
           callback({
             compressed: !err ? compressed : data,
             encoding: !err ? "gzip" : "identity",
-          })
+          }),
         );
         return;
       } else if (algorithm === "deflate") {
@@ -1065,7 +1072,7 @@ class HttpWsProtocol extends Protocol {
           callback({
             compressed: !err ? compressed : data,
             encoding: !err ? "deflate" : "identity",
-          })
+          }),
         );
         return;
       }
@@ -1130,7 +1137,7 @@ class HttpWsProtocol extends Protocol {
 
     if (cfg === undefined) {
       global.kuzzle.log.warn(
-        "[websocket] no configuration found for websocket: disabling it"
+        "[websocket] no configuration found for websocket: disabling it",
       );
       return { enabled: false };
     }
@@ -1141,7 +1148,7 @@ class HttpWsProtocol extends Protocol {
     if (idleTimeout === 0 || idleTimeout < 1000) {
       idleTimeout = DEFAULT_IDLE_TIMEOUT;
       global.kuzzle.log.warn(
-        `[websocket] The "idleTimeout" parameter can neither be deactivated or be set with a value lower than 1000. Defaulted to ${DEFAULT_IDLE_TIMEOUT}.`
+        `[websocket] The "idleTimeout" parameter can neither be deactivated or be set with a value lower than 1000. Defaulted to ${DEFAULT_IDLE_TIMEOUT}.`,
       );
     }
 
@@ -1152,7 +1159,7 @@ class HttpWsProtocol extends Protocol {
      */
     if (cfg.heartbeat) {
       global.kuzzle.log.warn(
-        '[websocket] The "heartbeat" parameter has been deprecated and is now ignored. The "idleTimeout" parameter should now be configured instead.'
+        '[websocket] The "heartbeat" parameter has been deprecated and is now ignored. The "idleTimeout" parameter should now be configured instead.',
       );
     }
 
@@ -1174,7 +1181,7 @@ class HttpWsProtocol extends Protocol {
 
     if (cfg === undefined) {
       global.kuzzle.log.warn(
-        "[http] no configuration found for http: disabling it"
+        "[http] no configuration found for http: disabling it",
       );
       return { enabled: false };
     }

package/lib/core/network/protocols/internalProtocol.js

@@ -25,7 +25,7 @@ const Protocol = require("./protocol");
 const ClientConnection = require("../clientConnection");
 
 const debug = require("../../../util/debug")(
-  "kuzzle:network:protocols:internal"
+  "kuzzle:network:protocols:internal",
 );
 
 /**
@@ -63,7 +63,7 @@ class InternalProtocol extends Protocol {
      */
     global.kuzzle.onAsk(
       "core:network:internal:connectionId:get",
-      () => this.connection.id
+      () => this.connection.id,
     );
   }
 

package/lib/core/network/protocols/mqttProtocol.js

@@ -73,7 +73,7 @@ class MqttProtocol extends Protocol {
           port: 1883,
         },
       },
-      this.config
+      this.config,
     );
 
     /*
@@ -93,7 +93,7 @@ class MqttProtocol extends Protocol {
     this.aedes.on("publish", this.onMessage.bind(this));
 
     await new Promise((res) =>
-      this.server.listen(this.config.server.port, res)
+      this.server.listen(this.config.server.port, res),
     );
 
     return true;
@@ -152,7 +152,7 @@ class MqttProtocol extends Protocol {
     const connection = new ClientConnection(
       this.name,
       [client.conn.remoteAddress],
-      {}
+      {},
     );
     this.entryPoint.newConnection(connection);
 
@@ -198,10 +198,10 @@ class MqttProtocol extends Protocol {
       debug(
         "no connection id for client id %s - packet: %o",
         client.id,
-        packet
+        packet,
       );
       global.kuzzle.log.error(
-        `[MQTT] Received a packet from an unregistered client: ${client.id}`
+        `[MQTT] Received a packet from an unregistered client: ${client.id}`,
       );
       return;
     }
@@ -214,7 +214,7 @@ class MqttProtocol extends Protocol {
       const request = new Request(payload, { connection });
 
       this.entryPoint.execute(connection, request, (response) =>
-        this._respond(client, response)
+        this._respond(client, response),
       );
     } catch (error) {
       this._respondError(client, error);
@@ -238,7 +238,7 @@ class MqttProtocol extends Protocol {
         payload: Buffer.from(JSON.stringify(response.content)),
         topic: this.config.responseTopic,
       },
-      this.publishCallback
+      this.publishCallback,
     );
   }
 
@@ -250,7 +250,7 @@ class MqttProtocol extends Protocol {
       {
         connection,
         error: kerror.getFrom(error, "unexpected_error", error.message),
-      }
+      },
     );
     this._respond(client, removeStacktrace(errReq.response.toJSON()));
   }
@@ -270,7 +270,7 @@ class MqttProtocol extends Protocol {
       callback(
         topic === this.config.requestTopic
           ? null
-          : new Error("Cannot publish on this topic: unauthorized")
+          : new Error("Cannot publish on this topic: unauthorized"),
       );
     }
   }

package/lib/core/network/protocols/protocol.js

@@ -52,7 +52,7 @@ class Protocol {
     // name should be passed in the constructor
     assert(
       this.name && !name,
-      "A name has been given in the constructor and init method. Passing the name in the init method is deprecated."
+      "A name has been given in the constructor and init method. Passing the name in the init method is deprecated.",
     );
 
     if (!this.name) {
@@ -63,7 +63,7 @@ class Protocol {
 
     assert(
       typeof this.name === "string" && this.name.length > 0,
-      'Invalid "name" parameter value: expected a non empty string value'
+      'Invalid "name" parameter value: expected a non empty string value',
     );
 
     if (entryPoint.config.protocols && entryPoint.config.protocols[this.name]) {
@@ -72,7 +72,7 @@ class Protocol {
 
     assert(
       Number.isInteger(this.maxRequestSize),
-      'Invalid "maxRequestSize" parameter value: expected a numeric value'
+      'Invalid "maxRequestSize" parameter value: expected a numeric value',
     );
 
     this.initCalled = true;

package/lib/core/network/router.js

@@ -49,8 +49,8 @@ class Router {
           "protocol",
           "runtime",
           "invalid_connection",
-          JSON.stringify(requestContext)
-        )
+          JSON.stringify(requestContext),
+        ),
       );
     } else {
       this.connections.set(requestContext.connection.id, requestContext);
@@ -72,8 +72,8 @@ class Router {
           "protocol",
           "runtime",
           "invalid_connection",
-          JSON.stringify(requestContext.context)
-        )
+          JSON.stringify(requestContext.context),
+        ),
       );
       return;
     }
@@ -84,8 +84,8 @@ class Router {
           "protocol",
           "runtime",
           "unknown_connection",
-          JSON.stringify(connId)
-        )
+          JSON.stringify(connId),
+        ),
       );
       return;
     }
@@ -130,7 +130,7 @@ class Router {
 
       const apiRequest = new Request(
         requestPayload,
-        request.serialize().options
+        request.serialize().options,
       );
 
       this._executeFromHttp("post", apiRequest, cb);