Merge pull request #30 from ava-labs/development

1.1.3
ava-labs · Jun 24, 2022 · 7175576 · 7175576
2 parents ee24652 + a0a028c
commit 7175576
Show file tree

Hide file tree

Showing 21 changed files with 32 additions and 18 deletions.
diff --git a/client/public/avaxblack.png b/client/public/avaxblack.png
diff --git a/client/public/avaxblack.webp b/client/public/avaxblack.webp
diff --git a/client/public/avaxred.png b/client/public/avaxred.png
diff --git a/client/public/avaxred.webp b/client/public/avaxred.webp
diff --git a/client/public/banner.png b/client/public/banner.png
diff --git a/client/public/banner.webp b/client/public/banner.webp
diff --git a/client/public/github.png b/client/public/github.png
diff --git a/client/public/github.webp b/client/public/github.webp
diff --git a/client/public/index.html b/client/public/index.html
@@ -2,7 +2,7 @@
 <html lang="en" style="width: 100%; height: 100%;">
   <head>
     <meta charset="utf-8" />
-    <link rel="icon" href="%PUBLIC_URL%/avaxblack.png" />
+    <link rel="icon" href="%PUBLIC_URL%/avaxblack.webp" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
 
 

diff --git a/client/public/memtamask.png b/client/public/memtamask.png
diff --git a/client/public/memtamask.webp b/client/public/memtamask.webp
diff --git a/client/public/wagmi.png b/client/public/wagmi.png
diff --git a/client/public/wagmi.webp b/client/public/wagmi.webp
diff --git a/client/src/components/AddNetwork.tsx b/client/src/components/AddNetwork.tsx
@@ -57,12 +57,12 @@ export default function AddNetwork(props: any) {
     return (
         <div className='footer-buttons'>
             <button className="add-network" onClick={() => {addNetwork(props.config)}}>
-                <img alt='metamask' style={{width: "25px", height: "25px", marginRight: "5px"}} src="/memtamask.png"/>
+                <img alt='metamask' style={{width: "25px", height: "25px", marginRight: "5px"}} src="/memtamask.webp"/>
                 Add Subnet to Metamask
             </button>
 
             <button className="add-network" onClick={() => {window.open(`${props.config.EXPLORER}`, '_blank')}}>
-                <img alt="block-explorer" style={{width: "25px", height: "25px"}} src="/avaxblack.png"/>
+                <img alt="block-explorer" style={{width: "25px", height: "25px"}} src="/avaxblack.webp"/>
                 View Block Explorer
             </button>
 

diff --git a/client/src/components/Contribute.tsx b/client/src/components/Contribute.tsx
@@ -16,7 +16,7 @@ const Contribute = () => {
                     window.open('https://github.com/ava-labs/avalanche-faucet', '_blank')
                 }
             }>
-            <img alt='github' src="/github.png"/>
+            <img alt='github' src="/github.webp"/>
             Contribute on Github
         </div>
     )

diff --git a/client/src/components/FaucetForm.tsx b/client/src/components/FaucetForm.tsx
@@ -14,6 +14,7 @@ const FaucetForm = (props: any) => {
     const [chain, setChain] = useState<number | null>(null)
     const [token, setToken] = useState<number | null>(null)
     const [widgetID, setwidgetID] = useState<string | undefined>(undefined)
+    const [recaptcha, setRecaptcha] = useState<ReCaptcha | undefined>(undefined)
     const [isV2, setIsV2] = useState<boolean>(false)
     const [chainConfigs, setChainConfigs] = useState<any>([])
     const [inputAddress, setInputAddress] = useState<string>("")
@@ -30,16 +31,15 @@ const FaucetForm = (props: any) => {
         message: null
     })
 
-    const recaptcha: ReCaptcha = new ReCaptcha(
-        props.config.SITE_KEY,
-        props.config.ACTION,
-        props.config.V2_SITE_KEY,
-        setwidgetID,
-        widgetID
-    )
-
     // Update chain configs
     useEffect(() => {
+        setRecaptcha(new ReCaptcha(
+            props.config.SITE_KEY,
+            props.config.ACTION,
+            props.config.V2_SITE_KEY,
+            setwidgetID,
+            widgetID
+        ))
         updateChainConfigs()
     }, [])
 
@@ -259,7 +259,7 @@ const FaucetForm = (props: any) => {
     }
 
     async function getCaptchaToken(): Promise<{token?:string, v2Token?: string}> {
-        const { token, v2Token } = await recaptcha.getToken(isV2)
+        const { token, v2Token } = await recaptcha!.getToken(isV2)
         return { token, v2Token }
     }
 
@@ -423,7 +423,7 @@ const FaucetForm = (props: any) => {
 
     const resetRecaptcha = (): void => {
         setIsV2(false)
-        recaptcha.resetV2Captcha()
+        recaptcha!.resetV2Captcha()
     }
 
     const back = (): void => {

diff --git a/client/src/config.json b/client/src/config.json
@@ -1,5 +1,5 @@
 {
-    "banner": "/banner.png",
+    "banner": "/banner.webp",
     "apiBaseEndpointProduction": "/api/",
     "apiBaseEndpointDevelopment": "http://localhost:8000/api/",
     "apiTimeout": 10000,

diff --git a/middlewares/index.ts b/middlewares/index.ts
@@ -1,3 +1,4 @@
 export * from './rateLimiter'
 export * from './verifyCaptcha'
-export * from './verifyTOTP'
+export * from './verifyTOTP'
+export * from './parseURI'
diff --git a/middlewares/parseURI.ts b/middlewares/parseURI.ts
@@ -0,0 +1,12 @@
+export const parseURI = (req: any, res: any, next: any) => {
+    var err = null;
+    try {
+        decodeURIComponent(req.path)
+    } catch(e) {
+        err = e
+    }
+    if(err) {
+        return res.redirect('/')    
+    }
+    next();
+}
diff --git a/middlewares/rateLimiter.ts b/middlewares/rateLimiter.ts
@@ -47,7 +47,7 @@ export class RateLimiter {
             keyGenerator: (req, res) => {
                 const ip = this.getIP(req)
                 if(ip != null) {
-                    return ip + req.body?.chain
+                    return ip
                 }
             }
         })

diff --git a/server.ts b/server.ts
@@ -5,7 +5,7 @@ import path from 'path'
 import dotenv from 'dotenv'
 import { BN } from 'avalanche'
 
-import { RateLimiter, VerifyCaptcha } from './middlewares'
+import { RateLimiter, VerifyCaptcha, parseURI } from './middlewares'
 import EVM from './vms/evm'
 
 import {
@@ -28,6 +28,7 @@ const router: any = express.Router()
 
 app.use(express.static(path.join(__dirname, "client")))
 app.use(cors())
+app.use(parseURI)
 app.use(bodyParser.json())
 
 new RateLimiter(app, [GLOBAL_RL])