Skip to content

Commit

Permalink
fix that a "wrong" JsonPointer in a search RQL query lead to ERRORs i…
Browse files Browse the repository at this point in the history 
…n Ditto

* instead, provide a BAD REQUEST (status 400) when doing a search with an RQL containing e.g. double slashes

Signed-off-by: Thomas Jäckle <thomas.jaeckle@beyonnex.io>
  • Loading branch information
@thjaeckle
thjaeckle committed Nov 23, 2023
1 parent 2d6d55b commit e10270e
Showing 1 changed file with 43 additions and 33 deletions.
76 changes: 43 additions & 33 deletions ...rvice/src/main/java/org/eclipse/ditto/thingsearch/service/starter/actors/SearchActor.java
View file
Expand Up @@ -22,7 +22,28 @@

import javax.annotation.Nullable;

import org.apache.pekko.Done;
import org.apache.pekko.NotUsed;
import org.apache.pekko.actor.ActorRef;
import org.apache.pekko.actor.ActorSystem;
import org.apache.pekko.actor.CoordinatedShutdown;
import org.apache.pekko.actor.Props;
import org.apache.pekko.cluster.pubsub.DistributedPubSubMediator;
import org.apache.pekko.japi.pf.PFBuilder;
import org.apache.pekko.japi.pf.ReceiveBuilder;
import org.apache.pekko.pattern.Patterns;
import org.apache.pekko.stream.Graph;
import org.apache.pekko.stream.KillSwitches;
import org.apache.pekko.stream.SharedKillSwitch;
import org.apache.pekko.stream.SourceRef;
import org.apache.pekko.stream.SourceShape;
import org.apache.pekko.stream.SystemMaterializer;
import org.apache.pekko.stream.javadsl.Flow;
import org.apache.pekko.stream.javadsl.Sink;
import org.apache.pekko.stream.javadsl.Source;
import org.apache.pekko.stream.javadsl.StreamRefs;
import org.eclipse.ditto.base.model.exceptions.DittoInternalErrorException;
import org.eclipse.ditto.base.model.exceptions.DittoJsonException;
import org.eclipse.ditto.base.model.exceptions.DittoRuntimeException;
import org.eclipse.ditto.base.model.headers.DittoHeaders;
import org.eclipse.ditto.base.model.headers.WithDittoHeaders;
Expand All @@ -31,15 +52,15 @@
import org.eclipse.ditto.base.model.signals.commands.Command;
import org.eclipse.ditto.base.service.signaltransformer.SignalTransformer;
import org.eclipse.ditto.base.service.signaltransformer.SignalTransformers;
import org.eclipse.ditto.internal.utils.pekko.actors.AbstractActorWithShutdownBehaviorAndRequestCounting;
import org.eclipse.ditto.internal.utils.pekko.logging.DittoLoggerFactory;
import org.eclipse.ditto.internal.utils.pekko.logging.ThreadSafeDittoLogger;
import org.eclipse.ditto.internal.utils.pekko.logging.ThreadSafeDittoLoggingAdapter;
import org.eclipse.ditto.internal.utils.cluster.DistPubSubAccess;
import org.eclipse.ditto.internal.utils.config.DefaultScopedConfig;
import org.eclipse.ditto.internal.utils.config.ScopedConfig;
import org.eclipse.ditto.internal.utils.metrics.DittoMetrics;
import org.eclipse.ditto.internal.utils.metrics.instruments.timer.StartedTimer;
import org.eclipse.ditto.internal.utils.pekko.actors.AbstractActorWithShutdownBehaviorAndRequestCounting;
import org.eclipse.ditto.internal.utils.pekko.logging.DittoLoggerFactory;
import org.eclipse.ditto.internal.utils.pekko.logging.ThreadSafeDittoLogger;
import org.eclipse.ditto.internal.utils.pekko.logging.ThreadSafeDittoLoggingAdapter;
import org.eclipse.ditto.internal.utils.tracing.DittoTracing;
import org.eclipse.ditto.json.JsonArray;
import org.eclipse.ditto.json.JsonCollectors;
Expand Down Expand Up @@ -70,27 +91,6 @@

import com.typesafe.config.Config;

import org.apache.pekko.Done;
import org.apache.pekko.NotUsed;
import org.apache.pekko.actor.ActorRef;
import org.apache.pekko.actor.ActorSystem;
import org.apache.pekko.actor.CoordinatedShutdown;
import org.apache.pekko.actor.Props;
import org.apache.pekko.cluster.pubsub.DistributedPubSubMediator;
import org.apache.pekko.japi.pf.PFBuilder;
import org.apache.pekko.japi.pf.ReceiveBuilder;
import org.apache.pekko.pattern.Patterns;
import org.apache.pekko.stream.Graph;
import org.apache.pekko.stream.KillSwitches;
import org.apache.pekko.stream.SharedKillSwitch;
import org.apache.pekko.stream.SourceRef;
import org.apache.pekko.stream.SourceShape;
import org.apache.pekko.stream.SystemMaterializer;
import org.apache.pekko.stream.javadsl.Flow;
import org.apache.pekko.stream.javadsl.Sink;
import org.apache.pekko.stream.javadsl.Source;
import org.apache.pekko.stream.javadsl.StreamRefs;

/**
* Actor handling all supported {@link ThingSearchCommand}s. Currently, those are {@link CountThings} and {@link
* QueryThings}.
Expand Down Expand Up @@ -308,12 +308,14 @@ private <T extends Command<?>> CompletionStage<Object> executeCount(final T coun
final StartedTimer databaseAccessTimer =
countTimer.startNewSegment(DATABASE_ACCESS_SEGMENT_NAME);

final Source<Long, NotUsed> countResultSource = isSudo
? searchPersistence.sudoCount(query)
: searchPersistence.count(query,
countCommand.getDittoHeaders()
.getAuthorizationContext()
.getAuthorizationSubjectIds());
final Source<Long, NotUsed> countResultSource =
DittoJsonException.wrapJsonRuntimeException(query, countCommand.getDittoHeaders(),
(theQuery, headers) -> isSudo
? searchPersistence.sudoCount(theQuery)
: searchPersistence.count(theQuery,
headers.getAuthorizationContext()
.getAuthorizationSubjectIds())
);

return processSearchPersistenceResult(countResultSource, dittoHeaders)
.via(Flow.fromFunction(result -> {
Expand Down Expand Up @@ -356,7 +358,13 @@ private CompletionStage<Object> performStream(final StreamThings streamThings, f
.getAuthorizationContext()
.getAuthorizationSubjectIds();

return searchPersistence.findAllUnlimited(query, subjectIds, namespaces)
final Source<ThingId, NotUsed> findAllUnlimitedResult =
DittoJsonException.wrapJsonRuntimeException(query, streamThings.getDittoHeaders(),
(theQuery, headers) ->
searchPersistence.findAllUnlimited(theQuery, subjectIds, namespaces)
);

return findAllUnlimitedResult
.via(streamKillSwitch.flow())
.map(ThingId::toString) // for serialization???
.runWith(StreamRefs.sourceRef(), SystemMaterializer.get(getSystem()).materializer());
Expand Down Expand Up @@ -473,7 +481,9 @@ private CompletionStage<Object> performQuery(final QueryThings queryThings, fina
.getAuthorizationContext()
.getAuthorizationSubjectIds();
final Source<ResultList<TimestampedThingId>, NotUsed> findAllResult =
searchPersistence.findAll(query, subjectIds, namespaces);
DittoJsonException.wrapJsonRuntimeException(query, dittoHeaders, (theQuery, headers) ->
searchPersistence.findAll(theQuery, subjectIds, namespaces)
);

return processSearchPersistenceResult(findAllResult, dittoHeaders)
.via(Flow.fromFunction(result -> {
Expand Down

0 comments on commit e10270e

Please sign in to comment.