Validate checksums in the JS5 client

Signed-off-by: Graham <gpe@openrs2.org>
bzip2
Graham 4 years ago
parent 4b1d25393c
commit 435a8b4eff
  1. 23
      archive/src/main/kotlin/org/openrs2/archive/cache/Js5ChannelHandler.kt

@ -6,6 +6,7 @@ import io.netty.channel.ChannelHandler
import io.netty.channel.ChannelHandlerContext import io.netty.channel.ChannelHandlerContext
import io.netty.channel.SimpleChannelInboundHandler import io.netty.channel.SimpleChannelInboundHandler
import kotlinx.coroutines.runBlocking import kotlinx.coroutines.runBlocking
import org.openrs2.buffer.crc32
import org.openrs2.buffer.use import org.openrs2.buffer.use
import org.openrs2.cache.Js5Archive import org.openrs2.cache.Js5Archive
import org.openrs2.cache.Js5Compression import org.openrs2.cache.Js5Compression
@ -38,6 +39,7 @@ public class Js5ChannelHandler(
private val maxVersion = version + maxVersionAttempts private val maxVersion = version + maxVersionAttempts
private val inFlightRequests = mutableSetOf<Js5Request.Group>() private val inFlightRequests = mutableSetOf<Js5Request.Group>()
private val pendingRequests = ArrayDeque<Js5Request.Group>() private val pendingRequests = ArrayDeque<Js5Request.Group>()
private var masterIndex: Js5MasterIndex? = null
private lateinit var indexes: Array<Js5Index?> private lateinit var indexes: Array<Js5Index?>
private val groups = mutableListOf<CacheImporter.Group>() private val groups = mutableListOf<CacheImporter.Group>()
@ -116,7 +118,13 @@ public class Js5ChannelHandler(
} else if (response.archive == Js5Archive.ARCHIVESET) { } else if (response.archive == Js5Archive.ARCHIVESET) {
processIndex(response.group, response.data) processIndex(response.group, response.data)
} else { } else {
val version = indexes[response.archive]!![response.group]!!.version val entry = indexes[response.archive]!![response.group]!!
if (response.data.crc32() != entry.checksum) {
throw Exception("Group checksum invalid")
}
val version = entry.version
val encrypted = Js5Compression.isEncrypted(response.data.slice()) val encrypted = Js5Compression.isEncrypted(response.data.slice())
groups += CacheImporter.Group(response.archive, response.group, response.data.retain(), version, encrypted) groups += CacheImporter.Group(response.archive, response.group, response.data.retain(), version, encrypted)
} }
@ -138,11 +146,11 @@ public class Js5ChannelHandler(
} }
private fun processMasterIndex(buf: ByteBuf) { private fun processMasterIndex(buf: ByteBuf) {
val masterIndex = Js5Compression.uncompress(buf.slice()).use { uncompressed -> masterIndex = Js5Compression.uncompress(buf.slice()).use { uncompressed ->
Js5MasterIndex.read(uncompressed) Js5MasterIndex.read(uncompressed)
} }
val rawIndexes = runBlocking { importer.importMasterIndexAndGetIndexes(masterIndex, buf) } val rawIndexes = runBlocking { importer.importMasterIndexAndGetIndexes(masterIndex!!, buf) }
try { try {
indexes = arrayOfNulls(rawIndexes.size) indexes = arrayOfNulls(rawIndexes.size)
@ -159,11 +167,20 @@ public class Js5ChannelHandler(
} }
private fun processIndex(archive: Int, buf: ByteBuf) { private fun processIndex(archive: Int, buf: ByteBuf) {
val entry = masterIndex!!.entries[archive]
if (buf.crc32() != entry.checksum) {
throw Exception("Index checksum invalid")
}
val index = Js5Compression.uncompress(buf.slice()).use { uncompressed -> val index = Js5Compression.uncompress(buf.slice()).use { uncompressed ->
Js5Index.read(uncompressed) Js5Index.read(uncompressed)
} }
indexes[archive] = index indexes[archive] = index
if (index.version != entry.version) {
throw Exception("Index version invalid")
}
val groups = runBlocking { val groups = runBlocking {
importer.importIndexAndGetMissingGroups(archive, index, buf) importer.importIndexAndGetMissingGroups(archive, index, buf)
} }

Loading…
Cancel
Save