Merge branch 'fix_security_coroutine_context' into v2

Author: michel-guillon

build.gradle.kts

@@ -39,7 +39,7 @@ group = "com.cosmotech"
 version = scmVersion.version
 
 val kotlinJvmTarget = 17
-val cosmotechApiCommonVersion = "0.1.27-SNAPSHOT"
+val cosmotechApiCommonVersion = "0.1.28-SNAPSHOT"
 val cosmotechApiAzureVersion = "0.1.7-SNAPSHOT"
 val azureSpringBootBomVersion = "3.14.0"
 

scenariorun/src/main/kotlin/com/cosmotech/scenariorun/azure/ScenarioRunServiceImpl.kt

@@ -27,6 +27,7 @@ import com.cosmotech.api.events.WorkflowPhaseToStateRequest
 import com.cosmotech.api.exceptions.CsmAccessForbiddenException
 import com.cosmotech.api.scenario.ScenarioRunMetaData
 import com.cosmotech.api.scenariorun.DataIngestionState
+import com.cosmotech.api.security.coroutine.SecurityCoroutineContext
 import com.cosmotech.api.utils.convertToMap
 import com.cosmotech.api.utils.getCurrentAuthenticatedUserName
 import com.cosmotech.api.utils.toDomain
@@ -482,7 +483,7 @@ internal class ScenarioRunServiceImpl(
         startInfo.runTemplate.deleteHistoricalData ?: DeleteHistoricalData()
     if (purgeHistoricalDataConfiguration.enable) {
       logger.debug("Start coroutine to poll simulation status")
-      GlobalScope.launch {
+      GlobalScope.launch(SecurityCoroutineContext()) {
         withTimeout(
             purgeHistoricalDataConfiguration.timeOut?.toLong()
                 ?: DELETE_SCENARIO_RUN_DEFAULT_TIMEOUT) {
@@ -713,12 +714,12 @@ internal class ScenarioRunServiceImpl(
   fun onScenarioDeleted(event: ScenarioDeleted) {
     logger.debug(
         "Caught ScenarioDeleted event => deleting all runs linked to scenario {}", event.scenarioId)
-    runBlocking {
+    runBlocking(SecurityCoroutineContext()) {
       val jobs =
           this@ScenarioRunServiceImpl.getScenarioRuns(
                   event.organizationId, event.workspaceId, event.scenarioId)
               .map { scenarioRun ->
-                GlobalScope.launch {
+                GlobalScope.launch(SecurityCoroutineContext()) {
                   // TODO Consider using a smaller coroutine scope
                   this@ScenarioRunServiceImpl.deleteScenarioRunWithoutAccessEnforcement(scenarioRun)
                 }

workspace/src/main/kotlin/com/cosmotech/workspace/azure/WorkspaceServiceImpl.kt

@@ -33,6 +33,7 @@ import com.cosmotech.api.rbac.getCommonRolesDefinition
 import com.cosmotech.api.rbac.getPermissions
 import com.cosmotech.api.rbac.model.RbacAccessControl
 import com.cosmotech.api.rbac.model.RbacSecurity
+import com.cosmotech.api.security.coroutine.SecurityCoroutineContext
 import com.cosmotech.api.utils.ResourceScanner
 import com.cosmotech.api.utils.SecretManager
 import com.cosmotech.api.utils.compareToAndMutateIfNeeded
@@ -139,7 +140,7 @@ internal class WorkspaceServiceImpl(
     csmRbac.verify(workspace.getRbac(), PERMISSION_WRITE)
     logger.debug("Deleting all files for workspace #{} ({})", workspace.id, workspace.name)
 
-    GlobalScope.launch {
+    GlobalScope.launch(SecurityCoroutineContext()) {
       // TODO Consider using a smaller coroutine scope
       val workspaceFiles =
           getWorkspaceFileResources(organizationId, workspaceId).map { it.url }.map {