From b71fb057607c42b96c37d57e8c1e53e0c90739ca Mon Sep 17 00:00:00 2001 From: Jonathan Pearlin Date: Wed, 1 Feb 2023 09:49:49 -0500 Subject: [PATCH] Annotate endpoints that are secured at the workspace level (#22168) --- .../commons/auth/SecuredWorkspace.java | 23 +++++++++++++++++++ .../server/apis/ConnectionApiController.java | 9 ++++++++ .../server/apis/DestinationApiController.java | 8 +++++++ .../DestinationDefinitionApiController.java | 4 ++++ .../apis/DestinationOauthApiController.java | 3 +++ .../server/apis/JobsApiController.java | 6 +++++ .../server/apis/OperationApiController.java | 6 +++++ .../server/apis/SchedulerApiController.java | 2 ++ .../server/apis/SourceApiController.java | 10 ++++++++ .../apis/SourceDefinitionApiController.java | 4 ++++ .../server/apis/SourceOauthApiController.java | 3 +++ .../server/apis/StateApiController.java | 2 ++ .../server/apis/WebBackendApiController.java | 6 +++++ .../server/apis/WorkspaceApiController.java | 10 +++++++- 14 files changed, 95 insertions(+), 1 deletion(-) create mode 100644 airbyte-commons/src/main/java/io/airbyte/commons/auth/SecuredWorkspace.java diff --git a/airbyte-commons/src/main/java/io/airbyte/commons/auth/SecuredWorkspace.java b/airbyte-commons/src/main/java/io/airbyte/commons/auth/SecuredWorkspace.java new file mode 100644 index 000000000000..f5cb5751807a --- /dev/null +++ b/airbyte-commons/src/main/java/io/airbyte/commons/auth/SecuredWorkspace.java @@ -0,0 +1,23 @@ +/* + * Copyright (c) 2022 Airbyte, Inc., all rights reserved. + */ + +package io.airbyte.commons.auth; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Inherited; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * Used to mark a controller route as requiring authorization at the workspace level. Works in + * conjunction with {@link io.micronaut.security.annotation.Secured}, which denotes the required + * roles that should be associated with the user and workspace. + */ +@Retention(RetentionPolicy.RUNTIME) +@Target({ElementType.METHOD}) +@Inherited +public @interface SecuredWorkspace { + +} diff --git a/airbyte-server/src/main/java/io/airbyte/server/apis/ConnectionApiController.java b/airbyte-server/src/main/java/io/airbyte/server/apis/ConnectionApiController.java index 094acc9416e3..600e46b7f132 100644 --- a/airbyte-server/src/main/java/io/airbyte/server/apis/ConnectionApiController.java +++ b/airbyte-server/src/main/java/io/airbyte/server/apis/ConnectionApiController.java @@ -16,6 +16,7 @@ import io.airbyte.api.model.generated.ConnectionUpdate; import io.airbyte.api.model.generated.JobInfoRead; import io.airbyte.api.model.generated.WorkspaceIdRequestBody; +import io.airbyte.commons.auth.SecuredWorkspace; import io.airbyte.commons.server.handlers.ConnectionsHandler; import io.airbyte.commons.server.handlers.OperationsHandler; import io.airbyte.commons.server.handlers.SchedulerHandler; @@ -51,6 +52,7 @@ public ConnectionApiController(final ConnectionsHandler connectionsHandler, @Override @Post(uri = "/create") @Secured({EDITOR}) + @SecuredWorkspace public ConnectionRead createConnection(@Body final ConnectionCreate connectionCreate) { return ApiHelper.execute(() -> connectionsHandler.createConnection(connectionCreate)); } @@ -58,6 +60,7 @@ public ConnectionRead createConnection(@Body final ConnectionCreate connectionCr @Override @Post(uri = "/update") @Secured({EDITOR}) + @SecuredWorkspace public ConnectionRead updateConnection(@Body final ConnectionUpdate connectionUpdate) { return ApiHelper.execute(() -> connectionsHandler.updateConnection(connectionUpdate)); } @@ -65,6 +68,7 @@ public ConnectionRead updateConnection(@Body final ConnectionUpdate connectionUp @Override @Post(uri = "/list") @Secured({READER}) + @SecuredWorkspace public ConnectionReadList listConnectionsForWorkspace(@Body final WorkspaceIdRequestBody workspaceIdRequestBody) { return ApiHelper.execute(() -> connectionsHandler.listConnectionsForWorkspace(workspaceIdRequestBody)); } @@ -72,6 +76,7 @@ public ConnectionReadList listConnectionsForWorkspace(@Body final WorkspaceIdReq @Override @Post(uri = "/list_all") @Secured({READER}) + @SecuredWorkspace public ConnectionReadList listAllConnectionsForWorkspace(@Body final WorkspaceIdRequestBody workspaceIdRequestBody) { return ApiHelper.execute(() -> connectionsHandler.listAllConnectionsForWorkspace(workspaceIdRequestBody)); } @@ -85,6 +90,7 @@ public ConnectionReadList searchConnections(@Body final ConnectionSearch connect @Override @Post(uri = "/get") @Secured({READER}) + @SecuredWorkspace public ConnectionRead getConnection(@Body final ConnectionIdRequestBody connectionIdRequestBody) { return ApiHelper.execute(() -> connectionsHandler.getConnection(connectionIdRequestBody.getConnectionId())); } @@ -93,6 +99,7 @@ public ConnectionRead getConnection(@Body final ConnectionIdRequestBody connecti @Post(uri = "/delete") @Status(HttpStatus.NO_CONTENT) @Secured({EDITOR}) + @SecuredWorkspace public void deleteConnection(@Body final ConnectionIdRequestBody connectionIdRequestBody) { ApiHelper.execute(() -> { operationsHandler.deleteOperationsForConnection(connectionIdRequestBody); @@ -104,6 +111,7 @@ public void deleteConnection(@Body final ConnectionIdRequestBody connectionIdReq @Override @Post(uri = "/sync") @Secured({EDITOR}) + @SecuredWorkspace public JobInfoRead syncConnection(@Body final ConnectionIdRequestBody connectionIdRequestBody) { return ApiHelper.execute(() -> schedulerHandler.syncConnection(connectionIdRequestBody)); } @@ -111,6 +119,7 @@ public JobInfoRead syncConnection(@Body final ConnectionIdRequestBody connection @Override @Post(uri = "/reset") @Secured({EDITOR}) + @SecuredWorkspace public JobInfoRead resetConnection(@Body final ConnectionIdRequestBody connectionIdRequestBody) { return ApiHelper.execute(() -> schedulerHandler.resetConnection(connectionIdRequestBody)); } diff --git a/airbyte-server/src/main/java/io/airbyte/server/apis/DestinationApiController.java b/airbyte-server/src/main/java/io/airbyte/server/apis/DestinationApiController.java index 0b3c16ea8424..39f11fcf2bf8 100644 --- a/airbyte-server/src/main/java/io/airbyte/server/apis/DestinationApiController.java +++ b/airbyte-server/src/main/java/io/airbyte/server/apis/DestinationApiController.java @@ -17,6 +17,7 @@ import io.airbyte.api.model.generated.DestinationSearch; import io.airbyte.api.model.generated.DestinationUpdate; import io.airbyte.api.model.generated.WorkspaceIdRequestBody; +import io.airbyte.commons.auth.SecuredWorkspace; import io.airbyte.commons.server.handlers.DestinationHandler; import io.airbyte.commons.server.handlers.SchedulerHandler; import io.micronaut.context.annotation.Requires; @@ -44,6 +45,7 @@ public DestinationApiController(final DestinationHandler destinationHandler, fin @Post(uri = "/check_connection") @Secured({EDITOR}) + @SecuredWorkspace @Override public CheckConnectionRead checkConnectionToDestination(@Body final DestinationIdRequestBody destinationIdRequestBody) { return ApiHelper.execute(() -> schedulerHandler.checkDestinationConnectionFromDestinationId(destinationIdRequestBody)); @@ -51,6 +53,7 @@ public CheckConnectionRead checkConnectionToDestination(@Body final DestinationI @Post(uri = "/check_connection_for_update") @Secured({EDITOR}) + @SecuredWorkspace @Override public CheckConnectionRead checkConnectionToDestinationForUpdate(@Body final DestinationUpdate destinationUpdate) { return ApiHelper.execute(() -> schedulerHandler.checkDestinationConnectionFromDestinationIdForUpdate(destinationUpdate)); @@ -64,6 +67,7 @@ public DestinationRead cloneDestination(@Body final DestinationCloneRequestBody @Post(uri = "/create") @Secured({EDITOR}) + @SecuredWorkspace @Override public DestinationRead createDestination(@Body final DestinationCreate destinationCreate) { return ApiHelper.execute(() -> destinationHandler.createDestination(destinationCreate)); @@ -71,6 +75,7 @@ public DestinationRead createDestination(@Body final DestinationCreate destinati @Post(uri = "/delete") @Secured({EDITOR}) + @SecuredWorkspace @Override @Status(HttpStatus.NO_CONTENT) public void deleteDestination(@Body final DestinationIdRequestBody destinationIdRequestBody) { @@ -82,6 +87,7 @@ public void deleteDestination(@Body final DestinationIdRequestBody destinationId @Post(uri = "/get") @Secured({READER}) + @SecuredWorkspace @Override public DestinationRead getDestination(@Body final DestinationIdRequestBody destinationIdRequestBody) { return ApiHelper.execute(() -> destinationHandler.getDestination(destinationIdRequestBody)); @@ -89,6 +95,7 @@ public DestinationRead getDestination(@Body final DestinationIdRequestBody desti @Post(uri = "/list") @Secured({READER}) + @SecuredWorkspace @Override public DestinationReadList listDestinationsForWorkspace(@Body final WorkspaceIdRequestBody workspaceIdRequestBody) { return ApiHelper.execute(() -> destinationHandler.listDestinationsForWorkspace(workspaceIdRequestBody)); @@ -102,6 +109,7 @@ public DestinationReadList searchDestinations(@Body final DestinationSearch dest @Post(uri = "/update") @Secured({EDITOR}) + @SecuredWorkspace @Override public DestinationRead updateDestination(@Body final DestinationUpdate destinationUpdate) { return ApiHelper.execute(() -> destinationHandler.updateDestination(destinationUpdate)); diff --git a/airbyte-server/src/main/java/io/airbyte/server/apis/DestinationDefinitionApiController.java b/airbyte-server/src/main/java/io/airbyte/server/apis/DestinationDefinitionApiController.java index 6fe120b689f6..6ed8dc52e3b9 100644 --- a/airbyte-server/src/main/java/io/airbyte/server/apis/DestinationDefinitionApiController.java +++ b/airbyte-server/src/main/java/io/airbyte/server/apis/DestinationDefinitionApiController.java @@ -19,6 +19,7 @@ import io.airbyte.api.model.generated.PrivateDestinationDefinitionRead; import io.airbyte.api.model.generated.PrivateDestinationDefinitionReadList; import io.airbyte.api.model.generated.WorkspaceIdRequestBody; +import io.airbyte.commons.auth.SecuredWorkspace; import io.airbyte.commons.server.handlers.DestinationDefinitionsHandler; import io.micronaut.context.annotation.Context; import io.micronaut.context.annotation.Requires; @@ -44,6 +45,7 @@ public DestinationDefinitionApiController(final DestinationDefinitionsHandler de @Post(uri = "/create_custom") @Secured({EDITOR}) + @SecuredWorkspace @Override public DestinationDefinitionRead createCustomDestinationDefinition(final CustomDestinationDefinitionCreate customDestinationDefinitionCreate) { return ApiHelper.execute(() -> destinationDefinitionsHandler.createCustomDestinationDefinition(customDestinationDefinitionCreate)); @@ -69,6 +71,7 @@ public DestinationDefinitionRead getDestinationDefinition(final DestinationDefin @Post(uri = "/get_for_workspace") @Secured({READER}) + @SecuredWorkspace @Override public DestinationDefinitionRead getDestinationDefinitionForWorkspace(final DestinationDefinitionIdWithWorkspaceId destinationDefinitionIdWithWorkspaceId) { return ApiHelper.execute(() -> destinationDefinitionsHandler.getDestinationDefinitionForWorkspace(destinationDefinitionIdWithWorkspaceId)); @@ -91,6 +94,7 @@ public DestinationDefinitionReadList listDestinationDefinitions() { @Post(uri = "/list_for_workspace") @Secured({READER}) + @SecuredWorkspace @Override public DestinationDefinitionReadList listDestinationDefinitionsForWorkspace(final WorkspaceIdRequestBody workspaceIdRequestBody) { return ApiHelper.execute(() -> destinationDefinitionsHandler.listDestinationDefinitionsForWorkspace(workspaceIdRequestBody)); diff --git a/airbyte-server/src/main/java/io/airbyte/server/apis/DestinationOauthApiController.java b/airbyte-server/src/main/java/io/airbyte/server/apis/DestinationOauthApiController.java index 3d508935a4bd..5fd948ba19c2 100644 --- a/airbyte-server/src/main/java/io/airbyte/server/apis/DestinationOauthApiController.java +++ b/airbyte-server/src/main/java/io/airbyte/server/apis/DestinationOauthApiController.java @@ -12,6 +12,7 @@ import io.airbyte.api.model.generated.DestinationOauthConsentRequest; import io.airbyte.api.model.generated.OAuthConsentRead; import io.airbyte.api.model.generated.SetInstancewideDestinationOauthParamsRequestBody; +import io.airbyte.commons.auth.SecuredWorkspace; import io.airbyte.commons.server.handlers.OAuthHandler; import io.micronaut.context.annotation.Context; import io.micronaut.context.annotation.Requires; @@ -36,6 +37,7 @@ public DestinationOauthApiController(final OAuthHandler oAuthHandler) { @Post("/complete_oauth") @Secured({EDITOR}) + @SecuredWorkspace @Override public Map completeDestinationOAuth(final CompleteDestinationOAuthRequest completeDestinationOAuthRequest) { return ApiHelper.execute(() -> oAuthHandler.completeDestinationOAuth(completeDestinationOAuthRequest)); @@ -43,6 +45,7 @@ public Map completeDestinationOAuth(final CompleteDestinationOAu @Post("/get_consent_url") @Secured({EDITOR}) + @SecuredWorkspace @Override public OAuthConsentRead getDestinationOAuthConsent(final DestinationOauthConsentRequest destinationOauthConsentRequest) { return ApiHelper.execute(() -> oAuthHandler.getDestinationOAuthConsent(destinationOauthConsentRequest)); diff --git a/airbyte-server/src/main/java/io/airbyte/server/apis/JobsApiController.java b/airbyte-server/src/main/java/io/airbyte/server/apis/JobsApiController.java index 8ca1195c92f4..6833e9c32933 100644 --- a/airbyte-server/src/main/java/io/airbyte/server/apis/JobsApiController.java +++ b/airbyte-server/src/main/java/io/airbyte/server/apis/JobsApiController.java @@ -18,6 +18,7 @@ import io.airbyte.api.model.generated.JobListRequestBody; import io.airbyte.api.model.generated.JobOptionalRead; import io.airbyte.api.model.generated.JobReadList; +import io.airbyte.commons.auth.SecuredWorkspace; import io.airbyte.commons.server.handlers.JobHistoryHandler; import io.airbyte.commons.server.handlers.SchedulerHandler; import io.micronaut.context.annotation.Context; @@ -44,6 +45,7 @@ public JobsApiController(final JobHistoryHandler jobHistoryHandler, final Schedu @Post("/cancel") @Secured({EDITOR}) + @SecuredWorkspace @Override public JobInfoRead cancelJob(final JobIdRequestBody jobIdRequestBody) { return ApiHelper.execute(() -> schedulerHandler.cancelJob(jobIdRequestBody)); @@ -58,6 +60,7 @@ public AttemptNormalizationStatusReadList getAttemptNormalizationStatusesForJob( @Post("/get_debug_info") @Secured({READER}) + @SecuredWorkspace @Override public JobDebugInfoRead getJobDebugInfo(final JobIdRequestBody jobIdRequestBody) { return ApiHelper.execute(() -> jobHistoryHandler.getJobDebugInfo(jobIdRequestBody)); @@ -65,6 +68,7 @@ public JobDebugInfoRead getJobDebugInfo(final JobIdRequestBody jobIdRequestBody) @Post("/get") @Secured({READER}) + @SecuredWorkspace @Override public JobInfoRead getJobInfo(final JobIdRequestBody jobIdRequestBody) { return ApiHelper.execute(() -> jobHistoryHandler.getJobInfo(jobIdRequestBody)); @@ -72,6 +76,7 @@ public JobInfoRead getJobInfo(final JobIdRequestBody jobIdRequestBody) { @Post("/get_light") @Secured({READER}) + @SecuredWorkspace @Override public JobInfoLightRead getJobInfoLight(final JobIdRequestBody jobIdRequestBody) { return ApiHelper.execute(() -> jobHistoryHandler.getJobInfoLight(jobIdRequestBody)); @@ -86,6 +91,7 @@ public JobOptionalRead getLastReplicationJob(final ConnectionIdRequestBody conne @Post("/list") @Secured({READER}) + @SecuredWorkspace @Override public JobReadList listJobsFor(final JobListRequestBody jobListRequestBody) { return ApiHelper.execute(() -> jobHistoryHandler.listJobsFor(jobListRequestBody)); diff --git a/airbyte-server/src/main/java/io/airbyte/server/apis/OperationApiController.java b/airbyte-server/src/main/java/io/airbyte/server/apis/OperationApiController.java index 73e19c184805..2e51fb073475 100644 --- a/airbyte-server/src/main/java/io/airbyte/server/apis/OperationApiController.java +++ b/airbyte-server/src/main/java/io/airbyte/server/apis/OperationApiController.java @@ -17,6 +17,7 @@ import io.airbyte.api.model.generated.OperationReadList; import io.airbyte.api.model.generated.OperationUpdate; import io.airbyte.api.model.generated.OperatorConfiguration; +import io.airbyte.commons.auth.SecuredWorkspace; import io.airbyte.commons.server.handlers.OperationsHandler; import io.micronaut.context.annotation.Requires; import io.micronaut.http.HttpStatus; @@ -49,12 +50,14 @@ public CheckOperationRead checkOperation(@Body final OperatorConfiguration opera @Post("/create") @Override @Secured({EDITOR}) + @SecuredWorkspace public OperationRead createOperation(@Body final OperationCreate operationCreate) { return ApiHelper.execute(() -> operationsHandler.createOperation(operationCreate)); } @Post("/delete") @Secured({EDITOR}) + @SecuredWorkspace @Override @Status(HttpStatus.NO_CONTENT) public void deleteOperation(@Body final OperationIdRequestBody operationIdRequestBody) { @@ -66,6 +69,7 @@ public void deleteOperation(@Body final OperationIdRequestBody operationIdReques @Post("/get") @Secured({READER}) + @SecuredWorkspace @Override public OperationRead getOperation(@Body final OperationIdRequestBody operationIdRequestBody) { return ApiHelper.execute(() -> operationsHandler.getOperation(operationIdRequestBody)); @@ -73,6 +77,7 @@ public OperationRead getOperation(@Body final OperationIdRequestBody operationId @Post("/list") @Secured({READER}) + @SecuredWorkspace @Override public OperationReadList listOperationsForConnection(@Body final ConnectionIdRequestBody connectionIdRequestBody) { return ApiHelper.execute(() -> operationsHandler.listOperationsForConnection(connectionIdRequestBody)); @@ -80,6 +85,7 @@ public OperationReadList listOperationsForConnection(@Body final ConnectionIdReq @Post("/update") @Secured({EDITOR}) + @SecuredWorkspace @Override public OperationRead updateOperation(@Body final OperationUpdate operationUpdate) { return ApiHelper.execute(() -> operationsHandler.updateOperation(operationUpdate)); diff --git a/airbyte-server/src/main/java/io/airbyte/server/apis/SchedulerApiController.java b/airbyte-server/src/main/java/io/airbyte/server/apis/SchedulerApiController.java index 4799406c8a42..6f824a2faebb 100644 --- a/airbyte-server/src/main/java/io/airbyte/server/apis/SchedulerApiController.java +++ b/airbyte-server/src/main/java/io/airbyte/server/apis/SchedulerApiController.java @@ -12,6 +12,7 @@ import io.airbyte.api.model.generated.DestinationCoreConfig; import io.airbyte.api.model.generated.SourceCoreConfig; import io.airbyte.api.model.generated.SourceDiscoverSchemaRead; +import io.airbyte.commons.auth.SecuredWorkspace; import io.airbyte.commons.server.handlers.SchedulerHandler; import io.micronaut.context.annotation.Requires; import io.micronaut.http.annotation.Controller; @@ -47,6 +48,7 @@ public CheckConnectionRead executeSourceCheckConnection(final SourceCoreConfig s @Post("/sources/discover_schema") @Secured({EDITOR}) + @SecuredWorkspace @Override public SourceDiscoverSchemaRead executeSourceDiscoverSchema(final SourceCoreConfig sourceCoreConfig) { return ApiHelper.execute(() -> schedulerHandler.discoverSchemaForSourceFromSourceCreate(sourceCoreConfig)); diff --git a/airbyte-server/src/main/java/io/airbyte/server/apis/SourceApiController.java b/airbyte-server/src/main/java/io/airbyte/server/apis/SourceApiController.java index 12efa7702316..752ac5c33278 100644 --- a/airbyte-server/src/main/java/io/airbyte/server/apis/SourceApiController.java +++ b/airbyte-server/src/main/java/io/airbyte/server/apis/SourceApiController.java @@ -22,6 +22,7 @@ import io.airbyte.api.model.generated.SourceSearch; import io.airbyte.api.model.generated.SourceUpdate; import io.airbyte.api.model.generated.WorkspaceIdRequestBody; +import io.airbyte.commons.auth.SecuredWorkspace; import io.airbyte.commons.server.handlers.SchedulerHandler; import io.airbyte.commons.server.handlers.SourceHandler; import io.micronaut.context.annotation.Requires; @@ -48,6 +49,7 @@ public SourceApiController(final SchedulerHandler schedulerHandler, final Source @Post("/check_connection") @Secured({EDITOR}) + @SecuredWorkspace @Override public CheckConnectionRead checkConnectionToSource(final SourceIdRequestBody sourceIdRequestBody) { return ApiHelper.execute(() -> schedulerHandler.checkSourceConnectionFromSourceId(sourceIdRequestBody)); @@ -55,6 +57,7 @@ public CheckConnectionRead checkConnectionToSource(final SourceIdRequestBody sou @Post("/check_connection_for_update") @Secured({EDITOR}) + @SecuredWorkspace @Override public CheckConnectionRead checkConnectionToSourceForUpdate(final SourceUpdate sourceUpdate) { return ApiHelper.execute(() -> schedulerHandler.checkSourceConnectionFromSourceIdForUpdate(sourceUpdate)); @@ -68,6 +71,7 @@ public SourceRead cloneSource(final SourceCloneRequestBody sourceCloneRequestBod @Post("/create") @Secured({EDITOR}) + @SecuredWorkspace @Override public SourceRead createSource(final SourceCreate sourceCreate) { return ApiHelper.execute(() -> sourceHandler.createSource(sourceCreate)); @@ -75,6 +79,7 @@ public SourceRead createSource(final SourceCreate sourceCreate) { @Post("/delete") @Secured({EDITOR}) + @SecuredWorkspace @Override @Status(HttpStatus.NO_CONTENT) public void deleteSource(final SourceIdRequestBody sourceIdRequestBody) { @@ -86,6 +91,7 @@ public void deleteSource(final SourceIdRequestBody sourceIdRequestBody) { @Post("/discover_schema") @Secured({EDITOR}) + @SecuredWorkspace @Override public SourceDiscoverSchemaRead discoverSchemaForSource(final SourceDiscoverSchemaRequestBody sourceDiscoverSchemaRequestBody) { return ApiHelper.execute(() -> schedulerHandler.discoverSchemaForSourceFromSourceId(sourceDiscoverSchemaRequestBody)); @@ -93,6 +99,7 @@ public SourceDiscoverSchemaRead discoverSchemaForSource(final SourceDiscoverSche @Post("/get") @Secured({READER}) + @SecuredWorkspace @Override public SourceRead getSource(final SourceIdRequestBody sourceIdRequestBody) { return ApiHelper.execute(() -> sourceHandler.getSource(sourceIdRequestBody)); @@ -100,6 +107,7 @@ public SourceRead getSource(final SourceIdRequestBody sourceIdRequestBody) { @Post("/most_recent_source_actor_catalog") @Secured({READER}) + @SecuredWorkspace @Override public ActorCatalogWithUpdatedAt getMostRecentSourceActorCatalog(final SourceIdRequestBody sourceIdRequestBody) { return ApiHelper.execute(() -> sourceHandler.getMostRecentSourceActorCatalogWithUpdatedAt(sourceIdRequestBody)); @@ -107,6 +115,7 @@ public ActorCatalogWithUpdatedAt getMostRecentSourceActorCatalog(final SourceIdR @Post("/list") @Secured({READER}) + @SecuredWorkspace @Override public SourceReadList listSourcesForWorkspace(final WorkspaceIdRequestBody workspaceIdRequestBody) { return ApiHelper.execute(() -> sourceHandler.listSourcesForWorkspace(workspaceIdRequestBody)); @@ -120,6 +129,7 @@ public SourceReadList searchSources(final SourceSearch sourceSearch) { @Post("/update") @Secured({EDITOR}) + @SecuredWorkspace @Override public SourceRead updateSource(final SourceUpdate sourceUpdate) { return ApiHelper.execute(() -> sourceHandler.updateSource(sourceUpdate)); diff --git a/airbyte-server/src/main/java/io/airbyte/server/apis/SourceDefinitionApiController.java b/airbyte-server/src/main/java/io/airbyte/server/apis/SourceDefinitionApiController.java index ef7004105e5b..2d920ae97415 100644 --- a/airbyte-server/src/main/java/io/airbyte/server/apis/SourceDefinitionApiController.java +++ b/airbyte-server/src/main/java/io/airbyte/server/apis/SourceDefinitionApiController.java @@ -19,6 +19,7 @@ import io.airbyte.api.model.generated.SourceDefinitionReadList; import io.airbyte.api.model.generated.SourceDefinitionUpdate; import io.airbyte.api.model.generated.WorkspaceIdRequestBody; +import io.airbyte.commons.auth.SecuredWorkspace; import io.airbyte.commons.server.handlers.SourceDefinitionsHandler; import io.micronaut.context.annotation.Context; import io.micronaut.context.annotation.Requires; @@ -44,6 +45,7 @@ public SourceDefinitionApiController(final SourceDefinitionsHandler sourceDefini @Post("/create_custom") @Secured({EDITOR}) + @SecuredWorkspace @Override public SourceDefinitionRead createCustomSourceDefinition(final CustomSourceDefinitionCreate customSourceDefinitionCreate) { return ApiHelper.execute(() -> sourceDefinitionsHandler.createCustomSourceDefinition(customSourceDefinitionCreate)); @@ -69,6 +71,7 @@ public SourceDefinitionRead getSourceDefinition(final SourceDefinitionIdRequestB @Post("/get_for_workspace") @Secured({READER}) + @SecuredWorkspace @Override public SourceDefinitionRead getSourceDefinitionForWorkspace(final SourceDefinitionIdWithWorkspaceId sourceDefinitionIdWithWorkspaceId) { return ApiHelper.execute(() -> sourceDefinitionsHandler.getSourceDefinitionForWorkspace(sourceDefinitionIdWithWorkspaceId)); @@ -104,6 +107,7 @@ public SourceDefinitionReadList listSourceDefinitions() { @Post("/list_for_workspace") @Secured({READER}) + @SecuredWorkspace @Override public SourceDefinitionReadList listSourceDefinitionsForWorkspace(final WorkspaceIdRequestBody workspaceIdRequestBody) { return ApiHelper.execute(() -> sourceDefinitionsHandler.listSourceDefinitionsForWorkspace(workspaceIdRequestBody)); diff --git a/airbyte-server/src/main/java/io/airbyte/server/apis/SourceOauthApiController.java b/airbyte-server/src/main/java/io/airbyte/server/apis/SourceOauthApiController.java index 785c41519bf5..ac727b7816b7 100644 --- a/airbyte-server/src/main/java/io/airbyte/server/apis/SourceOauthApiController.java +++ b/airbyte-server/src/main/java/io/airbyte/server/apis/SourceOauthApiController.java @@ -12,6 +12,7 @@ import io.airbyte.api.model.generated.OAuthConsentRead; import io.airbyte.api.model.generated.SetInstancewideSourceOauthParamsRequestBody; import io.airbyte.api.model.generated.SourceOauthConsentRequest; +import io.airbyte.commons.auth.SecuredWorkspace; import io.airbyte.commons.server.handlers.OAuthHandler; import io.micronaut.context.annotation.Requires; import io.micronaut.http.annotation.Body; @@ -35,6 +36,7 @@ public SourceOauthApiController(final OAuthHandler oAuthHandler) { @Post("/complete_oauth") @Secured({EDITOR}) + @SecuredWorkspace @Override public Map completeSourceOAuth(@Body final CompleteSourceOauthRequest completeSourceOauthRequest) { return ApiHelper.execute(() -> oAuthHandler.completeSourceOAuth(completeSourceOauthRequest)); @@ -42,6 +44,7 @@ public Map completeSourceOAuth(@Body final CompleteSourceOauthRe @Post("/get_consent_url") @Secured({EDITOR}) + @SecuredWorkspace @Override public OAuthConsentRead getSourceOAuthConsent(@Body final SourceOauthConsentRequest sourceOauthConsentRequest) { return ApiHelper.execute(() -> oAuthHandler.getSourceOAuthConsent(sourceOauthConsentRequest)); diff --git a/airbyte-server/src/main/java/io/airbyte/server/apis/StateApiController.java b/airbyte-server/src/main/java/io/airbyte/server/apis/StateApiController.java index 02b1941e5bd8..0b8426bb563e 100644 --- a/airbyte-server/src/main/java/io/airbyte/server/apis/StateApiController.java +++ b/airbyte-server/src/main/java/io/airbyte/server/apis/StateApiController.java @@ -11,6 +11,7 @@ import io.airbyte.api.model.generated.ConnectionIdRequestBody; import io.airbyte.api.model.generated.ConnectionState; import io.airbyte.api.model.generated.ConnectionStateCreateOrUpdate; +import io.airbyte.commons.auth.SecuredWorkspace; import io.airbyte.commons.server.handlers.StateHandler; import io.micronaut.context.annotation.Requires; import io.micronaut.http.annotation.Controller; @@ -39,6 +40,7 @@ public ConnectionState createOrUpdateState(final ConnectionStateCreateOrUpdate c @Post("/get") @Secured({READER}) + @SecuredWorkspace @Override public ConnectionState getState(final ConnectionIdRequestBody connectionIdRequestBody) { return ApiHelper.execute(() -> stateHandler.getState(connectionIdRequestBody)); diff --git a/airbyte-server/src/main/java/io/airbyte/server/apis/WebBackendApiController.java b/airbyte-server/src/main/java/io/airbyte/server/apis/WebBackendApiController.java index b5c515e37f93..d5ced09ce5cf 100644 --- a/airbyte-server/src/main/java/io/airbyte/server/apis/WebBackendApiController.java +++ b/airbyte-server/src/main/java/io/airbyte/server/apis/WebBackendApiController.java @@ -21,6 +21,7 @@ import io.airbyte.api.model.generated.WebBackendGeographiesListResult; import io.airbyte.api.model.generated.WebBackendWorkspaceState; import io.airbyte.api.model.generated.WebBackendWorkspaceStateResult; +import io.airbyte.commons.auth.SecuredWorkspace; import io.airbyte.commons.server.handlers.WebBackendCheckUpdatesHandler; import io.airbyte.commons.server.handlers.WebBackendConnectionsHandler; import io.airbyte.commons.server.handlers.WebBackendGeographiesHandler; @@ -50,6 +51,7 @@ public WebBackendApiController(final WebBackendConnectionsHandler webBackendConn @Post("/state/get_type") @Secured({READER}) + @SecuredWorkspace @Override public ConnectionStateType getStateType(final ConnectionIdRequestBody connectionIdRequestBody) { return ApiHelper.execute(() -> webBackendConnectionsHandler.getStateType(connectionIdRequestBody)); @@ -64,6 +66,7 @@ public WebBackendCheckUpdatesRead webBackendCheckUpdates() { @Post("/connections/create") @Secured({EDITOR}) + @SecuredWorkspace @Override public WebBackendConnectionRead webBackendCreateConnection(final WebBackendConnectionCreate webBackendConnectionCreate) { return ApiHelper.execute(() -> webBackendConnectionsHandler.webBackendCreateConnection(webBackendConnectionCreate)); @@ -71,6 +74,7 @@ public WebBackendConnectionRead webBackendCreateConnection(final WebBackendConne @Post("/connections/get") @Secured({READER}) + @SecuredWorkspace @Override public WebBackendConnectionRead webBackendGetConnection(final WebBackendConnectionRequestBody webBackendConnectionRequestBody) { return ApiHelper.execute(() -> webBackendConnectionsHandler.webBackendGetConnection(webBackendConnectionRequestBody)); @@ -78,6 +82,7 @@ public WebBackendConnectionRead webBackendGetConnection(final WebBackendConnecti @Post("/workspace/state") @Secured({READER}) + @SecuredWorkspace @Override public WebBackendWorkspaceStateResult webBackendGetWorkspaceState(final WebBackendWorkspaceState webBackendWorkspaceState) { return ApiHelper.execute(() -> webBackendConnectionsHandler.getWorkspaceState(webBackendWorkspaceState)); @@ -85,6 +90,7 @@ public WebBackendWorkspaceStateResult webBackendGetWorkspaceState(final WebBacke @Post("/connections/list") @Secured({READER}) + @SecuredWorkspace @Override public WebBackendConnectionReadList webBackendListConnectionsForWorkspace(final WebBackendConnectionListRequestBody webBackendConnectionListRequestBody) { return ApiHelper.execute(() -> webBackendConnectionsHandler.webBackendListConnectionsForWorkspace(webBackendConnectionListRequestBody)); diff --git a/airbyte-server/src/main/java/io/airbyte/server/apis/WorkspaceApiController.java b/airbyte-server/src/main/java/io/airbyte/server/apis/WorkspaceApiController.java index 5bc66adb7ffd..09b647789087 100644 --- a/airbyte-server/src/main/java/io/airbyte/server/apis/WorkspaceApiController.java +++ b/airbyte-server/src/main/java/io/airbyte/server/apis/WorkspaceApiController.java @@ -6,6 +6,7 @@ import static io.airbyte.commons.auth.AuthRoleConstants.AUTHENTICATED_USER; import static io.airbyte.commons.auth.AuthRoleConstants.OWNER; +import static io.airbyte.commons.auth.AuthRoleConstants.READER; import io.airbyte.api.generated.WorkspaceApi; import io.airbyte.api.model.generated.ConnectionIdRequestBody; @@ -17,6 +18,7 @@ import io.airbyte.api.model.generated.WorkspaceReadList; import io.airbyte.api.model.generated.WorkspaceUpdate; import io.airbyte.api.model.generated.WorkspaceUpdateName; +import io.airbyte.commons.auth.SecuredWorkspace; import io.airbyte.commons.server.handlers.WorkspacesHandler; import io.micronaut.context.annotation.Requires; import io.micronaut.http.HttpStatus; @@ -49,6 +51,7 @@ public WorkspaceRead createWorkspace(@Body final WorkspaceCreate workspaceCreate @Post("/delete") @Secured({OWNER}) + @SecuredWorkspace @Override @Status(HttpStatus.NO_CONTENT) public void deleteWorkspace(@Body final WorkspaceIdRequestBody workspaceIdRequestBody) { @@ -60,6 +63,7 @@ public void deleteWorkspace(@Body final WorkspaceIdRequestBody workspaceIdReques @Post("/get") @Secured({OWNER}) + @SecuredWorkspace @Override public WorkspaceRead getWorkspace(@Body final WorkspaceIdRequestBody workspaceIdRequestBody) { return ApiHelper.execute(() -> workspacesHandler.getWorkspace(workspaceIdRequestBody)); @@ -67,6 +71,7 @@ public WorkspaceRead getWorkspace(@Body final WorkspaceIdRequestBody workspaceId @Post("/get_by_slug") @Secured({OWNER}) + @SecuredWorkspace @Override public WorkspaceRead getWorkspaceBySlug(@Body final SlugRequestBody slugRequestBody) { return ApiHelper.execute(() -> workspacesHandler.getWorkspaceBySlug(slugRequestBody)); @@ -81,6 +86,7 @@ public WorkspaceReadList listWorkspaces() { @Post("/update") @Secured({OWNER}) + @SecuredWorkspace @Override public WorkspaceRead updateWorkspace(@Body final WorkspaceUpdate workspaceUpdate) { return ApiHelper.execute(() -> workspacesHandler.updateWorkspace(workspaceUpdate)); @@ -88,6 +94,7 @@ public WorkspaceRead updateWorkspace(@Body final WorkspaceUpdate workspaceUpdate @Post("/tag_feedback_status_as_done") @Secured({OWNER}) + @SecuredWorkspace @Override public void updateWorkspaceFeedback(@Body final WorkspaceGiveFeedback workspaceGiveFeedback) { ApiHelper.execute(() -> { @@ -98,13 +105,14 @@ public void updateWorkspaceFeedback(@Body final WorkspaceGiveFeedback workspaceG @Post("/update_name") @Secured({OWNER}) + @SecuredWorkspace @Override public WorkspaceRead updateWorkspaceName(@Body final WorkspaceUpdateName workspaceUpdateName) { return ApiHelper.execute(() -> workspacesHandler.updateWorkspaceName(workspaceUpdateName)); } @Post("/get_by_connection_id") - @Secured({AUTHENTICATED_USER}) + @Secured({READER}) @Override public WorkspaceRead getWorkspaceByConnectionId(@Body final ConnectionIdRequestBody connectionIdRequestBody) { return ApiHelper.execute(() -> workspacesHandler.getWorkspaceByConnectionId(connectionIdRequestBody));