@things-factory/shell 6.2.51 → 6.2.65

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/shell",
-  "version": "6.2.51",
+  "version": "6.2.65",
   "description": "Core module for framework",
   "bin": {
     "things-factory": "bin/things-factory",
@@ -133,5 +133,5 @@
     "pg": "^8.7.3",
     "sqlite3": "^5.0.8"
   },
-  "gitHead": "365e8ae6475eede1a4fd51460c24569d13de14b6"
+  "gitHead": "320f62ab586b0c7058e7879f3e6592c960ae97bc"
 }

package/server/middlewares/domain-middleware.ts

@@ -13,7 +13,7 @@ export async function domainMiddleware(context: any, next: any) {
   }
 
   if (domain) {
-    const ip = context.ip || requestIp.getClientIp(context.req)
+    const ip = requestIp.getClientIp(context.req)
     const { whitelist = [], blacklist = [], protectedlist = [], privileges = [] } = domain.iplist || {}
 
     if (Array.isArray(whitelist) && whitelist.length > 0) {

package/server/routers/global-router.ts

@@ -1,4 +1,5 @@
 import Router from 'koa-router'
+import requestIp from 'request-ip'
 
 import { getLicenseInfo } from '@things-factory/operato-license-checker'
 import { domainMiddleware } from '../middlewares/domain-middleware'
@@ -54,16 +55,17 @@ globalPublicRouter.get('/opensource-licenses', (context, next) => {
 })
 
 globalPublicRouter.get('/request-info', context => {
-  const clientIP = context.headers['x-forwarded-for'] || context.ip
-  const protocol = context.headers['x-forwarded-proto'] || context.protocol
-  const host = context.headers['x-forwarded-host'] || context.host
-  const port = context.headers['x-forwarded-port'] || context.host.split(':')[1]
-
   context.body = `
-    Client IP: ${clientIP}
-    Protocol: ${protocol}
-    Host: ${host}
-    Port: ${port}
+    Client info. from "requestIp": ${requestIp.getClientIp(context.req)}
+
+    Client info. from "context.ip": ${context.ip}
+    Client info. from "context.protocol": ${context.protocol}
+    Client info. from "context.host": ${context.host}
+
+    Client info. from "x-forwarded-for": ${context.headers['x-forwarded-for']}
+    Client info. from "x-forwarded-proto": ${context.headers['x-forwarded-proto']}
+    Client info. from "x-forwarded-host": ${context.headers['x-forwarded-host']}
+    Client info. from "x-forwarded-port": ${context.headers['x-forwarded-port']}
   `
 })