From 9d95f5194ab6f2916f6f21712fcefbd7e8b05439 Mon Sep 17 00:00:00 2001 From: Brian Rosenberger Date: Fri, 14 Jan 2022 14:35:55 +0000 Subject: [PATCH] Update Log4j2 dependency to 2.17.1 to resolve log4jshell vulnerability git-svn-id: https://brutex.net/svn/xservices/trunk@197 e7e49efb-446e-492e-b9ec-fcafc1997a86 --- ivy.xml | 58 +++++++++++++----- ivysettings.xml | 2 +- lib/DocBuilder-20131001.jar | Bin 0 -> 24724 bytes .../xservices/security/XServicesRealm.java | 24 ++------ .../xservices/types/StringMatchType.java | 2 +- .../BrutexHSQLQuartzConnectionProvider.java | 6 +- .../util/BrutexQuartzConnectionProvider.java | 5 -- .../xservices/util/OpenAirConnection.java | 14 ++++- .../ws/impl/OpenAirProxyServiceImpl.java | 13 +++- 9 files changed, 72 insertions(+), 52 deletions(-) create mode 100644 lib/DocBuilder-20131001.jar diff --git a/ivy.xml b/ivy.xml index 00ee93a..7b48f36 100644 --- a/ivy.xml +++ b/ivy.xml @@ -34,7 +34,7 @@ - + @@ -59,15 +59,15 @@ - - - + + + - + - + @@ -79,9 +79,12 @@ - - - + + + + + + @@ -96,9 +99,9 @@ - - - + + + @@ -140,8 +143,35 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ivysettings.xml b/ivysettings.xml index 22fbb58..f49f353 100644 --- a/ivysettings.xml +++ b/ivysettings.xml @@ -2,7 +2,7 @@ - + diff --git a/lib/DocBuilder-20131001.jar b/lib/DocBuilder-20131001.jar new file mode 100644 index 0000000000000000000000000000000000000000..e94f6a489952190af105b2af06338e514edf2557 GIT binary patch literal 24724 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 literal 0 HcmV?d00001 diff --git a/src/java/net/brutex/xservices/security/XServicesRealm.java b/src/java/net/brutex/xservices/security/XServicesRealm.java index 41ae528..60198b2 100644 --- a/src/java/net/brutex/xservices/security/XServicesRealm.java +++ b/src/java/net/brutex/xservices/security/XServicesRealm.java @@ -17,30 +17,14 @@ package net.brutex.xservices.security; +import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.shiro.config.Ini; +import org.apache.shiro.realm.text.IniRealm; +import org.apache.shiro.util.Nameable; import java.net.URI; import java.net.URISyntaxException; -import java.net.URL; - -import javax.servlet.ServletContext; - -import org.apache.catalina.core.ApplicationContext; -import org.apache.logging.log4j.LogManager; -import org.apache.shiro.authc.AuthenticationException; -import org.apache.shiro.authc.AuthenticationInfo; -import org.apache.shiro.authc.AuthenticationToken; -import org.apache.shiro.authz.AuthorizationInfo; -import org.apache.shiro.authz.SimpleAuthorizationInfo; -import org.apache.shiro.config.Ini; -import org.apache.shiro.io.ResourceUtils; -import org.apache.shiro.realm.AuthorizingRealm; -import org.apache.shiro.realm.text.IniRealm; -import org.apache.shiro.realm.text.TextConfigurationRealm; -import org.apache.shiro.subject.PrincipalCollection; -import org.apache.shiro.util.Nameable; -import org.apache.shiro.web.env.IniWebEnvironment; -import org.apache.shiro.web.util.WebUtils; // TODO: Auto-generated Javadoc /* diff --git a/src/java/net/brutex/xservices/types/StringMatchType.java b/src/java/net/brutex/xservices/types/StringMatchType.java index de23688..d372933 100644 --- a/src/java/net/brutex/xservices/types/StringMatchType.java +++ b/src/java/net/brutex/xservices/types/StringMatchType.java @@ -29,7 +29,7 @@ import javax.xml.bind.annotation.XmlType; @XmlType public class StringMatchType { - public final List stringlist = new ArrayList(); + public final List stringlist = new ArrayList(); public int size = 0; public synchronized void addStringMatch(StringMatchDetails match) diff --git a/src/java/net/brutex/xservices/util/BrutexHSQLQuartzConnectionProvider.java b/src/java/net/brutex/xservices/util/BrutexHSQLQuartzConnectionProvider.java index 14ce0ae..51b4d8c 100644 --- a/src/java/net/brutex/xservices/util/BrutexHSQLQuartzConnectionProvider.java +++ b/src/java/net/brutex/xservices/util/BrutexHSQLQuartzConnectionProvider.java @@ -177,11 +177,7 @@ public class BrutexHSQLQuartzConnectionProvider implements ConnectionProvider { return false; } - @Override - public void initialize() throws SQLException { - // TODO Auto-generated method stub - - } + } diff --git a/src/java/net/brutex/xservices/util/BrutexQuartzConnectionProvider.java b/src/java/net/brutex/xservices/util/BrutexQuartzConnectionProvider.java index f67d91b..733080d 100644 --- a/src/java/net/brutex/xservices/util/BrutexQuartzConnectionProvider.java +++ b/src/java/net/brutex/xservices/util/BrutexQuartzConnectionProvider.java @@ -177,11 +177,6 @@ public class BrutexQuartzConnectionProvider implements ConnectionProvider { return false; } - @Override - public void initialize() throws SQLException { - // TODO Auto-generated method stub - - } } diff --git a/src/java/net/brutex/xservices/util/OpenAirConnection.java b/src/java/net/brutex/xservices/util/OpenAirConnection.java index 5a53ab7..d054346 100644 --- a/src/java/net/brutex/xservices/util/OpenAirConnection.java +++ b/src/java/net/brutex/xservices/util/OpenAirConnection.java @@ -3,10 +3,14 @@ */ package net.brutex.xservices.util; +import java.io.BufferedInputStream; +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStreamReader; import java.net.URL; -import org.apache.commons.configuration.ConfigurationException; -import org.apache.commons.configuration.PropertiesConfiguration; +import org.apache.commons.configuration2.ex.ConfigurationException; +import org.apache.commons.configuration2.PropertiesConfiguration; import org.apache.commons.jcs.JCS; import org.apache.commons.jcs.access.exception.CacheException; import org.apache.logging.log4j.LogManager; @@ -29,7 +33,9 @@ public final class OpenAirConnection { final URL configloc = OpenAirConnection.class.getClassLoader().getResource(config); logger.debug("Loading Open Air connection details from {}", configloc.toString()); - props = new PropertiesConfiguration(configloc); + props = new PropertiesConfiguration(); + props.read( new InputStreamReader( new BufferedInputStream(configloc.openStream())) ); + final String user = props.getString("user"); final String password = props.getString("password"); final String company = props.getString("company"); @@ -46,6 +52,8 @@ public final class OpenAirConnection { } catch (ConfigurationException e) { logger.error(e.getMessage(), e); e.printStackTrace(); + } catch (IOException e) { + e.printStackTrace(); } finally { } diff --git a/src/java/net/brutex/xservices/ws/impl/OpenAirProxyServiceImpl.java b/src/java/net/brutex/xservices/ws/impl/OpenAirProxyServiceImpl.java index 3ea6a09..c08fafd 100644 --- a/src/java/net/brutex/xservices/ws/impl/OpenAirProxyServiceImpl.java +++ b/src/java/net/brutex/xservices/ws/impl/OpenAirProxyServiceImpl.java @@ -15,6 +15,9 @@ */ package net.brutex.xservices.ws.impl; +import java.io.BufferedInputStream; +import java.io.IOException; +import java.io.InputStreamReader; import java.net.URL; import java.time.format.DateTimeFormatter; import java.util.ArrayList; @@ -27,8 +30,8 @@ import javax.activation.DataHandler; import javax.jws.WebParam; import javax.jws.WebService; -import org.apache.commons.configuration.ConfigurationException; -import org.apache.commons.configuration.PropertiesConfiguration; +import org.apache.commons.configuration2.ex.ConfigurationException; +import org.apache.commons.configuration2.PropertiesConfiguration; import org.apache.commons.jcs.JCS; import org.apache.commons.jcs.access.exception.CacheException; import org.apache.logging.log4j.LogManager; @@ -464,7 +467,8 @@ public class OpenAirProxyServiceImpl implements OpenAirProxyService { final URL configloc = this.getClass().getClassLoader().getResource(config); - props = new PropertiesConfiguration(configloc); + props = new PropertiesConfiguration(); + props.read( new InputStreamReader( new BufferedInputStream( configloc.openStream() ))); final String user = props.getString("user"); final String password = props.getString("password"); final String company = props.getString("company"); @@ -481,6 +485,9 @@ public class OpenAirProxyServiceImpl implements OpenAirProxyService { } catch (ConfigurationException e) { logger.error(e); e.printStackTrace(); + } catch (IOException e) { + logger.error(e); + e.printStackTrace(); } finally { }