@nka212bg/backend-utils 0.1.59 → 0.1.61

package/location/index.js

@@ -5,21 +5,24 @@ const { locales, timeZones } = require(`./localelib`);
 const Reader = require("@maxmind/geoip2-node").Reader;
 const GeoDB = Reader.openBuffer(readFileSync(`${__dirname}/GeoLite2-City.mmdb`));
 
-exports.userIp = (req) => {
+// x-forwarded-for is client-controlled, trust it only behind a reverse proxy (nginx, Cloudflare...)
+exports.userIp = (req, { trustProxy = false } = {}) => {
     if (!req) throw new Error("Request object is missing, can't work like that! That's absurd!!!");
 
-    let ip = (req.headers["x-forwarded-for"] || req.socket?.remoteAddress || req.connection?.remoteAddress || req.ip)?.split(",")[0].replace(/::ffff:/gi, "");
+    let ip = ((trustProxy && req.headers["x-forwarded-for"]) || req.socket?.remoteAddress || req.connection?.remoteAddress || req.ip)
+        ?.split(",")[0]
+        .trim()
+        .replace(/::ffff:/gi, "");
 
-    // if (["127.0.0.1", "::1"].includes(ip)) return "146.70.185.8";
     return ip;
 };
 
 // user geo
-exports.location = ({ req, ip }) => {
+exports.location = ({ req, ip, trustProxy }) => {
     let userIP;
     try {
         if (!ip && !req) throw "missing_required";
-        userIP = ip || this.userIp(req);
+        userIP = ip || this.userIp(req, { trustProxy });
         const geo = GeoDB.city(userIP);
 
         const country = locales[geo.country.isoCode];

package/mailSmsTools/index.js

@@ -50,6 +50,28 @@ const subscriptionState = {
     },
 };
 
+// SMTP_URL=smtps://user%40mail.com:pass@smtp.host.com:465 (smtps = TLS on 465, smtp = STARTTLS on 587)
+// falls back to SMTP_HOST, SMTP_PORT, SMTP_USER, SMTP_PASS
+const smtpEnv = () => {
+    if (!process.env.SMTP_URL) {
+        return {
+            host: process.env.SMTP_HOST,
+            port: parseInt(process.env.SMTP_PORT),
+            secure: true,
+            auth: { user: process.env.SMTP_USER, pass: process.env.SMTP_PASS },
+        };
+    }
+
+    const u = new URL(process.env.SMTP_URL);
+    const secure = u.protocol == "smtps:";
+    return {
+        host: u.hostname,
+        port: parseInt(u.port) || (secure ? 465 : 587),
+        secure,
+        auth: { user: decodeURIComponent(u.username), pass: decodeURIComponent(u.password) },
+    };
+};
+
 // every call creates a separate instance with its own config and transports:
 // const { sendEmail } = require(".../mailSmsTools")({ name, logoUrl, baseUrl, smtp, twilio });
 // const { sendEmail } = require(".../mailSmsTools"); // default instance, env config only
@@ -81,13 +103,7 @@ const createInstance = (options = {}) => {
             maxMessages: Infinity,
             maxConnections: 20,
 
-            host: process.env.SMTP_HOST,
-            port: parseInt(process.env.SMTP_PORT),
-            secure: true, // true for 465, false for other ports
-            auth: {
-                user: process.env.SMTP_USER,
-                pass: process.env.SMTP_PASS,
-            },
+            ...smtpEnv(),
             ...smtp,
         }));
     };
@@ -115,7 +131,7 @@ const createInstance = (options = {}) => {
             const name = val(config.name);
             const baseUrl = val(config.baseUrl) || process.env.BASE_URL;
             const smtp = val(config.smtp) || {};
-            const smtpUser = smtp.auth?.user || process.env.SMTP_USER;
+            const smtpUser = smtp.auth?.user || smtpEnv().auth.user;
             logoUrl ||= val(config.logoUrl);
 
             const emailArray = strToEmailsArray(email || smtpUser);

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@nka212bg/backend-utils",
     "author": "nka212bg",
-    "version": "0.1.59",
+    "version": "0.1.61",
     "main": "index.js",
     "dependencies": {
         "@maxmind/geoip2-node": "^5.0.0",