diff --git a/build.gradle b/build.gradle index e482e6e9..bdcfceea 100644 --- a/build.gradle +++ b/build.gradle @@ -45,6 +45,13 @@ subprojects{ options.addBooleanOption('html5', true) } } + + // Mitigate CVE-2024-25710: Force commons-compress to 1.28.0 + configurations.all { + resolutionStrategy { + force libs.commonsCompress + } + } } /** diff --git a/gradle.properties b/gradle.properties index 76837905..dcd939a1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -12,4 +12,4 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -# +# \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 999f17d6..57a72cdb 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -19,6 +19,7 @@ snakeYaml = "2.0" #used for authz lib integration rundeck = "4.17.6-20240402" testcontainers = "1.21.3" +commonsCompress = "1.28.0" [libraries] @@ -50,6 +51,8 @@ rundeckAuthzYaml = { module = "org.rundeck:rundeck-authz-yaml", version.ref = "r testcontainers = { module = "org.testcontainers:testcontainers", version.ref = "testcontainers" } testcontainersSpock = { module = "org.testcontainers:spock", version.ref = "testcontainers" } +commonsCompress = { module = "org.apache.commons:commons-compress", version.ref = "commonsCompress" } + [bundles] retrofit = ["retrofitCore", "retrofitJackson", "retrofitJaxb", "okhttpLogging", "okhttpUrlconnection", "jaxb"] diff --git a/gradle/verification-keyring.keys b/gradle/verification-keyring.keys index 82e9ce22..86c86107 100644 --- a/gradle/verification-keyring.keys +++ b/gradle/verification-keyring.keys @@ -10106,3 +10106,347 @@ CKe2D0lazI6mo+w83IVq95noCue6knNkYsGU6AD0aWQYV4gdLQ9QTZZnXpHlX7WC uigGjFAEfm+7LwzNMH4twLdOTB6ioCFTpdwQXz3gtg1E9YFd =Cffr -----END PGP PUBLIC KEY BLOCK----- + +pub 2BFD7825A8984FBE +uid Lerbscher + +sub 9F621F1AE6EF2591 +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: BCPG v1.68 + +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 +yrHl3ckKrNgsl4RkTgS6lxs= +=+WZR +-----END PGP PUBLIC KEY BLOCK----- + +pub 2BFD7825A8984FBE +uid Lerbscher + +sub 9F621F1AE6EF2591 +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: BCPG v1.68 + +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 +yrHl3ckKrNgsl4RkTgS6lxs= +=+WZR +-----END PGP PUBLIC KEY BLOCK----- + +pub C71FB765CD9DE313 +uid Jaikiran Pai (CODE SIGNING KEY) + +sub DFF2D25E2CD6139E +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: BCPG v1.68 + +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 +z+XxH1rj6A== +=/0ir +-----END PGP PUBLIC KEY BLOCK----- + +pub C71FB765CD9DE313 +uid Jaikiran Pai (CODE SIGNING KEY) + +sub DFF2D25E2CD6139E +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: BCPG v1.68 + +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 +z+XxH1rj6A== +=/0ir +-----END PGP PUBLIC KEY BLOCK----- + +pub C71FB765CD9DE313 +uid Jaikiran Pai (CODE SIGNING KEY) + +sub DFF2D25E2CD6139E +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: BCPG v1.68 + +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 +z+XxH1rj6A== +=/0ir +-----END PGP PUBLIC KEY BLOCK----- diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 403d44d2..a0d3f4cc 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -6,6 +6,7 @@ + @@ -64,6 +65,7 @@ + @@ -244,14 +246,17 @@ + + + @@ -273,17 +278,21 @@ + + + + @@ -320,6 +329,12 @@ + + + + + + @@ -355,6 +370,12 @@ + + + + + + @@ -395,6 +416,12 @@ + + + + + + @@ -420,6 +447,12 @@ + + + + + + @@ -484,6 +517,16 @@ + + + + + + + + + + @@ -551,6 +594,16 @@ + + + + + + + + + + @@ -610,6 +663,16 @@ + + + + + + + + + + @@ -631,11 +694,27 @@ + + + + + + + + + + + + + + + + @@ -644,6 +723,16 @@ + + + + + + + + + + @@ -652,6 +741,16 @@ + + + + + + + + + + @@ -662,9 +761,11 @@ + + @@ -675,6 +776,7 @@ + @@ -713,9 +815,11 @@ + + @@ -736,6 +840,7 @@ + @@ -754,6 +859,7 @@ + @@ -796,9 +902,11 @@ + + @@ -925,9 +1033,11 @@ + + @@ -947,6 +1057,16 @@ + + + + + + + + + + @@ -1000,70 +1120,87 @@ + + + + + + + + + + + + + + + + + @@ -1075,6 +1212,16 @@ + + + + + + + + + + @@ -1106,9 +1253,11 @@ + + @@ -1122,9 +1271,11 @@ + + @@ -1138,9 +1289,11 @@ + + @@ -1152,6 +1305,16 @@ + + + + + + + + + + @@ -1168,6 +1331,16 @@ + + + + + + + + + + @@ -1178,6 +1351,7 @@ + @@ -1189,6 +1363,16 @@ + + + + + + + + + + @@ -1205,6 +1389,16 @@ + + + + + + + + + + @@ -1215,6 +1409,7 @@ + @@ -1231,6 +1426,12 @@ + + + + + + @@ -1239,41 +1440,60 @@ + + + + + + + + + + + + + + + + + + + @@ -1284,6 +1504,7 @@ + @@ -1302,9 +1523,11 @@ + + @@ -1339,6 +1562,12 @@ + + + + + + @@ -1368,6 +1597,16 @@ + + + + + + + + + + @@ -1386,6 +1625,12 @@ + + + + + + @@ -1401,6 +1646,12 @@ + + + + + + @@ -1408,9 +1659,11 @@ + + @@ -1454,11 +1707,33 @@ + + + + + + + + + + + + + + + + + + + + + + @@ -1488,12 +1763,24 @@ + + + + + + + + + + + + @@ -1510,9 +1797,11 @@ + + @@ -1550,17 +1839,21 @@ + + + + @@ -1582,12 +1875,24 @@ + + + + + + + + + + + + @@ -1596,6 +1901,16 @@ + + + + + + + + + + @@ -1606,9 +1921,11 @@ + + @@ -1619,14 +1936,17 @@ + + + @@ -1640,6 +1960,7 @@ + @@ -1650,9 +1971,11 @@ + + @@ -1674,22 +1997,27 @@ + + + + + @@ -1703,9 +2031,11 @@ + + @@ -1716,6 +2046,7 @@ + @@ -1724,6 +2055,7 @@ + @@ -1735,8 +2067,19 @@ + + + + + + + + + + + @@ -1745,6 +2088,12 @@ + + + + + + @@ -1755,15 +2104,18 @@ + + + @@ -1775,17 +2127,30 @@ + + + + + + + + + + + + + @@ -1796,9 +2161,11 @@ + + @@ -1848,17 +2215,21 @@ + + + + @@ -1866,9 +2237,16 @@ + + + + + + + @@ -1880,9 +2258,11 @@ + + @@ -1896,9 +2276,11 @@ + + @@ -1933,9 +2315,11 @@ + + @@ -1965,9 +2349,11 @@ + + @@ -1981,9 +2367,11 @@ + + @@ -1997,9 +2385,11 @@ + + @@ -2018,6 +2408,7 @@ + @@ -2028,6 +2419,7 @@ + @@ -2059,9 +2451,11 @@ + + @@ -2070,6 +2464,16 @@ + + + + + + + + + + @@ -2093,12 +2497,24 @@ + + + + + + + + + + + + @@ -2109,15 +2525,18 @@ + + + @@ -2150,12 +2569,14 @@ + + @@ -2166,14 +2587,27 @@ + + + + + + + + + + + + + @@ -2200,59 +2634,72 @@ + + + + + + + + + + + + + @@ -2356,6 +2803,12 @@ + + + + + + @@ -2398,6 +2851,16 @@ + + + + + + + + + + @@ -2414,6 +2877,16 @@ + + + + + + + + + + @@ -2469,9 +2942,11 @@ + + @@ -2494,6 +2969,16 @@ + + + + + + + + + + @@ -2514,17 +2999,21 @@ + + + + @@ -2546,9 +3035,11 @@ + + @@ -2562,17 +3053,21 @@ + + + + @@ -2586,9 +3081,11 @@ + + @@ -2611,6 +3108,7 @@ + @@ -2646,6 +3144,16 @@ + + + + + + + + + + @@ -2674,6 +3182,12 @@ + + + + + + @@ -2706,6 +3220,16 @@ + + + + + + + + + + @@ -2738,6 +3262,16 @@ + + + + + + + + + + @@ -2778,6 +3312,16 @@ + + + + + + + + + + @@ -2802,6 +3346,16 @@ + + + + + + + + + + @@ -2834,6 +3388,16 @@ + + + + + + + + + + @@ -2890,6 +3454,16 @@ + + + + + + + + + + @@ -2930,6 +3504,16 @@ + + + + + + + + + + @@ -2970,6 +3554,16 @@ + + + + + + + + + + @@ -3002,6 +3596,16 @@ + + + + + + + + + + @@ -3034,6 +3638,16 @@ + + + + + + + + + + @@ -3074,6 +3688,16 @@ + + + + + + + + + + @@ -3098,6 +3722,16 @@ + + + + + + + + + + @@ -3122,6 +3756,16 @@ + + + + + + + + + + @@ -3162,6 +3806,16 @@ + + + + + + + + + + @@ -3194,6 +3848,16 @@ + + + + + + + + + + @@ -3234,6 +3898,16 @@ + + + + + + + + + + @@ -3266,6 +3940,16 @@ + + + + + + + + + + @@ -3306,6 +3990,16 @@ + + + + + + + + + + @@ -3338,6 +4032,16 @@ + + + + + + + + + + @@ -3370,6 +4074,16 @@ + + + + + + + + + + @@ -3394,6 +4108,16 @@ + + + + + + + + + + @@ -3411,6 +4135,7 @@ + @@ -3424,14 +4149,17 @@ + + + @@ -3442,6 +4170,7 @@ + @@ -3452,14 +4181,17 @@ + + + @@ -3479,8 +4211,19 @@ + + + + + + + + + + + @@ -3494,6 +4237,12 @@ + + + + + + @@ -3510,6 +4259,16 @@ + + + + + + + + + + @@ -3526,6 +4285,16 @@ + + + + + + + + + + @@ -3542,6 +4311,16 @@ + + + + + + + + + + @@ -3558,6 +4337,16 @@ + + + + + + + + + + @@ -3620,6 +4409,8 @@ + + @@ -3630,54 +4421,67 @@ + + + + + + + + + + + + + @@ -3779,9 +4583,11 @@ + + @@ -3843,9 +4649,11 @@ + + @@ -3857,6 +4665,22 @@ + + + + + + + + + + + + + + + + @@ -3880,9 +4704,11 @@ + + @@ -3894,6 +4720,22 @@ + + + + + + + + + + + + + + + + @@ -3904,9 +4746,11 @@ + + @@ -3918,6 +4762,22 @@ + + + + + + + + + + + + + + + + @@ -3928,9 +4788,11 @@ + + @@ -3947,6 +4809,22 @@ + + + + + + + + + + + + + + + + @@ -4000,19 +4878,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4026,9 +4938,11 @@ + + @@ -4053,6 +4967,26 @@ + + + + + + + + + + + + + + + + + + + + @@ -4085,6 +5019,16 @@ + + + + + + + + + + @@ -4117,6 +5061,16 @@ + + + + + + + + + + @@ -4149,6 +5103,16 @@ + + + + + + + + + + @@ -4162,6 +5126,7 @@ + @@ -4181,6 +5146,16 @@ + + + + + + + + + + @@ -4213,11 +5188,22 @@ + + + + + + + + + + + @@ -4245,14 +5231,17 @@ + + + @@ -4272,8 +5261,19 @@ + + + + + + + + + + + @@ -4287,9 +5287,11 @@ + + @@ -4303,9 +5305,11 @@ + + @@ -4319,9 +5323,11 @@ + + @@ -4335,9 +5341,11 @@ + + @@ -4464,22 +5472,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -4488,6 +5520,16 @@ + + + + + + + + + + @@ -4496,6 +5538,16 @@ + + + + + + + + + + @@ -4552,11 +5604,23 @@ + + + + + + + + + + + + @@ -4586,22 +5650,27 @@ + + + + + @@ -4617,6 +5686,7 @@ + @@ -4627,11 +5697,13 @@ + + @@ -4671,22 +5743,26 @@ + + + + @@ -4752,9 +5828,11 @@ + + @@ -4769,9 +5847,11 @@ + + @@ -4799,6 +5879,16 @@ + + + + + + + + + + @@ -4815,6 +5905,16 @@ + + + + + + + + + + @@ -4830,6 +5930,7 @@ + @@ -4849,24 +5950,39 @@ + + + + + + + + + + + + + + + @@ -4880,17 +5996,21 @@ + + + + @@ -4936,9 +6056,11 @@ + + @@ -4966,6 +6088,16 @@ + + + + + + + + + + @@ -4978,6 +6110,7 @@ +