feat: upgrade ktor and kotlin and secure endpoints

This commit is contained in:
walamana committed 2026-07-30 10:45:59 +02:00
1 parent 87812d02d3
commit 5d4e855b8e
11 files changed
+233 -145

No files matched your search

+4 -4
View File
@@ -5,9 +5,9 @@ val logback_version: String by project
val exposed_version: String by project val exposed_version: String by project
val h2_version: String by project val h2_version: String by project
plugins { plugins {
kotlin("jvm") version "1.9.0" kotlin("jvm") version "2.3.21"
id("io.ktor.plugin") version "2.3.3" id("io.ktor.plugin") version "3.5.1"
kotlin("plugin.serialization") version "1.9.0" kotlin("plugin.serialization") version "2.3.21"
id("com.palantir.docker") version "0.36.0" id("com.palantir.docker") version "0.36.0"
} }
@@ -30,10 +30,10 @@ dependencies {
implementation("io.ktor:ktor-server-auth-jvm") implementation("io.ktor:ktor-server-auth-jvm")
implementation("io.ktor:ktor-server-auth-jwt-jvm") implementation("io.ktor:ktor-server-auth-jwt-jvm")
implementation("io.ktor:ktor-server-sessions-jvm") implementation("io.ktor:ktor-server-sessions-jvm")
implementation("io.ktor:ktor-server-host-common-jvm")
implementation("io.ktor:ktor-server-cors-jvm") implementation("io.ktor:ktor-server-cors-jvm")
implementation("io.ktor:ktor-server-content-negotiation-jvm") implementation("io.ktor:ktor-server-content-negotiation-jvm")
implementation("io.ktor:ktor-serialization-kotlinx-json-jvm") implementation("io.ktor:ktor-serialization-kotlinx-json-jvm")
implementation("io.ktor:ktor-server-swagger:$ktor_version")
implementation("org.jetbrains.exposed:exposed-core:$exposed_version") implementation("org.jetbrains.exposed:exposed-core:$exposed_version")
implementation("org.jetbrains.exposed:exposed-jdbc:$exposed_version") implementation("org.jetbrains.exposed:exposed-jdbc:$exposed_version")
implementation("io.ktor:ktor-server-netty-jvm") implementation("io.ktor:ktor-server-netty-jvm")
+2 -2
View File
@@ -1,5 +1,5 @@
ktor_version=2.3.3 ktor_version=3.5.1
kotlin_version=1.9.0 kotlin_version=2.3.21
logback_version=1.4.14 logback_version=1.4.14
kotlin.code.style=official kotlin.code.style=official
exposed_version=0.43.0 exposed_version=0.43.0
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
networkTimeout=10000 networkTimeout=10000
validateDistributionUrl=true validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
@@ -45,6 +45,14 @@ object MarksDao {
}.resultedValues?.isNotEmpty() ?: false }.resultedValues?.isNotEmpty() ?: false
} }
suspend fun setMarks(marks: List<Mark>) = dbQuery {
Marks.batchUpsert(marks) { mark ->
this[Marks.mid] = mark.mid
this[Marks.gid] = mark.gid
this[Marks.value] = mark.value
}.isNotEmpty() ?: false
}
suspend fun removeMark(ministrantId: Int, gottesdienstId: Int): Boolean = dbQuery { suspend fun removeMark(ministrantId: Int, gottesdienstId: Int): Boolean = dbQuery {
Marks.deleteWhere { Marks.deleteWhere {
(Marks.gid eq gottesdienstId) and (Marks.gid eq gottesdienstId) and
@@ -111,6 +111,18 @@ object MinistrantenDao {
statement.resultedValues?.singleOrNull()?.let(::resultRowToMinistrant) statement.resultedValues?.singleOrNull()?.let(::resultRowToMinistrant)
} }
suspend fun getMinistrantById(id: Int): Ministrant? = dbQuery {
Ministranten.select(Ministranten.id eq id).map {
resultRowToMinistrant(it)
}.firstOrNull()
}
suspend fun getMinistrantenById(ids: List<Int>): List<Ministrant> = dbQuery {
Ministranten.select { Ministranten.id inList ids }.map {
resultRowToMinistrant(it)
}
}
suspend fun deleteMinistrant(id: Int): Boolean = dbQuery { suspend fun deleteMinistrant(id: Int): Boolean = dbQuery {
Ministranten.deleteWhere { Ministranten.id eq id } > 0 Ministranten.deleteWhere { Ministranten.id eq id } > 0
} }
@@ -3,6 +3,7 @@ package de.walamana.plugins
import at.favre.lib.crypto.bcrypt.BCrypt import at.favre.lib.crypto.bcrypt.BCrypt
import com.auth0.jwt.JWT import com.auth0.jwt.JWT
import com.auth0.jwt.algorithms.Algorithm import com.auth0.jwt.algorithms.Algorithm
import com.auth0.jwt.interfaces.Claim
import com.auth0.jwt.interfaces.Payload import com.auth0.jwt.interfaces.Payload
import de.walamana.models.Ministrant import de.walamana.models.Ministrant
import de.walamana.models.MinistrantenDao import de.walamana.models.MinistrantenDao
@@ -13,7 +14,7 @@ import io.ktor.server.auth.jwt.*
import io.ktor.server.response.* import io.ktor.server.response.*
import io.ktor.server.routing.* import io.ktor.server.routing.*
import io.ktor.server.sessions.* import io.ktor.server.sessions.*
import java.util.* import java.util.Date
const val SALT_ROUNDS = 10; const val SALT_ROUNDS = 10;
@@ -56,6 +57,22 @@ fun Application.getJWTEnvironment(): JWTEnvironment {
fun Payload.username() = getClaim("username").asString() fun Payload.username() = getClaim("username").asString()
fun Payload.mid() = getClaim("id").asInt() fun Payload.mid() = getClaim("id").asInt()
fun Payload.privileges(): List<String> {
val claim = getClaim("privileges")
return if (claim.isNull || claim.asList(String::class.java).isNullOrEmpty()) emptyList() else claim.asList(String::class.java)
}
fun Payload.canAccessMinistrant(username: String): Boolean {
return this.username() == "admin" || this.privileges().contains(username)
}
fun Payload.canAccessMinistranten(usernames: List<String>): Boolean {
for (username in usernames) {
if(!canAccessMinistrant(username))
return false;
}
return true
}
object Security { object Security {
@@ -25,14 +25,6 @@ fun Application.configureSerialization() {
}) })
} }
routing {
get("/json/kotlinx-serialization") {
println("Test")
// call.respond("Test")
call.respond(mapOf("hello" to "world"))
}
}
} }
typealias CommaSeperatedStringList = @Serializable(StringListAsCommaSeperatedString::class) List<String>; typealias CommaSeperatedStringList = @Serializable(StringListAsCommaSeperatedString::class) List<String>;
@@ -2,58 +2,72 @@ package de.walamana.views
import de.walamana.models.Gottesdienst import de.walamana.models.Gottesdienst
import de.walamana.models.GottesdiensteDao import de.walamana.models.GottesdiensteDao
import de.walamana.plugins.getJWTEnvironment
import de.walamana.plugins.username
import de.walamana.service.ZelebrationsplanParser import de.walamana.service.ZelebrationsplanParser
import io.ktor.http.* import io.ktor.http.*
import io.ktor.http.content.* import io.ktor.http.content.*
import io.ktor.server.application.* import io.ktor.server.application.*
import io.ktor.server.auth.*
import io.ktor.server.auth.jwt.*
import io.ktor.server.request.* import io.ktor.server.request.*
import io.ktor.server.response.* import io.ktor.server.response.*
import io.ktor.server.routing.* import io.ktor.server.routing.*
import io.ktor.server.util.* import io.ktor.server.util.*
fun Route.configureGottesdiensteRoutes() { fun Route.configureGottesdiensteRoutes() {
route("/gottesdienste") { authenticate {
get { route("/gottesdienste") {
val data = GottesdiensteDao.allGottesdienste() get {
call.respond(data) val principal = call.principal<JWTPrincipal>() ?: return@get call.respond(HttpStatusCode.Unauthorized)
} val data = GottesdiensteDao.allGottesdienste()
put { call.respond(data)
val data = call.receive<Gottesdienst>() }
val gottesdienst = GottesdiensteDao.createGottesdienst( put {
data.name, val principal = call.principal<JWTPrincipal>() ?: return@put call.respond(HttpStatusCode.Unauthorized)
data.date, if (principal.payload.username() != "admin") return@put call.respond(HttpStatusCode.Forbidden, mapOf("msg" to "Nur Admin kann Gottesdienste erstellen"))
data.attendance, val data = call.receive<Gottesdienst>()
data.planId val gottesdienst = GottesdiensteDao.createGottesdienst(
) data.name,
call.respond(mapOf("id" to gottesdienst?.id)) data.date,
} data.attendance,
patch { data.planId
// TODO: Access only by admin )
val data = call.receive<Gottesdienst>() call.respond(mapOf("id" to gottesdienst?.id))
val changed = GottesdiensteDao.updateGottesdienst( }
data.id, patch {
data.name, val principal = call.principal<JWTPrincipal>() ?: return@patch call.respond(HttpStatusCode.Unauthorized)
data.date, if (principal.payload.username() != "admin") return@patch call.respond(HttpStatusCode.Forbidden, mapOf("msg" to "Nur Admin kann Gottesdienste aktualisieren"))
data.attendance, val data = call.receive<Gottesdienst>()
data.planId val changed = GottesdiensteDao.updateGottesdienst(
) data.id,
call.respond(HttpStatusCode.OK) data.name,
} data.date,
delete { data.attendance,
val id = call.request.queryParameters["id"]?.toInt() ?: TODO("fail") data.planId
GottesdiensteDao.deleteGottesdienst(id) )
call.respond(HttpStatusCode.OK) call.respond(HttpStatusCode.OK)
} }
delete {
val principal = call.principal<JWTPrincipal>() ?: return@delete call.respond(HttpStatusCode.Unauthorized)
if (principal.payload.username() != "admin") return@delete call.respond(HttpStatusCode.Forbidden, mapOf("msg" to "Nur Admin kann Gottesdienste löschen"))
val id = call.request.queryParameters["id"]?.toInt() ?: return@delete call.respond(HttpStatusCode.BadRequest, mapOf("msg" to "Missing id parameter"))
GottesdiensteDao.deleteGottesdienst(id)
call.respond(HttpStatusCode.OK)
}
post("/parseZelebrationsplan") { post("/parseZelebrationsplan") {
val id = call.parameters.getOrFail("id").toInt() val principal = call.principal<JWTPrincipal>() ?: return@post call.respond(HttpStatusCode.Unauthorized)
val multipartData = call.receiveMultipart() if (principal.payload.username() != "admin") return@post call.respond(HttpStatusCode.Forbidden, mapOf("msg" to "Nur Admin kann Pläne hochladen"))
multipartData.forEachPart { part -> val id = call.parameters.getOrFail("id").toInt()
if(part is PartData.FileItem) { val multipartData = call.receiveMultipart()
val data = ZelebrationsplanParser.parse(part.streamProvider(), planId = id) multipartData.forEachPart { part ->
call.respond(data) if(part is PartData.FileItem) {
val data = ZelebrationsplanParser.parse(part.streamProvider(), planId = id)
call.respond(data)
}
part.dispose()
} }
part.dispose()
} }
} }
} }
@@ -1,8 +1,15 @@
package de.walamana.views package de.walamana.views
import de.walamana.models.* import de.walamana.models.*
import de.walamana.plugins.canAccessMinistrant
import de.walamana.plugins.canAccessMinistranten
import de.walamana.plugins.mid
import de.walamana.plugins.username
import de.walamana.service.PlanDao
import io.ktor.http.* import io.ktor.http.*
import io.ktor.server.application.* import io.ktor.server.application.*
import io.ktor.server.auth.*
import io.ktor.server.auth.jwt.*
import io.ktor.server.request.* import io.ktor.server.request.*
import io.ktor.server.response.* import io.ktor.server.response.*
import io.ktor.server.routing.* import io.ktor.server.routing.*
@@ -10,37 +17,53 @@ import io.ktor.server.util.*
fun Route.configureMarksView() { fun Route.configureMarksView() {
route("/marks") { authenticate {
get { route("/marks") {
val data = MarksDao.allMarksForPlan(call.receiveParameters().getOrFail("id").toInt()) get {
call.respond(data) val principal = call.principal<JWTPrincipal>() ?: return@get call.respond(HttpStatusCode.Unauthorized)
} val planId = call.receiveParameters().getOrFail("id").toInt()
put { val plan = PlanDao.constructPlan(planId, isAnonymous = false)
val changedMarks = call.receive<List<Mark>>() val data = MarksDao.allMarksForPlan(planId)
for(changedMark in changedMarks) { call.respond(data)
val mark = MarksDao.setMark(
changedMark.mid,
changedMark.gid,
changedMark.value
)
} }
call.respond(HttpStatusCode.OK) patch {
} val principal = call.principal<JWTPrincipal>() ?: return@patch call.respond(HttpStatusCode.Unauthorized)
patch { val changedMarks = call.receive<List<Mark>>()
// TODO: Access only by admin val ministrantenIds = changedMarks.map { it.mid }.distinct()
val changedMarks = call.receive<List<Mark>>() val ministrantenUsernames = MinistrantenDao.getMinistrantenById(ministrantenIds).map { it.username }
for(changedMark in changedMarks) { if (ministrantenUsernames.size != ministrantenIds.size) {
val mark = MarksDao.setMark( return@patch call.respond(
changedMark.mid, HttpStatusCode.BadRequest,
changedMark.gid, mapOf("msg" to "Es wurden ungültige Ministranten IDs angegeben.")
changedMark.value )
) }
if (!principal.payload.canAccessMinistranten(ministrantenUsernames)) {
return@patch call.respond(
HttpStatusCode.Forbidden,
mapOf("msg" to "Sie haben keine Berechtigung für diese Ministrianten")
)
}
if (!MarksDao.setMarks(changedMarks)) {
return@patch call.respond(
HttpStatusCode.InternalServerError,
mapOf("msg" to "Server konnte Änderungen nicht speichern")
)
}
call.respond(HttpStatusCode.OK)
}
delete {
val principal = call.principal<JWTPrincipal>() ?: return@delete call.respond(HttpStatusCode.Unauthorized)
val ministerId = call.request.queryParameters["mid"]?.toInt() ?: return@delete call.respond(HttpStatusCode.BadRequest, mapOf("msg" to "Missing mid parameter"))
val gottesdienstId = call.request.queryParameters["gid"]?.toInt() ?: return@delete call.respond(HttpStatusCode.BadRequest, mapOf("msg" to "Missing gid parameter"))
val ministantUsername = if (ministerId == 0) "admin" else {
MinistrantenDao.getMinistrantById(ministerId)?.username ?: return@delete call.respond(HttpStatusCode.BadRequest, mapOf("msg" to "Ungültige Ministrianten-ID"))
}
if (!principal.payload.canAccessMinistrant(ministantUsername)) {
return@delete call.respond(HttpStatusCode.Forbidden, mapOf("msg" to "Sie haben keine Berechtigung für diese Ministrianten"))
}
MarksDao.removeMark(ministerId, gottesdienstId)
call.respond(HttpStatusCode.OK)
} }
call.respond(HttpStatusCode.OK)
}
delete {
GottesdiensteDao.deleteGottesdienst(call.receiveParameters().getOrFail("id").toInt())
call.respond(HttpStatusCode.OK)
} }
} }
} }
@@ -3,61 +3,72 @@ package de.walamana.views
import de.walamana.models.Ministrant import de.walamana.models.Ministrant
import de.walamana.models.MinistrantenDao import de.walamana.models.MinistrantenDao
import de.walamana.models.SimplifiedMinistrant import de.walamana.models.SimplifiedMinistrant
import de.walamana.plugins.username
import io.ktor.http.* import io.ktor.http.*
import io.ktor.server.application.* import io.ktor.server.application.*
import io.ktor.server.auth.*
import io.ktor.server.auth.jwt.*
import io.ktor.server.request.* import io.ktor.server.request.*
import io.ktor.server.response.* import io.ktor.server.response.*
import io.ktor.server.routing.* import io.ktor.server.routing.*
import io.ktor.server.util.* import io.ktor.server.util.*
fun Route.configureMinistrantenRoutes() { fun Route.configureMinistrantenRoutes() {
route("/ministranten") { authenticate {
get { route("/ministranten") {
val data = MinistrantenDao.allMinistranten(); get {
call.respond(data) call.principal<JWTPrincipal>() ?: return@get call.respond(HttpStatusCode.Unauthorized)
} val data = MinistrantenDao.allMinistranten();
put { call.respond(data)
val data = call.receive<Ministrant>() }
val passwordHash = data.passwordHash ?: return@put put {
val ministrant = MinistrantenDao.createMinistrant( val principal = call.principal<JWTPrincipal>() ?: return@put call.respond(HttpStatusCode.Unauthorized)
data.username,
passwordHash,
data.firstname,
data.lastname,
data.birthday,
data.privileges
)
call.respond(mapOf("id" to ministrant?.id))
}
patch {
// TODO: Access only by admin
val simple = false
if(simple) {
val data = call.receive<SimplifiedMinistrant>()
val changed = MinistrantenDao.updateMinistrant(
id = data.id,
username = data.username,
firstname = data.firstname,
lastname = data.lastname
)
}else{
val data = call.receive<Ministrant>() val data = call.receive<Ministrant>()
val changed = MinistrantenDao.updateMinistrant( if (principal.payload.username() != "admin") return@put call.respond(HttpStatusCode.Forbidden, mapOf("msg" to "Nur Admin kann Ministrianten erstellen"))
data.id, val passwordHash = data.passwordHash ?: return@put
val ministrant = MinistrantenDao.createMinistrant(
data.username, data.username,
null, passwordHash,
data.firstname, data.firstname,
data.lastname, data.lastname,
data.birthday, data.birthday,
data.privileges data.privileges
) )
call.respond(mapOf("id" to ministrant?.id))
}
patch {
val principal = call.principal<JWTPrincipal>() ?: return@patch call.respond(HttpStatusCode.Unauthorized)
if (principal.payload.username() != "admin") return@patch call.respond(HttpStatusCode.Forbidden, mapOf("msg" to "Nur Admin kann Ministrianten aktualisieren"))
val simple = false
if(simple) {
val data = call.receive<SimplifiedMinistrant>()
MinistrantenDao.updateMinistrant(
id = data.id,
username = data.username,
firstname = data.firstname,
lastname = data.lastname
)
}else{
val data = call.receive<Ministrant>()
MinistrantenDao.updateMinistrant(
data.id,
data.username,
null,
data.firstname,
data.lastname,
data.birthday,
data.privileges
)
}
call.respond(HttpStatusCode.OK)
}
delete {
val principal = call.principal<JWTPrincipal>() ?: return@delete call.respond(HttpStatusCode.Unauthorized)
if (principal.payload.username() != "admin") return@delete call.respond(HttpStatusCode.Forbidden, mapOf("msg" to "Nur Admin kann Ministrianten löschen"))
val id = call.request.queryParameters["id"]?.toInt() ?: return@delete call.respond(HttpStatusCode.BadRequest, mapOf("msg" to "Missing id parameter"))
MinistrantenDao.deleteMinistrant(id)
call.respond(HttpStatusCode.OK)
} }
call.respond(HttpStatusCode.OK)
}
delete {
val id = call.request.queryParameters["id"]?.toInt() ?: TODO("fail")
MinistrantenDao.deleteMinistrant(id)
call.respond(HttpStatusCode.OK)
} }
} }
} }
@@ -3,8 +3,9 @@ package de.walamana.views
import de.walamana.models.GottesdienstGroup import de.walamana.models.GottesdienstGroup
import de.walamana.models.GottesdienstGroupDao import de.walamana.models.GottesdienstGroupDao
import de.walamana.models.GottesdienstGroups import de.walamana.models.GottesdienstGroups
import de.walamana.plugins.getJWTEnvironment import de.walamana.plugins.username
import de.walamana.service.PlanDao import de.walamana.service.PlanDao
import io.ktor.http.*
import io.ktor.server.application.* import io.ktor.server.application.*
import io.ktor.server.auth.* import io.ktor.server.auth.*
import io.ktor.server.auth.jwt.* import io.ktor.server.auth.jwt.*
@@ -26,26 +27,36 @@ fun Route.configurePlanRoutes() {
} }
} }
route("/groups") { route("/groups") {
get { authenticate {
val offset = call.parameters.get("offset")?.toLong() ?: 0 get {
val amount = call.parameters.get("amount")?.toInt() ?: 10 val principal = call.principal<JWTPrincipal>() ?: return@get call.respond(HttpStatusCode.Unauthorized)
val groups = GottesdienstGroupDao.getPlans(amount, offset) if (principal.payload.username() != "admin") return@get call.respond(HttpStatusCode.Forbidden, mapOf("msg" to "Nur Admin kann Gruppen abfragen"))
call.respond(groups) val offset = call.parameters.get("offset")?.toLong() ?: 0
} val amount = call.parameters.get("amount")?.toInt() ?: 10
post { val groups = GottesdienstGroupDao.getPlans(amount, offset)
val group = call.receive<GottesdienstGroup>() call.respond(groups)
val res = GottesdienstGroupDao.createPlan(group.from, group.to) ?: TODO("fail") }
call.respond(res) post {
} val principal = call.principal<JWTPrincipal>() ?: return@post call.respond(HttpStatusCode.Unauthorized)
patch { if (principal.payload.username() != "admin") return@post call.respond(HttpStatusCode.Forbidden, mapOf("msg" to "Nur Admin kann Gruppen erstellen"))
val group = call.receive<GottesdienstGroup>() val group = call.receive<GottesdienstGroup>()
val res = GottesdienstGroupDao.updatePlan(group) ?: TODO("fail") val res = GottesdienstGroupDao.createPlan(group.from, group.to) ?: TODO("fail")
call.respond(res) call.respond(res)
} }
delete { patch {
val id = call.parameters.getOrFail("id").toInt() val principal = call.principal<JWTPrincipal>() ?: return@patch call.respond(HttpStatusCode.Unauthorized)
val res = GottesdienstGroupDao.deletePlan(id) if (principal.payload.username() != "admin") return@patch call.respond(HttpStatusCode.Forbidden, mapOf("msg" to "Nur Admin kann Gruppen aktualisieren"))
call.respond(hashMapOf("success" to res)) val group = call.receive<GottesdienstGroup>()
val res = GottesdienstGroupDao.updatePlan(group) ?: TODO("fail")
call.respond(res)
}
delete {
val principal = call.principal<JWTPrincipal>() ?: return@delete call.respond(HttpStatusCode.Unauthorized)
if (principal.payload.username() != "admin") return@delete call.respond(HttpStatusCode.Forbidden, mapOf("msg" to "Nur Admin kann Gruppen löschen"))
val id = call.parameters.getOrFail("id").toInt()
val res = GottesdienstGroupDao.deletePlan(id)
call.respond(hashMapOf("success" to res))
}
} }
} }
} }