velvox
/
litecord
mirror of https://gitlab.com/litecord/litecord.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

webhooks: add channel checks when user updates webhook

This commit is contained in:
Luna 2019-03-18 17:44:30 -03:00
parent 379bd75424
commit 012567c9d2
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
litecord/blueprints/webhooks.py
View File

@ -33,7 +33,7 @@ from litecord.schemas import (
from litecord.enums import ChannelType from litecord.enums import ChannelType
from litecord.snowflake import get_snowflake from litecord.snowflake import get_snowflake
from litecord.utils import async_map from litecord.utils import async_map
from litecord.errors import WebhookNotFound, Unauthorized from litecord.errors import WebhookNotFound, Unauthorized, ChannelNotFound
from litecord.blueprints.channel.messages import ( from litecord.blueprints.channel.messages import (
msg_create_request, msg_create_check_content, msg_add_attachment, msg_create_request, msg_create_check_content, msg_add_attachment,
@ -98,7 +98,7 @@ async def _webhook_check_fw(webhook_id):
if guild_id is None: if guild_id is None:
raise WebhookNotFound() raise WebhookNotFound()
return await _webhook_check_guild(guild_id) return (await _webhook_check_guild(guild_id)), guild_id
async def _webhook_many(where_clause, arg: int): async def _webhook_many(where_clause, arg: int):
@ -205,7 +205,7 @@ async def _update_webhook(webhook_id: int, j: dict):
UPDATE webhooks UPDATE webhooks
SET channel_id = $1 SET channel_id = $1
WHERE id = $2 WHERE id = $2
""", j['name'], webhook_id) """, j['channel_id'], webhook_id)
if 'avatar' in j: if 'avatar' in j:
new_icon = await app.icons.update( new_icon = await app.icons.update(
@ -222,9 +222,18 @@ async def _update_webhook(webhook_id: int, j: dict):
@bp.route('/webhooks/<int:webhook_id>', methods=['PATCH']) @bp.route('/webhooks/<int:webhook_id>', methods=['PATCH'])
async def modify_webhook(webhook_id: int): async def modify_webhook(webhook_id: int):
"""Patch a webhook.""" """Patch a webhook."""
await _webhook_check_fw(webhook_id) guild_id, _user_id = await _webhook_check_fw(webhook_id)
j = validate(await request.get_json(), WEBHOOK_UPDATE) j = validate(await request.get_json(), WEBHOOK_UPDATE)
if 'channel_id' in j:
# pre checks
chan = await app.storage.get_channel(j['channel_id'])
# short-circuiting should ensure chan isn't none
# by the time we do chan['guild_id']
if chan and chan['guild_id'] != str(guild_id):
raise ChannelNotFound('cant assign webhook to channel')
await _update_webhook(webhook_id, j) await _update_webhook(webhook_id, j)
return jsonify(await get_webhook(webhook_id)) return jsonify(await get_webhook(webhook_id))