tiramisu/seyfert
5
0
Fork 0
mirror of https://github.com/tiramisulabs/seyfert.git synced 2025-07-01 20:46:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(handle): checkPermissions bypass channels outside guilds

Browse Source
This commit is contained in:
Marcos Susaña 2024-09-19 16:21:35 -04:00
parent 06617ff1ce
commit 85b1b93131
No known key found for this signature in database
1 changed files with 45 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/commands/handle.ts
View File

@ -109,7 +109,11 @@ export class HandleCommand {
context: MenuCommandContext<UserCommandInteraction>, context: MenuCommandContext<UserCommandInteraction>,
) { ) {
if (command.botPermissions && interaction.appPermissions) { if (command.botPermissions && interaction.appPermissions) {
const permissions = this.checkPermissions(interaction.appPermissions, command.botPermissions); const permissions = this.checkPermissions(
interaction.appPermissions,
command.botPermissions,
!context.guildId || interaction.appPermissions.has('Administrator'),
);
if (permissions) return command.onBotPermissionsFail(context, permissions); if (permissions) return command.onBotPermissionsFail(context, permissions);
} }
@ -137,8 +141,12 @@ export class HandleCommand {
async entryPoint(command: EntryPointCommand, interaction: EntryPointInteraction, context: EntryPointContext) { async entryPoint(command: EntryPointCommand, interaction: EntryPointInteraction, context: EntryPointContext) {
if (command.botPermissions && interaction.appPermissions) { if (command.botPermissions && interaction.appPermissions) {
const permissions = this.checkPermissions(interaction.appPermissions, command.botPermissions); const permissions = this.checkPermissions(
if (permissions) return command.onBotPermissionsFail?.(context, permissions); interaction.appPermissions,
command.botPermissions,
!context.guildId || interaction.appPermissions.has('Administrator'),
);
if (permissions) return command.onBotPermissionsFail(context, permissions);
} }
const resultGlobal = await this.runGlobalMiddlewares(command, context); const resultGlobal = await this.runGlobalMiddlewares(command, context);
@ -170,7 +178,11 @@ export class HandleCommand {
context: CommandContext, context: CommandContext,
) { ) {
if (command.botPermissions && interaction.appPermissions) { if (command.botPermissions && interaction.appPermissions) {
const permissions = this.checkPermissions(interaction.appPermissions, command.botPermissions); const permissions = this.checkPermissions(
interaction.appPermissions,
command.botPermissions,
!context.guildId || interaction.appPermissions.has('Administrator'),
);
if (permissions) return command.onBotPermissionsFail?.(context, permissions); if (permissions) return command.onBotPermissionsFail?.(context, permissions);
} }
if (!(await this.runOptions(command, context, resolver))) return; if (!(await this.runOptions(command, context, resolver))) return;
@ -234,8 +246,13 @@ export class HandleCommand {
case ApplicationCommandType.Message: { case ApplicationCommandType.Message: {
const data = this.makeMenuCommand(body, shardId, __reply); const data = this.makeMenuCommand(body, shardId, __reply);
if (!data) return; if (!data) return;
// @ts-expect-error
this.contextMenuMessage(data.command, data.interaction, data.context); this.contextMenuMessage(
data.command,
// @ts-expect-error
data.interaction,
data.context,
);
break; break;
} }
case ApplicationCommandType.User: { case ApplicationCommandType.User: {
@ -358,7 +375,11 @@ export class HandleCommand {
if (rawMessage.guild_id) { if (rawMessage.guild_id) {
if (command.defaultMemberPermissions) { if (command.defaultMemberPermissions) {
const memberPermissions = await self.members.permissions(rawMessage.guild_id, rawMessage.author.id); const memberPermissions = await self.members.permissions(rawMessage.guild_id, rawMessage.author.id);
const permissions = this.checkPermissions(memberPermissions, command.defaultMemberPermissions); const permissions = this.checkPermissions(
memberPermissions,
command.defaultMemberPermissions,
memberPermissions.has('Administrator'),
);
const guild = await this.client.guilds.raw(rawMessage.guild_id); const guild = await this.client.guilds.raw(rawMessage.guild_id);
if (permissions && guild.owner_id !== rawMessage.author.id) { if (permissions && guild.owner_id !== rawMessage.author.id) {
return command.onPermissionsFail?.(context, memberPermissions.keys(permissions)); return command.onPermissionsFail?.(context, memberPermissions.keys(permissions));
@ -367,8 +388,12 @@ export class HandleCommand {
if (command.botPermissions) { if (command.botPermissions) {
const appPermissions = await self.members.permissions(rawMessage.guild_id, self.botId); const appPermissions = await self.members.permissions(rawMessage.guild_id, self.botId);
const permissions = this.checkPermissions(appPermissions, command.botPermissions); const permissions = this.checkPermissions(
if (!appPermissions.has('Administrator') && permissions) { appPermissions,
command.botPermissions,
appPermissions.has('Administrator'),
);
if (permissions) {
return command.onBotPermissionsFail?.(context, permissions); return command.onBotPermissionsFail?.(context, permissions);
} }
} }
@ -497,9 +522,10 @@ export class HandleCommand {
}) as T; }) as T;
} }
checkPermissions(app: PermissionsBitField, bot: bigint) { checkPermissions(app: PermissionsBitField, bot: bigint, bypass = false) {
if (bypass) return;
const permissions = app.missings(...app.values([bot])); const permissions = app.missings(...app.values([bot]));
if (!app.has('Administrator') && permissions.length) { if (permissions.length) {
return app.keys(permissions); return app.keys(permissions);
} }
return; return;
@ -624,9 +650,15 @@ export class HandleCommand {
resolved: MakeRequired<ContextOptionsResolved>, resolved: MakeRequired<ContextOptionsResolved>,
) { ) {
const options: APIApplicationCommandInteractionDataOption[] = []; const options: APIApplicationCommandInteractionDataOption[] = [];
const errors: { name: string; error: string; fullError: MessageCommandOptionErrors }[] = []; const errors: {
name: string;
error: string;
fullError: MessageCommandOptionErrors;
}[] = [];
let indexAttachment = -1; let indexAttachment = -1;
for (const i of (command.options ?? []) as (CommandOption & { type: ApplicationCommandOptionType })[]) { for (const i of (command.options ?? []) as (CommandOption & {
type: ApplicationCommandOptionType;
})[]) {
try { try {
let value: string | boolean | number | undefined; let value: string | boolean | number | undefined;
switch (i.type) { switch (i.type) {