Merge branch 'feature/black_list' into feature/pyapp

# Conflicts:
#	src/db/mongo_manager.py
#	src/pojo/black_contact.py
This commit is contained in:
PAN Lei
2022-07-05 09:43:09 +02:00
4 changed files with 63 additions and 9 deletions
+3 -2
View File
@@ -36,7 +36,7 @@ TOO_MANY_REQUEST_ERROR_MESSAGE = "Due to a large number of requests"
TOO_MANY_REQUEST_ERROR_MESSAGE_FR = "Suite à un trop grand nombre de demandes"
CAPTCHA_ERROR_MESSAGE = "Error verifying captcha, please try again"
CAPTCHA_ERROR_MESSAGE_FR = "La vérification du captcha a échoué"
TIME_OUT = 10*60*1000 #10 mins
TIME_OUT = 10 * 60 * 1000 # 10 mins
OTP_TIMEOUT = 240
PAGE_TIMEOUT = 40000
@@ -252,11 +252,12 @@ class CommandorPage:
self.is_finished = True
self.termine()
elif TOO_MANY_REQUEST_ERROR_MESSAGE in erro_content or TOO_MANY_REQUEST_ERROR_MESSAGE_FR in erro_content:
# this email has been already used
# this email is in black list
if not self.is_finished:
params.local_db_manager.insert_or_update(
get_captcha_error_contact_from_contact(self.contact, TOO_MANY_REQUEST_ERROR))
params.oracle_log_sender.send_too_many_error(self.contact)
params.mongo_store_manager.insert_blacklist_contact(self.contact)
self.is_finished = True
self.termine()
elif CAPTCHA_ERROR_MESSAGE in erro_content or CAPTCHA_ERROR_MESSAGE_FR in erro_content: