From f9a968ccc6611297c305eb941ae7a73e5b961435 Mon Sep 17 00:00:00 2001
From: rajranjan0608 <rranjan01234@gmail.com>
Date: Mon, 23 May 2022 18:31:51 +0530
Subject: [PATCH] cloudflare client ip patch

---
 client/src/components/FaucetForm.tsx | 62 ++++++++++++++--------------
 middlewares/rateLimiter.ts           | 15 ++++---
 package-lock.json                    | 35 ++++++++++++++++
 package.json                         |  3 +-
 server.ts                            |  2 +-
 5 files changed, 80 insertions(+), 37 deletions(-)

diff --git a/client/src/components/FaucetForm.tsx b/client/src/components/FaucetForm.tsx
index 2f2ac2f..afa1be4 100644
--- a/client/src/components/FaucetForm.tsx
+++ b/client/src/components/FaucetForm.tsx
@@ -9,25 +9,26 @@ import FooterBox from './FooterBox';
 import queryString from 'query-string';
 
 const FaucetForm = (props: any) => {
-    const [chain, setChain] = useState<number | null>(null)
-    const [chainConfigs, setChainConfigs] = useState<any>([])
-    const [inputAddress, setInputAddress] = useState("")
+    const [chain, setChain] = useState<number | null>(null);
+    const [chainConfigs, setChainConfigs] = useState<any>([]);
+    const [inputAddress, setInputAddress] = useState("");
     const [address, setAddress] = useState<string | null>(null);
     const [faucetAddress, setFaucetAddress] = useState(null);
-    const [options, setOptions] = useState([])
+    const [options, setOptions] = useState([]);
     const [balance, setBalance] = useState(0);
     const [shouldAllowSend, setShouldAllowSend] = useState(false);
-    const [isLoading, setIsLoading] = useState<boolean>(false)
+    const [isLoading, setIsLoading] = useState<boolean>(false);
     const [sendTokenResponse, setSendTokenResponse] = useState<any>({
         txHash: null,
         message: null
-    })
+    });
 
     const recaptcha = new ReCaptcha(props.config.SITE_KEY, props.config.ACTION);
 
+    // Update chain configs
     useEffect(() => {
         updateChainConfigs();
-    }, [])
+    }, []);
 
     useEffect(() => {
         updateBalance()
@@ -76,6 +77,28 @@ const FaucetForm = (props: any) => {
         }
     }, [window.location.search, chainConfigs]);
 
+    // API calls
+    async function updateChainConfigs() {
+        const response = await props.axios.get(props.config.api.getChainConfigs);
+        setChainConfigs(response?.data);
+    }
+
+    async function updateBalance() {
+        const response = await props.axios.get(props.config.api.getBalance, {params: {chain: chainConfigs[chain!]?.ID}});
+        
+        if(response?.data || response?.data == 0) {
+            setBalance(response?.data);
+        }
+    }
+
+    async function updateFaucetAddress() {
+        const response = await props.axios.get(props.config.api.faucetAddress, {params: {chain: chainConfigs[chain!]?.ID}});
+        
+        if(response?.data) {
+            setFaucetAddress(response?.data);
+        }
+    }
+
     function chainToIndex(id: any) {
         if(typeof id == "string") {
             id = id.toUpperCase();
@@ -89,14 +112,6 @@ const FaucetForm = (props: any) => {
         return index;
     }
 
-    async function updateFaucetAddress() {
-        const response = await props.axios.get(props.config.api.faucetAddress, {params: {chain: chainConfigs[chain!]?.ID}});
-        
-        if(response?.data) {
-            setFaucetAddress(response?.data);
-        }
-    }
-
     function updateAddress(addr: any): void {
         setInputAddress(addr!)
         
@@ -111,24 +126,11 @@ const FaucetForm = (props: any) => {
         }
     }
 
-    async function updateBalance() {
-        const response = await props.axios.get(props.config.api.getBalance, {params: {chain: chainConfigs[chain!]?.ID}});
-        
-        if(response?.data || response?.data == 0) {
-            setBalance(response?.data);
-        }
-    }
-
     async function getCaptchaToken() {
         const token = await recaptcha.getToken();
         return token;
     }
 
-    async function updateChainConfigs() {
-        const response = await props.axios.get(props.config.api.getChainConfigs);
-        setChainConfigs(response?.data);
-    }
-
     async function updateChain(option: any) {
         let chainNum = option.value
         
@@ -205,13 +207,13 @@ const FaucetForm = (props: any) => {
             ...base,
             color: "white"
         })
-    };
+    }
 
     const ChainDropdown = () => (
         <div style={{width: "100%", marginTop: "5px"}}>
             <Select
                 options={options}
-                value={options[chain || 0]}
+                value={options[chain!]}
                 onChange={updateChain}
                 styles={customStyles}
             />
diff --git a/middlewares/rateLimiter.ts b/middlewares/rateLimiter.ts
index fd2b37b..4388def 100644
--- a/middlewares/rateLimiter.ts
+++ b/middlewares/rateLimiter.ts
@@ -1,4 +1,5 @@
 import rateLimit, { RateLimitRequestHandler } from 'express-rate-limit';
+import { searchIP } from 'range_check';
 import { RateLimiterConfig } from '../types';
 
 export class RateLimiter {
@@ -18,10 +19,6 @@ export class RateLimiter {
             }
             
             rateLimiters.set(config.ID, this.getLimiter(RL_CONFIG));
-
-            if(RATELIMIT.REVERSE_PROXIES) {
-                app.set('trust proxy', RATELIMIT.REVERSE_PROXIES);
-            }
         });
 
         app.use(this.PATH, (req: any, res: any, next: any) => {
@@ -44,10 +41,18 @@ export class RateLimiter {
                 message: `Too many requests. Please try again after ${config.WINDOW_SIZE} minutes`
             },
             keyGenerator: (req, res) => {
-                return req.ip + req.body?.chain
+                const ip = this.getIP(req);
+                if(ip != null) {
+                    return ip + req.body?.chain;
+                }
             }
         });
 
         return limiter;
     }
+
+    getIP(req: any) {
+        const ip = req.headers['cf-connecting-ip'] || req.ip;
+        return searchIP(ip);
+    }
 }
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index 64d03f9..56e84d7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15,6 +15,7 @@
         "dotenv": "^16.0.0",
         "express": "^4.18.1",
         "express-rate-limit": "^6.4.0",
+        "range_check": "^2.0.4",
         "totp-generator": "^0.0.13",
         "ts-node": "^10.7.0",
         "typescript": "^4.6.4",
@@ -2585,6 +2586,14 @@
         "node": ">= 0.4"
       }
     },
+    "node_modules/ip6": {
+      "version": "0.2.10",
+      "resolved": "https://registry.npmjs.org/ip6/-/ip6-0.2.10.tgz",
+      "integrity": "sha512-1LdpyKjhvepd6EbAU6rW4g14vuYtx5TnJX9TfZZBhsM6DsyPQLNzW12rtbUqXBMwqFrLVV/Gcxv0GNFvJp2cYA==",
+      "bin": {
+        "ip6": "ip6-cli.js"
+      }
+    },
     "node_modules/ipaddr.js": {
       "version": "1.9.1",
       "license": "MIT",
@@ -3382,6 +3391,18 @@
         "safe-buffer": "^5.1.0"
       }
     },
+    "node_modules/range_check": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/range_check/-/range_check-2.0.4.tgz",
+      "integrity": "sha512-aed0ocXXj+SIiNNN9b+mZWA3Ow2GXHtftOGk2xQwshK5GbEZAvUcPWNQBLTx/lPcdFRIUFlFCRtHTQNIFMqynQ==",
+      "dependencies": {
+        "ip6": "^0.2.0",
+        "ipaddr.js": "^1.9.1"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
     "node_modules/range-parser": {
       "version": "1.2.1",
       "license": "MIT",
@@ -6217,6 +6238,11 @@
         "side-channel": "^1.0.4"
       }
     },
+    "ip6": {
+      "version": "0.2.10",
+      "resolved": "https://registry.npmjs.org/ip6/-/ip6-0.2.10.tgz",
+      "integrity": "sha512-1LdpyKjhvepd6EbAU6rW4g14vuYtx5TnJX9TfZZBhsM6DsyPQLNzW12rtbUqXBMwqFrLVV/Gcxv0GNFvJp2cYA=="
+    },
     "ipaddr.js": {
       "version": "1.9.1"
     },
@@ -6690,6 +6716,15 @@
         "safe-buffer": "^5.1.0"
       }
     },
+    "range_check": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/range_check/-/range_check-2.0.4.tgz",
+      "integrity": "sha512-aed0ocXXj+SIiNNN9b+mZWA3Ow2GXHtftOGk2xQwshK5GbEZAvUcPWNQBLTx/lPcdFRIUFlFCRtHTQNIFMqynQ==",
+      "requires": {
+        "ip6": "^0.2.0",
+        "ipaddr.js": "^1.9.1"
+      }
+    },
     "range-parser": {
       "version": "1.2.1"
     },
diff --git a/package.json b/package.json
index 2909662..334c66a 100644
--- a/package.json
+++ b/package.json
@@ -21,9 +21,10 @@
     "dotenv": "^16.0.0",
     "express": "^4.18.1",
     "express-rate-limit": "^6.4.0",
+    "range_check": "^2.0.4",
     "totp-generator": "^0.0.13",
-    "typescript": "^4.6.4",
     "ts-node": "^10.7.0",
+    "typescript": "^4.6.4",
     "web3": "^1.7.3"
   },
   "devDependencies": {
diff --git a/server.ts b/server.ts
index 51085bf..19bdf60 100644
--- a/server.ts
+++ b/server.ts
@@ -72,7 +72,7 @@ app.get('/ip', (req: any, res: any) => {
         reqip: req.ip,
         xfor: req.headers["x-forwarded-for"],
         cloudflare: req.headers["cf-connecting-ip"]
-    })
+    });
 })
 
 app.get('*', async (req: any, res: any) => {