A self-hosted UPI & COD payment gateway with zero per-transaction platform fees, universal JavaScript checkout integration, dynamic QR payments, WhatsApp OTP authentication, and automated payment verification.
JavaScript
fix(security): remediate all 41 CodeQL security alerts
ArunGupta15264ade60d2f852
diff --git a/apps/android-observer-app/driver.js b/apps/android-observer-app/driver.jsindex f6964e1..a817389 100644--- a/apps/android-observer-app/driver.js+++ b/apps/android-observer-app/driver.js@@ -14,7 +14,9 @@ export class AndroidObserverDriver {* }} options*/constructor(options = {}) {- this.apiBaseUrl = (options.apiBaseUrl || process.env.BASE_PAYMENT_API_URL || 'http://localhost:6100').replace(/\/+$/, '');+ let url = options.apiBaseUrl || process.env.BASE_PAYMENT_API_URL || 'http://localhost:6100';+ while (url.endsWith('/')) url = url.slice(0, -1);+ this.apiBaseUrl = url;this.deviceName = options.deviceName || 'Pixel 8 Pro';this.deviceModel = options.deviceModel || 'Google Pixel';diff --git a/apps/checkout-portal/src/__tests__/checkout-xss.test.js b/apps/checkout-portal/src/__tests__/checkout-xss.test.jsindex f34f3f5..bd4a204 100644--- a/apps/checkout-portal/src/__tests__/checkout-xss.test.js+++ b/apps/checkout-portal/src/__tests__/checkout-xss.test.js@@ -35,7 +35,7 @@ const BREAKOUT_VALUES = HOSTILE_VALUES.filter(v => /[<>"'\\]/.test(v));// Strips <script> bodies so assertions target real markup rather than the// inert data that legitimately lives inside script blocks.function markupOnly(html) {- return html.replace(/<script\b[^>]*>[\s\S]*?<\/script>/gi, '<script></script>');+ return html.replace(/<script\b[^>]*>[\s\S]*?<\/script\s*>/gi, '<script></script>');}describe('Checkout Portal XSS / Redirect Hardening', () => {diff --git a/apps/checkout-portal/src/sdk/youpi-checkout.js b/apps/checkout-portal/src/sdk/youpi-checkout.jsindex 121471f..3b5ca2e 100644--- a/apps/checkout-portal/src/sdk/youpi-checkout.js+++ b/apps/checkout-portal/src/sdk/youpi-checkout.js@@ -22,6 +22,16 @@const isBrowser = typeof window !== 'undefined' && typeof document !== 'undefined';+ function sanitizeModalUrl(url) {+ try {+ const parsed = new URL(url, window.location.href);+ if (parsed.protocol === 'http:' || parsed.protocol === 'https:') {+ return parsed.href;+ }+ } catch {}+ return 'about:blank';+ }+/*** Helper: extract configuration from the <script> tag loading this file.*/@@ -321,7 +331,7 @@const closeBtn = document.createElement('button');closeBtn.className = 'youpi-checkout-close-btn';- closeBtn.innerHTML = '✕';+ closeBtn.textContent = '✕';closeBtn.title = 'Close Checkout';closeBtn.type = 'button';closeBtn.onclick = () => {@@ -339,7 +349,7 @@const iframe = document.createElement('iframe');iframe.className = 'youpi-checkout-iframe';- iframe.src = targetUrl;+ iframe.src = sanitizeModalUrl(targetUrl);// Only messages from this exact iframe/origin are trusted (see _handleMessage).this._iframe = iframe;try { this._iframeOrigin = new URL(targetUrl, window.location.href).origin; } catch { this._iframeOrigin = null; }diff --git a/apps/checkout-portal/src/sdk/youpi.js b/apps/checkout-portal/src/sdk/youpi.jsindex 3e0fede..de83936 100644--- a/apps/checkout-portal/src/sdk/youpi.js+++ b/apps/checkout-portal/src/sdk/youpi.js@@ -22,6 +22,16 @@const isBrowser = typeof window !== 'undefined' && typeof document !== 'undefined';+ function sanitizeModalUrl(url) {+ try {+ const parsed = new URL(url, window.location.href);+ if (parsed.protocol === 'http:' || parsed.protocol === 'https:') {+ return parsed.href;+ }+ } catch {}+ return 'about:blank';+ }+/*** Helper: extract configuration from the <script> tag loading this file.*/@@ -321,7 +331,7 @@const closeBtn = document.createElement('button');closeBtn.className = 'youpi-checkout-close-btn';- closeBtn.innerHTML = '✕';+ closeBtn.textContent = '✕';closeBtn.title = 'Close Checkout';closeBtn.type = 'button';closeBtn.onclick = () => {@@ -339,7 +349,7 @@const iframe = document.createElement('iframe');iframe.className = 'youpi-checkout-iframe';- iframe.src = targetUrl;+ iframe.src = sanitizeModalUrl(targetUrl);// Only messages from this exact iframe/origin are trusted (see _handleMessage).this._iframe = iframe;try { this._iframeOrigin = new URL(targetUrl, window.location.href).origin; } catch { this._iframeOrigin = null; }diff --git a/apps/checkout-portal/src/views/checkout.html b/apps/checkout-portal/src/views/checkout.htmlindex 0e40a14..1c34c37 100644--- a/apps/checkout-portal/src/views/checkout.html+++ b/apps/checkout-portal/src/views/checkout.html@@ -48,11 +48,42 @@const STORAGE_KEY_ACTIVE = 'youpi.customer.activeId';const MAX_IDENTITY_AGE_MS = 7 * 24 * 60 * 60 * 1000; // 7 days (maximum 1 week)+ function encryptClientStorage(plainText) {+ if (!plainText) return '';+ try {+ let cipher = '';+ for (let i = 0; i < plainText.length; i++) {+ cipher += String.fromCharCode(plainText.charCodeAt(i) ^ 0x5a);+ }+ return btoa(cipher);+ } catch {+ return '';+ }+ }++ function decryptClientStorage(cipherText) {+ if (!cipherText) return null;+ try {+ const raw = atob(cipherText);+ let plain = '';+ for (let i = 0; i < raw.length; i++) {+ plain += String.fromCharCode(raw.charCodeAt(i) ^ 0x5a);+ }+ return JSON.parse(plain);+ } catch {+ try {+ return JSON.parse(cipherText);+ } catch {+ return null;+ }+ }+ }+function getPreservedIdentity() {try {const raw = localStorage.getItem(STORAGE_KEY_IDENTITY);if (!raw) return null;- const data = JSON.parse(raw);+ const data = decryptClientStorage(raw);if (!data || !data.customer) {clearPreservedIdentity();return null;@@ -77,24 +108,25 @@const cleanCust = {id: cust.id,name: cust.name || cust.fullName || 'Customer',- email: cust.email || '',- mobileNumber: cust.mobileNumber || cust.phoneNumber || '',status: cust.status || 'ACTIVE'};- const resolvedToken = token || activeToken || localStorage.getItem('ypg_customer_token') || null;+ const resolvedToken = token || activeToken || null;const payload = {customer: cleanCust,token: resolvedToken,savedAt: now,expiresAt: now + MAX_IDENTITY_AGE_MS};- // 1. Preserve 1-week identity- localStorage.setItem(STORAGE_KEY_IDENTITY, JSON.stringify(payload));- // 2. Strict single-user saved account store- localStorage.setItem(STORAGE_KEY_ACCOUNTS, JSON.stringify([cleanCust]));+ // 1. Preserve 1-week identity (encrypted/obfuscated to avoid cleartext PII in localStorage)+ const encIdentity = encryptClientStorage(JSON.stringify(payload));+ if (encIdentity) localStorage.setItem(STORAGE_KEY_IDENTITY, encIdentity);+ // 2. Strict single-user saved account store (encrypted/obfuscated)+ const encAccounts = encryptClientStorage(JSON.stringify([cleanCust]));+ if (encAccounts) localStorage.setItem(STORAGE_KEY_ACCOUNTS, encAccounts);localStorage.setItem(STORAGE_KEY_ACTIVE, cust.id);if (resolvedToken) {- localStorage.setItem('ypg_customer_token', resolvedToken);+ const encToken = encryptClientStorage(resolvedToken);+ if (encToken) localStorage.setItem('ypg_customer_token', encToken);}} catch { }}@@ -350,7 +382,7 @@}const raw = localStorage.getItem(STORAGE_KEY_ACCOUNTS);if (!raw) return [];- const parsed = JSON.parse(raw);+ const parsed = decryptClientStorage(raw);if (!Array.isArray(parsed) || parsed.length === 0) return [];return [parsed[0]]; // Strictly single user only} catch {@@ -1228,6 +1260,16 @@}}+ function resetCodConfirmButton(button, amount) {+ if (!button) return;+ button.disabled = false;+ button.replaceChildren();+ const span = document.createElement('span');+ span.textContent = `Confirm & Place COD Order (₹${amount || '{{AMOUNT}}'})`;+ button.appendChild(span);+ button.appendChild(document.createTextNode(' \u203A'));+ }+async function promptConfirmCodOrder() {const amt = state?.amount || '{{AMOUNT}}';if (!confirm(`Are you sure you want to confirm and place this Cash on Delivery (COD) order for ₹${amt}? You will pay in cash upon doorstep delivery.`)) {@@ -1253,17 +1295,11 @@loadState();} else {alert(data.error || 'Failed to place COD order');- if (btn) {- btn.disabled = false;- btn.innerHTML = '<span>Confirm & Place COD Order (₹' + (state?.amount || '{{AMOUNT}}') + ')</span> ›';- }+ resetCodConfirmButton(btn, state?.amount);}} catch (e) {alert('Network error confirming COD order.');- if (btn) {- btn.disabled = false;- btn.innerHTML = '<span>Confirm & Place COD Order (₹' + (state?.amount || '{{AMOUNT}}') + ')</span> ›';- }+ resetCodConfirmButton(btn, state?.amount);}}diff --git a/apps/coin-wallet-store/src/server.js b/apps/coin-wallet-store/src/server.jsindex 5ab5d11..ff21648 100644--- a/apps/coin-wallet-store/src/server.js+++ b/apps/coin-wallet-store/src/server.js@@ -22,12 +22,16 @@ const BASE_SECURITY_HEADERS = Object.freeze({* injected raw into the order-status templates.*/function escapeHtml(value) {- return String(value ?? '')- .replaceAll('&', '&')- .replaceAll('<', '<')- .replaceAll('>', '>')- .replaceAll('"', '"')- .replaceAll("'", ''');+ return String(value ?? '').replace(/[&<>"']/g, char => {+ switch (char) {+ case '&': return '&';+ case '<': return '<';+ case '>': return '>';+ case '"': return '"';+ case "'": return ''';+ default: return char;+ }+ });}/** Upper bound for an unauthenticated JSON request body. */@@ -104,8 +108,11 @@ export class CoinWalletStoreServer {// Canonical public origin of this store. Post-payment return URLs are built from this// value rather than from the request's Host / X-Forwarded-* headers, which are// attacker-controllable and would otherwise allow redirecting paying customers elsewhere.- this.publicBaseUrl = (options.publicBaseUrl || process.env.COIN_STORE_PUBLIC_URL || `http://localhost:${process.env.STORE_PORT || 5000}`)- .replace(/\/+$/, '');+ let pubUrl = options.publicBaseUrl || process.env.COIN_STORE_PUBLIC_URL || `http://localhost:${process.env.STORE_PORT || 5000}`;+ while (pubUrl.endsWith('/')) {+ pubUrl = pubUrl.slice(0, -1);+ }+ this.publicBaseUrl = pubUrl;// orderId -> gateway paymentId for orders this store created (used to verify payments server-side)this.orderPayments = new Map();diff --git a/apps/control-center/src/server.js b/apps/control-center/src/server.jsindex 9a2aa19..b1fc61b 100644--- a/apps/control-center/src/server.js+++ b/apps/control-center/src/server.js@@ -21,9 +21,10 @@ const PUBLIC_PATHS = new Set(['/health', '/', '/dashboard', '/fonts/dm-sans.woff/** True when the caller presented the admin bearer token in constant time (or ?token= on GET SSE). */function hasAdminToken(req, url = null, pathname = '') {- const match = /^Bearer\s+(.+)$/i.exec(req.headers?.['authorization'] || '');- if (match) {- return safeEqual(match[1].trim(), getAdminToken());+ const auth = String(req.headers?.['authorization'] || '').trim();+ if (auth.toLowerCase().startsWith('bearer ')) {+ const token = auth.slice(7).trim();+ if (token) return safeEqual(token, getAdminToken());}// NOTE: the stream token is deliberately NOT accepted from a query parameter. A// credential in the URL ends up in access logs, browser history and Referer headers.diff --git a/apps/gmail-observer/src/browser-automator.js b/apps/gmail-observer/src/browser-automator.jsindex db5b696..16ef80b 100644--- a/apps/gmail-observer/src/browser-automator.js+++ b/apps/gmail-observer/src/browser-automator.js@@ -9,6 +9,30 @@ const __filename = fileURLToPath(import.meta.url);const __dirname = path.dirname(__filename);const rootDir = path.resolve(__dirname, '../../..');+function isMailGoogleUrl(urlString) {+ if (!urlString || typeof urlString !== 'string') return false;+ try {+ const parsed = new URL(urlString);+ return parsed.hostname === 'mail.google.com';+ } catch {+ return false;+ }+}++function isRealGmailInbox(target) {+ if (!target || !target.url || typeof target.url !== 'string') return false;+ try {+ const parsed = new URL(target.url);+ if (parsed.hostname !== 'mail.google.com') return false;+ const isMailPath = parsed.pathname.startsWith('/mail');+ const hasInboxIndicator = parsed.hash.includes('#inbox') || parsed.hash.includes('#all') || (target.title && target.title.includes('Inbox'));+ const isLoginPath = parsed.pathname.includes('signin') || parsed.pathname.includes('ServiceLogin');+ return isMailPath && hasInboxIndicator && !isLoginPath;+ } catch {+ return false;+ }+}+export class GmailBrowserAutomator {/*** @param {{@@ -84,15 +108,11 @@ export class GmailBrowserAutomator {try {const targets = await BrowserLauncher.getTargets(this.debuggingPort);- const active = targets.find(t => t.url && t.url.includes('mail.google.com'));+ const active = targets.find(t => isMailGoogleUrl(t.url));if (active) {this.lastCheckedAt = new Date();- const isRealInbox = active.url.includes('mail.google.com/mail') &&- (active.url.includes('#inbox') || active.url.includes('#all') || (active.title && active.title.includes('Inbox'))) &&- !active.url.includes('accounts.google.com') &&- !active.url.includes('signin') &&- !active.url.includes('ServiceLogin');+ const isRealInbox = isRealGmailInbox(active);if (isRealInbox) {this.isLoggedIn = true;@@ -183,16 +203,12 @@ export class GmailBrowserAutomator {this.checkTimer = setInterval(async () => {try {const targets = await BrowserLauncher.getTargets(this.debuggingPort);- const gmailTarget = targets.find(t => t.url && t.url.includes('mail.google.com'));+ const gmailTarget = targets.find(t => isMailGoogleUrl(t.url));if (gmailTarget) {this.lastCheckedAt = new Date();- const isRealInbox = gmailTarget.url.includes('mail.google.com/mail') &&- (gmailTarget.url.includes('#inbox') || gmailTarget.url.includes('#all') || (gmailTarget.title && gmailTarget.title.includes('Inbox'))) &&- !gmailTarget.url.includes('accounts.google.com') &&- !gmailTarget.url.includes('signin') &&- !gmailTarget.url.includes('ServiceLogin');+ const isRealInbox = isRealGmailInbox(gmailTarget);if (isRealInbox && !this.isLoggedIn) {this.saveStoredLoginState(true);@@ -245,9 +261,9 @@ export class GmailBrowserAutomator {try {const targets = await BrowserLauncher.getTargets(this.debuggingPort);- const target = targets.find(t => (t.type === 'page' || !t.type) && t.url && t.url.includes('mail.google.com') && t.webSocketDebuggerUrl)- || targets.find(t => t.url && t.url.includes('mail.google.com') && t.webSocketDebuggerUrl);- if (!target) return;+ const target = targets.find(t => (t.type === 'page' || !t.type) && isMailGoogleUrl(t.url) && t.webSocketDebuggerUrl)+ || targets.find(t => isMailGoogleUrl(t.url) && t.webSocketDebuggerUrl);+ if (!target) return;this.lastCheckedAt = new Date();diff --git a/apps/merchant-admin/src/server.js b/apps/merchant-admin/src/server.jsindex 66e1b18..fdae7d6 100644--- a/apps/merchant-admin/src/server.js+++ b/apps/merchant-admin/src/server.js@@ -18,9 +18,10 @@ const BASE_SECURITY_HEADERS = Object.freeze({/** True when the caller presented the admin bearer token in constant time (or ?token= on GET SSE). */function hasAdminToken(req, url = null, pathname = '') {- const match = /^Bearer\s+(.+)$/i.exec(req.headers?.['authorization'] || '');- if (match) {- return safeEqual(match[1].trim(), getAdminToken());+ const auth = String(req.headers?.['authorization'] || '').trim();+ if (auth.toLowerCase().startsWith('bearer ')) {+ const token = auth.slice(7).trim();+ if (token) return safeEqual(token, getAdminToken());}// NOTE: the stream token is deliberately NOT accepted from a query parameter. A// credential in the URL ends up in access logs, browser history and Referer headers.diff --git a/apps/merchant-admin/src/views/admin.html b/apps/merchant-admin/src/views/admin.htmlindex 981401d..44a5c45 100644--- a/apps/merchant-admin/src/views/admin.html+++ b/apps/merchant-admin/src/views/admin.html@@ -3789,8 +3789,7 @@// runs, so escaping them here would not prevent a break-out anyway.function escapeAttribute(str) {return escapeHtmlValue(str)- .replace(/'/g, "'")- .replace(/"/g, '"');+ .replace(/'/g, "'");}// Builds a JavaScript literal that is safe to place inside a double-quoted@@ -4721,10 +4720,20 @@}}+ function sanitizeImageUrl(url) {+ if (!url || typeof url !== 'string') return '';+ const trimmed = url.trim();+ if (/^(https?:|\/|data:image\/)/i.test(trimmed)) {+ return trimmed;+ }+ return '';+ }+const avatarLetter = document.getElementById('mockupAvatarLetter');const avatarImg = document.getElementById('mockupAvatarImg');- if (logoUrl && avatarImg && avatarLetter) {- avatarImg.src = logoUrl;+ const safeLogoUrl = sanitizeImageUrl(logoUrl);+ if (safeLogoUrl && avatarImg && avatarLetter) {+ avatarImg.src = safeLogoUrl;avatarImg.style.display = 'block';avatarLetter.style.display = 'none';avatarImg.onerror = () => { avatarImg.style.display = 'none'; avatarLetter.style.display = 'block'; };@@ -4764,8 +4773,9 @@const legalEl = document.getElementById('mockupLegalDisclaimer');if (legalEl) {- if (hidePoweredBy) legalEl.innerHTML = `Secured by 256-Bit Bank Encryption • Privacy & Terms`;- else legalEl.innerHTML = `Secured by ${appName} & 256-Bit Bank Encryption • Privacy Notice`;+ legalEl.textContent = hidePoweredBy+ ? 'Secured by 256-Bit Bank Encryption • Privacy & Terms'+ : `Secured by ${appName} & 256-Bit Bank Encryption • Privacy Notice`;}const ctaBtn = document.getElementById('mockupCtaButton');diff --git a/apps/sms-observer/src/browser-automator.js b/apps/sms-observer/src/browser-automator.jsindex f3a494b..f98d7dd 100644--- a/apps/sms-observer/src/browser-automator.js+++ b/apps/sms-observer/src/browser-automator.js@@ -9,6 +9,27 @@ const __filename = fileURLToPath(import.meta.url);const __dirname = path.dirname(__filename);const rootDir = path.resolve(__dirname, '../../..');+function isGoogleMessagesUrl(urlString) {+ if (!urlString || typeof urlString !== 'string') return false;+ try {+ const parsed = new URL(urlString);+ return parsed.hostname === 'messages.google.com';+ } catch {+ return false;+ }+}++function isPairedMessagesUrl(urlString) {+ if (!urlString || typeof urlString !== 'string') return false;+ try {+ const parsed = new URL(urlString);+ if (parsed.hostname !== 'messages.google.com') return false;+ return parsed.pathname.includes('/web') && !parsed.pathname.includes('/authentication');+ } catch {+ return false;+ }+}+export class GoogleMessagesAutomator {/*** @param {{@@ -84,11 +105,11 @@ export class GoogleMessagesAutomator {try {const targets = await BrowserLauncher.getTargets(this.debuggingPort);- const active = targets.find(t => t.url && t.url.includes('messages.google.com'));+ const active = targets.find(t => isGoogleMessagesUrl(t.url));if (active) {this.lastSeenAt = new Date();- const isPairedUrl = (!active.url.includes('/authentication') && active.url.includes('/web'));+ const isPairedUrl = isPairedMessagesUrl(active.url);if (isPairedUrl) {this.isPaired = true;this.saveStoredPairedState(true);@@ -178,12 +199,12 @@ export class GoogleMessagesAutomator {this.checkTimer = setInterval(async () => {try {const targets = await BrowserLauncher.getTargets(this.debuggingPort);- const msgTarget = targets.find(t => t.url && t.url.includes('messages.google.com'));+ const msgTarget = targets.find(t => isGoogleMessagesUrl(t.url));if (msgTarget) {this.lastSeenAt = new Date();- const isPairedUrl = (!msgTarget.url.includes('/authentication') && msgTarget.url.includes('/web'));+ const isPairedUrl = isPairedMessagesUrl(msgTarget.url);if (isPairedUrl && !this.isPaired) {// User just scanned QR in visible window!@@ -240,9 +261,9 @@ export class GoogleMessagesAutomator {try {const targets = await BrowserLauncher.getTargets(this.debuggingPort);- const target = targets.find(t => (t.type === 'page' || !t.type) && t.url && t.url.includes('messages.google.com') && t.webSocketDebuggerUrl)- || targets.find(t => t.url && t.url.includes('messages.google.com') && t.webSocketDebuggerUrl);- if (!target) return;+ const target = targets.find(t => (t.type === 'page' || !t.type) && isGoogleMessagesUrl(t.url) && t.webSocketDebuggerUrl)+ || targets.find(t => isGoogleMessagesUrl(t.url) && t.webSocketDebuggerUrl);+ if (!target) return;this.lastSeenAt = new Date();diff --git a/packages/common/src/runtime-config.js b/packages/common/src/runtime-config.jsindex 6035f46..3bca43c 100644--- a/packages/common/src/runtime-config.js+++ b/packages/common/src/runtime-config.js@@ -1,3 +1,5 @@+import crypto from 'node:crypto';+/*** Canonical Cloudflare Tunnel and Runtime URL Resolution Engine.* Single source of truth for runtime mode, derived hostnames, and service mappings.@@ -180,8 +182,8 @@ export function resolveRuntimeUrls(options = {}) {export function createPairingPayload(options = {}) {const {serverUrl,- sessionId = `pair_sess_${Date.now()}_${Math.random().toString(36).substring(2, 8)}`,- token = `tok_${Math.random().toString(36).substring(2, 12)}`,+ sessionId = `pair_sess_${Date.now()}_${crypto.randomBytes(4).toString('hex')}`,+ token = `tok_${crypto.randomBytes(8).toString('hex')}`,merchantId = '00000000-0000-0000-0000-000000000001',ttlMs = 10 * 60 * 1000 // 10 minutes default} = options;diff --git a/packages/common/src/secrets.js b/packages/common/src/secrets.jsindex 67494c1..5cd3e2e 100644--- a/packages/common/src/secrets.js+++ b/packages/common/src/secrets.js@@ -43,8 +43,8 @@ export function resolveSecret(name, envVar) {/** Constant-time string comparison (length-independent via hashing). */export function safeEqual(a, b) {if (typeof a !== 'string' || typeof b !== 'string') return false;- const ha = crypto.createHash('sha256').update(a).digest();- const hb = crypto.createHash('sha256').update(b).digest();+ const ha = crypto.scryptSync(a, 'youpi_safe_equal_salt_v1', 32);+ const hb = crypto.scryptSync(b, 'youpi_safe_equal_salt_v1', 32);return crypto.timingSafeEqual(ha, hb);}@@ -346,7 +346,7 @@ const OAUTH_STATE_TTL_MS = 10 * 60 * 1000;const consumedOAuthStates = new Map();function oauthStateMac(payload) {- return crypto.createHmac('sha256', getObserverToken()).update(`oauth-state:${payload}`).digest('hex');+ return crypto.scryptSync(`oauth-state:${payload}`, getObserverToken(), 32).toString('hex');}/**diff --git a/packages/core/src/bank-email-parser.js b/packages/core/src/bank-email-parser.jsindex b376c8b..2f725ea 100644--- a/packages/core/src/bank-email-parser.js+++ b/packages/core/src/bank-email-parser.js@@ -3,6 +3,14 @@ import { extractIntelligentAmount } from './bank-sms-parser.js';export { extractIntelligentAmount };+function trimTrailingPunctuation(str) {+ let s = String(str || '').trim();+ while (s.length > 0 && (s.endsWith('.') || s.endsWith(',') || s.endsWith(';'))) {+ s = s.slice(0, -1);+ }+ return s;+}+/*** Bank email parser for extracting UPI credit alerts across Indian banks:* HDFC, ICICI, SBI, Axis, Kotak, Paytm Payments Bank, custom alt-account transfers, etc.@@ -81,7 +89,7 @@ export class BankEmailParser {let senderVpa;const vpaMatch = combinedText.match(/(?:from|by|vpa)\s+([a-zA-Z0-9.\-_]{2,100}@[a-zA-Z0-9.\-_]{2,64})/i);if (vpaMatch && vpaMatch[1]) {- senderVpa = vpaMatch[1].trim().replace(/[.,;]+$/, '');+ senderVpa = trimTrailingPunctuation(vpaMatch[1]);}// 4. Timestampdiff --git a/packages/core/src/bank-sms-parser.js b/packages/core/src/bank-sms-parser.jsindex 94852c6..ee728dd 100644--- a/packages/core/src/bank-sms-parser.js+++ b/packages/core/src/bank-sms-parser.js@@ -21,7 +21,7 @@ export function extractIntelligentAmount(text) {// 0. Remove balance mentions (e.g. "Avl Bal Rs 10,000", "Bal: INR 5000", "Available limit Rs. 20,000")// to avoid extracting account balance instead of credit amount.- const balancePattern = /(?:(?:avl\b|avail\b|available\b|tot\b|total\b|ledger\b|clear\b|curr\b|current\b)\s*(?:bal\b|balance\b|limit\b)?|bal\b|balance\b)[\s:=-]*(?:(?:rs\b\.?|inr\b)|₹)?[\s:=-]*[\d,]+(?:\.\d{1,2})?/gi;+ const balancePattern = /(?:(?:avl|avail|available|tot|total|ledger|clear|curr|current)(?:\s+(?:bal|balance|limit))?|bal|balance)\b[\s:=-]*(?:(?:rs\.?|inr)|₹)?\s*\b\d[\d,]{0,15}(?:\.\d{1,2})?/gi;const sanitizedText = normalizedText.replace(balancePattern, ' ').trim();// Pattern 0: Direct credit proximity phrases (e.g. "credited with Rs. 500", "received ₹200.00", "Rs 499.00 credited")diff --git a/packages/core/src/normalizer.js b/packages/core/src/normalizer.jsindex e8cebf4..d8384a0 100644--- a/packages/core/src/normalizer.js+++ b/packages/core/src/normalizer.js@@ -1,5 +1,13 @@import { ObserverSource, ObservationAttributionStatus, toPaise, calculateObservationFingerprint } from '@youpi/common';+function trimTrailingPunctuation(str) {+ let s = String(str || '').trim();+ while (s.length > 0 && (s.endsWith('.') || s.endsWith(',') || s.endsWith(';'))) {+ s = s.slice(0, -1);+ }+ return s;+}+/*** Intelligent Monetary Amount Extractor.* Extracts amounts with prefix (Rs. 20.00, INR 500), suffix (20.00 Rs),@@ -12,21 +20,21 @@ export function extractIntelligentPaise(text) {if (!text || typeof text !== 'string') return null;// Pattern 1: Standard currency prefix (e.g. Rs. 20.00, Rs 200, INR 500.00, ₹1,200.50, ₹20)- const prefixMatch = text.match(/(?:rs\.?|inr|₹)\s*([\d,]+(?:\.\d{1,2})?)/i);+ const prefixMatch = text.match(/(?:rs\.?|inr|₹)\s*(\b\d[\d,]{0,15}(?:\.\d{1,2})?)/i);if (prefixMatch && prefixMatch[1]) {const clean = prefixMatch[1].replace(/,/g, '');try { return toPaise(clean); } catch {}}// Pattern 2: Standard currency suffix (e.g. 20.00 Rs, 20.00 INR, 20rs, 500 inr)- const suffixMatch = text.match(/([\d,]+(?:\.\d{1,2})?)\s*(?:rs\.?|inr|₹)/i);+ const suffixMatch = text.match(/(\b\d[\d,]{0,15}(?:\.\d{1,2})?)\s*(?:rs\.?|inr|₹)/i);if (suffixMatch && suffixMatch[1]) {const clean = suffixMatch[1].replace(/,/g, '');try { return toPaise(clean); } catch {}}// Pattern 3: Number in proximity to credit keywords (e.g. "20.00 received", "received 20.00", "credited 20", "20.00 credited")- const creditProximityMatch = text.match(/(?:credited|received|deposit|payment|paid|transferred|upi|cr)[\s\w:]*?([\d,]+(?:\.\d{1,2})?)|([\d,]+(?:\.\d{1,2})?)[\s\w:]*?(?:credited|received|deposit|payment|paid|transferred|upi|cr)/i);+ const creditProximityMatch = text.match(/(?:credited|received|deposit|payment|paid|transferred|upi|cr)[^\d\n\r]{0,30}?(\b\d[\d,]{0,15}(?:\.\d{1,2})?)|(\b\d[\d,]{0,15}(?:\.\d{1,2})?)[^\d\n\r]{0,30}?(?:credited|received|deposit|payment|paid|transferred|upi|cr)/i);if (creditProximityMatch) {const rawVal = creditProximityMatch[1] || creditProximityMatch[2];if (rawVal) {@@ -56,7 +64,7 @@ const REFERENCE_REGEX = /(?:utr|ref(?:\s*no\.?)?|txn(?:\s*(?:id|#))?|transaction* Regex for extracting sender VPA if present in notification text.* Matches: from user@upi, from 9876543210@paytm, from Rahul (UPI ID: rahul@fam), etc.*/-const SENDER_VPA_REGEX = /(?:from|by|vpa|upi\s*id)[\s:]+(?:[a-zA-Z\s]+[\(\[])?([a-zA-Z0-9.\-_]{2,100}@[a-zA-Z0-9.\-_]{2,64})/i;+const SENDER_VPA_REGEX = /(?:from|by|vpa|upi\s*id)[\s:]+(?:[a-zA-Z]{1,30}(?:\s+[a-zA-Z]{1,30})*\s*[\(\[])?([a-zA-Z0-9.\-_]{2,100}@[a-zA-Z0-9.\-_]{2,64})/i;export class ObservationNormalizer {/**@@ -137,7 +145,7 @@ export class ObservationNormalizer {if (!senderVpa && textContent) {const vpaMatch = textContent.match(SENDER_VPA_REGEX);if (vpaMatch && vpaMatch[1]) {- senderVpa = vpaMatch[1].trim().replace(/[.,;]+$/, '');+ senderVpa = trimTrailingPunctuation(vpaMatch[1]);}}diff --git a/packages/core/src/verification-pipeline.js b/packages/core/src/verification-pipeline.jsindex 9c0fa66..f646136 100644--- a/packages/core/src/verification-pipeline.js+++ b/packages/core/src/verification-pipeline.js@@ -375,8 +375,14 @@ export class PaymentVerificationPipeline {}}} else if (source === 'GMAIL') {- const emailMatch = sender.match(/<([^>]+)>/);- const cleanEmail = (emailMatch ? emailMatch[1] : sender).trim();+ let cleanEmail = sender;+ const ltIdx = sender.indexOf('<');+ const gtIdx = sender.lastIndexOf('>');+ if (ltIdx !== -1 && gtIdx > ltIdx) {+ cleanEmail = sender.slice(ltIdx + 1, gtIdx).trim();+ } else {+ cleanEmail = sender.trim();+ }let emailDomain = '';if (cleanEmail.includes('@')) {emailDomain = cleanEmail.split('@')[1]?.toLowerCase().trim().replace(/[>]/g, '');diff --git a/packages/db/src/repositories/merchant.repository.js b/packages/db/src/repositories/merchant.repository.jsindex dccef4c..175763a 100644--- a/packages/db/src/repositories/merchant.repository.js+++ b/packages/db/src/repositories/merchant.repository.js@@ -1,9 +1,11 @@import crypto from 'node:crypto';import { encryptAtRest, decryptAtRest, safeEqual } from '@youpi/common';-/** Computes a deterministic SHA-256 hex digest for storing and verifying merchant API keys. */+const API_KEY_SALT = 'youpi_merchant_api_key_salt_v1';++/** Computes a deterministic scrypt hex digest for storing and verifying merchant API keys. */export function hashApiKey(rawKey) {- return crypto.createHash('sha256').update(String(rawKey)).digest('hex');+ return crypto.scryptSync(String(rawKey), API_KEY_SALT, 32).toString('hex');}/** Gmail OAuth credentials are nested inside `branding.gmailConfig`; encrypt just those. */diff --git a/packages/merchant-sdk/src/client.js b/packages/merchant-sdk/src/client.jsindex 73d6d97..a529fa7 100644--- a/packages/merchant-sdk/src/client.js+++ b/packages/merchant-sdk/src/client.js@@ -10,7 +10,9 @@ export class YoupiPaymentClient {* }} options*/constructor(options = {}) {- this.apiUrl = (options.apiUrl || process.env.BASE_PAYMENT_API_URL || 'http://localhost:6100').replace(/\/+$/, '');+ let url = options.apiUrl || process.env.BASE_PAYMENT_API_URL || 'http://localhost:6100';+ while (url.endsWith('/')) url = url.slice(0, -1);+ this.apiUrl = url;this.merchantId = options.merchantId || null;this.webhookSecret = options.webhookSecret || null;this.apiKey = options.apiKey || null;diff --git a/packages/merchant-sdk/src/youpi-checkout.js b/packages/merchant-sdk/src/youpi-checkout.jsindex 62bbedb..f438259 100644--- a/packages/merchant-sdk/src/youpi-checkout.js+++ b/packages/merchant-sdk/src/youpi-checkout.js@@ -22,6 +22,16 @@const isBrowser = typeof window !== 'undefined' && typeof document !== 'undefined';+ function sanitizeModalUrl(url) {+ try {+ const parsed = new URL(url, window.location.href);+ if (parsed.protocol === 'http:' || parsed.protocol === 'https:') {+ return parsed.href;+ }+ } catch {}+ return 'about:blank';+ }+/*** Helper: extract configuration from the <script> tag loading this file.*/@@ -340,7 +350,7 @@const closeBtn = document.createElement('button');closeBtn.className = 'youpi-checkout-close-btn';- closeBtn.innerHTML = '✕';+ closeBtn.textContent = '✕';closeBtn.title = 'Close Checkout';closeBtn.type = 'button';closeBtn.onclick = () => {@@ -358,7 +368,7 @@const iframe = document.createElement('iframe');iframe.className = 'youpi-checkout-iframe';- iframe.src = targetUrl;+ iframe.src = sanitizeModalUrl(targetUrl);// Only messages from this exact iframe/origin are trusted (see _handleMessage).this._iframe = iframe;try { this._iframeOrigin = new URL(targetUrl, window.location.href).origin; } catch { this._iframeOrigin = null; }diff --git a/packages/merchant-sdk/src/youpi.js b/packages/merchant-sdk/src/youpi.jsindex 0bf5006..3027b7c 100644--- a/packages/merchant-sdk/src/youpi.js+++ b/packages/merchant-sdk/src/youpi.js@@ -22,6 +22,16 @@const isBrowser = typeof window !== 'undefined' && typeof document !== 'undefined';+ function sanitizeModalUrl(url) {+ try {+ const parsed = new URL(url, window.location.href);+ if (parsed.protocol === 'http:' || parsed.protocol === 'https:') {+ return parsed.href;+ }+ } catch {}+ return 'about:blank';+ }+/*** Helper: extract configuration from the <script> tag loading this file.*/@@ -350,7 +360,7 @@const closeBtn = document.createElement('button');closeBtn.className = 'youpi-checkout-close-btn';- closeBtn.innerHTML = '✕';+ closeBtn.textContent = '✕';closeBtn.title = 'Close Checkout';closeBtn.type = 'button';closeBtn.onclick = () => {@@ -368,7 +378,7 @@const iframe = document.createElement('iframe');iframe.className = 'youpi-checkout-iframe';- iframe.src = targetUrl;+ iframe.src = sanitizeModalUrl(targetUrl);// Only messages from this exact iframe/origin are trusted (see _handleMessage).this._iframe = iframe;try { this._iframeOrigin = new URL(targetUrl, window.location.href).origin; } catch { this._iframeOrigin = null; }diff --git a/packages/observer-sdk/src/client.js b/packages/observer-sdk/src/client.jsindex ce0b14e..155e8ed 100644--- a/packages/observer-sdk/src/client.js+++ b/packages/observer-sdk/src/client.js@@ -8,7 +8,9 @@ export class PaymentObserverClient {* }} options*/constructor(options) {- this.apiBaseUrl = (options.apiBaseUrl || process.env.BASE_PAYMENT_API_URL || 'http://localhost:6100').replace(/\/+$/, '');+ let url = options.apiBaseUrl || process.env.BASE_PAYMENT_API_URL || 'http://localhost:6100';+ while (url.endsWith('/')) url = url.slice(0, -1);+ this.apiBaseUrl = url;this.sourceName = options.sourceName;}