Skip to content

OkHttp: extract hijacking logic into HijackingInterceptor #1347

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

Closed
bsideup wants to merge 3 commits into from
Closed

OkHttp: extract hijacking logic into HijackingInterceptor #1347

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cd207ea
Extract hijacking logic into `HijackingInterceptor`
bsideup Mar 15, 2020
353d14d
Simplify code
bsideup Mar 15, 2020
f8d7a32
fix NPE
bsideup Mar 16, 2020
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
16 changes: 16 additions & 0 deletions docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/Hijacked.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
package com.github.dockerjava.okhttp;

import java.io.InputStream;

class Hijacked {

private final InputStream inputStream;

Hijacked(InputStream inputStream) {
this.inputStream = inputStream;
}

public InputStream getInputStream() {
return inputStream;
}
}
57 changes: 57 additions & 0 deletions ...ava-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/HijackingInterceptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
package com.github.dockerjava.okhttp;

import okhttp3.Interceptor;
import okhttp3.Request;
import okhttp3.Response;
import okhttp3.internal.Internal;
import okhttp3.internal.ws.RealWebSocket;
import okio.BufferedSink;
import okio.Okio;
import okio.Source;

import java.io.IOException;
import java.io.InputStream;

class HijackingInterceptor implements Interceptor {

@Override
public Response intercept(Chain chain) throws IOException {
Request request = chain.request();
Response response = chain.proceed(request);
if (!response.isSuccessful()) {
return response;
}
Hijacked hijacked = request.tag(Hijacked.class);

if (hijacked == null) {
return response;
}

InputStream inputStream = hijacked.getInputStream();

if (inputStream == null) {
return response;
}

RealWebSocket.Streams streams = Internal.instance.exchange(response).newWebSocketStreams();
Thread thread = new Thread(() -> {
try (
BufferedSink sink = streams.sink;
Source source = Okio.source(inputStream);
) {
while (sink.isOpen()) {
int available = inputStream.available();
if (available > 0) {
sink.write(source, available);
sink.emit();
}
}
} catch (Exception e) {
throw new RuntimeException(e);
}
});
thread.setName("docker-java-hijack-" + System.identityHashCode(request));
thread.start();
return response;
}
}
4 changes: 3 additions & 1 deletion ...ansport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkHttpDockerCmdExecFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,9 @@ public void init(DockerClientConfig dockerClientConfig) {
}
}

okHttpClient = clientBuilder.build();
okHttpClient = clientBuilder
.addNetworkInterceptor(new HijackingInterceptor())
.build();

HttpUrl.Builder baseUrlBuilder;

Expand Down
55 changes: 4 additions & 51 deletions ...-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkHttpInvocationBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
import okhttp3.Request;
import okhttp3.RequestBody;
import okhttp3.Response;
import okhttp3.internal.connection.RealConnection;
import okio.BufferedSink;
import okio.BufferedSource;
import okio.Okio;
Expand All @@ -29,7 +28,6 @@
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.lang.reflect.Field;
import java.util.Objects;
import java.util.function.Consumer;

Expand Down Expand Up @@ -159,49 +157,13 @@ public void post(Object entity, InputStream stdin, ResultCallback<Frame> resultC
try {
request = requestBuilder
.post(RequestBody.create(MediaType.parse("application/json"), objectMapper.writeValueAsBytes(entity)))
.tag(Hijacked.class, new Hijacked(stdin))
.build();
} catch (JsonProcessingException e) {
throw new RuntimeException(e);
}

OkHttpClient clientToUse = this.okHttpClient;

if (stdin != null) {
// FIXME there must be a better way of handling it
clientToUse = clientToUse.newBuilder()
.addNetworkInterceptor(chain -> {
Response response = chain.proceed(chain.request());
if (response.isSuccessful()) {
Thread thread = new Thread(() -> {
try {
Field sinkField = RealConnection.class.getDeclaredField("sink");
sinkField.setAccessible(true);

try (
BufferedSink sink = (BufferedSink) sinkField.get(chain.connection());
Source source = Okio.source(stdin);
) {
while (sink.isOpen()) {
int available = stdin.available();
if (available > 0) {
sink.write(source, available);
sink.emit();
}
}
}
} catch (Exception e) {
throw new RuntimeException(e);
}
});
thread.start();
}
return response;
})
.build();
}

executeAndStream(
clientToUse,
request,
resultCallback,
new FramedSink(resultCallback)
Expand Down Expand Up @@ -268,10 +230,6 @@ public void writeTo(BufferedSink sink) throws IOException {
}

protected Response execute(Request request) {
return execute(okHttpClient, request);
}

protected Response execute(OkHttpClient okHttpClient, Request request) {
try {
Response response = okHttpClient.newCall(request).execute();
if (!response.isSuccessful()) {
Expand Down Expand Up @@ -302,20 +260,15 @@ protected Response execute(OkHttpClient okHttpClient, Request request) {
}
}

protected <T> void executeAndStream(Request request, ResultCallback<T> callback, Consumer<BufferedSource> sourceConsumer) {
executeAndStream(okHttpClient, request, callback, sourceConsumer);
}

protected <T> void executeAndStream(
OkHttpClient okHttpClient,
Request request,
ResultCallback<T> callback,
Consumer<BufferedSource> sourceConsumer
) {
Thread thread = new Thread(() -> {
try (
Response response = execute(okHttpClient, request.newBuilder().tag("streaming").build());
BufferedSource source = response.body().source();
Response response = execute(request);
BufferedSource source = response.body().source();
) {
callback.onStart(() -> {
boolean previous = CLOSING.get();
Expand All @@ -332,7 +285,7 @@ protected <T> void executeAndStream(
} catch (Exception e) {
callback.onError(e);
}
}, "tc-okhttp-stream-" + Objects.hashCode(request));
}, "docker-java-okhttp-stream-" + Objects.hashCode(request));
thread.setDaemon(true);

thread.start();
Expand Down