Skip to content

Changes for Release 1.9.8 #147

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 15, 2018
Merged

Changes for Release 1.9.8 #147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
283327f
Updating pom.xml and classpath for SensitiveLogger
vijayabraj Oct 15, 2018
574d1ff
Merge pull request #146 from vijayabraj/master
gnongsie Oct 15, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,6 @@
<classpathentry kind="lib" path="lib/hamcrest-core-1.3.jar"/>
<classpathentry kind="lib" path="lib/hamcrest-library-1.3.jar"/>
<classpathentry kind="lib" path="lib/jmock-2.6.0.jar"/>
<classpathentry kind="lib" path="lib/gson-2.3.1.jar" />
<classpathentry kind="output" path="target/classes"/>
</classpath>
Binary file added lib/gson-2.3.1.jar
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.3.1</version>
<scope>compile</scope>
</dependency>
</dependencies>
<properties>
Expand Down
82 changes: 45 additions & 37 deletions src/main/java/net/authorize/util/SensitiveFilterLayout.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,48 +24,56 @@ public class SensitiveFilterLayout extends PatternLayout{
private static Gson gson;

public SensitiveFilterLayout() throws UnsupportedEncodingException, FileNotFoundException, IOException {
GsonBuilder gsonBuilder = new GsonBuilder();
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];
try {
GsonBuilder gsonBuilder = new GsonBuilder();
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];

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<noOfSensitiveTags; j++) {
String tagName = configType.sensitiveTags[j].tagName;
String pattern = configType.sensitiveTags[j].pattern;
String replacement = configType.sensitiveTags[j].replacement;

if(pattern != null && !pattern.isEmpty())
tagPatterns[j] = Pattern.compile("<"+tagName+">"+pattern+"</"+tagName+">");
else
tagPatterns[j] = Pattern.compile("<"+tagName+">"+".+"+"</"+tagName+">");
tagReplacements[j] = "<"+tagName+">"+replacement+"</"+tagName+">";
}
if(reader!=null)
reader.close();
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<noOfSensitiveTags; j++) {
String tagName = configType.sensitiveTags[j].tagName;
String pattern = configType.sensitiveTags[j].pattern;
String replacement = configType.sensitiveTags[j].replacement;

if(pattern != null && !pattern.isEmpty())
tagPatterns[j] = Pattern.compile("<"+tagName+">"+pattern+"</"+tagName+">");
else
tagPatterns[j] = Pattern.compile("<"+tagName+">"+".+"+"</"+tagName+">");
tagReplacements[j] = "<"+tagName+">"+replacement+"</"+tagName+">";
}
if(reader!=null)
reader.close();
}
catch(Exception e){
}
}

@Override
public String format(LoggingEvent event) {
if(event.getMessage() instanceof String) {
String message = event.getRenderedMessage();
String maskXmlMessage = SensitiveFilterLayout.maskSensitiveXmlString(message);
String maskCardNumber = SensitiveFilterLayout.maskCreditCards(maskXmlMessage);

Throwable throwable = event.getThrowableInformation() != null ? event.getThrowableInformation().getThrowable() : null;
LoggingEvent maskedEvent = new LoggingEvent(event.fqnOfCategoryClass, Logger.getLogger(event.getLoggerName()), event.timeStamp, event.getLevel(), maskCardNumber, throwable);
return super.format(maskedEvent);
try {
if(event.getMessage() instanceof String) {
String message = event.getRenderedMessage();
String maskXmlMessage = SensitiveFilterLayout.maskSensitiveXmlString(message);
String maskCardNumber = SensitiveFilterLayout.maskCreditCards(maskXmlMessage);

Throwable throwable = event.getThrowableInformation() != null ? event.getThrowableInformation().getThrowable() : null;
LoggingEvent maskedEvent = new LoggingEvent(event.fqnOfCategoryClass, Logger.getLogger(event.getLoggerName()), event.timeStamp, event.getLevel(), maskCardNumber, throwable);
return super.format(maskedEvent);
}
}
catch(Exception e){
}
return null;
}
Expand Down
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