From d5c06688f0e366b7af67e2077dd9600d08df5dd9 Mon Sep 17 00:00:00 2001 From: Chaoscaot Date: Tue, 26 Nov 2024 16:34:24 +0100 Subject: [PATCH] Backend Fixes... --- WebsiteBackend/src/de/steamwar/plugins/Auth.kt | 5 +++-- WebsiteBackend/src/de/steamwar/plugins/Plugins.kt | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/WebsiteBackend/src/de/steamwar/plugins/Auth.kt b/WebsiteBackend/src/de/steamwar/plugins/Auth.kt index 6d90339a..cc5c0822 100644 --- a/WebsiteBackend/src/de/steamwar/plugins/Auth.kt +++ b/WebsiteBackend/src/de/steamwar/plugins/Auth.kt @@ -29,6 +29,7 @@ import io.ktor.server.application.hooks.* import io.ktor.server.auth.* import io.ktor.server.request.* import io.ktor.server.response.* +import io.ktor.util.* data class SWAuthPrincipal(val token: Token, val user: SteamwarUser) : Principal @@ -104,7 +105,7 @@ Message: ${cause.message} } onCallRespond { call -> - if (call.response.status()?.isSuccess() == true) { + if ((call.response.status() ?: HttpStatusCode.OK).isSuccess()) { return@onCallRespond } @@ -120,7 +121,7 @@ Message: ${cause.message} Headers: ${call.request.headers.entries().joinToString("\n ") { "${it.key}: ${it.value}" }} Body: - ${call.request.receiveChannel()} + ${call.request.receiveChannel().toByteArray().decodeToString()} """.trimIndent() SWException.log(msg, stack) diff --git a/WebsiteBackend/src/de/steamwar/plugins/Plugins.kt b/WebsiteBackend/src/de/steamwar/plugins/Plugins.kt index b8780f64..fc8dde36 100644 --- a/WebsiteBackend/src/de/steamwar/plugins/Plugins.kt +++ b/WebsiteBackend/src/de/steamwar/plugins/Plugins.kt @@ -50,7 +50,7 @@ fun Application.configurePlugins() { it.request.headers["X-Forwarded-For"] ?: it.request.local.remoteHost } requestWeight { applicationCall, _ -> - if(applicationCall.request.headers["X-Forwarded-For"] != null) { + if(!applicationCall.request.headers.contains("X-Forwarded-For")) { 0 } else { 1