Skip to content

The Unified and Autonomous Development Platform

fix: upgrade failed due to invalid XML character (Unicode: 0xffff) (#1392)

Robin Shen8c83037506f1
diff --git a/server-core/src/main/java/io/onedev/server/migration/VersionedXmlDoc.java b/server-core/src/main/java/io/onedev/server/migration/VersionedXmlDoc.java
index cf4e75b813..a245a1b110 100644
--- a/server-core/src/main/java/io/onedev/server/migration/VersionedXmlDoc.java
+++ b/server-core/src/main/java/io/onedev/server/migration/VersionedXmlDoc.java
@@ -404,6 +404,7 @@ public final class VersionedXmlDoc implements Document, Externalizable {
}
public static VersionedXmlDoc fromXML(String xml) {
+ xml = stripInvalidChars(xml);
try {
// remove special characters
Matcher matcher = SPECIAL_CHARACTERS.matcher(xml);
@@ -417,7 +418,27 @@ public final class VersionedXmlDoc implements Document, Externalizable {
throw ExceptionUtils.unchecked(e);
}
}
-
+
+ private static String stripInvalidChars(String string) {
+ StringBuilder builder = new StringBuilder();
+
+ char ch;
+ for (int i=0; i<string.length(); i++) {
+ ch = string.charAt(i);
+ if (ch == 0x9
+ || ch == 0xA
+ || ch == 0xD
+ || (ch >= 0x20 && ch <= 0xD7FF)
+ || (ch >= 0xE000 && ch <= 0xFFFD)
+ || (ch >= 0x10000 && ch <= 0x10FFFF)) {
+ builder.append(ch);
+ } else {
+ builder.append('?');
+ }
+ }
+ return builder.toString();
+ }
+
public static VersionedXmlDoc fromFile(File file) {
try {
return fromXML(FileUtils.readFileToString(file, StandardCharsets.UTF_8.name()));