From 2169e9d0d7fec58e92c55e42a166540d100dde66 Mon Sep 17 00:00:00 2001 From: Marc Hermans Date: Fri, 10 Dec 2021 14:17:34 +0100 Subject: [PATCH] [CVE-2021-44228]: Update Log4J to fix the security issue inside it. (#8275) --- Jenkinsfile | 45 +++++++++++----------------- build.gradle | 20 ++++++++----- src/main/resources/log4j2.xml | 16 +++++----- src/main/resources/log4j2_server.xml | 16 +++++----- 4 files changed, 46 insertions(+), 51 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 15b665b7ca..f2df718164 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -6,8 +6,8 @@ pipeline { } agent { docker { - image 'gradlewrapper:latest' - args '-v gradlecache:/gradlecache' + image 'gradle:jdk8' + args '-v forgegc:/home/gradle/.gradle/' } } environment { @@ -18,13 +18,6 @@ pipeline { } stages { - /* This resets the checkout on jenkins, but doesn't take branch into account... - stage('fetch') { - steps { - checkout scm - } - } - */ stage('notify_start') { when { not { @@ -41,16 +34,6 @@ pipeline { ) } } - stage('ciWriteBuildNumber') { - steps { - sh './gradlew ${GRADLE_ARGS} --refresh-dependencies --continue ciWriteBuildNumber' - script { - env.MYGROUP = sh(returnStdout: true, script: './gradlew properties -q | grep "group:" | awk \'{print $2}\'').trim() - env.MYARTIFACT = sh(returnStdout: true, script: './gradlew properties -q | grep "name:" | awk \'{print $2}\'').trim() - env.MYVERSION = sh(returnStdout: true, script: './gradlew properties -q | grep "version:" | awk \'{print $2}\'').trim() - } - } - } stage('setup') { steps { sh './gradlew ${GRADLE_ARGS} --refresh-dependencies --continue setup' @@ -66,7 +49,7 @@ pipeline { } } steps { - writeChangelog(currentBuild, 'build/changelog_new.txt') + writeChangelog(currentBuild, 'build/changelog.txt') } } stage('publish') { @@ -83,8 +66,16 @@ pipeline { KEYSTORE_STOREPASS = credentials('forge-jenkins-keystore-old-keypass') } steps { - sh './gradlew ${GRADLE_ARGS} :forge:publish -PforgeMavenUser=${FORGE_MAVEN_USR} -PforgeMavenPassword=${FORGE_MAVEN_PSW} -PkeystoreKeyPass=${KEYSTORE_KEYPASS} -PkeystoreStorePass=${KEYSTORE_STOREPASS} -Pkeystore=${KEYSTORE} -PcrowdinKey=${CROWDIN}' - sh 'curl --user ${FORGE_MAVEN} http://files.minecraftforge.net/maven/manage/promote/latest/${MYGROUP}.${MYARTIFACT}/${MYVERSION}' + withCredentials([usernamePassword(credentialsId: 'maven-forge-user', usernameVariable: 'MAVEN_USER', passwordVariable: 'MAVEN_PASSWORD')]) { + withGradle { + sh './gradlew ${GRADLE_ARGS} :forge:publish -PkeystoreKeyPass=${KEYSTORE_KEYPASS} -PkeystoreStorePass=${KEYSTORE_STOREPASS} -Pkeystore=${KEYSTORE} -PcrowdinKey=${CROWDIN}' + } + } + } + post { + success { + build job: 'filegenerator', parameters: [string(name: 'COMMAND', value: "promote net.minecraftforge:forge ${env.MYVERSION} latest")], propagate: false, wait: false + } } } stage('test_publish_pr') { //Publish to local repo to test full process, but don't include credentials so it can't sign/publish to maven @@ -95,17 +86,15 @@ pipeline { CROWDIN = credentials('forge-crowdin') } steps { - sh './gradlew ${GRADLE_ARGS} uploadArchives -PcrowdinKey=${CROWDIN}' + sh './gradlew ${GRADLE_ARGS} :forge:publish -PcrowdinKey=${CROWDIN}' } } } post { always { script { - //archiveArtifacts artifacts: 'projects/forge/build/libs/**/*.*', fingerprint: true, onlyIfSuccessful: true, allowEmptyArchive: true - //junit 'build/test-results/*/*.xml' - //jacoco sourcePattern: '**/src/*/java' - + archiveArtifacts artifacts: 'projects/forge/build/libs/**/*.*', fingerprint: true, onlyIfSuccessful: true, allowEmptyArchive: true + if (env.CHANGE_ID == null) { // This is unset for non-PRs discordSend( title: "${DISCORD_PREFIX} Finished ${currentBuild.currentResult}", @@ -119,4 +108,4 @@ pipeline { } } } -} +} \ No newline at end of file diff --git a/build.gradle b/build.gradle index b506022fb3..7f4c4876bb 100644 --- a/build.gradle +++ b/build.gradle @@ -200,7 +200,7 @@ project(':forge') { branch = null SPEC_VERSION = tag BUILD_NUMBER = LEGACY_BUILD + offset.toInteger() - return "${MC_VERSION}-${LEGACY_MAJOR}.${tag}.${BUILD_NUMBER}${t -> if (branch != null) t << '-' + branch}".toString() //Bake the response instead of making it dynamic + return ("${MC_VERSION}-${LEGACY_MAJOR}.${tag}.${BUILD_NUMBER}${t -> if (branch != null) t << '-' + branch}".toString()).replace("/", "-") //Bake the response instead of making it dynamic } version = getVersion() @@ -304,7 +304,10 @@ project(':forge') { installer 'net.sf.trove4j:trove4j:3.0.3' installer 'org.apache.maven:maven-artifact:3.5.3' installer 'net.sf.jopt-simple:jopt-simple:5.0.3' - + installer 'org.apache.logging.log4j:log4j-api:2.15.0' //TODO: Unpin in 1.18.1 or when Mojang bumps the Log4J version + installer 'org.apache.logging.log4j:log4j-core:2.15.0' //TODO: Unpin in 1.18.1 or when Mojang bumps the Log4J version + installer 'org.apache.logging.log4j:log4j-slf4j18-impl:2.15.0' //TODO: Unpin in 1.18.1 or when Mojang bumps the Log4J version + testImplementation 'org.junit.jupiter:junit-jupiter-api:5.0.0' testImplementation 'org.junit.vintage:junit-vintage-engine:5.+' testImplementation 'org.opentest4j:opentest4j:1.0.0' // needed for junit 5 @@ -871,12 +874,15 @@ project(':forge') { } repositories { maven { - if (project.hasProperty('forgeMavenPassword')) { - credentials { - username project.properties.forgeMavenUser - password project.properties.forgeMavenPassword + if (System.env.MAVEN_USER) { + url "https://maven.minecraftforge.net/releases/" + authentication { + basic(BasicAuthentication) + } + credentials { + username = System.env.MAVEN_USER ?: 'not' + password = System.env.MAVEN_PASSWORD ?: 'set' } - url 'https://files.minecraftforge.net/maven/manage/upload' } else { url 'file://' + rootProject.file('repo').getAbsolutePath() } diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml index 1e2fe026b7..836cba3fe2 100644 --- a/src/main/resources/log4j2.xml +++ b/src/main/resources/log4j2.xml @@ -3,31 +3,31 @@ - + - - + + - + - - + + - + - + diff --git a/src/main/resources/log4j2_server.xml b/src/main/resources/log4j2_server.xml index 239b2a41d1..05215b10cd 100644 --- a/src/main/resources/log4j2_server.xml +++ b/src/main/resources/log4j2_server.xml @@ -3,31 +3,31 @@ - + - - + + - + - - + + - + - +