sorceress
/
MatterLink
mirror of https://github.com/AgathaSorceress/MatterLink.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

add IllegalArgument checks, because parsing UUID can throw

This commit is contained in:
nikky 2018-07-19 15:06:17 +02:00
parent ad3862f14a
commit a9838339d6
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/src/main/kotlin/matterlink/bridge/command/AuthBridgeCommand.kt
View File

@ -37,8 +37,13 @@ object AuthBridgeCommand : IBridgeCommand() {
var targetUserName = target var targetUserName = target
val targetUUid: String = instance.nameToUUID(target)?.toString() ?: run { val targetUUid: String = instance.nameToUUID(target)?.toString() ?: run {
targetUserName = instance.uuidToName(UUID.fromString(target)) ?: run { try {
env.respond("cannot find player by username/uuid $target") targetUserName = instance.uuidToName(UUID.fromString(target)) ?: run {
env.respond("cannot find player by username/uuid $target")
return true
}
} catch (e: IllegalArgumentException) {
env.respond("invalid username/uuid $target")
return true return true
} }
target target

11
core/src/main/kotlin/matterlink/config/IdentitiesConfig.kt
View File

@ -8,6 +8,7 @@ import com.google.common.cache.Cache
import com.google.common.cache.CacheBuilder import com.google.common.cache.CacheBuilder
import matterlink.getList import matterlink.getList
import matterlink.logger import matterlink.logger
import matterlink.stackTraceString
import java.io.File import java.io.File
import java.io.FileNotFoundException import java.io.FileNotFoundException
import java.util.* import java.util.*
@ -121,6 +122,14 @@ object IdentitiesConfig {
logger.info("platform: $_platform userids: $userids") logger.info("platform: $_platform userids: $userids")
platform.equals(_platform, true) && userids.contains(userid) platform.equals(_platform, true) && userids.contains(userid)
} }
}?.key?.let { UUID.fromString(it) } }?.key?.let {
try {
UUID.fromString(it)
} catch (e: IllegalArgumentException) {
logger.error("cannot parse UUID: $it")
logger.error(e.stackTraceString)
null
}
}
} }
} }