Set ReCaptcha score env var (#242)

* Try ReCaptcha v3 * Merge branch 'master' into recaptcha_v3 * Update branch name * Add score env var * Install portal branch correctly (upgrade arg) * Install portal branch correctly (action file) * Add setting to django site * Remove test changes * Replace default score value
ocadotechnology · Jul 13, 2021 · f5cd683 · f5cd683
1 parent 3457c74
commit f5cd683
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 0 deletions.
diff --git a/.github/actions/deploy_gcloud/action.yml b/.github/actions/deploy_gcloud/action.yml
@@ -58,6 +58,9 @@ inputs:
   recaptcha-private-key:
     description: Recaptcha private key
     required: true
+  recaptcha-required-score:
+    description: Recaptcha required score
+    required: true
   redis-ip:
     description: Redis IP
     required: true
@@ -202,6 +205,7 @@ runs:
         DOTMAILER_DEFAULT_PREFERENCES: ${{ inputs.dotmailer-default-preferences }}
         RECAPTCHA_PUBLIC_KEY: ${{ inputs.recaptcha-public-key }}
         RECAPTCHA_PRIVATE_KEY: ${{ inputs.recaptcha-private-key }}
+        RECAPTCHA_REQUIRED_SCORE: ${{ inputs.recaptcha-required-score }}
         REDIS_IP: ${{ inputs.redis-ip }}
         REDIS_PORT: ${{ inputs.redis-port }}
       shell: bash
diff --git a/.github/workflows/deploy_default.yml b/.github/workflows/deploy_default.yml
@@ -54,6 +54,7 @@ jobs:
           dotmailer-default-preferences: ${{ secrets.DOTMAILER_DEFAULT_PREFERENCES }}
           recaptcha-public-key: ${{ secrets.RECAPTCHA_PUBLIC_KEY }}
           recaptcha-private-key: ${{ secrets.RECAPTCHA_PRIVATE_KEY }}
+          recaptcha-required-score: ${{ secrets.RECAPTCHA_REQUIRED_SCORE }}
           redis-ip: ${{ secrets.REDIS_IP }}
           redis-port: ${{ secrets.REDIS_PORT }}
 

diff --git a/.github/workflows/deploy_dev.yml b/.github/workflows/deploy_dev.yml
@@ -54,6 +54,7 @@ jobs:
           dotmailer-default-preferences: ${{ secrets.DOTMAILER_DEFAULT_PREFERENCES }}
           recaptcha-public-key: ${{ secrets.RECAPTCHA_PUBLIC_KEY }}
           recaptcha-private-key: ${{ secrets.RECAPTCHA_PRIVATE_KEY }}
+          recaptcha-required-score: ${{ secrets.RECAPTCHA_REQUIRED_SCORE }}
           redis-ip: ${{ secrets.REDIS_IP }}
           redis-port: ${{ secrets.REDIS_PORT }}
 

diff --git a/.github/workflows/deploy_staging.yml b/.github/workflows/deploy_staging.yml
@@ -54,6 +54,7 @@ jobs:
           dotmailer-default-preferences: ${{ secrets.DOTMAILER_DEFAULT_PREFERENCES }}
           recaptcha-public-key: ${{ secrets.RECAPTCHA_PUBLIC_KEY }}
           recaptcha-private-key: ${{ secrets.RECAPTCHA_PRIVATE_KEY }}
+          recaptcha-required-score: ${{ secrets.RECAPTCHA_REQUIRED_SCORE }}
           redis-ip: ${{ secrets.REDIS_IP }}
           redis-port: ${{ secrets.REDIS_PORT }}
 

diff --git a/app.yaml.tmpl b/app.yaml.tmpl
@@ -29,6 +29,7 @@ env_variables:
   DATABASE_HOST: '${DATABASE_HOST}'
   RECAPTCHA_PRIVATE_KEY: '${RECAPTCHA_PRIVATE_KEY}'
   RECAPTCHA_PUBLIC_KEY: '${RECAPTCHA_PUBLIC_KEY}'
+  RECAPTCHA_REQUIRED_SCORE: '${RECAPTCHA_REQUIRED_SCORE}'
   DJANGO_PORTAL_CONTACT_FORM_EMAIL: '${DJANGO_PORTAL_CONTACT_FORM_EMAIL}'
   DOTMAILER_CREATE_CONTACT_URL: '${DOTMAILER_CREATE_CONTACT_URL}'
   DOTMAILER_ADDRESS_BOOK_URL: '${DOTMAILER_ADDRESS_BOOK_URL}'

diff --git a/django_site/settings.py b/django_site/settings.py
@@ -21,6 +21,7 @@
 
 RECAPTCHA_PRIVATE_KEY = os.getenv("RECAPTCHA_PRIVATE_KEY", "NOT A SECRET")
 RECAPTCHA_PUBLIC_KEY = os.getenv("RECAPTCHA_PUBLIC_KEY", "NOT A SECRET")
+RECAPTCHA_REQUIRED_SCORE = os.getenv("RECAPTCHA_REQUIRED_SCORE", 0.5)
 NOCAPTCHA = True
 
 DOTMAILER_CREATE_CONTACT_URL = os.getenv("DOTMAILER_CREATE_CONTACT_URL", "")