feat: rm bot protection against GSIB respondents

opengovsg · Jul 25, 2023 · 2c1fcb9 · 2c1fcb9
1 parent 3177870
commit 2c1fcb9
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/frontend/src/features/public-form/PublicFormProvider.tsx b/frontend/src/features/public-form/PublicFormProvider.tsx
@@ -135,9 +135,10 @@ export const PublicFormProvider = ({
     }
   }, [submissionData])
 
+  // Only load catpcha if enabled on form and the user is not on GSIB
   const {
     data: { captchaPublicKey, turnstileSiteKey, useFetchForSubmissions } = {},
-  } = useEnv(/* enabled= */ !!data?.form.hasCaptcha)
+  } = useEnv(/* enabled= */ !!data?.form.hasCaptcha && !data?.isIntranetUser)
 
   // Feature flag to control turnstile captcha rollout
   // defaults to false

diff --git a/src/app/modules/submission/email-submission/email-submission.controller.ts b/src/app/modules/submission/email-submission/email-submission.controller.ts
@@ -113,8 +113,13 @@ const submitEmailModeForm: ControllerHandler<
           }),
       )
       .andThen((form) => {
-        // Check the captcha
-        if (form.hasCaptcha) {
+        // Check if respondent is a GSIB user
+        const isIntranetUser = FormService.checkIsIntranetFormAccess(
+          getRequestIp(req),
+          form,
+        )
+        // Check the captcha, provided user is not on GSIB
+        if (!isIntranetUser && form.hasCaptcha) {
           switch (req.query.captchaType) {
             case CaptchaTypes.Turnstile: {
               return TurnstileService.verifyTurnstileResponse(

diff --git a/src/app/modules/submission/encrypt-submission/encrypt-submission.controller.ts b/src/app/modules/submission/encrypt-submission/encrypt-submission.controller.ts
@@ -148,8 +148,13 @@ const submitEncryptModeForm: ControllerHandler<
       })
     }
   }
-  // Check captcha
-  if (form.hasCaptcha) {
+  // Check if respondent is a GSIB user
+  const isIntranetUser = FormService.checkIsIntranetFormAccess(
+    getRequestIp(req),
+    form,
+  )
+  // Check captcha, provided user is not on GSIB
+  if (!isIntranetUser && form.hasCaptcha) {
     switch (req.query.captchaType) {
       case CaptchaTypes.Turnstile: {
         const turnstileResult = await TurnstileService.verifyTurnstileResponse(