Skip to content

Refactored workflowIndexing validation - removed coroutine and contex… #857

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lezzago merged 5 commits into from
Apr 17, 2023
Merged

Refactored workflowIndexing validation - removed coroutine and contex… #857

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
40cd6a7
Refactored workflowIndexing validation - removed coroutine and contex…
stevanbz Apr 14, 2023
4339e91
refactored getting the workflows
stevanbz Apr 14, 2023
1c13f37
Changed the logic according to secure test findings
stevanbz Apr 17, 2023
b39fac8
[Backport 2.x] Notification security fix (#861) (#863)
stevanbz Apr 17, 2023
fc9f6d7
Stashed user together with it's roles
stevanbz Apr 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 18 additions & 10 deletions alerting/src/main/kotlin/org/opensearch/alerting/MonitorRunner.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,16 +62,24 @@ abstract class MonitorRunner {
throw IllegalStateException("Message content missing in the Destination with id: ${action.destinationId}")
}
if (!dryrun) {
val roles = MonitorRunnerService.getRolesForMonitor(monitor)
withClosableContext(
InjectorContextElement(monitor.id, monitorCtx.settings!!, monitorCtx.threadPool!!.threadContext, roles)
) {
actionOutput[Action.MESSAGE_ID] = getConfigAndSendNotification(
action,
monitorCtx,
actionOutput[Action.SUBJECT],
actionOutput[Action.MESSAGE]!!
)
val client = monitorCtx.client
client!!.threadPool().threadContext.stashContext().use {
withClosableContext(
InjectorContextElement(
monitor.id,
monitorCtx.settings!!,
monitorCtx.threadPool!!.threadContext,
monitor.user?.roles,
monitor.user
)
) {
actionOutput[Action.MESSAGE_ID] = getConfigAndSendNotification(
action,
monitorCtx,
actionOutput[Action.SUBJECT],
actionOutput[Action.MESSAGE]!!
)
}
}
}
ActionRunResult(action.id, action.name, actionOutput, false, MonitorRunnerService.currentTime(), null)
Expand Down
22 changes: 20 additions & 2 deletions alerting/src/main/kotlin/org/opensearch/alerting/transport/TransportDeleteWorkflowAction.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,10 @@ import org.opensearch.action.search.SearchResponse
import org.opensearch.action.support.ActionFilters
import org.opensearch.action.support.HandledTransportAction
import org.opensearch.action.support.WriteRequest.RefreshPolicy
import org.opensearch.alerting.opensearchapi.InjectorContextElement
import org.opensearch.alerting.opensearchapi.addFilter
import org.opensearch.alerting.opensearchapi.suspendUntil
import org.opensearch.alerting.opensearchapi.withClosableContext
import org.opensearch.alerting.settings.AlertingSettings
import org.opensearch.alerting.util.AlertingException
import org.opensearch.client.Client
Expand Down Expand Up @@ -53,6 +55,7 @@ import org.opensearch.rest.RestStatus
import org.opensearch.search.builder.SearchSourceBuilder
import org.opensearch.tasks.Task
import org.opensearch.transport.TransportService
import java.util.UUID

private val scope: CoroutineScope = CoroutineScope(Dispatchers.IO)
/**
Expand All @@ -64,7 +67,7 @@ class TransportDeleteWorkflowAction @Inject constructor(
val client: Client,
actionFilters: ActionFilters,
val clusterService: ClusterService,
settings: Settings,
val settings: Settings,
val xContentRegistry: NamedXContentRegistry
) : HandledTransportAction<ActionRequest, DeleteWorkflowResponse>(
AlertingActions.DELETE_WORKFLOW_ACTION_NAME, transportService, actionFilters, ::DeleteWorkflowRequest
Expand Down Expand Up @@ -149,7 +152,22 @@ class TransportDeleteWorkflowAction @Inject constructor(

val deleteResponse = deleteWorkflow(workflow)
if (deleteDelegateMonitors == true) {
deleteMonitors(delegateMonitorIds, RefreshPolicy.IMMEDIATE)
if (user == null) {
deleteMonitors(delegateMonitorIds, RefreshPolicy.IMMEDIATE)
} else {
// Un-stash the context
withClosableContext(
InjectorContextElement(
user.name.plus(UUID.randomUUID().toString()),
settings,
client.threadPool().threadContext,
user.roles,
user
)
) {
deleteMonitors(delegateMonitorIds, RefreshPolicy.IMMEDIATE)
}
}
}
actionListener.onResponse(DeleteWorkflowResponse(deleteResponse.id, deleteResponse.version))
} else {
Expand Down
16 changes: 15 additions & 1 deletion alerting/src/main/kotlin/org/opensearch/alerting/transport/TransportGetWorkflowAction.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,21 @@ class TransportGetWorkflowAction @Inject constructor(
xContentRegistry, LoggingDeprecationHandler.INSTANCE,
response.sourceAsBytesRef, XContentType.JSON
).use { xcp ->
workflow = ScheduledJob.parse(xcp, response.id, response.version) as Workflow
val compositeMonitor = ScheduledJob.parse(xcp, response.id, response.version)
if (compositeMonitor is Workflow) {
workflow = compositeMonitor
} else {
log.error("Wrong monitor type returned")
actionListener.onFailure(
AlertingException.wrap(
OpenSearchStatusException(
"Workflow not found.",
RestStatus.NOT_FOUND
)
)
)
return
}

// security is enabled and filterby is enabled
if (!checkUserPermissionsWithResource(
Expand Down
Loading