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

bugfix: 修复Spring Cloud Function拒绝服务漏洞(CVE-2022-22979) #1593 #1599

Merged
merged 1 commit into from
Dec 9, 2022
Merged

bugfix: 修复Spring Cloud Function拒绝服务漏洞(CVE-2022-22979) #1593 #1599

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
3 changes: 3 additions & 0 deletions src/backend/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,9 @@ ext {
set('bkjobVersion', "1.0.0")
println "bkjobVersoin:" + bkjobVersion
}
// Fix Spring Cloud Function Spel表达式注入漏洞(CVE-2022-22963)
// Fix Spring Cloud Function 拒绝服务漏洞(CVE-2022-22979)
set('spring-cloud-function.version', "3.2.8")
}

group "com.tencent.bk.job"
Expand Down
2 changes: 1 addition & 1 deletion src/backend/job-analysis/boot-job-analysis/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ dependencies {
testImplementation("com.h2database:h2")
}
springBoot {
mainClassName = "com.tencent.bk.job.analysis.JobAnalysisBootApplication"
getMainClass().set("com.tencent.bk.job.analysis.JobAnalysisBootApplication")
buildInfo()
}
task renameArtifacts(type: Copy) {
Expand Down
4 changes: 1 addition & 3 deletions src/backend/job-backup/boot-job-backup/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,16 +31,14 @@ dependencies {
implementation 'org.springframework.boot:spring-boot-starter-jdbc'
implementation 'org.springframework.cloud:spring-cloud-starter-bootstrap'
implementation 'org.springframework.cloud:spring-cloud-starter-bus-amqp'
// Fix RoutingFunction SpEL evaluation
implementation 'org.springframework.cloud:spring-cloud-function-context:3.1.7'
implementation 'org.springframework:spring-webmvc'
implementation(group: 'org.springframework.boot', name: 'spring-boot-starter-data-redis')
runtimeOnly('mysql:mysql-connector-java')

testImplementation("com.h2database:h2")
}
springBoot {
mainClassName = "com.tencent.bk.job.backup.JobBackupBootApplication"
getMainClass().set("com.tencent.bk.job.backup.JobBackupBootApplication")
buildInfo()
}
task renameArtifacts(type: Copy) {
Expand Down
2 changes: 1 addition & 1 deletion src/backend/job-config/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ dependencies {

apply plugin: 'org.springframework.boot'
springBoot {
mainClassName = "com.tencent.bk.job.config.JobConfigBootApplication"
getMainClass().set("com.tencent.bk.job.config.JobConfigBootApplication")
buildInfo()
}
apply from: "$rootDir/task_job_package.gradle"
2 changes: 1 addition & 1 deletion src/backend/job-crontab/boot-job-crontab/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ dependencies {
testImplementation("com.h2database:h2")
}
springBoot {
mainClassName = "com.tencent.bk.job.crontab.JobCrontabBootApplication"
getMainClass().set("com.tencent.bk.job.crontab.JobCrontabBootApplication")
buildInfo()
}
task renameArtifacts(type: Copy) {
Expand Down
4 changes: 1 addition & 3 deletions src/backend/job-execute/boot-job-execute/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,12 @@ dependencies {
implementation 'org.springframework.boot:spring-boot-starter-jdbc'
implementation 'org.springframework.cloud:spring-cloud-starter-bootstrap'
implementation 'org.springframework.cloud:spring-cloud-starter-stream-rabbit'
// Fix RoutingFunction SpEL evaluation
implementation 'org.springframework.cloud:spring-cloud-function-context:3.1.7'
runtimeOnly 'mysql:mysql-connector-java'

testImplementation("com.h2database:h2")
}
springBoot {
mainClassName = "com.tencent.bk.job.execute.JobExecuteBootApplication"
getMainClass().set("com.tencent.bk.job.execute.JobExecuteBootApplication")
buildInfo()
}
task renameArtifacts(type: Copy) {
Expand Down
2 changes: 1 addition & 1 deletion src/backend/job-file-gateway/boot-job-file-gateway/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ dependencies {
runtimeOnly('mysql:mysql-connector-java')
}
springBoot {
mainClassName = "com.tencent.bk.job.file_gateway.JobFileGatewayBootApplication"
getMainClass().set("com.tencent.bk.job.file_gateway.JobFileGatewayBootApplication")
buildInfo()
}
task renameArtifacts(type: Copy) {
Expand Down
2 changes: 1 addition & 1 deletion src/backend/job-file-worker/boot-job-file-worker/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ dependencies {
implementation 'org.springframework.cloud:spring-cloud-starter-bootstrap'
}
springBoot {
mainClassName = "com.tencent.bk.job.file.worker.JobFileWorkerBootApplication"
getMainClass().set("com.tencent.bk.job.file.worker.JobFileWorkerBootApplication")
buildInfo()
}
task renameArtifacts(type: Copy) {
Expand Down
2 changes: 1 addition & 1 deletion src/backend/job-gateway/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ dependencies {

apply plugin: 'org.springframework.boot'
springBoot {
mainClassName = "com.tencent.bk.job.gateway.JobGatewayBootApplication"
getMainClass().set("com.tencent.bk.job.gateway.JobGatewayBootApplication")
buildInfo()
}
test {
Expand Down
2 changes: 1 addition & 1 deletion src/backend/job-logsvr/boot-job-logsvr/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ dependencies {
testImplementation 'de.flapdoodle.embed:de.flapdoodle.embed.mongo'
}
springBoot {
mainClassName = "com.tencent.bk.job.logsvr.JobLogBootApplication"
getMainClass().set("com.tencent.bk.job.logsvr.JobLogBootApplication")
buildInfo()
}
task renameArtifacts(type: Copy) {
Expand Down
4 changes: 1 addition & 3 deletions src/backend/job-manage/boot-job-manage/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,16 +31,14 @@ dependencies {
implementation 'org.springframework.boot:spring-boot-starter-jdbc'
implementation 'org.springframework.cloud:spring-cloud-starter-bootstrap'
implementation 'org.springframework.cloud:spring-cloud-starter-bus-amqp'
// Fix RoutingFunction SpEL evaluation
implementation 'org.springframework.cloud:spring-cloud-function-context:3.1.7'
implementation 'org.springframework:spring-webmvc'
implementation(group: 'org.springframework.boot', name: 'spring-boot-starter-data-redis')
runtimeOnly('mysql:mysql-connector-java')

testImplementation("com.h2database:h2")
}
springBoot {
mainClassName = "com.tencent.bk.job.manage.JobManageBootApplication"
getMainClass().set("com.tencent.bk.job.manage.JobManageBootApplication")
buildInfo()
}
task renameArtifacts(type: Copy) {
Expand Down
4 changes: 2 additions & 2 deletions support-files/dependJarInfo/md5List.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,8 +178,8 @@ b567d00c0e1424ee412e049e7843e327
5902267a14aac1dd3378574f3738823e
21a6fb87085d1eb3627bf6852b3e66f7
71dee84bd1cf2049225f9d601d5f3c09
34dd0a94a108a2915ccbcd659f8b87bc
043b1de45a183607b3f143b0efcc61df
bb341e8db731b0a0f8552209e3c1da1e
1c6566af0882050b743665fb89b927c1
2b376967c0b44f3bd08d7a0f7150ce12
f3d37a87ce0e2fd4e56ba129ea1b8c99
6349dbeb65a5a7239aecb5e23d6a437d
Expand Down
4 changes: 2 additions & 2 deletions support-files/dependJarInfo/versionList.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,8 +178,8 @@
2.2.2.RELEASE
2.2.2.RELEASE
2.2.2.RELEASE
3.0.3.RELEASE
3.0.3.RELEASE
3.2.8
3.2.8
2.2.2.RELEASE
2.2.2.RELEASE
2.2.2.RELEASE
Expand Down