From 445da0e6584c78f6a74c3da690a1877931290abd Mon Sep 17 00:00:00 2001 From: Connor Tumbleson Date: Sun, 30 Jul 2023 13:48:26 -0400 Subject: [PATCH] Move to XMLUnit Legacy (#3235) * build: migrate to xmlunit 2.9.1 * feat: opt into xxe protection for test suite --- .../apktool-lib/src/test/java/brut/androlib/BaseTest.java | 2 ++ build.gradle | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/brut.apktool/apktool-lib/src/test/java/brut/androlib/BaseTest.java b/brut.apktool/apktool-lib/src/test/java/brut/androlib/BaseTest.java index 104f5476..acc8785c 100644 --- a/brut.apktool/apktool-lib/src/test/java/brut/androlib/BaseTest.java +++ b/brut.apktool/apktool-lib/src/test/java/brut/androlib/BaseTest.java @@ -115,6 +115,8 @@ public class BaseTest { Reader control = new FileReader(new File(sTestOrigDir, path)); Reader test = new FileReader(new File(sTestNewDir, path)); + XMLUnit.setEnableXXEProtection(true); + if (qualifier == null) { XMLUnit.setIgnoreWhitespace(true); XMLUnit.setIgnoreAttributeOrder(true); diff --git a/build.gradle b/build.gradle index 35928076..462867ae 100644 --- a/build.gradle +++ b/build.gradle @@ -28,7 +28,7 @@ buildscript { proguard_gradle: 'com.guardsquare:proguard-gradle:7.3.2', smali : 'com.android.tools.smali:smali:3.0.3', xmlpull : 'xpp3:xpp3:1.1.4c', - xmlunit : 'xmlunit:xmlunit:1.6', + xmlunit : 'org.xmlunit:xmlunit-legacy:2.9.1', ] }