From 85be1ce481f73a14811764ee4d178057c93e4afb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C4=93teris=20Caune?= <cuu508@gmail.com>
Date: Fri, 28 Oct 2022 08:28:32 +0300
Subject: [PATCH] Fix the link to the Signal CAPTCHA form
---
hc/api/models.py | 5 ++---
templates/front/signal_captcha.html | 3 ++-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/hc/api/models.py b/hc/api/models.py
index 15c0e65e..55fe33e0 100644
--- a/hc/api/models.py
+++ b/hc/api/models.py
@@ -601,13 +601,12 @@ class Channel(models.Model):
message = f"Challenge token: {challenge}"
hostname = socket.gethostname()
submit_url = settings.SITE_ROOT + reverse("hc-signal-captcha")
- submit_url += urlencode({"host": hostname, "challenge": challenge})
+ submit_url += "?" + urlencode({"host": hostname, "challenge": challenge})
html_message = f"""
On host <b>{hostname}</b>, run:<br>
<pre>manage.py submitchallenge {challenge} CAPTCHA-SOLUTION-HERE</pre><br>
<br>
- Alternatively, submit CAPTCHA solution here: <br>
- {submit_url}<br>
+ Alternatively, <a href="{submit_url}">submit CAPTCHA solution here</a>.<br>
<br>
Message from Signal:<br>
<pre>{raw}</pre>
diff --git a/templates/front/signal_captcha.html b/templates/front/signal_captcha.html
index a10e469f..9f2fa915 100644
--- a/templates/front/signal_captcha.html
+++ b/templates/front/signal_captcha.html
@@ -20,8 +20,9 @@
<form method="post">
{% csrf_token %}
<div class="form-group">
- <label for="captcha">Challenge</label>
+ <label for="challenge">Challenge</label>
<input
+ id="challenge"
name="challenge"
required
class="form-control"