From be54b9f38e348a8fd834c2fcca9f3a6f57beedc3 Mon Sep 17 00:00:00 2001 From: Enrique Zamudio Date: Tue, 7 May 2013 15:37:49 -0500 Subject: [PATCH] Fix #9 - Binary parsing with CustomBinaryField for LLBIN/LLLBIN fields --- .../solab/iso8583/parse/FieldParseInfo.java | 4 +- .../solab/iso8583/parse/LlbinParseInfo.java | 34 +++++++++--- .../solab/iso8583/parse/LllbinParseInfo.java | 52 +++++++++++++------ 3 files changed, 67 insertions(+), 23 deletions(-) diff --git a/src/main/java/com/solab/iso8583/parse/FieldParseInfo.java b/src/main/java/com/solab/iso8583/parse/FieldParseInfo.java index 3094c8d..b71ddfc 100644 --- a/src/main/java/com/solab/iso8583/parse/FieldParseInfo.java +++ b/src/main/java/com/solab/iso8583/parse/FieldParseInfo.java @@ -72,7 +72,7 @@ public abstract class FieldParseInfo { * @param custom A CustomField to decode the field. */ public abstract IsoValue parse(final int field, byte[] buf, int pos, CustomField custom) - throws ParseException, UnsupportedEncodingException; + throws ParseException, UnsupportedEncodingException; /** Parses binary data from the buffer, creating and returning an IsoValue of the configured * type and length. @@ -82,7 +82,7 @@ public abstract class FieldParseInfo { * @param custom A CustomField to decode the field. */ public abstract IsoValue parseBinary(final int field, byte[] buf, int pos, CustomField custom) - throws ParseException, UnsupportedEncodingException; + throws ParseException, UnsupportedEncodingException; /** Returns a new FieldParseInfo instance that can parse the specified type. */ public static FieldParseInfo getInstance(IsoType t, int len, String encoding) { diff --git a/src/main/java/com/solab/iso8583/parse/LlbinParseInfo.java b/src/main/java/com/solab/iso8583/parse/LlbinParseInfo.java index b0d551e..1cfdedc 100644 --- a/src/main/java/com/solab/iso8583/parse/LlbinParseInfo.java +++ b/src/main/java/com/solab/iso8583/parse/LlbinParseInfo.java @@ -20,6 +20,7 @@ package com.solab.iso8583.parse; import java.text.ParseException; +import com.solab.iso8583.CustomBinaryField; import com.solab.iso8583.CustomField; import com.solab.iso8583.IsoType; import com.solab.iso8583.IsoValue; @@ -60,6 +61,16 @@ public class LlbinParseInfo extends FieldParseInfo { byte[] binval = length == 0 ? new byte[0] : HexCodec.hexDecode(new String(buf, pos + 2, length)); if (custom == null) { return new IsoValue(type, binval, binval.length, null); + } else if (custom instanceof CustomBinaryField) { + try { + T dec = ((CustomBinaryField)custom).decodeBinaryField(buf, pos + 2, length); + return dec == null ? new IsoValue(type, binval, binval.length, null) : + new IsoValue(type, dec, 0, custom); + } catch (IndexOutOfBoundsException ex) { + throw new ParseException(String.format( + "Insufficient data for LLBIN field %d, pos %d (LEN states '%s')", + field, pos, new String(buf, pos, 2)), pos); + } } else { try { T dec = custom.decodeField(new String(buf, pos + 2, length)); @@ -84,18 +95,29 @@ public class LlbinParseInfo extends FieldParseInfo { throw new ParseException(String.format("Insufficient bin LLBIN header field %d", field), pos); } - length = (((buf[pos] & 0xf0) >> 4) * 10) + (buf[pos] & 0x0f); - if (length < 0) { + final int l = (((buf[pos] & 0xf0) >> 4) * 10) + (buf[pos] & 0x0f); + if (l < 0) { throw new ParseException(String.format("Invalid bin LLBIN length %d pos %d", length, pos), pos); } - if (length+pos+1 > buf.length) { + if (l+pos+1 > buf.length) { throw new ParseException(String.format( - "Insufficient data for bin LLBIN field %d, pos %d", field, pos), pos); + "Insufficient data for bin LLBIN field %d, pos %d: need %d, only %d available", + field, pos, l, buf.length), pos); } - byte[] _v = new byte[length]; - System.arraycopy(buf, pos+1, _v, 0, length); + byte[] _v = new byte[l]; + System.arraycopy(buf, pos+1, _v, 0, l); if (custom == null) { return new IsoValue(type, _v, null); + } else if (custom instanceof CustomBinaryField) { + try { + T dec = ((CustomBinaryField)custom).decodeBinaryField(buf, pos + 1, l); + return dec == null ? new IsoValue(type, _v, _v.length, null) : + new IsoValue(type, dec, l, custom); + } catch (IndexOutOfBoundsException ex) { + throw new ParseException(String.format( + "Insufficient data for LLBIN field %d, pos %d length %d", + field, pos, l), pos); + } } else { T dec = custom.decodeField(HexCodec.hexEncode(_v, 0, _v.length)); return dec == null ? new IsoValue(type, _v, null) : diff --git a/src/main/java/com/solab/iso8583/parse/LllbinParseInfo.java b/src/main/java/com/solab/iso8583/parse/LllbinParseInfo.java index 5ee4f8c..63bd537 100644 --- a/src/main/java/com/solab/iso8583/parse/LllbinParseInfo.java +++ b/src/main/java/com/solab/iso8583/parse/LllbinParseInfo.java @@ -20,6 +20,7 @@ package com.solab.iso8583.parse; import java.text.ParseException; +import com.solab.iso8583.CustomBinaryField; import com.solab.iso8583.CustomField; import com.solab.iso8583.IsoType; import com.solab.iso8583.IsoValue; @@ -51,23 +52,33 @@ public class LllbinParseInfo extends FieldParseInfo { throw new ParseException(String.format("Invalid LLLBIN length '%s' field %d pos %d", new String(buf, pos, 3), field, pos), pos); } - length = ((buf[pos] - 48) * 100) + ((buf[pos + 1] - 48) * 10) + (buf[pos + 2] - 48); - if (length < 0) { + final int l = ((buf[pos] - 48) * 100) + ((buf[pos + 1] - 48) * 10) + (buf[pos + 2] - 48); + if (l < 0) { throw new ParseException(String.format("Invalid LLLBIN length %d field %d pos %d", - length, field, pos), pos); - } else if (length+pos+3 > buf.length) { + l, field, pos), pos); + } else if (l+pos+3 > buf.length) { throw new ParseException(String.format( "Insufficient data for LLLBIN field %d, pos %d", field, pos), pos); } - byte[] binval = length == 0 ? new byte[0] : HexCodec.hexDecode(new String(buf, pos + 3, length)); + byte[] binval = l == 0 ? new byte[0] : HexCodec.hexDecode(new String(buf, pos + 3, l)); if (custom == null) { return new IsoValue(type, binval, binval.length, null); + } else if (custom instanceof CustomBinaryField) { + try { + T dec = ((CustomBinaryField)custom).decodeBinaryField( + buf, pos + 3, l); + return dec == null ? new IsoValue(type, binval, binval.length, null) : + new IsoValue(type, dec, 0, custom); + } catch (IndexOutOfBoundsException ex) { + throw new ParseException(String.format( + "Insufficient data for LLLBIN field %d, pos %d", field, pos), pos); + } } else { try { T dec = custom.decodeField( - length == 0 ? "" : new String(buf, pos + 3, length)); + l == 0 ? "" : new String(buf, pos + 3, l)); return dec == null ? new IsoValue(type, binval, binval.length, null) : - new IsoValue(type, dec, length, custom); + new IsoValue(type, dec, l, custom); } catch (IndexOutOfBoundsException ex) { throw new ParseException(String.format( "Insufficient data for LLLBIN field %d, pos %d", field, pos), pos); @@ -82,23 +93,34 @@ public class LllbinParseInfo extends FieldParseInfo { if (pos < 0) { throw new ParseException(String.format("Invalid bin LLLBIN field %d pos %d", field, pos), pos); - } else if (pos+3 > buf.length) { + } else if (pos+2 > buf.length) { throw new ParseException(String.format("Insufficient LLLBIN header field %d", field), pos); } - length = ((buf[pos] & 0x0f) * 100) + (((buf[pos + 1] & 0xf0) >> 4) * 10) + (buf[pos + 1] & 0x0f); - if (length < 0) { + final int l = ((buf[pos] & 0x0f) * 100) + (((buf[pos + 1] & 0xf0) >> 4) * 10) + (buf[pos + 1] & 0x0f); + if (l < 0) { throw new ParseException(String.format("Invalid LLLBIN length %d field %d pos %d", - length, field, pos), pos); + l, field, pos), pos); } - if (length+pos+2 > buf.length) { + if (l+pos+2 > buf.length) { throw new ParseException(String.format( - "Insufficient data for bin LLLBIN field %d, pos %d", field, pos), pos); + "Insufficient data for bin LLLBIN field %d, pos %d requires %d, only %d available", + field, pos, l, buf.length-pos+1), pos); } - byte[] _v = new byte[length]; - System.arraycopy(buf, pos+2, _v, 0, length); + byte[] _v = new byte[l]; + System.arraycopy(buf, pos+2, _v, 0, l); if (custom == null) { return new IsoValue(type, _v, null); + } else if (custom instanceof CustomBinaryField) { + try { + T dec = ((CustomBinaryField)custom).decodeBinaryField( + buf, pos + 2, l); + return dec == null ? new IsoValue(type, _v, _v.length, null) : + new IsoValue(type, dec, l, custom); + } catch (IndexOutOfBoundsException ex) { + throw new ParseException(String.format( + "Insufficient data for LLLBIN field %d, pos %d", field, pos), pos); + } } else { T dec = custom.decodeField(HexCodec.hexEncode(_v, 0, _v.length)); return dec == null ? new IsoValue(type, _v, null) :