@node-red/nodes 4.1.2 → 4.1.3

package/core/common/25-status.js

@@ -20,13 +20,15 @@ module.exports = function(RED) {
     function StatusNode(n) {
         RED.nodes.createNode(this,n);
         var node = this;
-        this.scope = n.scope || [];
+        this.scope = n.scope;
 
         // auto-filter out any directly connected nodes to avoid simple loopback
-        const w = this.wires.flat();
-        for (let i=0; i < this.scope.length; i++) {
-            if (w.includes(this.scope[i])) {
-                this.scope.splice(i, 1);
+        if (Array.isArray(this.scope)) {
+            const w = this.wires.flat();
+            for (let i = 0; i < this.scope.length; i++) {
+                if (w.includes(this.scope[i])) {
+                    this.scope.splice(i, 1);
+                }
             }
         }
 

package/core/function/89-delay.js

@@ -192,7 +192,8 @@ module.exports = function(RED) {
                     }
                     done();
                 }, delayvar, () => done());
-                node.idList.push(id);
+                if (Object.keys(msg).length === 2 && msg.hasOwnProperty("flush")) { id.clear(); }
+                else { node.idList.push(id); }
                 if (msg.hasOwnProperty("reset")) { clearDelayList(true); }
                 if (msg.hasOwnProperty("flush")) { flushDelayList(msg.flush); done(); }
                 if (delayvar >= 0) {

package/core/network/05-tls.html

@@ -167,12 +167,15 @@
             $("#tls-config-button-cert-clear").on("click", function() {
                 clearNameData("cert");
             });
+            RED.popover.tooltip($("#tls-config-button-cert-clear"), RED._("common.label.delete"));
             $("#tls-config-button-key-clear").on("click", function() {
                 clearNameData("key");
             });
+            RED.popover.tooltip($("#tls-config-button-key-clear"), RED._("common.label.delete"));
             $("#tls-config-button-ca-clear").on("click", function() {
                 clearNameData("ca");
             });
+            RED.popover.tooltip($("#tls-config-button-ca-clear"), RED._("common.label.delete"));
 
             if (RED.settings.tlsConfigDisableLocalFiles) {
                 $("#node-config-row-uselocalfiles").hide();

package/core/network/21-httprequest.js

@@ -143,15 +143,6 @@ in your Node-RED user directory (${RED.settings.userDir}).
                 });
             }
         }
-        /**
-         * @param {Object} headersObject
-         * @param {string} name
-         * @return {any} value
-        */
-        const getHeaderValue = (headersObject, name) => {
-            const asLowercase = name.toLowercase();
-            return headersObject[Object.keys(headersObject).find(k => k.toLowerCase() === asLowercase)];
-        }
         this.count = 0;
         this.on("input",function(msg,nodeSend,nodeDone) {
             node.count++;
@@ -256,34 +247,42 @@ in your Node-RED user directory (${RED.settings.userDir}).
             opts.hooks = {
                 beforeRequest: [
                     options => {
-                        // Whilst HTTP headers are meant to be case-insensitive,
-                        // in the real world, there are servers that aren't so compliant.
-                        // GOT will lower case all headers given a chance, so we need
-                        // to restore the case of any headers the user has set.
-                        Object.keys(options.headers).forEach(h => {
-                            if (originalHeaderMap[h] && originalHeaderMap[h] !== h) {
-                                options.headers[originalHeaderMap[h]] = options.headers[h];
-                                delete options.headers[h];
+                        try {
+                            // Whilst HTTP headers are meant to be case-insensitive,
+                            // in the real world, there are servers that aren't so compliant.
+                            // GOT will lower case all headers given a chance, so we need
+                            // to restore the case of any headers the user has set.
+                            Object.keys(options.headers).forEach(h => {
+                                if (originalHeaderMap[h] && originalHeaderMap[h] !== h) {
+                                    options.headers[originalHeaderMap[h]] = options.headers[h];
+                                    delete options.headers[h];
+                                }
+                            })
+                            if (node.insecureHTTPParser) {
+                                // Setting the property under _unixOptions as pretty
+                                // much the only hack available to get got to apply
+                                // a core http option it doesn't think we should be
+                                // allowed to set
+                                options._unixOptions = { ...options.unixOptions, insecureHTTPParser: true }
                             }
-                        })
-                        if (node.insecureHTTPParser) {
-                            // Setting the property under _unixOptions as pretty
-                            // much the only hack available to get got to apply
-                            // a core http option it doesn't think we should be
-                            // allowed to set
-                            options._unixOptions = { ...options.unixOptions, insecureHTTPParser: true }
+                        } catch (err) {
+                            node.warn("Error in beforeRequest hook: " + err.message);
                         }
                     }
                 ],
                 beforeRedirect: [
                     (options, response) => {
-                        let redirectInfo = {
-                            location: response.headers.location
-                        }
-                        if (response.headers.hasOwnProperty('set-cookie')) {
-                            redirectInfo.cookies = extractCookies(response.headers['set-cookie']);
+                        try {
+                            let redirectInfo = {
+                                location: response.headers.location
+                            }
+                            if (response.headers.hasOwnProperty('set-cookie')) {
+                                redirectInfo.cookies = extractCookies(response.headers['set-cookie']);
+                            }
+                            redirectList.push(redirectInfo)
+                        } catch (err) {
+                            node.warn("Error processing redirect: " + err.message);
                         }
-                        redirectList.push(redirectInfo)
                     }
                 ]
             }
@@ -422,25 +421,30 @@ in your Node-RED user directory (${RED.settings.userDir}).
                     let digestCreds = this.credentials;
                     let sentCreds = false;
                     opts.hooks.afterResponse = [(response, retry) => {
-                        if (response.statusCode === 401) {
-                            if (sentCreds) {
-                                return response
-                            }
-                            const requestUrl = new URL(response.request.requestUrl);
-                            const options = { headers: {} }
-                            const normalisedHeaders = {};
-                            Object.keys(response.headers).forEach(k => {
-                                normalisedHeaders[k.toLowerCase()] = response.headers[k]
-                            })
-                            if (normalisedHeaders['www-authenticate']) {
-                                let authHeader = buildDigestHeader(digestCreds.user,digestCreds.password, response.request.options.method, requestUrl.pathname + requestUrl.search, normalisedHeaders['www-authenticate'])
-                                options.headers.Authorization = authHeader;
+                        try {
+                            if (response.statusCode === 401) {
+                                if (sentCreds) {
+                                    return response
+                                }
+                                const requestUrl = new URL(response.request.requestUrl);
+                                const options = { headers: {} }
+                                const normalisedHeaders = {};
+                                Object.keys(response.headers).forEach(k => {
+                                    normalisedHeaders[k.toLowerCase()] = response.headers[k]
+                                })
+                                if (normalisedHeaders['www-authenticate']) {
+                                    let authHeader = buildDigestHeader(digestCreds.user,digestCreds.password, response.request.options.method, requestUrl.pathname + requestUrl.search, normalisedHeaders['www-authenticate'])
+                                    options.headers.Authorization = authHeader;
+                                }
+                                // response.request.options.merge(options)
+                                sentCreds = true;
+                                return retry(options);
                             }
-                            // response.request.options.merge(options)
-                            sentCreds = true;
-                            return retry(options);
+                            return response
+                        } catch (err) {
+                            node.warn("Digest authentication failed: " + err.message);
+                            return response;
                         }
-                        return response
                     }];
                 } else if (this.authType === "bearer") {
                     opts.headers.Authorization = `Bearer ${this.credentials.password||""}`
@@ -688,6 +692,7 @@ in your Node-RED user directory (${RED.settings.userDir}).
                 if (!sendErrorsToCatch) {
                     nodeSend(msg);
                 }
+                node.count--;
                 nodeDone();
             });
         });
@@ -720,13 +725,29 @@ in your Node-RED user directory (${RED.settings.userDir}).
 
         function extractCookies(setCookie) {
             var cookies = {};
+            if (!Array.isArray(setCookie)) {
+                return cookies;
+            }
             setCookie.forEach(function(c) {
-                var parsedCookie = cookie.parse(c);
-                var eq_idx = c.indexOf('=');
-                var key = c.substr(0, eq_idx).trim()
-                parsedCookie.value = parsedCookie[key];
-                delete parsedCookie[key];
-                cookies[key] = parsedCookie;
+                try {
+                    if (typeof c !== 'string') {
+                        return;
+                    }
+                    var parsedCookie = cookie.parse(c);
+                    var eq_idx = c.indexOf('=');
+                    if (eq_idx === -1) {
+                        return;
+                    }
+                    var key = c.substr(0, eq_idx).trim()
+                    if (!key) {
+                        return;
+                    }
+                    parsedCookie.value = parsedCookie[key];
+                    delete parsedCookie[key];
+                    cookies[key] = parsedCookie;
+                } catch (err) {
+                    // Skip malformed cookies
+                }
             });
             return cookies;
         }
@@ -778,6 +799,9 @@ in your Node-RED user directory (${RED.settings.userDir}).
     }
 
     function buildDigestHeader(user, pass, method, path, authHeader) {
+        if (!authHeader || typeof authHeader !== 'string') {
+            throw new Error("Invalid or missing WWW-Authenticate header");
+        }
         var challenge = {}
         var re = /([a-z0-9_-]+)=(?:"([^"]+)"|([a-z0-9_-]+))/gi
         for (;;) {
@@ -787,6 +811,12 @@ in your Node-RED user directory (${RED.settings.userDir}).
             }
             challenge[match[1]] = match[2] || match[3]
         }
+        if (!challenge.nonce) {
+            throw new Error("Invalid digest challenge: missing nonce");
+        }
+        if (!challenge.realm) {
+            throw new Error("Invalid digest challenge: missing realm");
+        }
         var qop = /(^|,)\s*auth\s*($|,)/.test(challenge.qop) && 'auth'
         var nc = qop && '00000001'
         var cnonce = qop && uuid().replace(/-/g, '')

package/core/storage/10-file.html

@@ -2,7 +2,7 @@
 <script type="text/html" data-template-name="file">
     <div class="form-row node-input-filename">
          <label for="node-input-filename"><i class="fa fa-file"></i> <span data-i18n="file.label.filename"></span></label>
-         <input id="node-input-filename" type="text">
+         <input id="node-input-filename" type="text" style="width: 100% !important;">
          <input type="hidden" id="node-input-filenameType">
     </div>
     <div class="form-row">
@@ -38,7 +38,7 @@
 <script type="text/html" data-template-name="file in">
     <div class="form-row">
          <label for="node-input-filename"><i class="fa fa-file"></i> <span data-i18n="file.label.filename"></span></label>
-         <input id="node-input-filename" type="text">
+         <input id="node-input-filename" type="text" style="width: 100% !important;">
          <input type="hidden" id="node-input-filenameType">
     </div>
     <div class="form-row">

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@node-red/nodes",
-    "version": "4.1.2",
+    "version": "4.1.3",
     "license": "Apache-2.0",
     "repository": {
         "type": "git",
@@ -18,7 +18,7 @@
         "acorn": "8.15.0",
         "acorn-walk": "8.3.4",
         "ajv": "8.17.1",
-        "body-parser": "1.20.3",
+        "body-parser": "1.20.4",
         "cheerio": "1.0.0-rc.10",
         "content-type": "1.0.5",
         "cookie-parser": "1.4.7",