Add command for downloading keys from RuneLite and OpenOSRS

Signed-off-by: Graham <gpe@openrs2.org>
Graham 4 years ago
parent 5da59135ea
commit c260548d73
  1. 2
      archive/build.gradle.kts
  2. 10
      archive/src/main/kotlin/org/openrs2/archive/ArchiveModule.kt
  3. 14
      archive/src/main/kotlin/org/openrs2/archive/key/DownloadCommand.kt
  4. 1
      archive/src/main/kotlin/org/openrs2/archive/key/KeyCommand.kt
  5. 7
      archive/src/main/kotlin/org/openrs2/archive/key/KeyDownloader.kt
  6. 13
      archive/src/main/kotlin/org/openrs2/archive/key/KeyImporter.kt
  7. 38
      archive/src/main/kotlin/org/openrs2/archive/key/OpenOsrsKeyDownloader.kt
  8. 65
      archive/src/main/kotlin/org/openrs2/archive/key/RuneLiteKeyDownloader.kt

@ -15,6 +15,7 @@ dependencies {
implementation(project(":cache")) implementation(project(":cache"))
implementation(project(":cli")) implementation(project(":cli"))
implementation(project(":db")) implementation(project(":db"))
implementation(project(":http"))
implementation(project(":json")) implementation(project(":json"))
implementation(project(":json")) implementation(project(":json"))
implementation(project(":net")) implementation(project(":net"))
@ -26,6 +27,7 @@ dependencies {
implementation("io.ktor:ktor-thymeleaf:${Versions.ktor}") implementation("io.ktor:ktor-thymeleaf:${Versions.ktor}")
implementation("io.ktor:ktor-webjars:${Versions.ktor}") implementation("io.ktor:ktor-webjars:${Versions.ktor}")
implementation("org.flywaydb:flyway-core:${Versions.flyway}") implementation("org.flywaydb:flyway-core:${Versions.flyway}")
implementation("org.jdom:jdom2:${Versions.jdom}")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:${Versions.kotlinCoroutines}") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:${Versions.kotlinCoroutines}")
implementation("org.postgresql:postgresql:${Versions.postgres}") implementation("org.postgresql:postgresql:${Versions.postgres}")
implementation("org.thymeleaf:thymeleaf:${Versions.thymeleaf}") implementation("org.thymeleaf:thymeleaf:${Versions.thymeleaf}")

@ -2,9 +2,14 @@ package org.openrs2.archive
import com.google.inject.AbstractModule import com.google.inject.AbstractModule
import com.google.inject.Scopes import com.google.inject.Scopes
import com.google.inject.multibindings.Multibinder
import org.openrs2.archive.key.KeyDownloader
import org.openrs2.archive.key.OpenOsrsKeyDownloader
import org.openrs2.archive.key.RuneLiteKeyDownloader
import org.openrs2.buffer.BufferModule import org.openrs2.buffer.BufferModule
import org.openrs2.cache.CacheModule import org.openrs2.cache.CacheModule
import org.openrs2.db.Database import org.openrs2.db.Database
import org.openrs2.http.HttpModule
import org.openrs2.json.JsonModule import org.openrs2.json.JsonModule
import org.openrs2.net.NetworkModule import org.openrs2.net.NetworkModule
@ -12,11 +17,16 @@ public object ArchiveModule : AbstractModule() {
override fun configure() { override fun configure() {
install(BufferModule) install(BufferModule)
install(CacheModule) install(CacheModule)
install(HttpModule)
install(JsonModule) install(JsonModule)
install(NetworkModule) install(NetworkModule)
bind(Database::class.java) bind(Database::class.java)
.toProvider(DatabaseProvider::class.java) .toProvider(DatabaseProvider::class.java)
.`in`(Scopes.SINGLETON) .`in`(Scopes.SINGLETON)
val binder = Multibinder.newSetBinder(binder(), KeyDownloader::class.java)
binder.addBinding().to(OpenOsrsKeyDownloader::class.java)
binder.addBinding().to(RuneLiteKeyDownloader::class.java)
} }
} }

@ -0,0 +1,14 @@
package org.openrs2.archive.key
import com.github.ajalt.clikt.core.CliktCommand
import com.google.inject.Guice
import kotlinx.coroutines.runBlocking
import org.openrs2.archive.ArchiveModule
public class DownloadCommand : CliktCommand(name = "download") {
override fun run(): Unit = runBlocking {
val injector = Guice.createInjector(ArchiveModule)
val importer = injector.getInstance(KeyImporter::class.java)
importer.download()
}
}

@ -7,6 +7,7 @@ public class KeyCommand : NoOpCliktCommand(name = "key") {
init { init {
subcommands( subcommands(
BruteForceCommand(), BruteForceCommand(),
DownloadCommand(),
ImportCommand() ImportCommand()
) )
} }

@ -0,0 +1,7 @@
package org.openrs2.archive.key
import org.openrs2.crypto.XteaKey
public interface KeyDownloader {
public suspend fun download(): Sequence<XteaKey>
}

@ -10,7 +10,8 @@ import javax.inject.Singleton
@Singleton @Singleton
public class KeyImporter @Inject constructor( public class KeyImporter @Inject constructor(
private val database: Database, private val database: Database,
private val jsonKeyReader: JsonKeyReader private val jsonKeyReader: JsonKeyReader,
private val downloaders: Set<KeyDownloader>
) { ) {
public suspend fun import(path: Path) { public suspend fun import(path: Path) {
val keys = mutableSetOf<XteaKey>() val keys = mutableSetOf<XteaKey>()
@ -38,6 +39,16 @@ public class KeyImporter @Inject constructor(
import(keys) import(keys)
} }
public suspend fun download() {
val keys = mutableSetOf<XteaKey>()
for (downloader in downloaders) {
keys += downloader.download()
}
keys -= XteaKey.ZERO
import(keys)
}
public suspend fun import(keys: Iterable<XteaKey>) { public suspend fun import(keys: Iterable<XteaKey>) {
database.execute { connection -> database.execute { connection ->
connection.prepareStatement( connection.prepareStatement(

@ -0,0 +1,38 @@
package org.openrs2.archive.key
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.future.await
import kotlinx.coroutines.withContext
import org.openrs2.crypto.XteaKey
import org.openrs2.http.checkStatusCode
import java.net.URI
import java.net.http.HttpClient
import java.net.http.HttpRequest
import java.net.http.HttpResponse
import javax.inject.Inject
import javax.inject.Singleton
@Singleton
public class OpenOsrsKeyDownloader @Inject constructor(
private val client: HttpClient,
private val jsonKeyReader: JsonKeyReader
) : KeyDownloader {
override suspend fun download(): Sequence<XteaKey> {
val request = HttpRequest.newBuilder(ENDPOINT)
.GET()
.build()
val response = client.sendAsync(request, HttpResponse.BodyHandlers.ofInputStream()).await()
response.checkStatusCode()
return withContext(Dispatchers.IO) {
response.body().use { input ->
jsonKeyReader.read(input)
}
}
}
private companion object {
private val ENDPOINT = URI("https://xtea.openosrs.dev/get")
}
}

@ -0,0 +1,65 @@
package org.openrs2.archive.key
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.future.await
import kotlinx.coroutines.withContext
import org.jdom2.input.SAXBuilder
import org.openrs2.crypto.XteaKey
import org.openrs2.http.checkStatusCode
import java.net.URI
import java.net.http.HttpClient
import java.net.http.HttpRequest
import java.net.http.HttpResponse
import javax.inject.Inject
import javax.inject.Singleton
@Singleton
public class RuneLiteKeyDownloader @Inject constructor(
private val client: HttpClient,
private val jsonKeyReader: JsonKeyReader
) : KeyDownloader {
override suspend fun download(): Sequence<XteaKey> {
val version = getVersion()
val request = HttpRequest.newBuilder(getXteaEndpoint(version))
.GET()
.build()
val response = client.sendAsync(request, HttpResponse.BodyHandlers.ofInputStream()).await()
response.checkStatusCode()
return withContext(Dispatchers.IO) {
response.body().use { input ->
jsonKeyReader.read(input)
}
}
}
private suspend fun getVersion(): String {
val request = HttpRequest.newBuilder(VERSION_ENDPOINT)
.GET()
.build()
val response = client.sendAsync(request, HttpResponse.BodyHandlers.ofInputStream()).await()
response.checkStatusCode()
val document = withContext(Dispatchers.IO) {
response.body().use { input ->
SAXBuilder().build(input)
}
}
return document.rootElement
.getChild("versioning")
.getChild("release")
.textTrim
}
private companion object {
private val VERSION_ENDPOINT = URI("https://repo.runelite.net/net/runelite/runelite-parent/maven-metadata.xml")
private fun getXteaEndpoint(version: String): URI {
return URI("https://api.runelite.net/runelite-$version/xtea")
}
}
}
Loading…
Cancel
Save