Skip to content

Commit

Permalink
Prevent an exception when importing odd OFX files using an XML declar…
Browse files Browse the repository at this point in the history 
…ation. (GitHub Issue #72)
@ccavanaugh
ccavanaugh committed Feb 11, 2019
1 parent 9a9bc82 commit be582be
Showing 4 changed files with 277 additions and 1 deletion.
3 changes: 2 additions & 1 deletion changelog.adoc
View file
Original file line number Diff line number Diff line change
@@ -27,7 +27,8 @@
* Choice dialog is not localized for some locales. Replace with an equivalent or submit upstream patch

== Release 2.36.2
* 02/10/2019 Update to the latest Hibernate, Netty, and HikariCP dependencies
* 02/10/2019 Prevent an exception when importing odd OFX files using an XML declaration. (GitHub Issue #72)
* 02/10/2019 Update to the latest Hibernate, Netty, and HikariCP dependencies. This improves compatibility with Java 9+.
* 01/14/2019 jGnash would not start on a early access version of Java 8 (Swing, Fx, GitHub Issue #71)
* 01/11/2019 Corrected an exception when the date picker was cleared and focus was lost (Fx, GitHub PR #70) _[pchurzin]_
* 12/24/2018 Updated Polish translation (Swing, Fx) _[Sławomir Szarkowicz]_
5 changes: 5 additions & 0 deletions jgnash-convert/src/main/java/jgnash/convert/importat/ofx/Sanitize.java
View file
Original file line number Diff line number Diff line change
@@ -19,6 +19,8 @@

/**
* Utility class for handling OFX files with invalid characters
*
* @author Craig Cavanaugh
*/
class Sanitize {

@@ -36,6 +38,9 @@ private Sanitize() {
static String sanitize(final String xml) {
String ugly = xml;

// remove all XML declarations as they are not needed
ugly = ugly.replaceAll("<\\?xml.*\\?>", "");

ugly = ugly.replaceAll("&(?!(?:amp);)", "&amp;");
ugly = ugly.replaceAll("\"", "&quot;");
ugly = ugly.replaceAll("'", "&apos;");
37 changes: 37 additions & 0 deletions jgnash-convert/src/test/java/jgnash/convert/importat/ofx/Ofx2Test.java
View file
Original file line number Diff line number Diff line change
@@ -477,6 +477,43 @@ void parse401k() {
}
}

@Test
void parse401kWithHeader() {
final String testFile = "/401k-header.xml";

final URL url = Ofx2Test.class.getResource(testFile);

try {
assertTrue(FileMagic.isOfxV2(Paths.get(url.toURI())));

try (final InputStream stream = Ofx2Test.class.getResourceAsStream(testFile)) {
parser.parse(stream);

OfxBank ofxBank = parser.getBank();

assertEquals("ENG", parser.getLanguage());
assertEquals("INFO", parser.getStatusSeverity());
assertEquals(0, parser.getStatusCode());

assertEquals(0, ofxBank.statusCode);
assertEquals("INFO", ofxBank.statusSeverity);
assertNull(ofxBank.statusMessage);

assertEquals(3, ofxBank.getTransactions().size());
assertEquals(3, ofxBank.getSecurityList().size());


assertTrue(ofxBank.isInvestmentAccount());
} catch (final IOException e) {
logSevere(Ofx2Test.class, e);
fail();
}
} catch (final URISyntaxException e) {
logSevere(Ofx2Test.class, e);
fail();
}
}

@Test
void parseInvest2() {
final String testFile = "/invest2.xml";
233 changes: 233 additions & 0 deletions jgnash-convert/src/test/resources/401k-header.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,233 @@
<?xml version="1.0" encoding="utf-8" ?>
<OFX> <!-- Example Investment Account taken from the 2.2 Public Draft 3 OFX specification -->
<SIGNONMSGSRSV1>
<SONRS> <!-- Begin signon -->
<STATUS> <!-- Begin status aggregate -->
<CODE>0</CODE> <!-- OK -->
<SEVERITY>INFO</SEVERITY>
</STATUS>
<DTSERVER>20060131172532</DTSERVER>
<LANGUAGE>ENG</LANGUAGE> <!-- Language used in response -->
<DTPROFUP>20060131172532</DTPROFUP> <!-- Last update to profile-->
<DTACCTUP>20060131172532</DTACCTUP> <!-- Last account update -->
<FI> <!-- ID of receiving institution -->
<ORG>NCH</ORG> <!-- Name of ID owner -->
<FID>1001</FID> <!-- Actual ID -->
</FI>
</SONRS>
</SIGNONMSGSRSV1>
<INVSTMTMSGSRSV1>
<INVSTMTTRNRS> <!--First request in file-->
<TRNUID>1002</TRNUID> <!--Client ID for this request-->
<STATUS>
<CODE>0</CODE> <!--0 = accepted, good data follows-->
<SEVERITY>INFO</SEVERITY>
</STATUS>
<INVSTMTRS> <!--Beginning of statement download-->
<DTASOF>20060131172605.000[-4:EST]</DTASOF> <!--Statement as of Jan 31, 2006 5:26pm-->
<CURDEF>USD</CURDEF> <!--Default currency is US Dollar-->
<INVACCTFROM> <!--Beginning of account information-->
<BROKERID>121099999</BROKERID> <!--FI ID-->
<ACCTID>999988</ACCTID> <!--Account number-->
</INVACCTFROM> <!--End of account information-->
<INVTRANLIST>
<DTSTART>20060105172532.000[-5:EST]</DTSTART>
<DTEND>20060131172532.000[-4:EST]</DTEND>
<BUYMF>
<INVBUY>
<INVTRAN>
<FITID>212839062820295310723</FITID>
<DTTRADE>20060119000000.000[-5:EST]</DTTRADE>
</INVTRAN>
<SECID>
<UNIQUEID>744316100</UNIQUEID>
<UNIQUEIDTYPE>CUSIP</UNIQUEIDTYPE>
</SECID>
<UNITS>14.6860</UNITS>
<UNITPRICE>18.9000</UNITPRICE>
<TOTAL>-277.5700</TOTAL>
<CURRENCY>
<CURRATE>1.0000</CURRATE>
<CURSYM>USD</CURSYM>
</CURRENCY>
<SUBACCTSEC>OTHER</SUBACCTSEC>
<SUBACCTFUND>OTHER</SUBACCTFUND>
<LOANID>2</LOANID>
<LOANPRINCIPAL>277.5700</LOANPRINCIPAL>
<LOANINTEREST>0.0000</LOANINTEREST>
<INV401KSOURCE>ROLLOVER</INV401KSOURCE>
<DTPAYROLL>20060114000000.000[-5:EST]</DTPAYROLL>
<PRIORYEARCONTRIB>N</PRIORYEARCONTRIB>
</INVBUY>
<BUYTYPE>BUY</BUYTYPE>
</BUYMF>
<BUYMF>
<INVBUY>
<INVTRAN>
<FITID>212839062820510822977</FITID>
<DTTRADE>20060119000000.000[-5:EST]</DTTRADE>
</INVTRAN>
<SECID>
<UNIQUEID>744316100</UNIQUEID>
<UNIQUEIDTYPE>CUSIP</UNIQUEIDTYPE>
</SECID>
<UNITS>2.0220</UNITS>
<UNITPRICE>18.9000</UNITPRICE>
<TOTAL>-38.2200</TOTAL>
<CURRENCY>
<CURRATE>1.0000</CURRATE>
<CURSYM>USD</CURSYM>
</CURRENCY>
<SUBACCTSEC>OTHER</SUBACCTSEC>
<SUBACCTFUND>OTHER</SUBACCTFUND>
<LOANID>2</LOANID>
<LOANPRINCIPAL>0.0000</LOANPRINCIPAL>
<LOANINTEREST>38.2200</LOANINTEREST>
<INV401KSOURCE>ROLLOVER</INV401KSOURCE>
<DTPAYROLL>20060114000000.000[-5:EST]</DTPAYROLL>
<PRIORYEARCONTRIB>N</PRIORYEARCONTRIB>
</INVBUY>
<BUYTYPE>BUY</BUYTYPE>
</BUYMF>
<BUYMF>
<INVBUY>
<INVTRAN>
<FITID>212849815151950488609</FITID>
<DTTRADE>20060106000000.000[-5:EST]</DTTRADE>
</INVTRAN>
<SECID>
<UNIQUEID>744316100</UNIQUEID>
<UNIQUEIDTYPE>CUSIP</UNIQUEIDTYPE>
</SECID>
<UNITS>4.9010</UNITS>
<UNITPRICE>18.7900</UNITPRICE>
<TOTAL>-92.0900</TOTAL>
<CURRENCY>
<CURRATE>1.0000</CURRATE>
<CURSYM>USD</CURSYM>
</CURRENCY>
<SUBACCTSEC>OTHER</SUBACCTSEC>
<SUBACCTFUND>OTHER</SUBACCTFUND>
<INV401KSOURCE>PRETAX</INV401KSOURCE>
<DTPAYROLL>20051231000000.000[-5:EST]</DTPAYROLL>
<PRIORYEARCONTRIB>Y</PRIORYEARCONTRIB>
</INVBUY>
<BUYTYPE>BUY</BUYTYPE>
</BUYMF>
</INVTRANLIST>
<INV401KBAL>
<PRETAX>31690.340000</PRETAX>
<PROFITSHARING>10725.640000</PROFITSHARING>
<ROLLOVER>15945.750000</ROLLOVER>
<OTHERVEST>108.800000</OTHERVEST>
<TOTAL>58470.530000</TOTAL>
</INV401KBAL>
<INV401K>
<EMPLOYERNAME>ELGIN NATIONAL INDUSTRIES INC</EMPLOYERNAME>
<PLANID>4343</PLANID>
<PLANJOINDATE>19940101000000.000[-5:EST]</PLANJOINDATE>
<MATCHINFO>
<MATCHPCT>0.00</MATCHPCT>
</MATCHINFO>
<CONTRIBINFO>
<CONTRIBSECURITY>
<SECID>
<UNIQUEID>744316100</UNIQUEID>
<UNIQUEIDTYPE>CUSIP</UNIQUEIDTYPE>
</SECID>
<PRETAXCONTRIBPCT>50.0000</PRETAXCONTRIBPCT>
<PROFITSHARINGCONTRIBPCT>100.0000
</PROFITSHARINGCONTRIBPCT>
<ROLLOVERCONTRIBPCT>100.0000</ROLLOVERCONTRIBPCT>
<OTHERVESTPCT>100.0000</OTHERVESTPCT>
</CONTRIBSECURITY>
<CONTRIBSECURITY>
<SECID>
<UNIQUEID>74431M105</UNIQUEID>
<UNIQUEIDTYPE>CUSIP</UNIQUEIDTYPE>
</SECID>
<PRETAXCONTRIBPCT>25.0000</PRETAXCONTRIBPCT>
<PROFITSHARINGCONTRIBPCT>0.0000
</PROFITSHARINGCONTRIBPCT>
<ROLLOVERCONTRIBPCT>0.0000</ROLLOVERCONTRIBPCT>
<OTHERVESTPCT>0.0000</OTHERVESTPCT>
</CONTRIBSECURITY>
<CONTRIBSECURITY>
<SECID>
<UNIQUEID>743969107</UNIQUEID>
<UNIQUEIDTYPE>CUSIP</UNIQUEIDTYPE>
</SECID>
<PRETAXCONTRIBPCT>25.0000</PRETAXCONTRIBPCT>
<PROFITSHARINGCONTRIBPCT>0.0000
</PROFITSHARINGCONTRIBPCT>
<ROLLOVERCONTRIBPCT>0.0000</ROLLOVERCONTRIBPCT>
<OTHERVESTPCT>0.0000</OTHERVESTPCT>
</CONTRIBSECURITY>
</CONTRIBINFO>
<INV401KSUMMARY>
<YEARTODATE>
<DTSTART>20060101000000</DTSTART>
<DTEND>20060131000000</DTEND>
<CONTRIBUTIONS>
<PRETAX>843.2500</PRETAX>
<AFTERTAX>43.4200</AFTERTAX>
<MATCH>421.6200</MATCH>
<TOTAL>1308.2900</TOTAL>
</CONTRIBUTIONS>
</YEARTODATE>
</INV401KSUMMARY>
</INV401K>
</INVSTMTRS>
</INVSTMTTRNRS>
</INVSTMTMSGSRSV1>
<SECLISTMSGSRSV1>
<SECLIST> <!--Beginning of securities list-->
<STOCKINFO> <!--Beginning of 1st security ID-->
<SECINFO>
<SECID> <!--Security ID-->
<UNIQUEID>123456789</UNIQUEID> <!--CUSIP for the stock -->
<UNIQUEIDTYPE>CUSIP</UNIQUEIDTYPE>
</SECID>
<SECNAME>Acme Development, Inc.</SECNAME>
<TICKER>ACME</TICKER> <!--Ticker symbol-->
<FIID>1024</FIID> <!--FI internal security identifier-->
</SECINFO>
<YIELD>10</YIELD> <!--10% yield-->
<ASSETCLASS>SMALLSTOCK</ASSETCLASS> <!--Small Capital Stock asset class-->
</STOCKINFO> <!--End of security ID-->
<STOCKINFO>
<SECINFO>
<SECID> <!--Security ID-->
<UNIQUEID>666678578</UNIQUEID> <!--CUSIP for the stock -->
<UNIQUEIDTYPE>CUSIP</UNIQUEIDTYPE>
</SECID>
<SECNAME>Hackson Unlimited, Inc.</SECNAME>
<TICKER>HACK</TICKER> <!--Ticker symbol-->
<FIID>1027</FIID> <!--FI internal security identifier-->
</SECINFO>
<YIELD>17</YIELD> <!--17% yield-->
<ASSETCLASS>SMALLSTOCK</ASSETCLASS> <!--Small Capital Stock asset class-->
</STOCKINFO>
<OPTINFO>
<SECINFO>
<SECID> <!--Security ID-->
<UNIQUEID>000342222</UNIQUEID> <!--CUSIP for the option -->
<UNIQUEIDTYPE>CUSIP</UNIQUEIDTYPE>
</SECID> <!--End of security ID-->
<SECNAME>Lucky Airlines Jan 97 Put</SECNAME>
<TICKER>LUAXX</TICKER> <!--Ticker symbol-->
<FIID>0013</FIID> <!--FI internal security identifier-->
</SECINFO>
<OPTTYPE>PUT</OPTTYPE>
<STRIKEPRICE>35.00</STRIKEPRICE> <!--Strike price $35/share-->
<DTEXPIRE>20050121</DTEXPIRE> <!--Option expires Jan 21, 2005-->
<SHPERCTRCT>100</SHPERCTRCT> <!--100 shares per contract-->
<SECID> <!--Security ID-->
<UNIQUEID>000342200</UNIQUEID> <!--CUSIP for the underlying stock -->
<UNIQUEIDTYPE>CUSIP</UNIQUEIDTYPE>
</SECID>
<ASSETCLASS>LARGESTOCK</ASSETCLASS> <!--Large Capital Stock asset class-->
</OPTINFO> <!--End of option information-->
</SECLIST> <!--End of securities list-->
</SECLISTMSGSRSV1>
</OFX>

0 comments on commit be582be

Please sign in to comment.