Skip to content

[cdp][java] Continue requests without modification for know errors in NetworkInterceptor #13836

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

Merged
merged 2 commits into from
Apr 23, 2024
Merged

[cdp][java] Continue requests without modification for know errors in NetworkInterceptor #13836

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
788763d
[cdp][java] Continue requests without modification for know errors in…
pujagani Apr 18, 2024
6db69fa
[java] Ensure the pending future is removed
pujagani Apr 23, 2024
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
9 changes: 9 additions & 0 deletions java/src/org/openqa/selenium/devtools/idealized/Network.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,13 @@ public void prepareToInterceptTraffic() {
pausedRequest -> {
try {
String id = getRequestId(pausedRequest);

if (hasErrorResponse(pausedRequest)) {
pendingResponses.remove(id);
devTools.send(continueWithoutModification(pausedRequest));
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need to clean up the future in pendingResponses for this interception?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, you are right. I have updated the PR for the same.

return;
}

Either<HttpRequest, HttpResponse> message = createSeMessages(pausedRequest);

if (message.isRight()) {
Expand Down Expand Up @@ -348,6 +355,8 @@ protected abstract Command<Void> continueWithAuth(

protected abstract Either<HttpRequest, HttpResponse> createSeMessages(REQUESTPAUSED pausedReq);

protected abstract boolean hasErrorResponse(REQUESTPAUSED pausedReq);

protected abstract Command<Void> continueWithoutModification(REQUESTPAUSED pausedReq);

protected abstract Command<Void> continueRequest(REQUESTPAUSED pausedReq, HttpRequest req);
Expand Down
8 changes: 6 additions & 2 deletions java/src/org/openqa/selenium/devtools/v121/v121Network.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,7 @@ public Event<RequestPaused> requestPausedEvent() {

@Override
public Either<HttpRequest, HttpResponse> createSeMessages(RequestPaused pausedReq) {
if (pausedReq.getResponseStatusCode().isPresent()
|| pausedReq.getResponseErrorReason().isPresent()) {
if (pausedReq.getResponseStatusCode().isPresent()) {
String body;
boolean bodyIsBase64Encoded;

Expand Down Expand Up @@ -161,6 +160,11 @@ public Either<HttpRequest, HttpResponse> createSeMessages(RequestPaused pausedRe
return Either.left(req);
}

@Override
protected boolean hasErrorResponse(RequestPaused pausedReq) {
return pausedReq.getResponseErrorReason().isPresent();
}

@Override
protected String getRequestId(RequestPaused pausedReq) {
return pausedReq.getRequestId().toString();
Expand Down
8 changes: 6 additions & 2 deletions java/src/org/openqa/selenium/devtools/v122/v122Network.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,7 @@ public Event<RequestPaused> requestPausedEvent() {

@Override
public Either<HttpRequest, HttpResponse> createSeMessages(RequestPaused pausedReq) {
if (pausedReq.getResponseStatusCode().isPresent()
|| pausedReq.getResponseErrorReason().isPresent()) {
if (pausedReq.getResponseStatusCode().isPresent()) {
String body;
boolean bodyIsBase64Encoded;

Expand Down Expand Up @@ -161,6 +160,11 @@ public Either<HttpRequest, HttpResponse> createSeMessages(RequestPaused pausedRe
return Either.left(req);
}

@Override
protected boolean hasErrorResponse(RequestPaused pausedReq) {
return pausedReq.getResponseErrorReason().isPresent();
}

@Override
protected String getRequestId(RequestPaused pausedReq) {
return pausedReq.getRequestId().toString();
Expand Down
8 changes: 6 additions & 2 deletions java/src/org/openqa/selenium/devtools/v123/v123Network.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,7 @@ public Event<RequestPaused> requestPausedEvent() {

@Override
public Either<HttpRequest, HttpResponse> createSeMessages(RequestPaused pausedReq) {
if (pausedReq.getResponseStatusCode().isPresent()
|| pausedReq.getResponseErrorReason().isPresent()) {
if (pausedReq.getResponseStatusCode().isPresent()) {
String body;
boolean bodyIsBase64Encoded;

Expand Down Expand Up @@ -161,6 +160,11 @@ public Either<HttpRequest, HttpResponse> createSeMessages(RequestPaused pausedRe
return Either.left(req);
}

@Override
protected boolean hasErrorResponse(RequestPaused pausedReq) {
return pausedReq.getResponseErrorReason().isPresent();
}

@Override
protected String getRequestId(RequestPaused pausedReq) {
return pausedReq.getRequestId().toString();
Expand Down
8 changes: 6 additions & 2 deletions java/src/org/openqa/selenium/devtools/v85/V85Network.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,8 +124,7 @@ public Event<RequestPaused> requestPausedEvent() {

@Override
public Either<HttpRequest, HttpResponse> createSeMessages(RequestPaused pausedReq) {
if (pausedReq.getResponseStatusCode().isPresent()
|| pausedReq.getResponseErrorReason().isPresent()) {
if (pausedReq.getResponseStatusCode().isPresent()) {
String body;
boolean bodyIsBase64Encoded;

Expand Down Expand Up @@ -171,6 +170,11 @@ public Either<HttpRequest, HttpResponse> createSeMessages(RequestPaused pausedRe
return Either.left(req);
}

@Override
protected boolean hasErrorResponse(RequestPaused pausedReq) {
return pausedReq.getResponseErrorReason().isPresent();
}

@Override
protected String getRequestId(RequestPaused pausedReq) {
return pausedReq.getRequestId().toString();
Expand Down
15 changes: 14 additions & 1 deletion java/test/org/openqa/selenium/devtools/NetworkInterceptorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@
import static com.google.common.net.MediaType.XHTML_UTF_8;
import static java.net.HttpURLConnection.HTTP_MOVED_TEMP;
import static java.net.HttpURLConnection.HTTP_NOT_FOUND;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.AssertionsForClassTypes.assertThatExceptionOfType;
import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
import static org.assertj.core.api.Assumptions.assumeThat;
import static org.openqa.selenium.remote.http.Contents.utf8String;
import static org.openqa.selenium.testing.Safely.safelyCall;
Expand All @@ -35,7 +36,9 @@
import org.junit.jupiter.api.Test;
import org.openqa.selenium.By;
import org.openqa.selenium.WebDriver;
import org.openqa.selenium.WebDriverException;
import org.openqa.selenium.environment.webserver.NettyAppServer;
import org.openqa.selenium.net.PortProber;
import org.openqa.selenium.remote.http.Contents;
import org.openqa.selenium.remote.http.Filter;
import org.openqa.selenium.remote.http.HttpMethod;
Expand Down Expand Up @@ -248,4 +251,14 @@ void shouldHandleRedirects() {
assertThat(body).contains("Hello, World!");
}
}

@Test
@NoDriverBeforeTest
void shouldProceedAsNormalIfRequestResultInAnKnownError() {
Filter filter = next -> next;
try (NetworkInterceptor ignored = new NetworkInterceptor(driver, filter)) {
assertThatExceptionOfType(WebDriverException.class)
.isThrownBy(() -> driver.get("http://localhost:" + PortProber.findFreePort()));
}
}
}