From 704687e262ed2828fac42409d662a697e2b24e25 Mon Sep 17 00:00:00 2001 From: Graham Date: Fri, 12 Feb 2021 23:01:25 +0000 Subject: [PATCH] Remove /keys/submit endpoint This was actually only compatible with OpenOSRS's code (RuneLite uses a completely different API). Furthermore, I don't think it's really going to be necessary as we've arranged access to RuneLite's XTEA API. Signed-off-by: Graham --- .../org/openrs2/archive/web/KeysController.kt | 29 ------------------- .../org/openrs2/archive/web/WebServer.kt | 4 --- 2 files changed, 33 deletions(-) delete mode 100644 archive/src/main/kotlin/org/openrs2/archive/web/KeysController.kt diff --git a/archive/src/main/kotlin/org/openrs2/archive/web/KeysController.kt b/archive/src/main/kotlin/org/openrs2/archive/web/KeysController.kt deleted file mode 100644 index e7f690fe..00000000 --- a/archive/src/main/kotlin/org/openrs2/archive/web/KeysController.kt +++ /dev/null @@ -1,29 +0,0 @@ -package org.openrs2.archive.web - -import io.ktor.application.ApplicationCall -import io.ktor.http.HttpStatusCode -import io.ktor.response.respond -import org.openrs2.archive.key.KeyImporter -import org.openrs2.crypto.XteaKey -import javax.inject.Inject -import javax.inject.Singleton - -@Singleton -public class KeysController @Inject constructor( - private val importer: KeyImporter -) { - public suspend fun create(call: ApplicationCall) { - val k0 = call.request.queryParameters["key1"]?.toIntOrNull() - val k1 = call.request.queryParameters["key2"]?.toIntOrNull() - val k2 = call.request.queryParameters["key3"]?.toIntOrNull() - val k3 = call.request.queryParameters["key4"]?.toIntOrNull() - - if (k0 == null || k1 == null || k2 == null || k3 == null) { - call.respond(HttpStatusCode.BadRequest) - return - } - - importer.import(listOf(XteaKey(k0, k1, k2, k3))) - call.respond(HttpStatusCode.NoContent) - } -} diff --git a/archive/src/main/kotlin/org/openrs2/archive/web/WebServer.kt b/archive/src/main/kotlin/org/openrs2/archive/web/WebServer.kt index b837fb19..4504b920 100644 --- a/archive/src/main/kotlin/org/openrs2/archive/web/WebServer.kt +++ b/archive/src/main/kotlin/org/openrs2/archive/web/WebServer.kt @@ -21,7 +21,6 @@ import javax.inject.Singleton @Singleton public class WebServer @Inject constructor( private val cachesController: CachesController, - private val keysController: KeysController, @Json private val mapper: ObjectMapper ) { public fun start() { @@ -43,9 +42,6 @@ public class WebServer @Inject constructor( get("/caches") { cachesController.index(call) } get("/caches/{id}.zip") { cachesController.export(call) } get("/caches/{id}.json") { cachesController.exportKeys(call) } - - // ideally we'd use POST /keys here, but I want to be compatible with the RuneLite/OpenOSRS API - get("/keys/submit") { keysController.create(call) } } }.start(wait = true) }