mirror/plugin-hub
1
0
Fork 0
mirror of https://github.com/runelite/plugin-hub.git synced 2026-05-24 16:38:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

package: manually shade jars

Browse Source 
this lets us get rid of shadow, which
 1) lets hub plugins bring their own shadow if they desire without
    impacting the build process
 2) removes a vulnerable log4j from the build process. This isn't
    a huge issue to us because if you can get arbitrary files into the
    shadow jar, security is already compromised, so at worst this lets
    you escalate
This commit is contained in:
Max Weber
2021-12-20 18:37:03 -07:00
parent d3facd6aef
commit 3e17fb2cb7
7 changed files with 20 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
package/build.gradle
View File

@@ -22,10 +22,6 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
plugins {
id "com.github.johnrengelman.shadow" version "6.1.0"
}
allprojects {
version "2.0-SNAPSHOT"
group "net.runelite.pluginhub"
@@ -38,12 +34,17 @@ allprojects {
subprojects {
apply plugin: "java"
apply plugin: "com.github.johnrengelman.shadow"
sourceCompatibility = 11
shadowJar {
task shadowJar(type: Jar) {
archiveFileName.set archiveBaseName.get() + "." + archiveExtension.get()
from {
configurations.runtimeClasspath.collect {
it.isDirectory() ? it : zipTree(it)
}
}
with tasks.jar
}
}
@@ -51,7 +52,6 @@ subprojects {
// the daemon used to build this can be reused by a real plugin build
task prep {
dependsOn ":package:shadowJar"
dependsOn ":initLib:shadowJar"
dependsOn ":apirecorder:shadowJar"
doLast {
file("build").mkdirs()

172
package/gradle/verification-metadata.xml
View File

@@ -3,25 +3,12 @@
<configuration>
<verify-metadata>true</verify-metadata>
<verify-signatures>false</verify-signatures>
<trusted-artifacts>
<trust file=".*-javadoc[.]jar" regex="true"/>
<trust file=".*-sources[.]jar" regex="true"/>
</trusted-artifacts>
</configuration>
<trusted-artifacts>
<trust file=".*-javadoc[.]jar" regex="true"/>
<trust file=".*-sources[.]jar" regex="true"/>
</trusted-artifacts>
</configuration>
<components>
<component group="com.github.jengelman.gradle.plugins" name="shadow" version="6.1.0">
<artifact name="shadow-6.1.0.jar">
<sha256 value="b66cb33a1d204ffaa1ba67393bdddbe9ff517f24f4438d11c341423868759aa3" origin="Generated by Gradle"/>
</artifact>
<artifact name="shadow-6.1.0.pom">
<sha256 value="d40c29bce31762b6c8539a87d2515324f44db9d7d579a5aa7016a15ce164abb8" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.github.johnrengelman.shadow" name="com.github.johnrengelman.shadow.gradle.plugin" version="6.1.0">
<artifact name="com.github.johnrengelman.shadow.gradle.plugin-6.1.0.pom">
<sha256 value="d79cec882e8f6870d9872bc10d1a4f80630308b64a91ba0630cd5e1fb4dfd05b" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.google.code.findbugs" name="jsr305" version="3.0.2">
<artifact name="jsr305-3.0.2.jar">
<sha256 value="766ad2a0783f2687962c8ad74ceecc38a28b9f72a2d085ee438b7813e928d0c7" origin="Generated by Gradle"/>
@@ -111,19 +98,6 @@
<sha256 value="e81f40146f2a0eb394b10fa3a175c85ab9fbe757aa418aa44d4b760efe16f024" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="commons-io" name="commons-io" version="2.5">
<artifact name="commons-io-2.5.pom">
<sha256 value="28ebb2998bc7d7acb25078526971640892000f3413586ff42d611f1043bfec30" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="commons-io" name="commons-io" version="2.6">
<artifact name="commons-io-2.6.jar">
<sha256 value="f877d304660ac2a142f3865badfc971dec7ed73c747c7f8d5d2f5139ca736513" origin="Generated by Gradle"/>
</artifact>
<artifact name="commons-io-2.6.pom">
<sha256 value="0c23863893a2291f5a7afdbd8d15923b3948afd87e563fa341cdcf6eae338a60" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="junit" name="junit" version="4.12">
<artifact name="junit-4.12.jar">
<sha256 value="59721f0805e223d84b90677887d9ff567dc534d7c502ca903c0c2b17f05c116a" origin="Generated by Gradle"/>
@@ -132,73 +106,6 @@
<sha256 value="90f163f78e3ffb6f1c7ad97de9e7eba4eea25807141b85d6d12be67ca25449c4" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache" name="apache" version="16">
<artifact name="apache-16.pom">
<sha256 value="9f85ff2fd7d6cb3097aa47fb419ee7f0ebe869109f98aba9f4eca3f49e74a40e" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache" name="apache" version="18">
<artifact name="apache-18.pom">
<sha256 value="7831307285fd475bbc36b20ae38e7882f11c3153b1d5930f852d44eda8f33c17" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache" name="apache" version="21">
<artifact name="apache-21.pom">
<sha256 value="af10c108da014f17cafac7b52b2b4b5a3a1c18265fa2af97a325d9143537b380" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.ant" name="ant" version="1.9.7">
<artifact name="ant-1.9.7.jar">
<sha256 value="9a5dbe3f5f2cb91854c8682cab80178afa412ab35a5ab718bf39ce01b3435d93" origin="Generated by Gradle"/>
</artifact>
<artifact name="ant-1.9.7.pom">
<sha256 value="1b9fbd4f325a71e99b279080d63084f12d884d42081af298f9e553e1fe0cd74a" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.ant" name="ant-launcher" version="1.9.7">
<artifact name="ant-launcher-1.9.7.jar">
<sha256 value="bc376f6d6cb586229f451ac459faf1443b144c26d6647618ec9cba60e54c2b79" origin="Generated by Gradle"/>
</artifact>
<artifact name="ant-launcher-1.9.7.pom">
<sha256 value="d7bcdd3ab0ff55edbe1b96d06f06dac2135ec63b5a7c32cef3a436b49c9eee27" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.ant" name="ant-parent" version="1.9.7">
<artifact name="ant-parent-1.9.7.pom">
<sha256 value="75d2cef64c65ccbdd2faf7261e53b444778d56d338763154e30fada4a41d1215" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.commons" name="commons-parent" version="39">
<artifact name="commons-parent-39.pom">
<sha256 value="87cd27e1a02a5c3eb6d85059ce98696bb1b44c2b8b650f0567c86df60fa61da7" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.commons" name="commons-parent" version="42">
<artifact name="commons-parent-42.pom">
<sha256 value="cd313494c670b483ec256972af1698b330e598f807002354eb765479f604b09c" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.logging.log4j" name="log4j" version="2.13.3">
<artifact name="log4j-2.13.3.pom">
<sha256 value="674f1fa5165b9d48935f4103d9316fe5b161dff6f9be904a6edb9baa33da4480" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.logging.log4j" name="log4j-api" version="2.13.3">
<artifact name="log4j-api-2.13.3.jar">
<sha256 value="2b4b1965c9dce7f3732a0fbf5c8493199c1e6bf8cf65c3e235b57d98da5f36af" origin="Generated by Gradle"/>
</artifact>
<artifact name="log4j-api-2.13.3.pom">
<sha256 value="5953807d4e4fd4d7ae8087b5a76660236e55e718fcad62cf8a7adedc2ddc5a6e" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.logging.log4j" name="log4j-core" version="2.13.3">
<artifact name="log4j-core-2.13.3.jar">
<sha256 value="9529c55814264ab96b0eeba2920ac0805170969c994cc479bd3d4d7eb24a35a8" origin="Generated by Gradle"/>
</artifact>
<artifact name="log4j-core-2.13.3.pom">
<sha256 value="ec5592381a9b37e5054a91fcaf79e3c2c4582eee3574d9ad8a022afbd5b5a3fb" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.codehaus" name="codehaus-parent" version="4">
<artifact name="codehaus-parent-4.pom">
<sha256 value="6b87237de8c2e1740cf80627c7f3ce3e15de1930bb250c55a1eca94fa3e014df" origin="Generated by Gradle"/>
@@ -222,19 +129,6 @@
<sha256 value="3e395d6fbc43c09a3774cac8694ce527398305ea3fd5492d80e25af27d382a9c" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.codehaus.plexus" name="plexus" version="4.0">
<artifact name="plexus-4.0.pom">
<sha256 value="0a1b692d7fcc90d6a45dae2e50f4660d48f7a44504f174aa60ef34fbe1327f6a" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.codehaus.plexus" name="plexus-utils" version="3.0.24">
<artifact name="plexus-utils-3.0.24.jar">
<sha256 value="83ee748b12d06afb0ad4050a591132b3e8025fbb1990f1ed002e8b73293e69b4" origin="Generated by Gradle"/>
</artifact>
<artifact name="plexus-utils-3.0.24.pom">
<sha256 value="11067f6a75fded12bcdc8daf7a66ddd942ce289c3daf88a3fe0f8b12858a2ee6" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.gradle" name="gradle-tooling-api" version="6.6.1">
<artifact name="gradle-tooling-api-6.6.1.jar">
<sha256 value="38b7a9317a06a0f3797f972462d198d8b370faa1aecc5832fba736c4c99aa3b2" origin="Generated by Gradle"/>
@@ -256,14 +150,6 @@
<sha256 value="6d535f94efb663bdb682c9f27a50335394688009642ba7a9677504bc1be4129b" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.jdom" name="jdom2" version="2.0.6">
<artifact name="jdom2-2.0.6.jar">
<sha256 value="1345f11ba606d15603d6740551a8c21947c0215640770ec67271fe78bea97cf5" origin="Generated by Gradle"/>
</artifact>
<artifact name="jdom2-2.0.6.pom">
<sha256 value="47b23a79fe336b741b82434c6e049d68165256e405e75c10921fd72fa8a65d8d" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.ow2" name="ow2" version="1.5">
<artifact name="ow2-1.5.pom">
<sha256 value="0f8a1b116e760b8fe6389c51b84e4b07a70fc11082d4f936e453b583dd50b43b" origin="Generated by Gradle"/>
@@ -277,42 +163,7 @@
<sha256 value="83f65b1083d5ce4f8ba7f9545cfe9ff17824589c9a7cc82c3a4695801e4f5f68" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.ow2.asm" name="asm" version="9.0">
<artifact name="asm-9.0.jar">
<sha256 value="0df97574914aee92fd349d0cb4e00f3345d45b2c239e0bb50f0a90ead47888e0" origin="Generated by Gradle"/>
</artifact>
<artifact name="asm-9.0.module">
<sha256 value="8af81096ed3affa39a4729fc900a55b663894911d67c4d4bef0ea424393dd3f9" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.ow2.asm" name="asm-analysis" version="9.0">
<artifact name="asm-analysis-9.0.jar">
<sha256 value="2d46de6df856a4daac9aa534459ab7287eb80584e9109850405e5b302dc9c2a6" origin="Generated by Gradle"/>
</artifact>
<artifact name="asm-analysis-9.0.module">
<sha256 value="6e02aafb4637979c7cdc3daa3047a88b40f3e1071bdbbd0c7f1cd5da7ac38454" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.ow2.asm" name="asm-commons" version="9.0">
<artifact name="asm-commons-9.0.jar">
<sha256 value="1b9090acb7e67bd4ed2f2cfb002063316d79cecace237bd07cc4f7f1b302092f" origin="Generated by Gradle"/>
</artifact>
<artifact name="asm-commons-9.0.module">
<sha256 value="58880e03e9196f566c998186f58bd0af41c77a04ba841664f80377ba0665f97c" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.ow2.asm" name="asm-tree" version="9.0">
<artifact name="asm-tree-9.0.jar">
<sha256 value="e2c25f332eb95861883a8568e45aac5e77d140d0fe961ae8eb9a474ec876e00d" origin="Generated by Gradle"/>
</artifact>
<artifact name="asm-tree-9.0.module">
<sha256 value="b38cbdd2c47fa4f29ab680c18954c7216d0afd28692221cd288c1cc7b9d9641c" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.projectlombok" name="lombok" version="1.18.4">
<artifact name="lombok-1.18.4.jar">
<sha256 value="39f3922deb679b1852af519eb227157ef2dd0a21eec3542c8ce1b45f2df39742" origin="Generated by Gradle"/>
</artifact>
<artifact name="lombok-1.18.4.pom">
<sha256 value="2eaf8fc3d7a9c2ce18ec874bc4674f7ab492b2121143342321e820eea12ffa2f" origin="Generated by Gradle"/>
</artifact>
@@ -351,23 +202,10 @@
<sha256 value="bbd8c6f5cf54d1c1fb11b415e51f6b35483fc264f81ccd98654cc3420e756901" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.sonatype.forge" name="forge-parent" version="10">
<artifact name="forge-parent-10.pom">
<sha256 value="c14fb9c32b59cc03251f609416db7c0cff01f811edcccb4f6a865d6e7046bd0b" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.sonatype.oss" name="oss-parent" version="7">
<artifact name="oss-parent-7.pom">
<sha256 value="b51f8867c92b6a722499557fc3a1fdea77bdf9ef574722fe90ce436a29559454" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.vafer" name="jdependency" version="2.1.1">
<artifact name="jdependency-2.1.1.jar">
<sha256 value="642d23a86217850721d9fa80671683d8308fd03114f0da7af553d43b82013a09" origin="Generated by Gradle"/>
</artifact>
<artifact name="jdependency-2.1.1.pom">
<sha256 value="4a139306cbe0aa3765bd9fd837a71253a911a9c4e55c50e062a4bd6843ee19a1" origin="Generated by Gradle"/>
</artifact>
</component>
</components>
</verification-metadata>

32
package/initLib/build.gradle
View File

@@ -1,32 +0,0 @@
/*
* Copyright (c) 2020 Abex
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
repositories {
mavenCentral()
gradlePluginPortal()
}
dependencies {
implementation "com.github.johnrengelman.shadow:com.github.johnrengelman.shadow.gradle.plugin:6.1.0"
}

1
package/package/build.gradle
View File

@@ -63,7 +63,6 @@ jar {
}
test {
dependsOn ":initLib:shadowJar"
dependsOn ":apirecorder:shadowJar"
workingDir new File(project.rootDir, "../")
}

1
package/package/src/main/java/net/runelite/pluginhub/packager/Plugin.java
View File

@@ -469,7 +469,6 @@ public class Plugin implements Closeable
"--console=plain",
"--init-script", new File("./package/target_init.gradle").getAbsolutePath())
.setEnvironmentVariables(ImmutableMap.of(
"runelite.pluginhub.package.lib", new File(Packager.PACKAGE_ROOT, "initLib/build/libs/initLib.jar").toString(),
"runelite.pluginhub.package.apirecorder", new File(Packager.PACKAGE_ROOT, "apirecorder/build/libs/apirecorder.jar").toString(),
"runelite.pluginhub.package.buildDir", buildDirectory.getAbsolutePath(),
"runelite.pluginhub.package.runeliteVersion", runeliteVersion))

1
package/settings.gradle
View File

@@ -1,6 +1,5 @@
rootProject.name = "package-root"
include "initLib"
include "upload"
include "package"
include 'apirecorder'

22
package/target_init.gradle
View File

@@ -22,18 +22,8 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
import com.github.jengelman.gradle.plugins.shadow.ShadowPlugin
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
initscript {
dependencies {
classpath files(System.getenv("runelite.pluginhub.package.lib"))
}
}
allprojects {
apply plugin: "java"
apply plugin: ShadowPlugin
compileJava {
options.release.set(8)
@@ -51,11 +41,15 @@ allprojects {
def buildDir = new File(System.getenv("runelite.pluginhub.package.buildDir"));
task runelitePluginHubPackage(type: ShadowJar) {
destinationDir = buildDir
archiveName = "plugin.jar"
configurations = [project.configurations.runtimeClasspath]
task runelitePluginHubPackage(type: Jar) {
destinationDirectory = buildDir
archiveFileName = "plugin.jar"
from sourceSets.main.output
from {
project.configurations.runtimeClasspath.collect {
it.isDirectory() ? it : project.zipTree(it)
}
}
}
task runelitePluginHubManifest {