(hbase) branch branch-3 updated: HBASE-29553 TestMutualTlsServerSide failure since allowing TLSv13 (#7251)

[stoty]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch branch-3
in repository https://gitbox.apache.org/repos/asf/hbase.git


The following commit(s) were added to refs/heads/branch-3 by this push:
     new 484bbb4ac18 HBASE-29553 TestMutualTlsServerSide failure since allowing 
TLSv13 (#7251)
484bbb4ac18 is described below

commit 484bbb4ac185154206ae914582e8f0fb36d4c29c
Author: Istvan Toth <st...@apache.org>
AuthorDate: Thu Aug 28 12:34:17 2025 +0200

    HBASE-29553 TestMutualTlsServerSide failure since allowing TLSv13 (#7251)
    
    Signed-off-by: Peter Somogyi <psomo...@apache.org>
    (cherry picked from commit a21bff1e4a48ed11e963dff4638a3f3722482117)
---
 .../hadoop/hbase/security/AbstractTestMutualTls.java     | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/AbstractTestMutualTls.java
 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/AbstractTestMutualTls.java
index 78b20805470..74e4068627d 100644
--- 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/AbstractTestMutualTls.java
+++ 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/AbstractTestMutualTls.java
@@ -18,9 +18,8 @@
 package org.apache.hadoop.hbase.security;
 
 import static org.apache.hadoop.hbase.ipc.TestProtobufRpcServiceImpl.SERVICE;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.instanceOf;
 import static org.junit.Assert.assertThrows;
+import static org.junit.Assert.assertTrue;
 
 import java.io.File;
 import java.io.IOException;
@@ -215,7 +214,18 @@ public abstract class AbstractTestMutualTls {
       submitRequest();
     } else {
       ServiceException se = assertThrows(ServiceException.class, 
this::submitRequest);
-      assertThat(se.getCause(), instanceOf(SSLHandshakeException.class));
+      // The SSLHandshakeException is encapsulated differently depending on 
the TLS version
+      boolean seenSSLHandshakeException = false;
+      Throwable current = se;
+      do {
+        if (current instanceof SSLHandshakeException) {
+          seenSSLHandshakeException = true;
+          break;
+        }
+        current = current.getCause();
+      } while (current != null);
+      assertTrue("Exception chain does not include SSLHandshakeException",
+        seenSSLHandshakeException);
     }
   }