Add CAPTCHA

2025-06-05 22:09:15 +02:00 · 2022-06-18 14:09:59 +02:00
parent 4be55cdb23
commit fd1fcc8cf8
81 changed files with 59403 additions and 24 deletions
--- a/CAPTCHA/OpenDyslexic3-Regular.ttf
+++ b/CAPTCHA/OpenDyslexic3-Regular.ttf
--- a/CAPTCHA/en/0/default.wav
+++ b/CAPTCHA/en/0/default.wav
--- a/CAPTCHA/en/1/default.wav
+++ b/CAPTCHA/en/1/default.wav
--- a/CAPTCHA/en/2/default.wav
+++ b/CAPTCHA/en/2/default.wav
--- a/CAPTCHA/en/3/default.wav
+++ b/CAPTCHA/en/3/default.wav
--- a/CAPTCHA/en/4/default.wav
+++ b/CAPTCHA/en/4/default.wav
--- a/CAPTCHA/en/5/default.wav
+++ b/CAPTCHA/en/5/default.wav
--- a/CAPTCHA/en/6/default.wav
+++ b/CAPTCHA/en/6/default.wav
--- a/CAPTCHA/en/7/default.wav
+++ b/CAPTCHA/en/7/default.wav
--- a/CAPTCHA/en/8/default.wav
+++ b/CAPTCHA/en/8/default.wav
--- a/CAPTCHA/en/9/default.wav
+++ b/CAPTCHA/en/9/default.wav
--- a/CAPTCHA/en/a/default.wav
+++ b/CAPTCHA/en/a/default.wav
--- a/CAPTCHA/en/b/default.wav
+++ b/CAPTCHA/en/b/default.wav
--- a/CAPTCHA/en/c/default.wav
+++ b/CAPTCHA/en/c/default.wav
--- a/CAPTCHA/en/d/default.wav
+++ b/CAPTCHA/en/d/default.wav
--- a/CAPTCHA/en/e/default.wav
+++ b/CAPTCHA/en/e/default.wav
--- a/CAPTCHA/en/f/default.wav
+++ b/CAPTCHA/en/f/default.wav
--- a/CAPTCHA/en/g/default.wav
+++ b/CAPTCHA/en/g/default.wav
--- a/CAPTCHA/en/h/default.wav
+++ b/CAPTCHA/en/h/default.wav
--- a/CAPTCHA/en/i/default.wav
+++ b/CAPTCHA/en/i/default.wav
--- a/CAPTCHA/en/j/default.wav
+++ b/CAPTCHA/en/j/default.wav
--- a/CAPTCHA/en/k/default.wav
+++ b/CAPTCHA/en/k/default.wav
--- a/CAPTCHA/en/l/default.wav
+++ b/CAPTCHA/en/l/default.wav
--- a/CAPTCHA/en/m/default.wav
+++ b/CAPTCHA/en/m/default.wav
--- a/CAPTCHA/en/n/default.wav
+++ b/CAPTCHA/en/n/default.wav
--- a/CAPTCHA/en/o/default.wav
+++ b/CAPTCHA/en/o/default.wav
--- a/CAPTCHA/en/p/default.wav
+++ b/CAPTCHA/en/p/default.wav
--- a/CAPTCHA/en/q/default.wav
+++ b/CAPTCHA/en/q/default.wav
--- a/CAPTCHA/en/r/default.wav
+++ b/CAPTCHA/en/r/default.wav
--- a/CAPTCHA/en/s/default.wav
+++ b/CAPTCHA/en/s/default.wav
--- a/CAPTCHA/en/t/default.wav
+++ b/CAPTCHA/en/t/default.wav
--- a/CAPTCHA/en/u/default.wav
+++ b/CAPTCHA/en/u/default.wav
--- a/CAPTCHA/en/v/default.wav
+++ b/CAPTCHA/en/v/default.wav
--- a/CAPTCHA/en/w/default.wav
+++ b/CAPTCHA/en/w/default.wav
--- a/CAPTCHA/en/x/default.wav
+++ b/CAPTCHA/en/x/default.wav
--- a/CAPTCHA/en/y/default.wav
+++ b/CAPTCHA/en/y/default.wav
--- a/CAPTCHA/en/z/default.wav
+++ b/CAPTCHA/en/z/default.wav
--- a/CAPTCHA/it.txt
+++ b/CAPTCHA/it.txt
--- a/CAPTCHA/it/0/default.wav
+++ b/CAPTCHA/it/0/default.wav
--- a/CAPTCHA/it/1/default.wav
+++ b/CAPTCHA/it/1/default.wav
--- a/CAPTCHA/it/2/default.wav
+++ b/CAPTCHA/it/2/default.wav
--- a/CAPTCHA/it/3/default.wav
+++ b/CAPTCHA/it/3/default.wav
--- a/CAPTCHA/it/4/default.wav
+++ b/CAPTCHA/it/4/default.wav
--- a/CAPTCHA/it/5/default.wav
+++ b/CAPTCHA/it/5/default.wav
--- a/CAPTCHA/it/6/default.wav
+++ b/CAPTCHA/it/6/default.wav
--- a/CAPTCHA/it/7/default.wav
+++ b/CAPTCHA/it/7/default.wav
--- a/CAPTCHA/it/8/default.wav
+++ b/CAPTCHA/it/8/default.wav
--- a/CAPTCHA/it/9/default.wav
+++ b/CAPTCHA/it/9/default.wav
--- a/CAPTCHA/it/a/default.wav
+++ b/CAPTCHA/it/a/default.wav
--- a/CAPTCHA/it/b/default.wav
+++ b/CAPTCHA/it/b/default.wav
--- a/CAPTCHA/it/c/default.wav
+++ b/CAPTCHA/it/c/default.wav
--- a/CAPTCHA/it/d/default.wav
+++ b/CAPTCHA/it/d/default.wav
--- a/CAPTCHA/it/e/default.wav
+++ b/CAPTCHA/it/e/default.wav
--- a/CAPTCHA/it/f/default.wav
+++ b/CAPTCHA/it/f/default.wav
--- a/CAPTCHA/it/g/default.wav
+++ b/CAPTCHA/it/g/default.wav
--- a/CAPTCHA/it/h/default.wav
+++ b/CAPTCHA/it/h/default.wav
--- a/CAPTCHA/it/i/default.wav
+++ b/CAPTCHA/it/i/default.wav
--- a/CAPTCHA/it/j/default.wav
+++ b/CAPTCHA/it/j/default.wav
--- a/CAPTCHA/it/k/default.wav
+++ b/CAPTCHA/it/k/default.wav
--- a/CAPTCHA/it/l/default.wav
+++ b/CAPTCHA/it/l/default.wav
--- a/CAPTCHA/it/m/default.wav
+++ b/CAPTCHA/it/m/default.wav
--- a/CAPTCHA/it/n/default.wav
+++ b/CAPTCHA/it/n/default.wav
--- a/CAPTCHA/it/o/default.wav
+++ b/CAPTCHA/it/o/default.wav
--- a/CAPTCHA/it/p/default.wav
+++ b/CAPTCHA/it/p/default.wav
--- a/CAPTCHA/it/q/default.wav
+++ b/CAPTCHA/it/q/default.wav
--- a/CAPTCHA/it/r/default.wav
+++ b/CAPTCHA/it/r/default.wav
--- a/CAPTCHA/it/s/default.wav
+++ b/CAPTCHA/it/s/default.wav
--- a/CAPTCHA/it/t/default.wav
+++ b/CAPTCHA/it/t/default.wav
--- a/CAPTCHA/it/u/default.wav
+++ b/CAPTCHA/it/u/default.wav
--- a/CAPTCHA/it/v/default.wav
+++ b/CAPTCHA/it/v/default.wav
--- a/CAPTCHA/it/w/default.wav
+++ b/CAPTCHA/it/w/default.wav
--- a/CAPTCHA/it/x/default.wav
+++ b/CAPTCHA/it/x/default.wav
--- a/CAPTCHA/it/y/default.wav
+++ b/CAPTCHA/it/y/default.wav
--- a/CAPTCHA/it/z/default.wav
+++ b/CAPTCHA/it/z/default.wav
--- a/Config.json
+++ b/Config.json
@ -1,3 +1,4 @@
 {
-	"Development": true
+	"Development": true,
 	"Port": 8081
 }
--- a/Source/Form.Base.html
+++ b/Source/Form.Base.html
@ -6,6 +6,7 @@
 	</style>
 </head>
 <body>
 	<h3>[Locale:Comments]</h3>
 	<div id="StatusGoodDiv">
 {StatusGood}
 	</div>
--- a/Source/Form.Main.html
+++ b/Source/Form.Main.html
@ -1,5 +1,4 @@
 <div>
 	<h3>Comments</h3>
 	<button type="submit" name="Action" value="Login">Admin Login</button>
 </div>
 <br>
@ -9,8 +8,7 @@
 </div>
 <br>
 <div>
-	<label>CAPTCHA:</label>
+{CAPTCHAHTML}
 	<span><input type="text" name="CAPTCHA"></span>
 </div>
 <br>
 <div>
--- a/Source/Server.py
+++ b/Source/Server.py
@ -7,18 +7,23 @@
 | =============================== """
 import json
 import os
 import random
 import secrets
 import sqlite3
 import time
 from ast import literal_eval
 from base64 import b64encode
 from flask import Flask, request, send_file
 from pathlib import Path
 from captcha.audio import AudioCaptcha
 from captcha.image import ImageCaptcha
 App = Flask(__name__)
-def ReadFile(p):
+def ReadFile(p, m='r'):
 	try:
-		with open(p, 'r') as f:
+		with open(p, m) as f:
 			return f.read()
 	except Exception:
 		print("Error reading file {}".format(p))
@ -53,7 +58,7 @@ def GetConfig():
 		'Development': False,
 		'Port': 8080,
 		'Default Locale': 'en',
-		'Antispam Time': 0}
+		'CAPTCHA': True}
 	File = ReadFile('Config.json')
 	if File:
 		File = json.loads(File)
@ -71,6 +76,40 @@ def GetDB():
 	DB = sqlite3.connect('Comments.db')
 	return DB
 def RandomWord():
 	Words = ReadFile('CAPTCHA/it.txt')
 	Word = '#'
 	while Word.startswith('#'):
 		Word = random.choice(Words.splitlines())
 	return Word.lower()
 def MakeCAPTCHA(ID):
 	#ID = time.time()
 	String = RandomWord()
 	Audio = AudioCaptcha(voicedir='CAPTCHA/it')
 	Image = ImageCaptcha(fonts=['CAPTCHA/OpenDyslexic3-Regular.ttf'],width=len(String)*40, height=90)
 	CAPTCHA = Audio.generate(String)
 	Audio.write(String, 'CAPTCHA.{}.wav'.format(ID))
 	CAPTCHA = Image.generate(String)
 	Image.write(String, 'CAPTCHA.{}.png'.format(ID))
 	#return ID
 def CAPTCHAHTML(ID):
 	#ID = MakeCAPTCHA()
 	MakeCAPTCHA(ID)
 	Audio = b64encode(ReadFile('CAPTCHA.{}.wav'.format(ID), 'rb'))
 	Image = b64encode(ReadFile('CAPTCHA.{}.png'.format(ID), 'rb'))
 	os.remove('CAPTCHA.{}.wav'.format(ID))
 	os.remove('CAPTCHA.{}.png'.format(ID))
 	return """\
 <label>CAPTCHA:</label>
 <br>
 <img src="data:image/png;base64,{}">
 <audio src="data:audio/wav;base64,{}"controls="controls"></audio>
 <br>
 <span><input type="text" name="CAPTCHA"></span>
 	""".format(Image.decode('UTF-8'), Audio.decode('UTF-8'))
 def GetComments(Site, Page):
 	DB = GetDB()
 	Comments = []
@ -134,6 +173,7 @@ def PostCommentData(Data):
 	return Good, Error
 def PatchCommentsHTML(Data):
 	ReqID = time.time()
 	FormBase = ReadFile('Source/Form.Base.html')
 	FormMain = ReadFile('Source/Form.Main.html')
 	FormComment = ReadFile('Source/Form.Comment.html')
@ -145,22 +185,26 @@ def PatchCommentsHTML(Data):
 		FormMain = FormMain.replace('[Locale:{}]'.format(String), Locale[String])
 		FormComment = FormComment.replace('[Locale:{}]'.format(String), Locale[String])
-	FormMain = FormMain.format(
+	if 'ReadOnly' in Data and Data['ReadOnly'] == 'True':
-		SecKey=Data['SecKey'] if 'SecKey' in Data and Data['SecKey'] else '',
+		FormMain, Good, Error = '', '', ''
 		User=Data['User'] if 'User' in Data and Data['User'] else '',
 		Comment=Data['Comment'] if 'Comment' in Data and Data['Comment'] else '')
 	if 'Action' in Data and Data['Action']:
 		if Data['Action'] == 'Login':
 			Good, Error = '', ''
 		elif Data['Action'] == 'Post':
 			Good, Error = PostCommentData(Data)
 	elif 'Reply' in Data and Data['Reply']:
 		Good, Error = PostCommentData(Data)
 	elif 'Delete' in Data and Data['Delete']:
 		Good, Error = '', ''
 	else:
-		Good, Error = '', ''
+		FormMain = FormMain.format(
 			CAPTCHAHTML=CAPTCHAHTML(ReqID) if Config['CAPTCHA'] else '',
 			SecKey=Data['SecKey'] if 'SecKey' in Data and Data['SecKey'] else '',
 			User=Data['User'] if 'User' in Data and Data['User'] else '',
 			Comment=Data['Comment'] if 'Comment' in Data and Data['Comment'] else '')
 		if 'Action' in Data and Data['Action']:
 			if Data['Action'] == 'Login':
 				Good, Error = '', ''
 			elif Data['Action'] == 'Post':
 				Good, Error = PostCommentData(Data)
 		elif 'Reply' in Data and Data['Reply']:
 			Good, Error = PostCommentData(Data)
 		elif 'Delete' in Data and Data['Delete']:
 			Good, Error = '', ''
 		else:
 			Good, Error = '', ''
 	Comments = ''
 	for ID,User,Page,Reply,Date,Comment in GetComments(Data['Site'], Data['Page']):
@ -185,7 +229,7 @@ def Comments():
 	Req = request
 	Data = {}
 	if Req.method == 'GET':
-		for i in ['Lang','StyleFile','Site','Page']:
+		for i in ['Lang','StyleFile','Site','Page','ReadOnly']:
 			Data.update({i:Req.args.get(i)})
 	if Req.method == 'POST':
 		for i in ['Lang','StyleFile','Site','Page','User','CAPTCHA','Comment','SecKey','Action','Reply','Report','Delete']:
--- a/Source/pycache/Server.cpython-310.pyc
+++ b/Source/pycache/Server.cpython-310.pyc
--- a/Wrapper.html
+++ b/Wrapper.html
@ -2,6 +2,6 @@
 <head>
 </head>
 <body>
-	 <iframe src="http://localhost:8080/Comments?Lang=it&Site=5dGQi5vT0hxWULCprKW7Og9g0xRNkHqxxEKI3cGdh-A&Page=/index.html" width="100%" height="80%"></iframe>
+	 <iframe src="http://localhost:8081/Comments?Lang=it&Site=5dGQi5vT0hxWULCprKW7Og9g0xRNkHqxxEKI3cGdh-A&Page=/index.html" width="100%" height="80%"></iframe>
 </body>
 </html>
--- a/requirements.txt
+++ b/requirements.txt
@ -1,2 +1,3 @@
 flask
 waitress
 captcha