Database governance built for humans and agents — controlling changes and access across every major database.
Go cicddata-governancedata-maskingdata-securitydatabase-accessdatabase-governancedevopsdevsecopsflywaygitopsliquibasemongodbmysqloraclepostgresqlschema-migrationssecuritysql-clientsqlservertidb
fix: check parent when Get/DeleteRevision (#17838)
p0ny8f24c082c55a
diff --git a/backend/api/v1/revision_service.go b/backend/api/v1/revision_service.goindex e50f6bf70d..1ab896871e 100644--- a/backend/api/v1/revision_service.go+++ b/backend/api/v1/revision_service.go@@ -92,15 +92,15 @@ func (s *RevisionService) GetRevision(req *connect.Request[v1pb.GetRevisionRequest],) (*connect.Response[v1pb.Revision], error) {request := req.Msg- instanceName, databaseName, revisionUID, err := common.GetInstanceDatabaseRevisionID(request.Name)+ instanceID, databaseName, revisionUID, err := common.GetInstanceDatabaseRevisionID(request.Name)if err != nil {return nil, connect.NewError(connect.CodeInvalidArgument, errors.Wrapf(err, "failed to get revision UID from %v", request.Name))}- revision, err := s.store.GetRevision(ctx, revisionUID)+ revision, err := s.store.GetRevision(ctx, revisionUID, instanceID, databaseName)if err != nil {- return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to delete revision %v", revisionUID))+ return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to get revision %v", request.Name))}- parent := fmt.Sprintf("%s%s/%s%s", common.InstanceNamePrefix, instanceName, common.DatabaseIDPrefix, databaseName)+ parent := common.FormatDatabase(instanceID, databaseName)converted, err := convertToRevision(ctx, s.store, parent, revision)if err != nil {return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to convert to revision"))@@ -254,16 +254,16 @@ func (s *RevisionService) DeleteRevision(req *connect.Request[v1pb.DeleteRevisionRequest],) (*connect.Response[emptypb.Empty], error) {request := req.Msg- _, _, revisionUID, err := common.GetInstanceDatabaseRevisionID(request.Name)+ instanceID, databaseName, revisionUID, err := common.GetInstanceDatabaseRevisionID(request.Name)if err != nil {- return nil, connect.NewError(connect.CodeInvalidArgument, errors.Wrapf(err, "failed to get revision UID from %v", request.Name))+ return nil, connect.NewError(connect.CodeInvalidArgument, errors.Wrapf(err, "failed to parse %v", request.Name))}user, ok := GetUserFromContext(ctx)if !ok {return nil, connect.NewError(connect.CodeInternal, errors.Errorf("user not found"))}- if err := s.store.DeleteRevision(ctx, revisionUID, user.ID); err != nil {- return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to delete revision %v", revisionUID))+ if err := s.store.DeleteRevision(ctx, revisionUID, instanceID, databaseName, user.ID); err != nil {+ return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to delete revision %v", request.Name))}return connect.NewResponse(&emptypb.Empty{}), nil}diff --git a/backend/store/revision.go b/backend/store/revision.goindex 5b76576458..85e7c94793 100644--- a/backend/store/revision.go+++ b/backend/store/revision.go@@ -141,8 +141,13 @@ func (s *Store) ListRevisions(ctx context.Context, find *FindRevisionMessage) ([return revisions, nil}-func (s *Store) GetRevision(ctx context.Context, uid int64) (*RevisionMessage, error) {- revisions, err := s.ListRevisions(ctx, &FindRevisionMessage{UID: &uid, ShowDeleted: true})+func (s *Store) GetRevision(ctx context.Context, uid int64, instanceID, databaseName string) (*RevisionMessage, error) {+ revisions, err := s.ListRevisions(ctx, &FindRevisionMessage{+ UID: &uid,+ InstanceID: &instanceID,+ DatabaseName: &databaseName,+ ShowDeleted: true,+ })if err != nil {return nil, err}@@ -201,11 +206,11 @@ func (s *Store) CreateRevision(ctx context.Context, revision *RevisionMessage) (return revision, nil}-func (s *Store) DeleteRevision(ctx context.Context, uid int64, deleterUID int) error {+func (s *Store) DeleteRevision(ctx context.Context, uid int64, instanceID, databaseName string, deleterUID int) error {query :=`UPDATE revisionSET deleter_id = $1, deleted_at = now()- WHERE id = $2`+ WHERE id = $2 AND instance = $3 AND db_name = $4`tx, err := s.GetDB().BeginTx(ctx, nil)if err != nil {@@ -213,7 +218,7 @@ func (s *Store) DeleteRevision(ctx context.Context, uid int64, deleterUID int) e}defer tx.Rollback()- if _, err := tx.ExecContext(ctx, query, deleterUID, uid); err != nil {+ if _, err := tx.ExecContext(ctx, query, deleterUID, uid, instanceID, databaseName); err != nil {return errors.Wrapf(err, "failed to exec")}