@peopl-health/nexus 3.3.10 → 3.3.11

package/lib/helpers/twilioHelper.js

@@ -2,6 +2,9 @@ const axios = require('axios');
 const { v4: uuidv4 } = require('uuid');
 
 const runtimeConfig = require('../config/runtimeConfig');
+const { isAllowedUrl, redactUrl } = require('../utils/sanitizerUtils');
+
+const TWILIO_CDN_DOMAINS = ['api.twilio.com', 'mms.twiliocdn.com', 'media.twiliocdn.com'];
 
 function convertTwilioToInternalFormat(twilioMessage) {
   const from = twilioMessage.From || '';
@@ -23,29 +26,59 @@ function convertTwilioToInternalFormat(twilioMessage) {
 }
 
 async function downloadMediaFromTwilio(mediaUrl, logger, maxRetries = 5) {
+  if (!isAllowedUrl(mediaUrl, TWILIO_CDN_DOMAINS)) {
+    throw new Error('Invalid media URL domain');
+  }
+
   const accountSid = runtimeConfig.get('TWILIO_ACCOUNT_SID');
   const authToken = runtimeConfig.get('TWILIO_AUTH_TOKEN');
   const authorization = `Basic ${Buffer.from(`${accountSid}:${authToken}`).toString('base64')}`;
 
   for (let attempt = 1; attempt <= maxRetries; attempt++) {
     try {
-      logger.debug('[TwilioMedia] Download attempt', { attempt, maxRetries });
+      logger.debug('[TwilioMedia] Download attempt', { attempt, maxRetries, url: redactUrl(mediaUrl) });
       
-      const response = await axios.get(mediaUrl, {
+      const redirectResponse = await axios.get(mediaUrl, {
         headers: {
           'Authorization': authorization,
           'User-Agent': 'Nexus-Media-Processor/1.0'
         },
+        maxRedirects: 0,
+        validateStatus: status => status >= 200 && status < 400,
+        responseType: 'arraybuffer',
+        timeout: 30000
+      });
+
+      if (redirectResponse.status === 200) {
+        return Buffer.from(redirectResponse.data);
+      }
+      
+      const cdnUrl = redirectResponse.headers.location;
+      if (!cdnUrl) {
+        throw new Error('No redirect URL in response');
+      }
+
+      if (!isAllowedUrl(cdnUrl, TWILIO_CDN_DOMAINS)) {
+        throw new Error('Redirect URL not in allowed domains');
+      }
+
+      logger.debug('[TwilioMedia] Following redirect', { url: redactUrl(cdnUrl) });
+
+      const response = await axios.get(cdnUrl, {
+        headers: { 'User-Agent': 'Nexus-Media-Processor/1.0' },
         responseType: 'arraybuffer',
         timeout: 30000
       });
       return Buffer.from(response.data);
     } catch (error) {
       const is404 = error.response?.status === 404;
+      const isDnsError = error.code === 'ENOTFOUND';
       const isLastAttempt = attempt === maxRetries;
 
-      if (is404 && !isLastAttempt) {
-        await new Promise(r => setTimeout(r, Math.pow(2, attempt - 1) * 1000));
+      if ((is404 || isDnsError) && !isLastAttempt) {
+        const delay = Math.pow(2, attempt - 1) * 1000;
+        logger.warn('[TwilioMedia] Download failed, retrying', { error: error.message, attempt, delay });
+        await new Promise(r => setTimeout(r, delay));
         continue;
       }
 
@@ -54,7 +87,7 @@ async function downloadMediaFromTwilio(mediaUrl, logger, maxRetries = 5) {
         return null;
       }
 
-      logger.error('[TwilioMedia] Download failed', { error: error.message, status: error.response?.status, attempt });
+      logger.error('[TwilioMedia] Download failed', { error: error.message, attempt });
       throw error;
     }
   }

package/lib/utils/sanitizerUtils.js

@@ -52,11 +52,33 @@ function validateRequired(params, fields) {
   return missing.length ? missing : null;
 }
 
+function isAllowedUrl(url, allowedDomains) {
+  try {
+    const parsed = new URL(url);
+    return allowedDomains.some(domain => parsed.hostname === domain || parsed.hostname.endsWith(`.${domain}`));
+  } catch {
+    return false;
+  }
+}
+
+function redactUrl(url) {
+  try {
+    const parsed = new URL(url);
+    const pathParts = parsed.pathname.split('/');
+    const id = pathParts.find(p => /^[A-Z]{2}[a-f0-9]{32}$/i.test(p)) || pathParts.pop();
+    return `${parsed.hostname}/.../${id}`;
+  } catch {
+    return '[invalid-url]';
+  }
+}
+
 module.exports = {
   sanitizeFilename,
   sanitizeMediaFilename,
   sanitizeLogMetadata,
   maskSensitiveValue,
   cleanObject,
-  validateRequired
+  validateRequired,
+  isAllowedUrl,
+  redactUrl
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@peopl-health/nexus",
-  "version": "3.3.10",
+  "version": "3.3.11",
   "description": "Core messaging and assistant library for WhatsApp communication platforms",
   "keywords": [
     "whatsapp",