mirror of
https://github.com/Cog-Creators/Red-DiscordBot.git
synced 2025-11-06 11:18:54 -05:00
54975eb812
* This starts setting up checks.py to handle managed permission overrides * A decent starting point, more work to come * missing else fix * more work on this * reduce redundant code * More work on this... * more progress * add a debug flag to some things in .resolvers to help with exploring why checks behave in a certain way * modify this to be a list for ease of showing full resolution order * more * don't bypass is_owner, ever * remove old logic about ownercommands * better handling of chec validity * anonymous functions return None for __module__, remove some code as a result * mutable default bind fix * Add a caching layer (to be invalidated as needed) Ensure checks in the chain inserted before the core logic only return None or False (whitelists then blacklists are checked first in core logic, from most to least specific scope, overriding this with an allow does not make sense) * more progress, slow work as I have time * Modifies the predicates so that their inner functions are accesible from cogs without being a check * Update checks.py Safety for existing permissions.py cogs * This is where I take a change of course on setting this up, because this would have been the most long winded interactive command ever as it was starting to progress. This is going to support individual entry updates, settings from yaml, gettings, and clearing existing settings as well as printing a settings template out and referring people to what is going to be very well written docs * block permissions cog from being unblocked by the permissions cog as a safety feature (really, co-owner exists at this point) * WIP * Okay, this has the intent of the changes, just to actually test these as working as intended + add corresponding guild functions * oh nice, missed a couple files, sec... * WIP, also, something's broken in resolvers or check_overrides >> * This is working now (still needs docs and more...) * unmerge changes from other PR * is_owner still needs to exist in here due to management of non checked commands * Update this to new style standards * forgot to commit some local changes earlier * fix update logic * fix update logic * b14 fix, lol * fix issue with management command name * this isnt a real fix * Ok.. * perms * This is working, but needs docs and more configuration opts now * more * Ux functions, need testing * style * fix using the obj str rather than the id * fix CogOrCommand converter * Return the correct things in the converter * last fix, needs docs, and possibly some extra Ux utils * start doc writing * extra user facing commands * yaml docs * yaml fix * secondary checks-fix * 3rd party check stuff * remove warning that this isn't ready yet * swap ctx.tick for real responses, require emoji perms for interactive menuing, better attr handling for nicknames * send file to author * alias to `p` * more ctx tick removal (This is a long ass changelog...)
92 lines
2.8 KiB
Python
92 lines
2.8 KiB
Python
import types
|
|
import contextlib
|
|
import asyncio
|
|
import logging
|
|
from redbot.core import commands
|
|
|
|
log = logging.getLogger("redbot.cogs.permissions.resolvers")
|
|
|
|
|
|
async def val_if_check_is_valid(*, ctx: commands.Context, check: object, level: str) -> bool:
|
|
"""
|
|
Returns the value from a check if it is valid
|
|
"""
|
|
|
|
# Non staticmethods should not be run without their parent
|
|
# class, even if the parent class did not deregister them
|
|
if check.__module__ is None:
|
|
pass
|
|
elif isinstance(check, types.FunctionType):
|
|
if (
|
|
next(filter(lambda x: check.__module__ == x.__module__, ctx.bot.cogs.values()), None)
|
|
is None
|
|
):
|
|
return None
|
|
|
|
val = None
|
|
# let's not spam the console with improperly made 3rd party checks
|
|
try:
|
|
if asyncio.iscoroutine(check) or asyncio.iscoroutinefunction(check):
|
|
val = await check(ctx, level=level)
|
|
else:
|
|
val = check(ctx, level=level)
|
|
except Exception as e:
|
|
# but still provide a way to view it (run with debug flag)
|
|
log.debug(str(e))
|
|
|
|
return val
|
|
|
|
|
|
def resolve_models(*, ctx: commands.Context, models: dict) -> bool:
|
|
"""
|
|
Resolves models in order.
|
|
"""
|
|
|
|
cmd_name = ctx.command.qualified_name
|
|
cog_name = ctx.cog.__class__.__name__
|
|
|
|
resolved = None
|
|
|
|
to_iter = (("commands", cmd_name), ("cogs", cog_name))
|
|
|
|
for model_name, ctx_attr in to_iter:
|
|
if ctx_attr in models.get(model_name, {}):
|
|
blacklist = models[model_name][ctx_attr].get("deny", [])
|
|
whitelist = models[model_name][ctx_attr].get("allow", [])
|
|
resolved = resolve_lists(ctx=ctx, whitelist=whitelist, blacklist=blacklist)
|
|
if resolved is not None:
|
|
return resolved
|
|
resolved = models[model_name][ctx_attr].get("default", None)
|
|
if resolved is not None:
|
|
return resolved
|
|
|
|
return None
|
|
|
|
|
|
def resolve_lists(*, ctx: commands.Context, whitelist: list, blacklist: list) -> bool:
|
|
"""
|
|
resolves specific lists
|
|
"""
|
|
|
|
voice_channel = None
|
|
with contextlib.suppress(Exception):
|
|
voice_channel = ctx.author.voice.voice_channel
|
|
|
|
entries = [x.id for x in (ctx.author, voice_channel, ctx.channel) if x]
|
|
roles = sorted(ctx.author.roles, reverse=True) if ctx.guild else []
|
|
entries.extend([x.id for x in roles])
|
|
# entries now contains the following (in order) (if applicable)
|
|
# author.id
|
|
# author.voice.voice_channel.id
|
|
# channel.id
|
|
# role.id for each role (highest to lowest)
|
|
# (implicitly) guild.id because
|
|
# the @everyone role shares an id with the guild
|
|
|
|
for entry in entries:
|
|
if entry in whitelist:
|
|
return True
|
|
if entry in blacklist:
|
|
return False
|
|
return None
|