From a2aee59e7fd364c8bc7998dac3686ebd8e478190 Mon Sep 17 00:00:00 2001
From: rimu <3310831+rimu@users.noreply.github.com>
Date: Fri, 5 Jan 2024 11:56:18 +1300
Subject: [PATCH] make recaptcha work with nonce

---
 app/auth/recaptcha3.py    | 12 ++++++------
 app/static/structure.css  |  3 +--
 app/static/structure.scss |  3 +--
 interests.txt             |  9 ++++++++-
 4 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/app/auth/recaptcha3.py b/app/auth/recaptcha3.py
index 6a7ea5bd..3800672f 100644
--- a/app/auth/recaptcha3.py
+++ b/app/auth/recaptcha3.py
@@ -1,6 +1,6 @@
 import logging
 import requests
-from flask import Markup, current_app, request
+from flask import Markup, current_app, request, session
 from wtforms import ValidationError
 from wtforms.fields import HiddenField
 from wtforms.widgets import HiddenInput
@@ -8,8 +8,8 @@ from wtforms.widgets import HiddenInput
 logger = logging.getLogger(__name__)
 
 RECAPTCHA_TEMPLATE = '''
-<script src='https://www.google.com/recaptcha/api.js?render={public_key}&onload=executeRecaptcha{action}' async defer></script>
-<script>
+<script src='https://www.google.com/recaptcha/api.js?render={public_key}&onload=executeRecaptcha{action}' async defer nonce={nonce}></script>
+<script nonce={nonce}>
   var executeRecaptcha{action} = function() {{
     console.log("grecaptcha is ready!");
     grecaptcha.execute('{public_key}', {{action: '{action}'}}).then(function(token) {{
@@ -22,8 +22,8 @@ RECAPTCHA_TEMPLATE = '''
 '''
 
 RECAPTCHA_TEMPLATE_MANUAL = '''
-<script src='https://www.google.com/recaptcha/api.js?render={public_key}' async defer></script>
-<script>
+<script src='https://www.google.com/recaptcha/api.js?render={public_key}' async defer nonce={nonce}></script>
+<script nonce={nonce}>
   var executeRecaptcha{action} = function() {{
     console.log("executeRecaptcha{action}() is called!");
     grecaptcha.ready(function() {{
@@ -113,7 +113,7 @@ class Recaptcha3Widget(HiddenInput):
 
         return Markup(
                 (RECAPTCHA_TEMPLATE if field.execute_on_load else RECAPTCHA_TEMPLATE_MANUAL).format(
-                        public_key=public_key, action=field.action, field_name=field.name))
+                        public_key=public_key, action=field.action, field_name=field.name, nonce=session['nonce']))
 
 
 class Recaptcha3Field(HiddenField):
diff --git a/app/static/structure.css b/app/static/structure.css
index 20ec1bc0..b25ef176 100644
--- a/app/static/structure.css
+++ b/app/static/structure.css
@@ -523,8 +523,7 @@ fieldset legend {
 
 .url_thumbnail {
   float: right;
-  margin-top: 6px;
-  margin-right: 6px;
+  margin-top: -6px;
 }
 
 .post_image img {
diff --git a/app/static/structure.scss b/app/static/structure.scss
index 53623d4d..a3dbfdb4 100644
--- a/app/static/structure.scss
+++ b/app/static/structure.scss
@@ -197,8 +197,7 @@ nav, etc which are used site-wide */
 
 .url_thumbnail {
   float: right;
-  margin-top: 6px;
-  margin-right: 6px;
+  margin-top: -6px;
 }
 
 .post_image {
diff --git a/interests.txt b/interests.txt
index 0bc749fa..fc2631ba 100644
--- a/interests.txt
+++ b/interests.txt
@@ -45,7 +45,7 @@ gaming
     https://lemmy.world/c/linux_gaming
     https://lemmy.world/c/pcgaming
     https://lemmy.world/c/diablo
-    https://beehaw.org/c/gaming
+    https://sopuli.xyz/c/steamdeck
     
 interesting stuff
     https://kbin.social/m/science
@@ -169,3 +169,10 @@ health
     https://lemmy.world/c/health
     https://lemmy.ml/c/health
     https://mander.xyz/c/medicine
+
+music
+    https://sopuli.xyz/c/hiphopheads
+    https://lemmy.world/c/classicrock
+    https://lemmy.world/c/90smusic
+    https://lemmy.world/c/alternativenation
+    https://lemmy.world/c/music