diff --git a/.idea/mobibot.iml b/.idea/mobibot.iml index ff7c6e0..e4284c1 100644 --- a/.idea/mobibot.iml +++ b/.idea/mobibot.iml @@ -1,5 +1,5 @@ - + diff --git a/.idea/modules/mobibot.main.iml b/.idea/modules/mobibot.main.iml index 8c73c3a..763c148 100644 --- a/.idea/modules/mobibot.main.iml +++ b/.idea/modules/mobibot.main.iml @@ -1,5 +1,5 @@ - + @@ -12,8 +12,10 @@ + + @@ -30,8 +32,7 @@ - - + @@ -40,7 +41,6 @@ - diff --git a/.idea/modules/mobibot.test.iml b/.idea/modules/mobibot.test.iml index 1811810..4435909 100644 --- a/.idea/modules/mobibot.test.iml +++ b/.idea/modules/mobibot.test.iml @@ -1,5 +1,5 @@ - + diff --git a/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java b/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java index 25ac76b..f50da5d 100644 --- a/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java +++ b/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java @@ -14,13 +14,13 @@ import java.time.*; public final class ReleaseInfo { public static final String PROJECT = "mobibot"; public static final LocalDateTime BUILDDATE = - LocalDateTime.ofInstant(Instant.ofEpochMilli(1584495033449L), ZoneId.systemDefault()); + LocalDateTime.ofInstant(Instant.ofEpochMilli(1584571512171L), ZoneId.systemDefault()); public static final int MAJOR = 0; public static final int MINOR = 7; public static final int PATCH = 3; public static final String PRERELEASE = "beta"; - public static final String BUILDMETA = "566"; - public static final String VERSION = "0.7.3-beta+566"; + public static final String BUILDMETA = "579"; + public static final String VERSION = "0.7.3-beta+579"; /** * Disables the default constructor. diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/CurrencyConverter.java b/src/main/java/net/thauvin/erik/mobibot/modules/CurrencyConverter.java index cb8ed9c..0d4cfe7 100644 --- a/src/main/java/net/thauvin/erik/mobibot/modules/CurrencyConverter.java +++ b/src/main/java/net/thauvin/erik/mobibot/modules/CurrencyConverter.java @@ -47,6 +47,7 @@ import org.jdom2.JDOMException; import org.jdom2.Namespace; import org.jdom2.input.SAXBuilder; +import javax.xml.XMLConstants; import java.io.IOException; import java.net.URL; import java.text.NumberFormat; @@ -137,6 +138,9 @@ public final class CurrencyConverter extends ThreadedModule { if (EXCHANGE_RATES.isEmpty()) { try { final SAXBuilder builder = new SAXBuilder(); + // See https://rules.sonarsource.com/java/tag/owasp/RSPEC-2755 + builder.setProperty(XMLConstants.ACCESS_EXTERNAL_DTD, ""); + builder.setProperty(XMLConstants.ACCESS_EXTERNAL_SCHEMA, ""); builder.setIgnoringElementContentWhitespace(true); final Document doc = builder.build(new URL(EXCHANGE_TABLE_URL)); diff --git a/version.properties b/version.properties index a198481..cbd68fc 100644 --- a/version.properties +++ b/version.properties @@ -1,9 +1,9 @@ #Generated by the Semver Plugin for Gradle -#Wed Mar 18 15:07:49 PDT 2020 -version.buildmeta=574 +#Wed Mar 18 15:45:11 PDT 2020 +version.buildmeta=579 version.major=0 version.minor=7 version.patch=3 version.prerelease=beta version.project=mobibot -version.semver=0.7.3-beta+574 +version.semver=0.7.3-beta+579