From e101287c255643f3cc2042f7b3f64c9bda73ad37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sunxien=C2=AE?= <81640257+sunxien@users.noreply.github.com>
Date: Fri, 16 May 2025 15:04:02 +0800
Subject: [PATCH] =?UTF-8?q?fix(canal/startup.sh):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=8E=AF=E5=A2=83ZK=E5=90=AF=E7=94=A8sasl?=
 =?UTF-8?q?=E5=AE=89=E5=85=A8=E8=AE=A4=E8=AF=81=20(#5438)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(canal/startup.sh): 修复生产环境ZK启用sasl安全认证

- 如果生产环境zk启用sasl安全认证，canal-server/canal-adapter启动无法连接zk进行读写操作
- 默认支持用户将 jaas.conf 放置在 ./conf/ 目录下，启动脚本增加-Djava.security.auth.login.config 启动参数即可

* fix(canal/parent): upgrade h2 version

- runtime error: Value too long for column "CHARACTER VARYING" #5086

- Ref: https://github.com/alibaba/canal/issues/5086
---
 client-adapter/launcher/src/main/bin/startup.sh | 6 ++++++
 deployer/src/main/bin/startup.sh                | 7 +++++++
 pom.xml                                         | 2 +-
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/client-adapter/launcher/src/main/bin/startup.sh b/client-adapter/launcher/src/main/bin/startup.sh
index 04e0e222..bcdd9a78 100644
--- a/client-adapter/launcher/src/main/bin/startup.sh
+++ b/client-adapter/launcher/src/main/bin/startup.sh
@@ -9,7 +9,10 @@ case "`uname`" in
 		bin_abs_path=`cd $(dirname $0); pwd`
 		;;
 esac
+
 base=${bin_abs_path}/..
+jaas_conf=$base/conf/jaas.conf
+
 export LANG=en_US.UTF-8
 export BASE=$base
 
@@ -81,6 +84,9 @@ fi
 
 JAVA_OPTS=" $JAVA_OPTS -Djava.awt.headless=true -Djava.net.preferIPv4Stack=true -Dfile.encoding=UTF-8"
 ADAPTER_OPTS="-DappName=canal-adapter"
+if [ -f "$jaas_conf" ]; then
+  ADAPTER_OPTS="$ADAPTER_OPTS -Djava.security.auth.login.config=$jaas_conf"
+fi
 
 for i in $base/lib/*;
     do CLASSPATH=$i:"$CLASSPATH";
diff --git a/deployer/src/main/bin/startup.sh b/deployer/src/main/bin/startup.sh
index 8afcafb5..010e0294 100644
--- a/deployer/src/main/bin/startup.sh
+++ b/deployer/src/main/bin/startup.sh
@@ -9,10 +9,14 @@ case "`uname`" in
 		bin_abs_path=`cd $(dirname $0); pwd`
 		;;
 esac
+
 base=${bin_abs_path}/..
+
+jaas_conf=$base/conf/jaas.conf
 canal_conf=$base/conf/canal.properties
 canal_local_conf=$base/conf/canal_local.properties
 logback_configurationFile=$base/conf/logback.xml
+
 export LANG=en_US.UTF-8
 export BASE=$base
 
@@ -104,6 +108,9 @@ fi
 
 JAVA_OPTS=" $JAVA_OPTS -Djava.awt.headless=true -Djava.net.preferIPv4Stack=true -Dfile.encoding=UTF-8"
 CANAL_OPTS="-DappName=otter-canal -Dlogback.configurationFile=$logback_configurationFile -Dcanal.conf=$canal_conf"
+if [ -f "$jaas_conf" ]; then
+  CANAL_OPTS="$CANAL_OPTS -Djava.security.auth.login.config=$jaas_conf"
+fi
 
 if [ -e $canal_conf -a -e $logback_configurationFile ]
 then 
diff --git a/pom.xml b/pom.xml
index edd431f9..84a535f8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -357,7 +357,7 @@
             <dependency>
                 <groupId>com.h2database</groupId>
                 <artifactId>h2</artifactId>
-                <version>2.1.210</version>
+                <version>2.2.224</version>
             </dependency>
             <dependency>
                 <groupId>mysql</groupId>