Skip to content
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

Jump to bottom

bugfix: 修复log4j1.x配置代码执行漏洞(CVE-2021-4104) #1756 #1761

Merged
merged 1 commit into from
Feb 23, 2023
Merged

bugfix: 修复log4j1.x配置代码执行漏洞(CVE-2021-4104) #1756 #1761

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 4 additions & 0 deletions src/backend/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,8 @@ ext {
// https://mvnrepository.com/artifact/org.apache.commons/commons-pool2
set('apacheCommonsPoolVersion', "2.8.0")
set('apacheCommonsCodecVersion', "1.14")
set('apacheCuratorFrameworkVersion', "5.4.0")
set('apacheCuratorRecipesVersion', "5.4.0")
set('dozerVersion', "5.5.1")
set('commonsCollectionsVersion', "3.2.2")
set('jedisVersion', "3.0.1")
Expand Down Expand Up @@ -229,6 +231,8 @@ subprojects {
dependency "io.springfox:springfox-swagger-ui:$swaggerVersion"
dependency "org.apache.commons:commons-collections4:$apacheCommonsCollectionVersion"
dependency "org.apache.commons:commons-pool2:$apacheCommonsPoolVersion"
dependency "org.apache.curator:curator-framework:$apacheCuratorFrameworkVersion"
dependency "org.apache.curator:curator-recipes:$apacheCuratorRecipesVersion"
dependency "net.sf.dozer:dozer:$dozerVersion"
dependency "commons-collections:commons-collections:$commonsCollectionsVersion"
dependency "org.jedis:jedis:$jedisVersion"
Expand Down
4 changes: 2 additions & 2 deletions src/backend/job-execute/service-job-execute/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@ dependencies {
implementation 'io.micrometer:micrometer-registry-prometheus'
implementation "org.hibernate.validator:hibernate-validator"
// https://mvnrepository.com/artifact/org.apache.curator/curator-framework
api(group: 'org.apache.curator', name: 'curator-framework', version: '5.1.0')
api(group: 'org.apache.curator', name: 'curator-framework')
// https://mvnrepository.com/artifact/org.apache.curator/curator-recipes
api(group: 'org.apache.curator', name: 'curator-recipes', version: '5.1.0')
api(group: 'org.apache.curator', name: 'curator-recipes')

testImplementation 'org.springframework.boot:spring-boot-starter-test'
testImplementation 'org.apache.commons:commons-lang3'
Expand Down
2 changes: 1 addition & 1 deletion ...ice-job-execute/src/main/java/com/tencent/bk/job/execute/service/impl/LogServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
import com.tencent.bk.job.logsvr.model.service.ServiceScriptLogQueryRequest;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

Expand Down
2 changes: 2 additions & 0 deletions support-files/dependJarInfo/md5List.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ a69448e8c1e24d989266083c301e354b
fa752c3cb5474b05e14bf2ed7e242020
040b4b4d8eac886f6b4a2a3bd2f31b00
08c4c1bdf25e2e30c2615bc477c3b36c
1fbff4f1b23cc418d1a4d9d0f12f93b5
955750f1af38c1c2382b96e128810f99
3b76e3e8bb6814dd418b058c6c8e1b3b
54eec02e942f50ffea7e147f33cd85f7
67beeee58df00366100061c7da82f4c2
Expand Down
2 changes: 2 additions & 0 deletions support-files/dependJarInfo/nameList.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ commons-lang
commons-lang3
commons-logging
commons-pool2
curator-framework
curator-recipes
consul-api
dozer
error_prone_annotations
Expand Down
2 changes: 2 additions & 0 deletions support-files/dependJarInfo/orgList.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ commons-lang
org.apache.commons
commons-logging
org.apache.commons
org.apache.curator
org.apache.curator
com.ecwid.consul
net.sf.dozer
com.google.errorprone
Expand Down
2 changes: 2 additions & 0 deletions support-files/dependJarInfo/versionList.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@
3.9
1.2
2.8.0
5.4.0
5.4.0
1.4.1
5.5.1
2.3.4
Expand Down