This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/main by this push:
new 1d3d700fd8 CXF-9065: StackOverflow Exception during execution of
WebClient POST Request on SSLUtils class (#2224)
1d3d700fd8 is described below
commit 1d3d700fd88bb1326bfd4a650a6db2f6585eaf2d
Author: Andriy Redko <[email protected]>
AuthorDate: Tue Jan 14 17:59:59 2025 -0500
CXF-9065: StackOverflow Exception during execution of WebClient POST
Request on SSLUtils class (#2224)
---
.../org/apache/cxf/transport/https/SSLUtils.java | 7 ++-
.../apache/cxf/transport/https/SSLUtilsTest.java | 64 ++++++++++++++++++++++
2 files changed, 70 insertions(+), 1 deletion(-)
diff --git
a/rt/transports/http/src/main/java/org/apache/cxf/transport/https/SSLUtils.java
b/rt/transports/http/src/main/java/org/apache/cxf/transport/https/SSLUtils.java
index 9c6da933ba..ba34a645c7 100644
---
a/rt/transports/http/src/main/java/org/apache/cxf/transport/https/SSLUtils.java
+++
b/rt/transports/http/src/main/java/org/apache/cxf/transport/https/SSLUtils.java
@@ -293,7 +293,12 @@ public final class SSLUtils {
static class SSLEngineWrapper extends SSLEngine {
final SSLEngine delegate;
SSLEngineWrapper(SSLEngine delegate) {
- this.delegate = delegate;
+ // Unwrap the delegate if it is an instance of the SSLEngineWrapper
+ if (delegate instanceof SSLEngineWrapper) {
+ this.delegate = ((SSLEngineWrapper) delegate).delegate;
+ } else {
+ this.delegate = delegate;
+ }
}
public SSLParameters getSSLParameters() {
//make sure the hostname verification is not done in the default
X509 stuff
diff --git
a/rt/transports/http/src/test/java/org/apache/cxf/transport/https/SSLUtilsTest.java
b/rt/transports/http/src/test/java/org/apache/cxf/transport/https/SSLUtilsTest.java
new file mode 100644
index 0000000000..66a1cc2786
--- /dev/null
+++
b/rt/transports/http/src/test/java/org/apache/cxf/transport/https/SSLUtilsTest.java
@@ -0,0 +1,64 @@
+/**
+ * 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.cxf.transport.https;
+
+import java.security.NoSuchAlgorithmException;
+
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLEngine;
+
+import org.apache.cxf.transport.https.SSLUtils.SSLEngineWrapper;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.hamcrest.MatcherAssert.assertThat;
+
+
+public class SSLUtilsTest {
+ private SSLEngine engine;
+
+ @Before
+ public void setUp() throws NoSuchAlgorithmException {
+ engine = SSLContext.getDefault().createSSLEngine();
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ engine.closeInbound();
+ engine.closeOutbound();
+ engine = null;
+ }
+
+ @Test
+ public void testCXF9065() throws NoSuchAlgorithmException,
InterruptedException {
+ SSLEngineWrapper wrapper = new SSLEngineWrapper(engine);
+
+ for (int i = 0; i < 15000; ++i) {
+ wrapper = new SSLEngineWrapper(wrapper);
+ }
+
+ assertThat(wrapper.getSSLParameters(), is(not(nullValue())));
+ }
+}
