Administrator can now disable misbehaving servers

This commit is contained in:
Jeremy Zhang
2018-01-05 08:52:22 +00:00
parent 6c4b850669
commit bf47f9457c
14 changed files with 253 additions and 6 deletions

View File

@ -1,7 +1,7 @@
from flask import Blueprint, url_for, redirect, session, render_template, abort, request, jsonify
from flask_socketio import emit
from functools import wraps
from titanembeds.database import db, get_administrators_list, Cosmetics, Guilds, UnauthenticatedUsers, UnauthenticatedBans, TitanTokens, TokenTransactions, get_titan_token, set_titan_token
from titanembeds.database import db, get_administrators_list, Cosmetics, Guilds, UnauthenticatedUsers, UnauthenticatedBans, TitanTokens, TokenTransactions, get_titan_token, set_titan_token, list_disabled_guilds, DisabledGuilds
from titanembeds.oauth import generate_guild_icon_url
import datetime
import json
@ -266,4 +266,31 @@ def patch_titan_tokens():
if get_titan_token(user_id) == -1:
abort(409)
set_titan_token(user_id, amount, "MODIFY VIA ADMIN [{}]".format(str(reason)))
return ('', 204)
@admin.route("/disabled_guilds", methods=["GET"])
@is_admin
def get_disabled_guilds():
return render_template("admin_disabled_guilds.html.j2", guilds=list_disabled_guilds())
@admin.route("/disabled_guilds", methods=["POST"])
@is_admin
def post_disabled_guilds():
guild_id = request.form.get("guild_id", None)
if guild_id in list_disabled_guilds():
abort(409)
guild = DisabledGuilds(guild_id)
db.session.add(guild)
db.session.commit()
return ('', 204)
@admin.route("/disabled_guilds", methods=["DELETE"])
@is_admin
def delete_disabled_guilds():
guild_id = request.form.get("guild_id", None)
if guild_id not in list_disabled_guilds():
abort(409)
guild = db.session.query(DisabledGuilds).filter(DisabledGuilds.guild_id == guild_id).first()
db.session.delete(guild)
db.session.commit()
return ('', 204)

View File

@ -1,5 +1,5 @@
from titanembeds.database import db, Guilds, UnauthenticatedUsers, UnauthenticatedBans, AuthenticatedUsers, GuildMembers, Messages, get_channel_messages, list_all_guild_members, get_guild_member, get_administrators_list, get_badges
from titanembeds.decorators import valid_session_required, discord_users_only
from titanembeds.decorators import valid_session_required, discord_users_only, abort_if_guild_disabled
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, get_member_roles
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
@ -163,6 +163,7 @@ def get_channel_webhook_url(guild_id, channel_id):
@api.route("/fetch", methods=["GET"])
@valid_session_required(api=True)
@abort_if_guild_disabled()
@rate_limiter.limit("2 per 2 second", key_func = channel_ratelimit_key)
def fetch():
guild_id = request.args.get("guild_id")
@ -193,6 +194,7 @@ def fetch():
return response
@api.route("/fetch_visitor", methods=["GET"])
@abort_if_guild_disabled()
@rate_limiter.limit("2 per 2 second", key_func = channel_ratelimit_key)
def fetch_visitor():
guild_id = request.args.get("guild_id")
@ -215,6 +217,7 @@ def fetch_visitor():
@api.route("/post", methods=["POST"])
@valid_session_required(api=True)
@abort_if_guild_disabled()
@rate_limiter.limit("1 per 5 second", key_func = channel_ratelimit_key)
def post():
guild_id = request.form.get("guild_id")
@ -285,6 +288,7 @@ def verify_captcha_request(captcha_response, ip_address):
@api.route("/create_unauthenticated_user", methods=["POST"])
@rate_limiter.limit("3 per 30 minute", key_func=guild_ratelimit_key)
@abort_if_guild_disabled()
def create_unauthenticated_user():
session['unauthenticated'] = True
username = request.form['username']
@ -326,6 +330,7 @@ def create_unauthenticated_user():
@api.route("/change_unauthenticated_username", methods=["POST"])
@rate_limiter.limit("1 per 10 minute", key_func=guild_ratelimit_key)
@abort_if_guild_disabled()
def change_unauthenticated_username():
username = request.form['username']
guild_id = request.form['guild_id']
@ -381,6 +386,7 @@ def process_query_guild(guild_id, visitor=False):
@api.route("/query_guild", methods=["GET"])
@valid_session_required(api=True)
@abort_if_guild_disabled()
def query_guild():
guild_id = request.args.get('guild_id')
if check_guild_existance(guild_id):
@ -390,6 +396,7 @@ def query_guild():
abort(404)
@api.route("/query_guild_visitor", methods=["GET"])
@abort_if_guild_disabled()
def query_guild_visitor():
guild_id = request.args.get('guild_id')
if check_guild_existance(guild_id):
@ -400,6 +407,7 @@ def query_guild_visitor():
@api.route("/create_authenticated_user", methods=["POST"])
@discord_users_only(api=True)
@abort_if_guild_disabled()
def create_authenticated_user():
guild_id = request.form.get('guild_id')
if session['unauthenticated']:

View File

@ -2,7 +2,7 @@ from flask import Blueprint, render_template, abort, redirect, url_for, session,
from flask_babel import gettext
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 titanembeds.database import db, Guilds, UserCSS, list_disabled_guilds
from config import config
import random
import json
@ -65,6 +65,7 @@ def guild_embed(guild_id):
}
customcss = get_custom_css()
return render_template("embed.html.j2",
disabled=guild_id in list_disabled_guilds(),
login_greeting=get_logingreeting(),
guild_id=guild_id,
guild=guild_dict,

View File

@ -3,7 +3,7 @@ from flask import current_app as app
from flask_socketio import emit
from config import config
from titanembeds.decorators import discord_users_only
from titanembeds.database import db, Guilds, UnauthenticatedUsers, UnauthenticatedBans, Cosmetics, UserCSS, Patreon, set_titan_token, get_titan_token, add_badge
from titanembeds.database import db, Guilds, UnauthenticatedUsers, UnauthenticatedBans, Cosmetics, UserCSS, Patreon, set_titan_token, get_titan_token, add_badge, list_disabled_guilds
from titanembeds.oauth import authorize_url, token_url, make_authenticated_session, get_current_authenticated_user, get_user_managed_servers, check_user_can_administrate_guild, check_user_permission, generate_avatar_url, generate_guild_icon_url, generate_bot_invite_url
import time
import datetime
@ -218,11 +218,13 @@ def administrate_guild(guild_id):
"discordio": db_guild.discordio if db_guild.discordio != None else "",
"guest_icon": db_guild.guest_icon if db_guild.guest_icon != None else "",
}
return render_template("administrate_guild.html.j2", guild=dbguild_dict, members=users, permissions=permissions, cosmetics=cosmetics)
return render_template("administrate_guild.html.j2", guild=dbguild_dict, members=users, permissions=permissions, cosmetics=cosmetics, disabled=(guild_id in list_disabled_guilds()))
@user.route("/administrate_guild/<guild_id>", methods=["POST"])
@discord_users_only()
def update_administrate_guild(guild_id):
if guild_id in list_disabled_guilds():
return ('', 423)
if not check_user_can_administrate_guild(guild_id):
abort(403)
db_guild = db.session.query(Guilds).filter(Guilds.guild_id == guild_id).first()
@ -316,6 +318,8 @@ def ban_unauthenticated_user():
guild_id = request.form.get("guild_id", None)
user_id = request.form.get("user_id", None)
reason = request.form.get("reason", None)
if guild_id in list_disabled_guilds():
return ('', 423)
if reason is not None:
reason = reason.strip()
if reason == "":
@ -342,6 +346,8 @@ def ban_unauthenticated_user():
def unban_unauthenticated_user():
guild_id = request.args.get("guild_id", None)
user_id = request.args.get("user_id", None)
if guild_id in list_disabled_guilds():
return ('', 423)
if not guild_id or not user_id:
abort(400)
if not check_user_permission(guild_id, 2):
@ -362,6 +368,8 @@ def unban_unauthenticated_user():
def revoke_unauthenticated_user():
guild_id = request.form.get("guild_id", None)
user_id = request.form.get("user_id", None)
if guild_id in list_disabled_guilds():
return ('', 423)
if not guild_id or not user_id:
abort(400)
if not check_user_permission(guild_id, 1):