github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-01-11 02:50:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Check Command.owner, #216

Browse Source
This commit is contained in:
Karlatemp 2020-11-29 18:00:48 +08:00
parent 4803a21488
commit 595c9480a6
No known key found for this signature in database
GPG Key ID: 21FBDDF664FF06F8
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/mirai-console/src/command/AbstractCommand.kt
View File

@ -37,6 +37,8 @@ public abstract class AbstractCommand
init { init {
Command.checkCommandName(primaryName) Command.checkCommandName(primaryName)
@Suppress("LeakingThis")
Command.checkCommandOwner(this)
secondaryNames.forEach(Command.Companion::checkCommandName) secondaryNames.forEach(Command.Companion::checkCommandName)
} }

14
backend/mirai-console/src/command/Command.kt
View File

@ -117,5 +117,19 @@ public interface Command {
name.contains('.') -> throw IllegalArgumentException("'.' is forbidden in command name.") name.contains('.') -> throw IllegalArgumentException("'.' is forbidden in command name.")
} }
} }
/**
* 检查指令 [owner] 的合法性, 在非法时抛出 [IllegalArgumentException]
*/
@JvmStatic
@Throws(IllegalArgumentException::class)
public fun checkCommandOwner(command: Command) {
val owner = command.owner
if (owner is ConsoleCommandOwner) {
if (command.javaClass.enclosingClass != BuiltInCommands::class.java) {
throw IllegalArgumentException("ConsoleCommandOwner is not allowed")
}
}
}
} }
} }