chenjl/canal
1
0
Fork 0
mirror of https://github.com/alibaba/canal.git synced 2026-11-04 00:30:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixed #5154,avoid spring RCE

Browse Source
This commit is contained in:
jianghang.loujh
2024-06-06 15:29:17 +08:00
parent d66a15fe35
commit 7bb619cf12
7 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
client-adapter/common/src/main/java/com/alibaba/otter/canal/client/adapter/support/YamlUtils.java
View File

@@ -25,6 +25,9 @@ import org.springframework.util.PropertyPlaceholderHelper;
public class YamlUtils {
public static <T> T resourceYmlToObj(String resource, String prefix, Class<T> clazz) {
if (!StringUtils.startsWithIgnoreCase("classpath:", resource)) {
resource = "classpath:" + resource;
}
ClassPathResource classPathResource = new ClassPathResource(resource);
String content;

4
instance/manager/src/main/java/com/alibaba/otter/canal/instance/manager/PlainCanalInstanceGenerator.java
View File

@@ -2,6 +2,7 @@ package com.alibaba.otter.canal.instance.manager;
import java.util.Properties;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.BeanFactory;
@@ -69,6 +70,9 @@ public class PlainCanalInstanceGenerator implements CanalInstanceGenerator {
// ================ setter / getter ================
private BeanFactory getBeanFactory(String springXml) {
if (!StringUtils.startsWithIgnoreCase("classpath:", springXml)) {
springXml = "classpath:" + springXml;
}
ApplicationContext applicationContext = new ClassPathXmlApplicationContext(springXml);
return applicationContext;
}

4
instance/spring/src/main/java/com/alibaba/otter/canal/instance/spring/SpringCanalInstanceGenerator.java
View File

@@ -1,5 +1,6 @@
package com.alibaba.otter.canal.instance.spring;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.BeanFactory;
@@ -44,6 +45,9 @@ public class SpringCanalInstanceGenerator implements CanalInstanceGenerator {
}
private BeanFactory getBeanFactory(String springXml) {
if (!StringUtils.startsWithIgnoreCase("classpath:", springXml)) {
springXml = "classpath:" + springXml;
}
ApplicationContext applicationContext = new ClassPathXmlApplicationContext(springXml);
return applicationContext;
}

2
instance/spring/src/test/java/com/alibaba/otter/canal/instance/spring/integrated/DefaultSpringInstanceTest.java
View File

@@ -24,7 +24,7 @@ public class DefaultSpringInstanceTest {
@Before
public void start() {
System.setProperty("canal.instance.destination", "retl");
context = new ClassPathXmlApplicationContext(new String[] { "spring/default-instance.xml" });
context = new ClassPathXmlApplicationContext(new String[] { "classpath:spring/default-instance.xml" });
}
@After

2
instance/spring/src/test/java/com/alibaba/otter/canal/instance/spring/integrated/GroupSpringInstanceTest.java
View File

@@ -24,7 +24,7 @@ public class GroupSpringInstanceTest {
@Before
public void start() {
System.setProperty("canal.instance.destination", "retl");
context = new ClassPathXmlApplicationContext(new String[] { "spring/group-instance.xml" });
context = new ClassPathXmlApplicationContext(new String[] { "classpath:spring/group-instance.xml" });
}
@After

2
instance/spring/src/test/java/com/alibaba/otter/canal/instance/spring/integrated/MemorySpringInstanceTest.java
View File

@@ -24,7 +24,7 @@ public class MemorySpringInstanceTest {
@Before
public void start() {
System.setProperty("canal.instance.destination", "retl");
context = new ClassPathXmlApplicationContext(new String[] { "spring/memory-instance.xml" });
context = new ClassPathXmlApplicationContext(new String[] { "classpath:spring/memory-instance.xml" });
}
@After

3
parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/tsdb/TableMetaTSDBBuilder.java
View File

@@ -30,6 +30,9 @@ public class TableMetaTSDBBuilder {
if (applicationContext == null) {
synchronized (contexts) {
if (applicationContext == null) {
if (!StringUtils.startsWithIgnoreCase("classpath:", springXml)) {
springXml = "classpath:" + springXml;
}
applicationContext = new ClassPathXmlApplicationContext(springXml);
contexts.put(destination, applicationContext);
}