Yadciel/Titan
1
0
Fork 0
mirror of https://github.com/TitanEmbeds/Titan.git synced 2025-06-16 19:35:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Server administrators may disable captchas for guest users

Browse Source
This commit is contained in:
Jeremy Zhang
2017-11-04 02:58:26 +00:00
parent 71209d2824
commit bba4950ddc
12 changed files with 78 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
webapp/titanembeds/blueprints/admin/admin.py
View File

@ -155,6 +155,7 @@ def administrate_guild(guild_id):
"chat_links": db_guild.chat_links,
"bracket_links": db_guild.bracket_links,
"mentions_limit": db_guild.mentions_limit,
"unauth_captcha": db_guild.unauth_captcha,
"icon": db_guild.icon,
"discordio": db_guild.discordio if db_guild.discordio != None else "",
"guest_icon": db_guild.guest_icon if db_guild.guest_icon != None else "",
@ -171,6 +172,7 @@ def update_administrate_guild(guild_id):
db_guild.chat_links = request.form.get("chat_links", db_guild.chat_links) in ["true", True]
db_guild.bracket_links = request.form.get("bracket_links", db_guild.bracket_links) in ["true", True]
db_guild.mentions_limit = request.form.get("mentions_limit", db_guild.mentions_limit)
db_guild.unauth_captcha = request.form.get("unauth_captcha", db_guild.unauth_captcha) in ["true", True]
discordio = request.form.get("discordio", db_guild.discordio)
if discordio != None and discordio.strip() == "":
discordio = None
@ -192,6 +194,7 @@ def update_administrate_guild(guild_id):
mentions_limit=db_guild.mentions_limit,
discordio=db_guild.discordio,
guest_icon=db_guild.guest_icon,
unauth_captcha=unauth_captcha,
)
@admin.route("/guilds")

9
webapp/titanembeds/blueprints/api/api.py
View File

@ -1,6 +1,6 @@
from titanembeds.database import db, Guilds, UnauthenticatedUsers, UnauthenticatedBans, AuthenticatedUsers, KeyValueProperties, GuildMembers, Messages, get_channel_messages, list_all_guild_members, get_guild_member, get_administrators_list
from titanembeds.decorators import valid_session_required, discord_users_only
from titanembeds.utils import check_guild_existance, guild_accepts_visitors, guild_query_unauth_users_bool, get_client_ipaddr, discord_api, rate_limiter, channel_ratelimit_key, guild_ratelimit_key, user_unauthenticated, checkUserRevoke, checkUserBanned, update_user_status, check_user_in_guild, get_guild_channels, guild_webhooks_enabled
from titanembeds.utils import check_guild_existance, guild_accepts_visitors, guild_query_unauth_users_bool, get_client_ipaddr, discord_api, rate_limiter, channel_ratelimit_key, guild_ratelimit_key, user_unauthenticated, checkUserRevoke, checkUserBanned, update_user_status, check_user_in_guild, get_guild_channels, guild_webhooks_enabled, guild_unauthcaptcha_enabled
from titanembeds.oauth import user_has_permission, generate_avatar_url, check_user_can_administrate_guild
from flask import Blueprint, abort, jsonify, session, request, url_for
from flask import current_app as app
@ -291,9 +291,6 @@ def create_unauthenticated_user():
guild_id = request.form['guild_id']
ip_address = get_client_ipaddr()
username = username.strip()
captcha_response = request.form['captcha_response']
if not verify_captcha_request(captcha_response, request.remote_addr):
abort(412)
if len(username) < 2 or len(username) > 32:
abort(406)
if not all(x.isalnum() or x.isspace() or "-" == x or "_" == x for x in username):
@ -302,6 +299,10 @@ def create_unauthenticated_user():
abort(404)
if not guild_query_unauth_users_bool(guild_id):
abort(401)
if guild_unauthcaptcha_enabled(guild_id):
captcha_response = request.form['captcha_response']
if not verify_captcha_request(captcha_response, request.remote_addr):
abort(412)
if not checkUserBanned(guild_id, ip_address):
session['username'] = username
if 'user_id' not in session or len(str(session["user_id"])) > 4:

3
webapp/titanembeds/blueprints/embed/embed.py
View File

@ -1,5 +1,5 @@
from flask import Blueprint, render_template, abort, redirect, url_for, session, request
from titanembeds.utils import check_guild_existance, guild_query_unauth_users_bool, guild_accepts_visitors
from titanembeds.utils import check_guild_existance, guild_query_unauth_users_bool, guild_accepts_visitors, guild_unauthcaptcha_enabled
from titanembeds.oauth import generate_guild_icon_url, generate_avatar_url
from titanembeds.database import db, Guilds, UserCSS
from config import config
@ -70,6 +70,7 @@ def guild_embed(guild_id):
generate_guild_icon=generate_guild_icon_url,
unauth_enabled=guild_query_unauth_users_bool(guild_id),
visitors_enabled=guild_accepts_visitors(guild_id),
unauth_captcha_enabled=guild_unauthcaptcha_enabled(guild_id),
client_id=config['client-id'],
recaptcha_site_key=config["recaptcha-site-key"],
css=customcss,

3
webapp/titanembeds/blueprints/user/user.py
View File

@ -209,6 +209,7 @@ def administrate_guild(guild_id):
"chat_links": db_guild.chat_links,
"bracket_links": db_guild.bracket_links,
"mentions_limit": db_guild.mentions_limit,
"unauth_captcha": db_guild.unauth_captcha,
"icon": db_guild.icon,
"discordio": db_guild.discordio if db_guild.discordio != None else "",
"guest_icon": db_guild.guest_icon if db_guild.guest_icon != None else "",
@ -231,6 +232,7 @@ def update_administrate_guild(guild_id):
db_guild.chat_links = request.form.get("chat_links", db_guild.chat_links) in ["true", True]
db_guild.bracket_links = request.form.get("bracket_links", db_guild.bracket_links) in ["true", True]
db_guild.mentions_limit = request.form.get("mentions_limit", db_guild.mentions_limit)
db_guild.unauth_captcha = request.form.get("unauth_captcha", db_guild.unauth_captcha) in ["true", True]
discordio = request.form.get("discordio", db_guild.discordio)
if discordio != None and discordio.strip() == "":
@ -255,6 +257,7 @@ def update_administrate_guild(guild_id):
mentions_limit=db_guild.mentions_limit,
discordio=db_guild.discordio,
guest_icon=guest_icon,
unauth_captcha=db_guild.unauth_captcha,
)
@user.route("/add-bot/<guild_id>")