Skip to content

fix(external-form): disable follow for result redirect responses #3930

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

Draft
thoniTUB wants to merge 1 commit into
base: develop
Choose a base branch
from
Draft

fix(external-form): disable follow for result redirect responses #3930

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
26 changes: 19 additions & 7 deletions backend/src/main/java/com/bakdata/conquery/io/external/form/ExternalFormBackendApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@
import java.util.Map;
import java.util.UUID;
import java.util.function.Function;

import com.bakdata.conquery.models.error.ConqueryError;
import jakarta.ws.rs.BadRequestException;
import jakarta.ws.rs.client.Client;
import jakarta.ws.rs.client.Entity;
import jakarta.ws.rs.client.Invocation;
Expand All @@ -25,6 +28,7 @@
import io.dropwizard.health.check.http.HttpHealthCheck;
import lombok.Getter;
import lombok.extern.slf4j.Slf4j;
import org.glassfish.jersey.client.ClientProperties;

@Slf4j
@Getter
Expand Down Expand Up @@ -105,8 +109,12 @@ public ExternalTaskState postForm(ExternalForm form, User originalUser, User ser
.acceptLanguage(I18n.LOCALE.get())
;

ExternalTaskState post = request.post(Entity.entity(form.getExternalApiPayload(), MediaType.APPLICATION_JSON_TYPE), ExternalTaskState.class);
return post;
try {
return request.post(Entity.entity(form.getExternalApiPayload(), MediaType.APPLICATION_JSON_TYPE), ExternalTaskState.class);
} catch (BadRequestException bre) {
log.error("Failed to forward form request (target: {}, body: {}). Problem: {}", webTarget.getUri(), form.getExternalApiPayload(), bre.getResponse().readEntity(String.class));
throw new ConqueryError.UnknownError(bre);
}
}

public ExternalTaskState getFormState(UUID externalId) {
Expand All @@ -115,16 +123,20 @@ public ExternalTaskState getFormState(UUID externalId) {
log.debug("Getting status from: {}", getStatusTargetResolved);

return getStatusTargetResolved.request(MediaType.APPLICATION_JSON_TYPE)
.acceptLanguage(I18n.LOCALE.get())
.get(ExternalTaskState.class);
.acceptLanguage(I18n.LOCALE.get())
.get(ExternalTaskState.class);
}

public Response getResult(final URI resultURL) {
log.debug("Query external form result from {}", resultURL);

return client.target(baseTarget.getUri().resolve(resultURL)).request()
.acceptLanguage(I18n.LOCALE.get())
.get();
Response response = client.target(baseTarget.getUri().resolve(resultURL)).request()
.acceptLanguage(I18n.LOCALE.get())
// We don't follow result urls, since a redirect here is intended for the users browser
.property(ClientProperties.FOLLOW_REDIRECTS, false)
.get();
log.debug("Response from {}: {}", resultURL, response.getStatus());
return response;

}

Expand Down
Loading