Merge branch 'sirixdb:master' into master

sirixdb · Jul 13, 2023 · fe820ae · fe820ae
2 parents bf1f0fc + 7577818
commit fe820ae
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 10 deletions.
diff --git a/bundles/sirix-rest-api/src/main/kotlin/org/sirix/rest/Auth.kt b/bundles/sirix-rest-api/src/main/kotlin/org/sirix/rest/Auth.kt
@@ -23,6 +23,12 @@ class Auth(private val keycloak: OAuth2Auth, private val authz: AuthorizationPro
     suspend fun handle(ctx: RoutingContext): Route {
         ctx.request().pause()
         val token = ctx.request().getHeader(HttpHeaders.AUTHORIZATION.toString())
+
+        if (token == null) {
+            ctx.fail(HttpResponseStatus.UNAUTHORIZED.code())
+            return ctx.currentRoute()
+        }
+
         val credentials = TokenCredentials(token.substring(7))
         val user = keycloak.authenticate(credentials).await()
         val database = ctx.pathParam("database")
@@ -38,7 +44,7 @@ class Auth(private val keycloak: OAuth2Auth, private val authz: AuthorizationPro
 
         if (!isAuthorized && !RoleBasedAuthorization.create(role.keycloakRole()).match(user)) {
             ctx.fail(HttpResponseStatus.UNAUTHORIZED.code())
-            ctx.response().end()
+            return ctx.currentRoute()
         }
 
         ctx.put("user", user)

diff --git a/bundles/sirix-rest-api/src/main/kotlin/org/sirix/rest/crud/PermissionCheckingXQuery.kt b/bundles/sirix-rest-api/src/main/kotlin/org/sirix/rest/crud/PermissionCheckingXQuery.kt
@@ -24,6 +24,7 @@ import java.io.PrintWriter
 /**
  * @author Johannes Lichtenberger
  */
+@Suppress("unused")
 class PermissionCheckingXQuery {
     private val module: Module
     private var isPrettyPrint: Boolean = false

diff --git a/bundles/sirix-rest-api/src/main/kotlin/org/sirix/rest/crud/json/JsonGet.kt b/bundles/sirix-rest-api/src/main/kotlin/org/sirix/rest/crud/json/JsonGet.kt
@@ -63,19 +63,19 @@ class JsonGet(private val location: Path, private val keycloak: OAuth2Auth, priv
             val manager = database.beginResourceSession(resource)
 
             manager.use {
-                body = if (query != null && query.isNotEmpty()) {
-                    queryResource(
-                        databaseName, database, revision, revisionTimestamp, manager, ctx, nodeId, query,
-                        vertxContext, user, jsonBody
-                    )
-                } else {
+                body = if (query.isNullOrEmpty()) {
                     val revisions: IntArray =
                         Revisions.getRevisionsToSerialize(
                             startRevision, endRevision, startRevisionTimestamp,
                             endRevisionTimestamp, manager, revision, revisionTimestamp
                         )
 
                     serializeResource(manager, revisions, nodeId?.toLongOrNull(), ctx, vertxContext)
+                } else {
+                    queryResource(
+                        databaseName, database, revision, revisionTimestamp, manager, ctx, nodeId, query,
+                        vertxContext, user, jsonBody
+                    )
                 }
             }
         }

diff --git a/bundles/sirix-rest-api/src/main/kotlin/org/sirix/rest/crud/json/JsonHead.kt b/bundles/sirix-rest-api/src/main/kotlin/org/sirix/rest/crud/json/JsonHead.kt
@@ -49,7 +49,7 @@ class JsonHead(private val location: Path) {
                     rtx.use {
                         if (nodeId != null) {
                             if (!rtx.moveTo(nodeId.toLong())) {
-                                throw IllegalStateException("Node with ID ${nodeId} doesn't exist.")
+                                throw IllegalStateException("Node with ID $nodeId doesn't exist.")
                             }
                         } else if (rtx.isDocumentRoot) {
                             rtx.moveToFirstChild()

diff --git a/bundles/sirix-rest-api/src/main/kotlin/org/sirix/rest/crud/json/JsonSerializeHelper.kt b/bundles/sirix-rest-api/src/main/kotlin/org/sirix/rest/crud/json/JsonSerializeHelper.kt
@@ -44,10 +44,10 @@ class JsonSerializeHelper {
 
         rtx.use {
             val hash = if (nodeId == null) {
-                rtx.moveToFirstChild();
+                rtx.moveToFirstChild()
                 rtx.hash
             } else {
-                rtx.moveTo(nodeId);
+                rtx.moveTo(nodeId)
                 rtx.hash
             }