Revert "Disable XML external entities before parsing."

This reverts commit b1e75a29614352a74693c838be234238aaa2fb0f.

16 files changed, 5 insertions, 38 deletions

diff --git a/src/net/java/sip/communicator/impl/contactlist/MclStorageManager.java b/src/net/java/sip/communicator/impl/contactlist/MclStorageManager.java
index 77fd7c2..01721ef 100644
--- a/src/net/java/sip/communicator/impl/contactlist/MclStorageManager.java
+++ b/src/net/java/sip/communicator/impl/contactlist/MclStorageManager.java
@@ -348,7 +348,6 @@ public class MclStorageManager
             // load the contact list
             DocumentBuilderFactory factory =
                 DocumentBuilderFactory.newInstance();
-            XMLUtils.disableExternalEntities(factory);
             DocumentBuilder builder = factory.newDocumentBuilder();
             if (contactlistFile.length() == 0)
             {
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/thumbnail/ThumbnailElement.java b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/thumbnail/ThumbnailElement.java
index 9f1b9fe..3b89bdd 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/thumbnail/ThumbnailElement.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/thumbnail/ThumbnailElement.java
@@ -13,7 +13,6 @@ import javax.xml.parsers.*;
 
 import net.java.sip.communicator.util.*;
 
-import org.jitsi.util.xml.*;
 import org.w3c.dom.*;
 
 /**
@@ -98,7 +97,6 @@ public class ThumbnailElement
     {
         DocumentBuilderFactory factory =
             DocumentBuilderFactory.newInstance();
-        XMLUtils.disableExternalEntities(factory);
 
           DocumentBuilder builder;
           try
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardObjectCircleJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardObjectCircleJabberImpl.java
index 24dc0d1..9dfa974 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardObjectCircleJabberImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardObjectCircleJabberImpl.java
@@ -16,7 +16,6 @@ import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.whiteboardobjects.*;
 import net.java.sip.communicator.util.*;
 
-import org.jitsi.util.xml.*;
 import org.w3c.dom.*;
 
 /**
@@ -69,7 +68,6 @@ public class WhiteboardObjectCircleJabberImpl
     {
         DocumentBuilderFactory factory =
           DocumentBuilderFactory.newInstance ();
-        XMLUtils.disableExternalEntities(factory);
         DocumentBuilder builder;
         try
         {
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardObjectImageJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardObjectImageJabberImpl.java
index 2c658d4..b04263d 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardObjectImageJabberImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardObjectImageJabberImpl.java
@@ -15,7 +15,6 @@ import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.whiteboardobjects.*;
 import net.java.sip.communicator.util.*;
 
-import org.jitsi.util.xml.*;
 import org.w3c.dom.*;
 
 /**
@@ -70,7 +69,6 @@ public class WhiteboardObjectImageJabberImpl
     {
         DocumentBuilderFactory factory =
           DocumentBuilderFactory.newInstance ();
-        XMLUtils.disableExternalEntities(factory);
         DocumentBuilder builder;
         try
         {
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardObjectLineJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardObjectLineJabberImpl.java
index 3a1106a..55085e1 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardObjectLineJabberImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardObjectLineJabberImpl.java
@@ -16,7 +16,6 @@ import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.whiteboardobjects.*;
 import net.java.sip.communicator.util.*;
 
-import org.jitsi.util.xml.*;
 import org.w3c.dom.*;
 
 /**
@@ -61,7 +60,6 @@ public class WhiteboardObjectLineJabberImpl
     {
         DocumentBuilderFactory factory =
           DocumentBuilderFactory.newInstance ();
-        XMLUtils.disableExternalEntities(factory);
         DocumentBuilder builder;
         try
         {
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardObjectPacketExtension.java b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardObjectPacketExtension.java
index f78ca3f..1d2e69c 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardObjectPacketExtension.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardObjectPacketExtension.java
@@ -13,7 +13,6 @@ import javax.xml.parsers.*;
 
 import net.java.sip.communicator.util.*;
 
-import org.jitsi.util.xml.*;
 import org.jivesoftware.smack.packet.*;
 import org.w3c.dom.*;
 
@@ -111,7 +110,6 @@ public class WhiteboardObjectPacketExtension implements PacketExtension
     {
         DocumentBuilderFactory factory =
           DocumentBuilderFactory.newInstance ();
-        XMLUtils.disableExternalEntities(factory);
         DocumentBuilder builder;
         try
         {
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardObjectPathJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardObjectPathJabberImpl.java
index 9dd7de1..3db8cfe 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardObjectPathJabberImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardObjectPathJabberImpl.java
@@ -18,7 +18,6 @@ import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.whiteboardobjects.*;
 import net.java.sip.communicator.util.*;
 
-import org.jitsi.util.xml.*;
 import org.w3c.dom.*;
 
 /**
@@ -60,7 +59,6 @@ public class WhiteboardObjectPathJabberImpl
     {
         DocumentBuilderFactory factory =
           DocumentBuilderFactory.newInstance ();
-        XMLUtils.disableExternalEntities(factory);
         DocumentBuilder builder;
         try
         {
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardObjectPolyLineJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardObjectPolyLineJabberImpl.java
index 0fcb284..fd62eca 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardObjectPolyLineJabberImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardObjectPolyLineJabberImpl.java
@@ -17,7 +17,6 @@ import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.whiteboardobjects.*;
 import net.java.sip.communicator.util.*;
 
-import org.jitsi.util.xml.*;
 import org.w3c.dom.*;
 
 /**
@@ -59,7 +58,6 @@ public class WhiteboardObjectPolyLineJabberImpl
     {
         DocumentBuilderFactory factory =
           DocumentBuilderFactory.newInstance ();
-        XMLUtils.disableExternalEntities(factory);
         DocumentBuilder builder;
         try
         {
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardObjectPolygonJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardObjectPolygonJabberImpl.java
index 0a1a281..4bc933a 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardObjectPolygonJabberImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardObjectPolygonJabberImpl.java
@@ -17,7 +17,6 @@ import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.whiteboardobjects.*;
 import net.java.sip.communicator.util.*;
 
-import org.jitsi.util.xml.*;
 import org.w3c.dom.*;
 
 /**
@@ -69,7 +68,6 @@ public class WhiteboardObjectPolygonJabberImpl
     {
         DocumentBuilderFactory factory =
           DocumentBuilderFactory.newInstance ();
-        XMLUtils.disableExternalEntities(factory);
         DocumentBuilder builder;
         try
         {
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardObjectRectJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardObjectRectJabberImpl.java
index 896ea3e..34b992d 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardObjectRectJabberImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardObjectRectJabberImpl.java
@@ -16,7 +16,6 @@ import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.whiteboardobjects.*;
 import net.java.sip.communicator.util.*;
 
-import org.jitsi.util.xml.*;
 import org.w3c.dom.*;
 
 /**
@@ -103,7 +102,6 @@ public class WhiteboardObjectRectJabberImpl
     {
         DocumentBuilderFactory factory =
           DocumentBuilderFactory.newInstance ();
-        XMLUtils.disableExternalEntities(factory);
         DocumentBuilder builder;
         try
         {
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardObjectTextJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardObjectTextJabberImpl.java
index cf9dc26..e0d1fef 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardObjectTextJabberImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardObjectTextJabberImpl.java
@@ -16,7 +16,6 @@ import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.whiteboardobjects.*;
 import net.java.sip.communicator.util.*;
 
-import org.jitsi.util.xml.*;
 import org.w3c.dom.*;
 
 /**
@@ -74,7 +73,6 @@ public class WhiteboardObjectTextJabberImpl
     {
         DocumentBuilderFactory factory =
           DocumentBuilderFactory.newInstance ();
-        XMLUtils.disableExternalEntities(factory);
         DocumentBuilder builder;
         try
         {
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardSessionPacketExtension.java b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardSessionPacketExtension.java
index dbf590c..8a303e8 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardSessionPacketExtension.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/whiteboard/WhiteboardSessionPacketExtension.java
@@ -13,7 +13,6 @@ import javax.xml.parsers.*;
 import net.java.sip.communicator.impl.protocol.jabber.*;
 import net.java.sip.communicator.util.*;
 
-import org.jitsi.util.xml.*;
 import org.jivesoftware.smack.packet.*;
 import org.w3c.dom.*;
 
@@ -87,7 +86,6 @@ public class WhiteboardSessionPacketExtension
     {
         DocumentBuilderFactory factory =
           DocumentBuilderFactory.newInstance ();
-        XMLUtils.disableExternalEntities(factory);
 
         DocumentBuilder builder;
         try
diff --git a/src/net/java/sip/communicator/impl/protocol/sip/OperationSetDesktopSharingServerSipImpl.java b/src/net/java/sip/communicator/impl/protocol/sip/OperationSetDesktopSharingServerSipImpl.java
index fc4e810..e332a52 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/OperationSetDesktopSharingServerSipImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/OperationSetDesktopSharingServerSipImpl.java
@@ -27,7 +27,6 @@ import net.java.sip.communicator.util.*;
 import org.jitsi.service.neomedia.MediaType;
 import org.jitsi.service.neomedia.device.*;
 import org.jitsi.service.neomedia.format.*;
-import org.jitsi.util.xml.*;
 import org.w3c.dom.*;
 import org.xml.sax.*;
 
@@ -490,11 +489,9 @@ public class OperationSetDesktopSharingServerSipImpl
 
                 try
                 {
-                    DocumentBuilderFactory factory
-                        = DocumentBuilderFactory.newInstance();
-                    XMLUtils.disableExternalEntities(factory);
                     document
-                        = factory.newDocumentBuilder()
+                        = DocumentBuilderFactory.newInstance()
+                            .newDocumentBuilder()
                                 .parse(new ByteArrayInputStream(rawContent));
                 }
                 catch (IOException ioe)
diff --git a/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberServerChooserDialog.java b/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberServerChooserDialog.java
index 9737a37..9abaad6 100644
--- a/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberServerChooserDialog.java
+++ b/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberServerChooserDialog.java
@@ -23,7 +23,6 @@ import net.java.sip.communicator.plugin.desktoputil.*;
 import net.java.sip.communicator.util.*;
 
 import org.jitsi.service.fileaccess.*;
-import org.jitsi.util.xml.*;
 import org.osgi.framework.*;
 import org.w3c.dom.*;
 import org.xml.sax.*;
@@ -240,9 +239,8 @@ public class JabberServerChooserDialog
             }
 
             FileInputStream fis = new FileInputStream(localServersListFile);
-            DocumentBuilderFactory factory
-                = DocumentBuilderFactory.newInstance();
-            XMLUtils.disableExternalEntities(factory);
+            DocumentBuilderFactory factory = DocumentBuilderFactory
+                .newInstance();
             DocumentBuilder constructor = factory.newDocumentBuilder();
             Document document = constructor.parse(fis);
             Element root = document.getDocumentElement();
@@ -316,7 +314,6 @@ public class JabberServerChooserDialog
                 // Create a builder factory
                 DocumentBuilderFactory factory
                     = DocumentBuilderFactory.newInstance();
-                XMLUtils.disableExternalEntities(factory);
 
                 // Create the builder and parse the file
                 serverComments = factory.newDocumentBuilder()
diff --git a/src/net/java/sip/communicator/plugin/jabberaccregwizz/jabberaccregwizz.manifest.mf b/src/net/java/sip/communicator/plugin/jabberaccregwizz/jabberaccregwizz.manifest.mf
index e1b222c..2ad0e96 100755
--- a/src/net/java/sip/communicator/plugin/jabberaccregwizz/jabberaccregwizz.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/jabberaccregwizz/jabberaccregwizz.manifest.mf
@@ -46,6 +46,5 @@ Import-Package: org.osgi.framework,
  javax.swing.tree,
  javax.swing.undo,
  javax.swing.border,
- org.jitsi.util.xml,
  org.jivesoftware.smack,
  org.jivesoftware.smack.packet
diff --git a/src/net/java/sip/communicator/service/protocol/media/ConferenceInfoDocument.java b/src/net/java/sip/communicator/service/protocol/media/ConferenceInfoDocument.java
index 3d8778c..2641fce 100644
--- a/src/net/java/sip/communicator/service/protocol/media/ConferenceInfoDocument.java
+++ b/src/net/java/sip/communicator/service/protocol/media/ConferenceInfoDocument.java
@@ -224,11 +224,8 @@ public class ConferenceInfoDocument
 
         try
         {
-            DocumentBuilderFactory factory
-                = DocumentBuilderFactory.newInstance();
-            XMLUtils.disableExternalEntities(factory);
             document
-                = factory.newDocumentBuilder()
+                    = DocumentBuilderFactory.newInstance().newDocumentBuilder()
                     .parse(new ByteArrayInputStream(bytes));
         }
         catch (Exception e)