From a9d702bb67164c8c4f3ceaa96f69203da653c8b8 Mon Sep 17 00:00:00 2001 From: jsonwan Date: Thu, 8 Dec 2022 21:17:33 +0800 Subject: [PATCH] =?UTF-8?q?bugfix:=20=E4=BF=AE=E5=A4=8DSpring=20Cloud=20Fu?= =?UTF-8?q?nction=E6=8B=92=E7=BB=9D=E6=9C=8D=E5=8A=A1=E6=BC=8F=E6=B4=9E(CV?= =?UTF-8?q?E-2022-22979)=20#1593?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 升级Spring Cloud Function小版本至3.2.8 --- src/backend/build.gradle | 3 +++ src/backend/job-analysis/boot-job-analysis/build.gradle | 2 +- src/backend/job-backup/boot-job-backup/build.gradle | 4 +--- src/backend/job-config/build.gradle | 2 +- src/backend/job-crontab/boot-job-crontab/build.gradle | 2 +- src/backend/job-execute/boot-job-execute/build.gradle | 4 +--- .../job-file-gateway/boot-job-file-gateway/build.gradle | 2 +- .../job-file-worker-sdk/boot-job-file-worker-sdk/build.gradle | 2 +- src/backend/job-file-worker/boot-job-file-worker/build.gradle | 2 +- src/backend/job-gateway/build.gradle | 2 +- src/backend/job-logsvr/boot-job-logsvr/build.gradle | 2 +- src/backend/job-manage/boot-job-manage/build.gradle | 4 +--- src/backend/upgrader/build.gradle | 3 --- support-files/dependJarInfo/md5List.txt | 4 ++-- support-files/dependJarInfo/versionList.txt | 4 ++-- 15 files changed, 18 insertions(+), 24 deletions(-) diff --git a/src/backend/build.gradle b/src/backend/build.gradle index 3545fd29b3..c583fe0364 100644 --- a/src/backend/build.gradle +++ b/src/backend/build.gradle @@ -117,6 +117,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" diff --git a/src/backend/job-analysis/boot-job-analysis/build.gradle b/src/backend/job-analysis/boot-job-analysis/build.gradle index 50d00d1e40..6e99aed05e 100644 --- a/src/backend/job-analysis/boot-job-analysis/build.gradle +++ b/src/backend/job-analysis/boot-job-analysis/build.gradle @@ -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) { diff --git a/src/backend/job-backup/boot-job-backup/build.gradle b/src/backend/job-backup/boot-job-backup/build.gradle index 919d7fb41f..e237392639 100644 --- a/src/backend/job-backup/boot-job-backup/build.gradle +++ b/src/backend/job-backup/boot-job-backup/build.gradle @@ -31,8 +31,6 @@ 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') @@ -40,7 +38,7 @@ dependencies { 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) { diff --git a/src/backend/job-config/build.gradle b/src/backend/job-config/build.gradle index 1d35ab99a3..be727a6647 100644 --- a/src/backend/job-config/build.gradle +++ b/src/backend/job-config/build.gradle @@ -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" diff --git a/src/backend/job-crontab/boot-job-crontab/build.gradle b/src/backend/job-crontab/boot-job-crontab/build.gradle index ba8aeeecef..e7e295bd34 100644 --- a/src/backend/job-crontab/boot-job-crontab/build.gradle +++ b/src/backend/job-crontab/boot-job-crontab/build.gradle @@ -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) { diff --git a/src/backend/job-execute/boot-job-execute/build.gradle b/src/backend/job-execute/boot-job-execute/build.gradle index 561dd4915b..b5b9c42ec0 100644 --- a/src/backend/job-execute/boot-job-execute/build.gradle +++ b/src/backend/job-execute/boot-job-execute/build.gradle @@ -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) { diff --git a/src/backend/job-file-gateway/boot-job-file-gateway/build.gradle b/src/backend/job-file-gateway/boot-job-file-gateway/build.gradle index 8dde0f3042..9708e91c0d 100644 --- a/src/backend/job-file-gateway/boot-job-file-gateway/build.gradle +++ b/src/backend/job-file-gateway/boot-job-file-gateway/build.gradle @@ -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) { diff --git a/src/backend/job-file-worker-sdk/boot-job-file-worker-sdk/build.gradle b/src/backend/job-file-worker-sdk/boot-job-file-worker-sdk/build.gradle index ee457e78e3..29477576dd 100644 --- a/src/backend/job-file-worker-sdk/boot-job-file-worker-sdk/build.gradle +++ b/src/backend/job-file-worker-sdk/boot-job-file-worker-sdk/build.gradle @@ -30,7 +30,7 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-web' } springBoot { - mainClassName = "com.tencent.bk.job.file.worker.JobFileWorkerBootApplication" + getMainClass().set("com.tencent.bk.job.file.worker.JobFileWorkerBootApplication") buildInfo() } task renameArtifacts(type: Copy) { diff --git a/src/backend/job-file-worker/boot-job-file-worker/build.gradle b/src/backend/job-file-worker/boot-job-file-worker/build.gradle index 3de4ca369f..8b15020780 100644 --- a/src/backend/job-file-worker/boot-job-file-worker/build.gradle +++ b/src/backend/job-file-worker/boot-job-file-worker/build.gradle @@ -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) { diff --git a/src/backend/job-gateway/build.gradle b/src/backend/job-gateway/build.gradle index 7fc7d85c51..6e067486f7 100644 --- a/src/backend/job-gateway/build.gradle +++ b/src/backend/job-gateway/build.gradle @@ -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 { diff --git a/src/backend/job-logsvr/boot-job-logsvr/build.gradle b/src/backend/job-logsvr/boot-job-logsvr/build.gradle index e7fc52c328..9d53bc8833 100644 --- a/src/backend/job-logsvr/boot-job-logsvr/build.gradle +++ b/src/backend/job-logsvr/boot-job-logsvr/build.gradle @@ -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) { diff --git a/src/backend/job-manage/boot-job-manage/build.gradle b/src/backend/job-manage/boot-job-manage/build.gradle index caa52cee96..52601ccd35 100644 --- a/src/backend/job-manage/boot-job-manage/build.gradle +++ b/src/backend/job-manage/boot-job-manage/build.gradle @@ -31,8 +31,6 @@ 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') @@ -40,7 +38,7 @@ dependencies { 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) { diff --git a/src/backend/upgrader/build.gradle b/src/backend/upgrader/build.gradle index 6e4587c9ad..99086efd57 100644 --- a/src/backend/upgrader/build.gradle +++ b/src/backend/upgrader/build.gradle @@ -60,9 +60,6 @@ apply plugin: "application" mainClassName = "com.tencent.bk.job.upgrader.Upgrader" shadowJar { - // baseName为插件默认打包名+".jar"，bkdevops-plugin.jar - // 如果修改，则要一同修改插件task.json中的target启动命令 - // 为了省事，建议不用修改 classifier = null zip64 true } diff --git a/support-files/dependJarInfo/md5List.txt b/support-files/dependJarInfo/md5List.txt index 87460fbfaa..3cb10756e2 100644 --- a/support-files/dependJarInfo/md5List.txt +++ b/support-files/dependJarInfo/md5List.txt @@ -178,8 +178,8 @@ b567d00c0e1424ee412e049e7843e327 5902267a14aac1dd3378574f3738823e 21a6fb87085d1eb3627bf6852b3e66f7 71dee84bd1cf2049225f9d601d5f3c09 -34dd0a94a108a2915ccbcd659f8b87bc -043b1de45a183607b3f143b0efcc61df +bb341e8db731b0a0f8552209e3c1da1e +1c6566af0882050b743665fb89b927c1 2b376967c0b44f3bd08d7a0f7150ce12 f3d37a87ce0e2fd4e56ba129ea1b8c99 6349dbeb65a5a7239aecb5e23d6a437d diff --git a/support-files/dependJarInfo/versionList.txt b/support-files/dependJarInfo/versionList.txt index 2db7903ca0..3d67a17ff8 100644 --- a/support-files/dependJarInfo/versionList.txt +++ b/support-files/dependJarInfo/versionList.txt @@ -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