Alawn/Java-8583-Util
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make parsing of invalid messages more robust

Browse Source 
git-svn-id: https://j8583.svn.sourceforge.net/svnroot/j8583/j8583@107 db60a039-f72e-0410-b1d2-baa000846441
This commit is contained in:
chochos
2012-06-14 18:22:34 +00:00
parent 4856c90632
commit 839b32c75a
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/solab/iso8583/MessageFactory.java
+16 -6
View File
@@ -236,7 +236,11 @@ public class MessageFactory {
* and the rest of the message must come. */
public IsoMessage parseMessage(byte[] buf, int isoHeaderLength)
throws ParseException, UnsupportedEncodingException {
IsoMessage m = new IsoMessage(isoHeaderLength > 0 ? new String(buf, 0, isoHeaderLength) : null);
final int minlength = isoHeaderLength+(useBinary ? 10 : 20);
if (buf.length < minlength) {
throw new ParseException("Insufficient buffer length, needs to be at least " + minlength, 0);
}
final IsoMessage m = new IsoMessage(isoHeaderLength > 0 ? new String(buf, 0, isoHeaderLength) : null);
m.setCharacterEncoding(encoding);
int type = 0;
if (useBinary) {
@@ -249,7 +253,7 @@ public class MessageFactory {
}
m.setType(type);
//Parse the bitmap (primary first)
BitSet bs = new BitSet(64);
final BitSet bs = new BitSet(64);
int pos = 0;
if (useBinary) {
for (int i = isoHeaderLength + 2; i < isoHeaderLength + 10; i++) {
@@ -261,6 +265,9 @@ public class MessageFactory {
}
//Check for secondary bitmap and parse if necessary
if (bs.get(0)) {
if (buf.length < minlength + 8) {
throw new ParseException("Insufficient length for secondary bitmap", minlength);
}
for (int i = isoHeaderLength + 10; i < isoHeaderLength + 18; i++) {
int bit = 128;
for (int b = 0; b < 8; b++) {
@@ -268,9 +275,9 @@ public class MessageFactory {
bit >>= 1;
}
}
pos = 18 + isoHeaderLength;
pos = minlength + 8;
} else {
pos = 10 + isoHeaderLength;
pos = minlength;
}
} else {
//ASCII parsing
@@ -295,6 +302,9 @@ public class MessageFactory {
}
//Check for secondary bitmap and parse it if necessary
if (bs.get(0)) {
if (buf.length < minlength + 16) {
throw new ParseException("Insufficient length for secondary bitmap", minlength);
}
for (int i = isoHeaderLength + 20; i < isoHeaderLength + 36; i++) {
if (buf[i] >= '0' && buf[i] <= '9') {
bs.set(pos++, ((buf[i] - 48) & 8) > 0);
@@ -313,9 +323,9 @@ public class MessageFactory {
bs.set(pos++, ((buf[i] - 87) & 1) > 0);
}
}
pos = 36 + isoHeaderLength;
pos = 16 + minlength;
} else {
pos = 20 + isoHeaderLength;
pos = minlength;
}
} catch (NumberFormatException ex) {
ParseException _e = new ParseException("Invalid ISO8583 bitmap", pos);