You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@flink.apache.org by GitBox <gi...@apache.org> on 2018/10/10 11:18:10 UTC
[GitHub] zentol closed pull request #6796: [FLINK-10075] Redirect non-ssl
requests to https url if ssl is enabled
zentol closed pull request #6796: [FLINK-10075] Redirect non-ssl requests to https url if ssl is enabled
URL: https://github.com/apache/flink/pull/6796
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/net/RedirectingSslHandler.java b/flink-runtime/src/main/java/org/apache/flink/runtime/net/RedirectingSslHandler.java
new file mode 100644
index 00000000000..e608d90a12d
--- /dev/null
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/net/RedirectingSslHandler.java
@@ -0,0 +1,105 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.flink.runtime.net;
+
+import org.apache.flink.runtime.rest.handler.util.HandlerRedirectUtils;
+import org.apache.flink.runtime.rest.handler.util.KeepAliveWrite;
+
+import org.apache.flink.shaded.netty4.io.netty.buffer.ByteBuf;
+import org.apache.flink.shaded.netty4.io.netty.channel.ChannelHandlerContext;
+import org.apache.flink.shaded.netty4.io.netty.channel.ChannelInboundHandlerAdapter;
+import org.apache.flink.shaded.netty4.io.netty.handler.codec.ByteToMessageDecoder;
+import org.apache.flink.shaded.netty4.io.netty.handler.codec.http.HttpRequest;
+import org.apache.flink.shaded.netty4.io.netty.handler.codec.http.HttpResponse;
+import org.apache.flink.shaded.netty4.io.netty.handler.codec.http.HttpResponseStatus;
+import org.apache.flink.shaded.netty4.io.netty.handler.codec.http.HttpServerCodec;
+import org.apache.flink.shaded.netty4.io.netty.handler.ssl.SslHandler;
+import org.apache.flink.shaded.netty4.io.netty.util.ReferenceCountUtil;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.annotation.Nonnull;
+
+import java.net.InetSocketAddress;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+
+/** SSL handler which automatically redirects Non-SSL requests to SSL address. */
+public class RedirectingSslHandler extends ByteToMessageDecoder {
+ private static final Logger log = LoggerFactory.getLogger(RedirectingSslHandler.class);
+
+ private static final String SSL_HANDLER_NAME = "ssl";
+ private static final String HTTP_CODEC_HANDLER_NAME = "http-codec";
+ private static final String NON_SSL_HANDLER_NAME = "redirecting-non-ssl";
+
+ /** the length of the ssl record header (in bytes). */
+ private static final int SSL_RECORD_HEADER_LENGTH = 5;
+
+ @Nonnull private final String confRedirectBaseUrl;
+ @Nonnull private final CompletableFuture<String> redirectBaseUrl;
+ @Nonnull private final SSLEngineFactory sslEngineFactory;
+
+ public RedirectingSslHandler(
+ @Nonnull String confRedirectHost,
+ @Nonnull CompletableFuture<String> redirectBaseUrl,
+ @Nonnull SSLEngineFactory sslEngineFactory) {
+ this.confRedirectBaseUrl = "https://" + confRedirectHost + ":";
+ this.redirectBaseUrl = redirectBaseUrl;
+ this.sslEngineFactory = sslEngineFactory;
+ }
+
+ @Override
+ protected void decode(ChannelHandlerContext context, ByteBuf in, List<Object> out) {
+ if (in.readableBytes() >= SSL_RECORD_HEADER_LENGTH && SslHandler.isEncrypted(in)) {
+ handleSsl(context);
+ } else {
+ context.pipeline().replace(this, HTTP_CODEC_HANDLER_NAME, new HttpServerCodec());
+ context.pipeline().addAfter(HTTP_CODEC_HANDLER_NAME, NON_SSL_HANDLER_NAME, new NonSslHandler());
+ }
+ }
+
+ private void handleSsl(ChannelHandlerContext context) {
+ SslHandler sslHandler = new SslHandler(sslEngineFactory.createSSLEngine());
+ try {
+ context.pipeline().replace(this, SSL_HANDLER_NAME, sslHandler);
+ } catch (Throwable t){
+ ReferenceCountUtil.safeRelease(sslHandler.engine());
+ throw t;
+ }
+ }
+
+ private class NonSslHandler extends ChannelInboundHandlerAdapter {
+ @Override
+ public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
+ HttpRequest request = msg instanceof HttpRequest ? (HttpRequest) msg : null;
+ String path = request == null ? "" : request.uri();
+ String redirectAddress = getRedirectAddress(ctx);
+ log.trace("Received non-SSL request, redirecting to {}{}", redirectAddress, path);
+ HttpResponse response = HandlerRedirectUtils.getRedirectResponse(
+ redirectAddress, path, HttpResponseStatus.MOVED_PERMANENTLY);
+ KeepAliveWrite.flush(ctx, request, response);
+ }
+
+ private String getRedirectAddress(ChannelHandlerContext ctx) throws Exception {
+ return redirectBaseUrl.isDone() ? redirectBaseUrl.get() :
+ confRedirectBaseUrl + ((InetSocketAddress) (ctx.channel()).localAddress()).getPort();
+ }
+ }
+}
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/RestServerEndpoint.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/RestServerEndpoint.java
index 38da82cb7fb..43636dd8f9e 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/RestServerEndpoint.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/RestServerEndpoint.java
@@ -22,6 +22,7 @@
import org.apache.flink.api.common.time.Time;
import org.apache.flink.api.java.tuple.Tuple2;
import org.apache.flink.runtime.concurrent.FutureUtils;
+import org.apache.flink.runtime.net.RedirectingSslHandler;
import org.apache.flink.runtime.net.SSLEngineFactory;
import org.apache.flink.runtime.rest.handler.PipelineErrorHandler;
import org.apache.flink.runtime.rest.handler.RestHandlerSpecification;
@@ -43,7 +44,6 @@
import org.apache.flink.shaded.netty4.io.netty.channel.socket.SocketChannel;
import org.apache.flink.shaded.netty4.io.netty.channel.socket.nio.NioServerSocketChannel;
import org.apache.flink.shaded.netty4.io.netty.handler.codec.http.HttpServerCodec;
-import org.apache.flink.shaded.netty4.io.netty.handler.ssl.SslHandler;
import org.apache.flink.shaded.netty4.io.netty.handler.stream.ChunkedWriteHandler;
import org.slf4j.Logger;
@@ -156,7 +156,8 @@ protected void initChannel(SocketChannel ch) {
// SSL should be the first handler in the pipeline
if (sslEngineFactory != null) {
- ch.pipeline().addLast("ssl", new SslHandler(sslEngineFactory.createSSLEngine()));
+ ch.pipeline().addLast("ssl",
+ new RedirectingSslHandler(restAddress, restAddressFuture, sslEngineFactory));
}
ch.pipeline()
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/util/HandlerRedirectUtils.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/util/HandlerRedirectUtils.java
index 900e1d24da1..eed1c71c736 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/util/HandlerRedirectUtils.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/util/HandlerRedirectUtils.java
@@ -68,13 +68,16 @@
}
public static HttpResponse getRedirectResponse(String redirectAddress, String path) {
+ return getRedirectResponse(redirectAddress, path, HttpResponseStatus.TEMPORARY_REDIRECT);
+ }
+
+ public static HttpResponse getRedirectResponse(String redirectAddress, String path, HttpResponseStatus code) {
checkNotNull(redirectAddress, "Redirect address");
checkNotNull(path, "Path");
String newLocation = String.format("%s%s", redirectAddress, path);
- HttpResponse redirectResponse = new DefaultFullHttpResponse(
- HttpVersion.HTTP_1_1, HttpResponseStatus.TEMPORARY_REDIRECT);
+ HttpResponse redirectResponse = new DefaultFullHttpResponse(HttpVersion.HTTP_1_1, code);
redirectResponse.headers().set(HttpHeaders.Names.LOCATION, newLocation);
redirectResponse.headers().set(HttpHeaders.Names.CONTENT_LENGTH, 0);
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/RestServerEndpointITCase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/RestServerEndpointITCase.java
index 962619160e4..430bfad38fd 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/RestServerEndpointITCase.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/RestServerEndpointITCase.java
@@ -96,6 +96,7 @@
import java.util.stream.Collectors;
import static java.util.Objects.requireNonNull;
+import static org.hamcrest.CoreMatchers.hasItems;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.instanceOf;
import static org.junit.Assert.assertEquals;
@@ -530,6 +531,20 @@ public void testDefaultVersionRouting() throws Exception {
}
}
+ @Test
+ public void testNonSslRedirectForEnabledSsl() throws Exception {
+ Assume.assumeTrue(config.getBoolean(SecurityOptions.SSL_REST_ENABLED));
+ OkHttpClient client = new OkHttpClient.Builder().followRedirects(false).build();
+ String httpsUrl = serverEndpoint.getRestBaseUrl() + "/path";
+ String httpUrl = httpsUrl.replace("https://", "http://");
+ Request request = new Request.Builder().url(httpUrl).build();
+ try (final Response response = client.newCall(request).execute()) {
+ assertEquals(HttpResponseStatus.MOVED_PERMANENTLY.code(), response.code());
+ assertThat(response.headers().names(), hasItems("Location"));
+ assertEquals(httpsUrl, response.header("Location"));
+ }
+ }
+
private HttpURLConnection openHttpConnectionForUpload(final String boundary) throws IOException {
final HttpURLConnection connection =
(HttpURLConnection) new URL(serverEndpoint.getRestBaseUrl() + "/upload").openConnection();
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services