From 394f9f2bb6fb6260a176fca4eac090385c433e4c Mon Sep 17 00:00:00 2001
From: Alexandre Archambault <alexandre.archambault@gmail.com>
Date: Thu, 11 May 2017 17:48:44 +0200
Subject: [PATCH] Handle html entities in XML files

---
 .../core/compatibility/Entities.scala         | 99 +++++++++++++++++++
 .../coursier/core/compatibility/package.scala | 16 ++-
 .../org.codehaus.plexus/plexus/1.0.4          |  1 +
 .../scala/coursier/test/CentralTests.scala    |  7 ++
 4 files changed, 122 insertions(+), 1 deletion(-)
 create mode 100644 core/jvm/src/main/scala/coursier/core/compatibility/Entities.scala
 create mode 100644 tests/shared/src/test/resources/resolutions/org.codehaus.plexus/plexus/1.0.4

diff --git a/core/jvm/src/main/scala/coursier/core/compatibility/Entities.scala b/core/jvm/src/main/scala/coursier/core/compatibility/Entities.scala
new file mode 100644
index 000000000..d0ee727c5
--- /dev/null
+++ b/core/jvm/src/main/scala/coursier/core/compatibility/Entities.scala
@@ -0,0 +1,99 @@
+package coursier.core.compatibility
+
+object Entities {
+
+  // Generated via https://gist.github.com/alexarchambault/79388ff31ec8cbddf6607b55ab2f6527
+
+  val entities = Vector(
+    ("&nbsp;", "&#160;"),
+    ("&iexcl;", "&#161;"),
+    ("&cent;", "&#162;"),
+    ("&pound;", "&#163;"),
+    ("&curren;", "&#164;"),
+    ("&yen;", "&#165;"),
+    ("&brvbar;", "&#166;"),
+    ("&sect;", "&#167;"),
+    ("&uml;", "&#168;"),
+    ("&copy;", "&#169;"),
+    ("&ordf;", "&#170;"),
+    ("&laquo;", "&#171;"),
+    ("&not;", "&#172;"),
+    ("&shy;", "&#173;"),
+    ("&reg;", "&#174;"),
+    ("&macr;", "&#175;"),
+    ("&deg;", "&#176;"),
+    ("&plusmn;", "&#177;"),
+    ("&acute;", "&#180;"),
+    ("&micro;", "&#181;"),
+    ("&para;", "&#182;"),
+    ("&middot;", "&#183;"),
+    ("&cedil;", "&#184;"),
+    ("&ordm;", "&#186;"),
+    ("&raquo;", "&#187;"),
+    ("&iquest;", "&#191;"),
+    ("&Agrave;", "&#192;"),
+    ("&Aacute;", "&#193;"),
+    ("&Acirc;", "&#194;"),
+    ("&Atilde;", "&#195;"),
+    ("&Auml;", "&#196;"),
+    ("&Aring;", "&#197;"),
+    ("&AElig;", "&#198;"),
+    ("&Ccedil;", "&#199;"),
+    ("&Egrave;", "&#200;"),
+    ("&Eacute;", "&#201;"),
+    ("&Ecirc;", "&#202;"),
+    ("&Euml;", "&#203;"),
+    ("&Igrave;", "&#204;"),
+    ("&Iacute;", "&#205;"),
+    ("&Icirc;", "&#206;"),
+    ("&Iuml;", "&#207;"),
+    ("&ETH;", "&#208;"),
+    ("&Ntilde;", "&#209;"),
+    ("&Ograve;", "&#210;"),
+    ("&Oacute;", "&#211;"),
+    ("&Ocirc;", "&#212;"),
+    ("&Otilde;", "&#213;"),
+    ("&Ouml;", "&#214;"),
+    ("&times;", "&#215;"),
+    ("&Oslash;", "&#216;"),
+    ("&Ugrave;", "&#217;"),
+    ("&Uacute;", "&#218;"),
+    ("&Ucirc;", "&#219;"),
+    ("&Uuml;", "&#220;"),
+    ("&Yacute;", "&#221;"),
+    ("&THORN;", "&#222;"),
+    ("&szlig;", "&#223;"),
+    ("&agrave;", "&#224;"),
+    ("&aacute;", "&#225;"),
+    ("&acirc;", "&#226;"),
+    ("&atilde;", "&#227;"),
+    ("&auml;", "&#228;"),
+    ("&aring;", "&#229;"),
+    ("&aelig;", "&#230;"),
+    ("&ccedil;", "&#231;"),
+    ("&egrave;", "&#232;"),
+    ("&eacute;", "&#233;"),
+    ("&ecirc;", "&#234;"),
+    ("&euml;", "&#235;"),
+    ("&igrave;", "&#236;"),
+    ("&iacute;", "&#237;"),
+    ("&icirc;", "&#238;"),
+    ("&iuml;", "&#239;"),
+    ("&eth;", "&#240;"),
+    ("&ntilde;", "&#241;"),
+    ("&ograve;", "&#242;"),
+    ("&oacute;", "&#243;"),
+    ("&ocirc;", "&#244;"),
+    ("&otilde;", "&#245;"),
+    ("&ouml;", "&#246;"),
+    ("&divide;", "&#247;"),
+    ("&oslash;", "&#248;"),
+    ("&ugrave;", "&#249;"),
+    ("&uacute;", "&#250;"),
+    ("&ucirc;", "&#251;"),
+    ("&uuml;", "&#252;"),
+    ("&yacute;", "&#253;"),
+    ("&thorn;", "&#254;"),
+    ("&yuml;", "&#255;")
+  )
+}
diff --git a/core/jvm/src/main/scala/coursier/core/compatibility/package.scala b/core/jvm/src/main/scala/coursier/core/compatibility/package.scala
index b6b63e269..87146078f 100644
--- a/core/jvm/src/main/scala/coursier/core/compatibility/package.scala
+++ b/core/jvm/src/main/scala/coursier/core/compatibility/package.scala
@@ -2,6 +2,8 @@ package coursier.core
 
 import coursier.util.Xml
 
+import java.util.regex.Pattern.quote
+
 import scala.collection.JavaConverters._
 import scala.xml.{ Attribute, MetaData, Null }
 
@@ -14,11 +16,23 @@ package object compatibility {
     def letter = c.isLetter
   }
 
+  private val entityPattern = (quote("&") + "[a-zA-Z]+" + quote(";")).r
+
   private val utf8Bom = "\ufeff"
 
   def xmlParse(s: String): Either[String, Xml.Node] = {
+
+    val content =
+      if (entityPattern.findFirstIn(s).isEmpty)
+        s
+      else
+        Entities.entities.foldLeft(s) {
+          case (s0, (target, replacement)) =>
+            s0.replace(target, replacement)
+        }
+
     def parse =
-      try Right(scala.xml.XML.loadString(s.stripPrefix(utf8Bom)))
+      try Right(scala.xml.XML.loadString(content.stripPrefix(utf8Bom)))
       catch { case e: Exception => Left(e.toString + Option(e.getMessage).fold("")(" (" + _ + ")")) }
 
     def fromNode(node: scala.xml.Node): Xml.Node =
diff --git a/tests/shared/src/test/resources/resolutions/org.codehaus.plexus/plexus/1.0.4 b/tests/shared/src/test/resources/resolutions/org.codehaus.plexus/plexus/1.0.4
new file mode 100644
index 000000000..8d5ac7bf8
--- /dev/null
+++ b/tests/shared/src/test/resources/resolutions/org.codehaus.plexus/plexus/1.0.4
@@ -0,0 +1 @@
+org.codehaus.plexus:plexus:1.0.4:compile
diff --git a/tests/shared/src/test/scala/coursier/test/CentralTests.scala b/tests/shared/src/test/scala/coursier/test/CentralTests.scala
index 63fe3e665..e494f0c1c 100644
--- a/tests/shared/src/test/scala/coursier/test/CentralTests.scala
+++ b/tests/shared/src/test/scala/coursier/test/CentralTests.scala
@@ -616,6 +616,13 @@ object CentralTests extends TestSuite {
       }
     }
 
+    'entities - {
+      'odash - resolutionCheck(
+        Module("org.codehaus.plexus", "plexus"),
+        "1.0.4"
+      )
+    }
+
     'parentBeforeImports - {
       * - resolutionCheck(
         Module("org.kie", "kie-api"),