Skip to content

Commit

Permalink
Fix permission checks
Browse files Browse the repository at this point in the history 
Show correct command names & permissions in RequireHomeserverPerm failure messages, properly honor OwnerOverride
  • Loading branch information
@FloatingMilkshake
FloatingMilkshake committed Dec 18, 2024
1 parent 887b069 commit e8dc35c
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 23 deletions.
49 changes: 28 additions & 21 deletions Commands/GlobalCmds.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public async Task Help(CommandContext ctx, [Description("Command to provide help

Command? cmd = null;
IEnumerable<Command>? searchIn = cmds;
foreach (string c in commandSplit)
for (int i = 0; i < commandSplit.Length; i++)
{
if (searchIn is null)
{
Expand All @@ -41,35 +41,41 @@ public async Task Help(CommandContext ctx, [Description("Command to provide help

StringComparison comparison = StringComparison.InvariantCultureIgnoreCase;
StringComparer comparer = StringComparer.InvariantCultureIgnoreCase;
cmd = searchIn.FirstOrDefault(xc => xc.Name.Equals(c, comparison) || ((xc.Attributes.FirstOrDefault(x => x is TextAliasAttribute) as TextAliasAttribute)?.Aliases.Contains(c.Replace("textcmd", ""), comparer) ?? false));
cmd = searchIn.FirstOrDefault(xc => xc.Name.Equals(commandSplit[i], comparison) || ((xc.Attributes.FirstOrDefault(x => x is TextAliasAttribute) as TextAliasAttribute)?.Aliases.Contains(commandSplit[i].Replace("textcmd", ""), comparer) ?? false));

if (cmd is null)
{
break;
}

IEnumerable<ContextCheckAttribute> failedChecks = (await CheckPermissionsAsync(ctx, cmd)).ToList();
if (failedChecks.Any())
// Only run checks on the last command in the chain.
// So if we are looking at a command group here, only run checks against the actual command,
// not the group(s) it's under.
if (i == commandSplit.Length - 1)
{
if (failedChecks.All(x => x is RequireHomeserverPermAttribute))
IEnumerable<ContextCheckAttribute> failedChecks = (await CheckPermissionsAsync(ctx, cmd)).ToList();
if (failedChecks.Any())
{
var att = failedChecks.FirstOrDefault(x => x is RequireHomeserverPermAttribute) as RequireHomeserverPermAttribute;
if (att is not null)
if (failedChecks.All(x => x is RequireHomeserverPermAttribute))
{
var level = (await GetPermLevelAsync(ctx.Member));
var levelText = level.ToString();
if (level == ServerPermLevel.Nothing && Program.rand.Next(1, 100) == 69)
levelText = $"naught but a thing, my dear human. Congratulations, you win {Program.rand.Next(1, 10)} bonus points.";
var att = failedChecks.FirstOrDefault(x => x is RequireHomeserverPermAttribute) as RequireHomeserverPermAttribute;
if (att is not null)
{
var level = (await GetPermLevelAsync(ctx.Member));
var levelText = level.ToString();
if (level == ServerPermLevel.Nothing && Program.rand.Next(1, 100) == 69)
levelText = $"naught but a thing, my dear human. Congratulations, you win {Program.rand.Next(1, 10)} bonus points.";

await ctx.RespondAsync(
$"{Program.cfgjson.Emoji.NoPermissions} Invalid permissions to use command **{cmd.Name.Replace("textcmd", "")}**!\n" +
$"Required: `{att.TargetLvl}`\nYou have: `{levelText}`");
await ctx.RespondAsync(
$"{Program.cfgjson.Emoji.NoPermissions} Invalid permissions to use command **{command.Replace("textcmd", "")}**!\n" +
$"Required: `{att.TargetLvl}`\nYou have: `{levelText}`");

return;
return;
}
}
}

return;
return;
}
}

searchIn = cmd.Subcommands.Any() ? cmd.Subcommands : null;
Expand Down Expand Up @@ -322,22 +328,23 @@ private async Task<IEnumerable<ContextCheckAttribute>> CheckPermissionsAsync(Com

if (check is RequireHomeserverPermAttribute requireHomeserverPermAttribute)
{
// Fail if guild member is null but this cmd does not work outside of the home server
if (ctx.Member is null && !requireHomeserverPermAttribute.WorkOutside)
{
failedChecks.Add(requireHomeserverPermAttribute);
}
else
{
if (!requireHomeserverPermAttribute.WorkOutside)
var level = await GetPermLevelAsync(ctx.Member);
if (level < requireHomeserverPermAttribute.TargetLvl)
{
var level = await GetPermLevelAsync(ctx.Member);
if (level < requireHomeserverPermAttribute.TargetLvl)
if (requireHomeserverPermAttribute.OwnerOverride && !Program.cfgjson.BotOwners.Contains(ctx.User.Id)
|| !requireHomeserverPermAttribute.OwnerOverride)
{
failedChecks.Add(requireHomeserverPermAttribute);
}
}
}

}

if (check is RequirePermissionsAttribute requirePermissionsAttribute)
Expand Down
11 changes: 9 additions & 2 deletions Events/ErrorEvents.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,16 @@ await e.Context.RespondAsync(

if (ex is ChecksFailedException cfex && (commandName != "help"))
{
foreach (var check in cfex.Errors)
// Iterate over RequireHomeserverPermAttribute failures.
// Only evaluate the last one, so that if we are looking at a command in a group (say, debug shutdown),
// we only evaluate against permissions for the command (shutdown) instead of the group (debug) in case they differ.
var permErrIndex = 1;
foreach(var permErr in cfex.Errors.Where(x => x.ContextCheckAttribute is RequireHomeserverPermAttribute))
{
if (check.ContextCheckAttribute is RequireHomeserverPermAttribute att)
// Only evaluate the last failed RequireHomeserverPermAttribute
if (permErrIndex == cfex.Errors.Count(x => x.ContextCheckAttribute is RequireHomeserverPermAttribute))
{
var att = permErr.ContextCheckAttribute as RequireHomeserverPermAttribute;
var level = (await GetPermLevelAsync(e.Context.Member));
var levelText = level.ToString();
if (level == ServerPermLevel.Nothing && Program.rand.Next(1, 100) == 69)
Expand All @@ -86,6 +92,7 @@ await e.Context.RespondAsync(

return;
}
permErrIndex++;
}
return;
}
Expand Down

0 comments on commit e8dc35c

Please sign in to comment.