@chat21/chat21-ionic 3.4.23 → 3.4.25

package/CHANGELOG.md

@@ -8,6 +8,12 @@
 ### **Copyrigth**: 
 *Tiledesk SRL*
 
+# 3.4.25 in PROD
+- **changed**: pipe marked to support malicious text input
+
+# 3.4.24 in PROD
+- **changed**: fullname in info message replaced with firstname
+
 # 3.4.23 in PROD
 
 # 3.4.23-rc3

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@chat21/chat21-ionic",
     "author": "Tiledesk SRL",
-    "version": "3.4.23",
+    "version": "3.4.25",
     "license": "MIT License",
     "homepage": "https://tiledesk.com/",
     "repository": {

package/src/app/directives/marked.pipe.ts

@@ -1,6 +1,7 @@
 import { Pipe, PipeTransform } from '@angular/core';
 import { marked } from 'marked';
 
+
 @Pipe({
   name: 'marked'
 })
@@ -8,19 +9,78 @@ import { marked } from 'marked';
 export class MarkedPipe implements PipeTransform {
   transform(value: any): any {
     const renderer = new marked.Renderer();
-    renderer.link = function(href, title, text) {
-        const link = marked.Renderer.prototype.link.call(this, href, title, text);
-        return link.replace('<a', '<a target="_blank" ');
+    renderer.link = function (href, title, text) {
+      // Normalizza l'href per evitare falsi negativi
+      const normalized = (href || '').trim().toLowerCase();
+      // Pattern pericolosi da cercare nell'intero URL (non solo all'inizio)
+      const dangerousPatterns = [
+        /javascript:/i,           // javascript: protocol
+        /data:/i,                // data: protocol  
+        /vbscript:/i,            // vbscript: protocol
+        /on\w+\s*=/i,           // event handlers (onclick, onload, etc.)
+        /alert\s*\(/i,          // alert() function
+        /eval\s*\(/i,           // eval() function
+        /document\./i,          // document object access
+        /window\./i,            // window object access
+        /\.appendChild\s*\(/i,  // DOM manipulation
+        /\.createElement\s*\(/i, // DOM creation
+        /<script/i,             // script tags
+        /<\/script>/i,          // closing script tags
+        /function\s*\(/i,       // function definitions
+        /\(function/i,          // IIFE patterns
+        /setTimeout\s*\(/i,     // setTimeout
+        /setInterval\s*\(/i,    // setInterval
+        /location\./i,          // location object manipulation
+        /history\./i,           // history object manipulation
+        /localStorage\./i,      // localStorage access
+        /sessionStorage\./i,    // sessionStorage access
+        /cookie/i,              // cookie manipulation
+        /fetch\s*\(/i,          // fetch API
+        /XMLHttpRequest/i,      // XHR
+        /FormData/i,            // FormData
+        /Blob\s*\(/i,           // Blob constructor
+        /FileReader/i,          // FileReader
+        /crypto\./i,            // crypto object
+        /btoa\s*\(/i,           // base64 encoding
+        /atob\s*\(/i,           // base64 decoding
+        /decodeURI/i,           // URI decoding
+        /encodeURI/i,           // URI encoding
+        /String\.fromCharCode/i, // character code conversion
+        /unescape\s*\(/i,       // unescape function
+        /escape\s*\(/i          // escape function
+      ];
+
+      // Controlla se l'URL contiene pattern pericolosi
+      const isDangerous = dangerousPatterns.some(p => p.test(normalized));
+      if (isDangerous) {
+        // Se l’URL è pericoloso, restituisci solo il testo
+        return text || href || '';
+      }
+
+      // tokens = this.cleanInput(href);
+
+      if (!href) return text;
+
+      return `<a href="${href}" target="_blank" rel="noopener noreferrer">${text}</a>`;
     };
+    
     marked.setOptions({
-        renderer: renderer
+      renderer,
+      gfm: true,
+      breaks: true
     });
+
     if (value && value.length > 0) {
-      const text = marked(value);
-      return text;
+      try {
+        return marked.parse(value);
+      } catch (err) {
+        console.error('Errore nel parsing markdown:', err);
+        return value;
+      }
     }
     return value;
   }
 
 
+
 }

package/src/chat21-core/providers/firebase/firebase-conversation-handler.ts

@@ -386,9 +386,9 @@ export class FirebaseConversationHandler extends ConversationHandlerService {
                 complement = INFO_SUPPORT_USER_ADDED_COMPLEMENT;
             } else {
 
-                if (message.attributes.messagelabel.parameters.fullname) {
+                if (message.attributes.messagelabel.parameters.firstname) {
                     // other user has been added to the group (and he has a fullname)
-                    subject = message.attributes.messagelabel.parameters.fullname;
+                    subject = message.attributes.messagelabel.parameters.firstname;
                     verb = INFO_SUPPORT_USER_ADDED_VERB;
                     complement = INFO_SUPPORT_USER_ADDED_COMPLEMENT;
                 } else {

package/src/chat21-core/providers/mqtt/mqtt-conversation-handler.ts

@@ -364,9 +364,9 @@ export class MQTTConversationHandler extends ConversationHandlerService {
                 verb = INFO_SUPPORT_USER_ADDED_YOU_VERB;
                 complement = INFO_SUPPORT_USER_ADDED_COMPLEMENT;
             } else {
-                if (message.attributes.messagelabel.parameters.fullname) {
+                if (message.attributes.messagelabel.parameters.firstname) {
                     // other user has been added to the group (and he has a fullname)
-                    subject = message.attributes.messagelabel.parameters.fullname;
+                    subject = message.attributes.messagelabel.parameters.firstname;
                     verb = INFO_SUPPORT_USER_ADDED_VERB;
                     complement = INFO_SUPPORT_USER_ADDED_COMPLEMENT;
                 } else {