From cf6298ef0abb2e61824b4cd38397bcdee7617e7c Mon Sep 17 00:00:00 2001 From: Mike Kienenberger Date: Thu, 4 Jun 2020 13:44:46 -0400 Subject: [PATCH] Warn if the configuration file is missing or exception occurs during processing. Close open resources even if an exception occurs. --- .../authorize/util/SensitiveFilterLayout.java | 67 ++++++++++++------- 1 file changed, 42 insertions(+), 25 deletions(-) diff --git a/src/main/java/net/authorize/util/SensitiveFilterLayout.java b/src/main/java/net/authorize/util/SensitiveFilterLayout.java index b425c3e0..9e279847 100644 --- a/src/main/java/net/authorize/util/SensitiveFilterLayout.java +++ b/src/main/java/net/authorize/util/SensitiveFilterLayout.java @@ -1,6 +1,7 @@ package net.authorize.util; import java.io.BufferedReader; +import java.io.Closeable; import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; @@ -17,7 +18,9 @@ public class SensitiveFilterLayout extends PatternLayout{ - private static Pattern[] cardPatterns; + private static final String SENSITIVE_CONFIG_FILE_NAME = "/AuthorizedNetSensitiveTagsConfig.json"; + + private static Pattern[] cardPatterns; private static Pattern[] tagPatterns; private static String[] tagReplacements; @@ -29,34 +32,48 @@ public SensitiveFilterLayout() throws UnsupportedEncodingException, FileNotFound gsonBuilder.registerTypeAdapter(SensitiveDataConfigType.class, new SensitiveTagsDeserializer()); gson = gsonBuilder.create(); - InputStream in = getClass().getResourceAsStream("/AuthorizedNetSensitiveTagsConfig.json"); - BufferedReader reader = new BufferedReader(new InputStreamReader(in)); - SensitiveDataConfigType configType = gson.fromJson(reader, SensitiveDataConfigType.class); - cardPatterns = new Pattern[configType.sensitiveStringRegexes.length]; + InputStream in = getClass().getResourceAsStream(SENSITIVE_CONFIG_FILE_NAME); + Closeable closeableResource = in; + if (null != in) { + try { + InputStreamReader inputStreamReader = new InputStreamReader(in); + closeableResource = inputStreamReader; + BufferedReader reader = new BufferedReader(inputStreamReader); + closeableResource = reader; + SensitiveDataConfigType configType = gson.fromJson(reader, SensitiveDataConfigType.class); + cardPatterns = new Pattern[configType.sensitiveStringRegexes.length]; - for(int i = 0; i < configType.sensitiveStringRegexes.length; i++) { - cardPatterns[i] = Pattern.compile(configType.sensitiveStringRegexes[i]); - } - - int noOfSensitiveTags = configType.sensitiveTags.length; - tagPatterns = new Pattern[noOfSensitiveTags]; - tagReplacements = new String[noOfSensitiveTags]; - - for(int j=0; j"+pattern+""); - else - tagPatterns[j] = Pattern.compile("<"+tagName+">"+".+"+""); - tagReplacements[j] = "<"+tagName+">"+replacement+""; - } - if(reader!=null) - reader.close(); + int noOfSensitiveTags = configType.sensitiveTags.length; + tagPatterns = new Pattern[noOfSensitiveTags]; + tagReplacements = new String[noOfSensitiveTags]; + + for(int j=0; j"+pattern+""); + else + tagPatterns[j] = Pattern.compile("<"+tagName+">"+".+"+""); + tagReplacements[j] = "<"+tagName+">"+replacement+""; + } + } finally { + closeableResource.close(); + } + } else { + // no logging system configured, so System.err is the only option... + System.err.println("Resource "+ SENSITIVE_CONFIG_FILE_NAME + " not found when configuring SensitiveFilterLayout"); + } } catch(Exception e){ + // no logging system configured, so System.err is the only option... + System.err.println("Something went wrong configuring the SensitiveFilterLayout"); + e.printStackTrace(System.err); } } pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy