Skip to content

Fix ZOOKEEPER-4393 issue #1780

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

Open
edipesh19 wants to merge 3 commits into
base: master
Choose a base branch
from
+56 −1
Open

Fix ZOOKEEPER-4393 issue #1780

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
5f69bf4
Fix ZOOKEEPER-4393 issue
Nov 22, 2021
61fb77d
Add comment to the class
Nov 28, 2021
df55d20
Fix checkstyle issue
Nov 29, 2021
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
4 changes: 3 additions & 1 deletion zookeeper-server/src/main/java/org/apache/zookeeper/common/X509Util.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import java.io.Closeable;
import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Proxy;
import java.net.Socket;
import java.nio.file.Path;
import java.nio.file.Paths;
Expand Down Expand Up @@ -504,7 +505,8 @@ public static X509TrustManager createTrustManager(

for (final TrustManager tm : tmf.getTrustManagers()) {
if (tm instanceof X509ExtendedTrustManager) {
return new ZKTrustManager((X509ExtendedTrustManager) tm, serverHostnameVerificationEnabled, clientHostnameVerificationEnabled);
return (X509ExtendedTrustManager) Proxy.newProxyInstance(Thread.currentThread().getContextClassLoader(), new Class[]{X509ExtendedTrustManager.class},
new ZKTrustManagerProxy(new ZKTrustManager((X509ExtendedTrustManager) tm, serverHostnameVerificationEnabled, clientHostnameVerificationEnabled)));
}
}
throw new TrustManagerException("Couldn't find X509TrustManager");
Expand Down
53 changes: 53 additions & 0 deletions zookeeper-server/src/main/java/org/apache/zookeeper/common/ZKTrustManagerProxy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
/*
* 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.zookeeper.common;

import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

/**
* This is the ZKTrustManager proxy class.
* This is used to expose ZKTrustManager class through proxy instance to avoid class cast error
* as X509TrustManagerImpl will conflict with ZKTrustManager class
*/
public class ZKTrustManagerProxy implements InvocationHandler {
private static final Logger LOG = LoggerFactory.getLogger(ZKTrustManagerProxy.class);
private final ZKTrustManager zkTrustManager;

public ZKTrustManagerProxy(ZKTrustManager zkTrustManager) {
this.zkTrustManager = zkTrustManager;
}

/**
* Invoke method implementation of proxy instance
*
* @param proxy proxy object
* @param method method object
* @param args method arguments
* @return return the output which comes from invoke mrthod
* @throws Throwable it throws any kind of exception which pop up in executing the given method
*/
@Override
public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
LOG.debug("Invoking method {} with arguments {}", method.getName(), args);
return method.invoke(zkTrustManager, args);
}
}