Add TLS channel failure reporting hooks #18299
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,75 @@ | ||
| /* | ||
| * 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.iotdb.rest; | ||
|
Check warning on line 19 in external-service-impl/rest/src/main/java/org/apache/iotdb/rest/TrustedChannelAuditHandshakeListener.java
|
||
|
|
||
| import org.apache.iotdb.common.rpc.thrift.TEndPoint; | ||
| import org.apache.iotdb.commons.audit.TrustedChannelFailureHandler; | ||
|
|
||
| import org.eclipse.jetty.io.EndPoint; | ||
| import org.eclipse.jetty.io.ssl.SslHandshakeListener; | ||
|
|
||
| import java.net.InetSocketAddress; | ||
| import java.net.SocketAddress; | ||
| import java.util.Objects; | ||
|
|
||
| final class TrustedChannelAuditHandshakeListener implements SslHandshakeListener { | ||
|
|
||
| private final TrustedChannelFailureHandler failureHandler; | ||
|
|
||
| TrustedChannelAuditHandshakeListener(TrustedChannelFailureHandler failureHandler) { | ||
| this.failureHandler = Objects.requireNonNull(failureHandler); | ||
| } | ||
|
|
||
| @Override | ||
| public void handshakeFailed(Event event, Throwable failure) { | ||
| recordHandshakeFailure(event.getEndPoint(), failure); | ||
| } | ||
|
|
||
| void recordHandshakeFailure(EndPoint endPoint, Throwable failure) { | ||
| if (endPoint == null) { | ||
| return; | ||
| } | ||
|
|
||
| TEndPoint initiator = toEndPoint(endPoint.getRemoteSocketAddress()); | ||
| TEndPoint target = toEndPoint(endPoint.getLocalSocketAddress()); | ||
| if (initiator == null || target == null) { | ||
| return; | ||
| } | ||
|
|
||
| try { | ||
| failureHandler.onFailure(failure, initiator, target); | ||
| } catch (RuntimeException auditFailure) { | ||
| if (auditFailure != failure) { | ||
| failure.addSuppressed(auditFailure); | ||
| } | ||
| } | ||
| } | ||
|
HTHou marked this conversation as resolved.
|
||
|
|
||
| private static TEndPoint toEndPoint(SocketAddress socketAddress) { | ||
| if (!(socketAddress instanceof InetSocketAddress)) { | ||
| return null; | ||
| } | ||
| InetSocketAddress inetSocketAddress = (InetSocketAddress) socketAddress; | ||
| String host = | ||
| inetSocketAddress.getAddress() == null | ||
| ? inetSocketAddress.getHostString() | ||
| : inetSocketAddress.getAddress().getHostAddress(); | ||
| return new TEndPoint(host, inetSocketAddress.getPort()); | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,96 @@ | ||
| /* | ||
| * 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.iotdb.rest; | ||
|
|
||
| import org.apache.iotdb.common.rpc.thrift.TEndPoint; | ||
|
|
||
| import org.eclipse.jetty.io.EndPoint; | ||
| import org.junit.Test; | ||
|
|
||
| import javax.net.ssl.SSLHandshakeException; | ||
|
|
||
| import java.lang.reflect.Proxy; | ||
| import java.net.InetSocketAddress; | ||
| import java.util.concurrent.atomic.AtomicReference; | ||
|
|
||
| import static org.junit.Assert.assertEquals; | ||
| import static org.junit.Assert.assertSame; | ||
|
|
||
| public class TrustedChannelAuditHandshakeListenerTest { | ||
|
|
||
| @Test | ||
| public void testRecordSocketEndpointsOnHandshakeFailure() { | ||
| AtomicReference<Throwable> actualFailure = new AtomicReference<>(); | ||
| AtomicReference<TEndPoint> actualInitiator = new AtomicReference<>(); | ||
| AtomicReference<TEndPoint> actualTarget = new AtomicReference<>(); | ||
| TrustedChannelAuditHandshakeListener listener = | ||
| new TrustedChannelAuditHandshakeListener( | ||
| (failure, initiator, target) -> { | ||
| actualFailure.set(failure); | ||
| actualInitiator.set(initiator); | ||
| actualTarget.set(target); | ||
| }); | ||
| SSLHandshakeException failure = new SSLHandshakeException("test"); | ||
| EndPoint endPoint = | ||
| newEndPoint( | ||
| new InetSocketAddress("192.0.2.10", 45123), new InetSocketAddress("192.0.2.20", 18080)); | ||
|
|
||
| listener.recordHandshakeFailure(endPoint, failure); | ||
|
|
||
| assertSame(failure, actualFailure.get()); | ||
| assertEquals(new TEndPoint("192.0.2.10", 45123), actualInitiator.get()); | ||
| assertEquals(new TEndPoint("192.0.2.20", 18080), actualTarget.get()); | ||
| } | ||
|
|
||
| @Test | ||
| public void testReportingFailureDoesNotSelfSuppressHandshakeFailure() { | ||
| RuntimeException failure = new RuntimeException("test"); | ||
| TrustedChannelAuditHandshakeListener listener = | ||
| new TrustedChannelAuditHandshakeListener( | ||
| (ignoredFailure, initiator, target) -> { | ||
| throw failure; | ||
| }); | ||
| EndPoint endPoint = | ||
| newEndPoint( | ||
| new InetSocketAddress("192.0.2.10", 45123), new InetSocketAddress("192.0.2.20", 18080)); | ||
|
|
||
| listener.recordHandshakeFailure(endPoint, failure); | ||
|
|
||
| assertEquals(0, failure.getSuppressed().length); | ||
| } | ||
|
|
||
| private static EndPoint newEndPoint( | ||
| InetSocketAddress remoteAddress, InetSocketAddress localAddress) { | ||
| return (EndPoint) | ||
| Proxy.newProxyInstance( | ||
| EndPoint.class.getClassLoader(), | ||
| new Class<?>[] {EndPoint.class}, | ||
| (proxy, method, args) -> { | ||
| switch (method.getName()) { | ||
| case "getRemoteAddress": | ||
| case "getRemoteSocketAddress": | ||
| return remoteAddress; | ||
| case "getLocalAddress": | ||
| case "getLocalSocketAddress": | ||
| return localAddress; | ||
| default: | ||
| return null; | ||
| } | ||
| }); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.