Skip to content
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

Validate that incoming requests to mutate state are sent to keyed services only (virtual objects or workflows) #1581

Merged
merged 1 commit into from
Jun 3, 2024
Merged

Validate that incoming requests to mutate state are sent to keyed services only (virtual objects or workflows) #1581

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 6 additions & 1 deletion crates/admin/src/rest_api/error.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ use okapi_operation::okapi::openapi3::Responses;
use okapi_operation::{okapi, Components, ToMediaTypes, ToResponses};
use restate_core::ShutdownError;
use restate_types::identifiers::{DeploymentId, SubscriptionId};
use restate_types::invocation::ServiceType;
use schemars::JsonSchema;
use serde::Serialize;

Expand All @@ -41,6 +42,8 @@ pub enum MetaApiError {
},
#[error("The requested subscription '{0}' does not exist")]
SubscriptionNotFound(SubscriptionId),
#[error("Cannot {0} for service type {1}")]
UnsupportedOperation(&'static str, ServiceType),
#[error(transparent)]
Schema(#[from] SchemaError),
#[error(transparent)]
Expand Down Expand Up @@ -68,7 +71,9 @@ impl IntoResponse for MetaApiError {
| MetaApiError::HandlerNotFound { .. }
| MetaApiError::DeploymentNotFound(_)
| MetaApiError::SubscriptionNotFound(_) => StatusCode::NOT_FOUND,
MetaApiError::InvalidField(_, _) => StatusCode::BAD_REQUEST,
MetaApiError::InvalidField(_, _) | MetaApiError::UnsupportedOperation(_, _) => {
StatusCode::BAD_REQUEST
}
MetaApiError::Schema(schema_error) => match schema_error {
SchemaError::NotFound(_) => StatusCode::NOT_FOUND,
SchemaError::Override(_)
Expand Down
10 changes: 10 additions & 0 deletions crates/admin/src/rest_api/services.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,16 @@ pub async fn modify_service_state<V>(
new_state,
}): Json<ModifyServiceStateRequest>,
) -> Result<StatusCode, MetaApiError> {
let svc = state
.task_center
.run_in_scope_sync("get-service", None, || {
state.schema_registry.get_service(&service_name)
})
.ok_or_else(|| MetaApiError::ServiceNotFound(service_name.clone()))?;
if !svc.ty.has_state() {
return Err(MetaApiError::UnsupportedOperation("modify state", svc.ty));
}

let service_id = ServiceId::new(service_name, object_key);

let new_state = new_state
Expand Down
Loading