Skip to content
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

ProtectDebugInfo: Make wipe and protect iso paths #136

Merged
merged 1 commit into from
Feb 20, 2020
Merged

ProtectDebugInfo: Make wipe and protect iso paths #136

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
46 changes: 21 additions & 25 deletions modules/txn/src/main/java/org/jpos/transaction/ProtectDebugInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@

import org.jpos.core.Configuration;
import org.jpos.core.ConfigurationException;
import org.jpos.iso.ISOException;
import org.jpos.iso.ISOMsg;
import org.jpos.iso.ISOUtil;
import org.jpos.util.FSDMsg;
Expand Down Expand Up @@ -59,8 +60,8 @@ public class ProtectDebugInfo extends TxnSupport implements AbortParticipant {
private String[] protectedEntrys;
private String[] wipedEntrys;
private String[] protectFSD;
private int[] protectISO;
private int[] wipeISO;
private String[] protectISO;
private String[] wipeISO;

public int prepare (long id, Serializable o) {
return PREPARED | READONLY;
Expand All @@ -86,9 +87,9 @@ private void protect (Context ctx) {
if (m != null) {
m = (ISOMsg) m.clone();
ctx.put (s, m); // place a clone in the context
for (int p: protectISO)
for (String p: protectISO)
protectField(m,p);
for (int p: wipeISO)
for (String p: wipeISO)
wipeField(m,p);
}
}
Expand All @@ -107,19 +108,25 @@ private void protect (Context ctx) {
}
}
}
private void protectField (ISOMsg m, int f) {
private void protectField (ISOMsg m, String f) {
if (m != null) {
m.set (f, protect (m.getString (f)));
}
}
private void wipeField (ISOMsg m, int f) {
private void wipeField (ISOMsg m, String f) {
if (m != null) {
Object v = m.getValue(f);
if (v != null) {
if (v instanceof String)
m.set(f, ProtectedLogListener.WIPED);
else
m.set(f, ProtectedLogListener.BINARY_WIPED);
Object v = null;
try {
v = m.getValue(f);
if (v != null) {
if (v instanceof String)
m.set(f, ProtectedLogListener.WIPED);
else
m.set(f, ProtectedLogListener.BINARY_WIPED);
}
} catch (ISOException ignored) {
//ignore, valid routes for some messages in the context may not be vaild for others
//e.g. in transaction switches with protocol conversion
}
}
}
Expand Down Expand Up @@ -147,19 +154,8 @@ public void setConfiguration (Configuration cfg)
this.wipedEntrys = cfg.getAll("wipe-entry");
this.protectFSD = cfg.getAll("protect-FSDMsg");

try {
this.protectISO = parseInt(cfg.getAll("protect-ISOMsg"));
this.wipeISO = parseInt(cfg.getAll("wipe-ISOMsg"));
} catch (NumberFormatException e) {
throw new ConfigurationException (e);
}
this.protectISO = cfg.getAll("protect-ISOMsg");
this.wipeISO = cfg.getAll("wipe-ISOMsg");
}

private int[] parseInt(String[] ss) throws NumberFormatException {
int[] ii = new int[ss.length];
for (int i=0; i<ii.length; i++) {
ii[i] = Integer.parseInt(ss[i]);
}
return ii;
}
}