From 3aa52d36824d11b8774de15708fdfcbb93cd9dc3 Mon Sep 17 00:00:00 2001 From: Mohammed Abdul Azeem Date: Mon, 18 Jul 2016 13:17:19 +0530 Subject: GSOC - Handling namespace declaration missing case: initialization parameter to FastParser will turn off the namespace declaration missing exception. Test cases have also been given to verify the same. Change-Id: I4c3e02c7ad92d50e279f895ced53c78fc8f49b91 Reviewed-on: https://gerrit.libreoffice.org/27278 Tested-by: Jenkins Reviewed-by: Michael Meeks Tested-by: Michael Meeks --- sax/qa/cppunit/xmlimport.cxx | 33 ++++++++++++++++++++++++++++-- sax/qa/data/manifestwithnsdecl.xml | 12 +++++++++++ sax/qa/data/manifestwithoutnsdecl.xml | 12 +++++++++++ sax/source/fastparser/fastparser.cxx | 25 ++++++++++++++++++++-- sax/source/fastparser/legacyfastparser.cxx | 5 ++++- 5 files changed, 82 insertions(+), 5 deletions(-) create mode 100644 sax/qa/data/manifestwithnsdecl.xml create mode 100644 sax/qa/data/manifestwithoutnsdecl.xml (limited to 'sax') diff --git a/sax/qa/cppunit/xmlimport.cxx b/sax/qa/cppunit/xmlimport.cxx index c0320fc00351..f7fcd739d4c3 100644 --- a/sax/qa/cppunit/xmlimport.cxx +++ b/sax/qa/cppunit/xmlimport.cxx @@ -278,10 +278,12 @@ public: XMLImportTest() : BootstrapFixture(true, false) {} void parse(); + void testMissingNamespaceDeclaration(); void testIllegalNamespaceUse(); CPPUNIT_TEST_SUITE( XMLImportTest ); CPPUNIT_TEST( parse ); + CPPUNIT_TEST( testMissingNamespaceDeclaration ); CPPUNIT_TEST( testIllegalNamespaceUse ); CPPUNIT_TEST_SUITE_END(); }; @@ -317,11 +319,11 @@ void XMLImportTest::parse() source.aInputStream = createStreamFromFile( m_sDirPath + fileNames[i] ); m_xParser->parseStream(source); - const OUString& rParserStr = m_xDocumentHandler->getString(); + const OUString rParserStr = m_xDocumentHandler->getString(); source.aInputStream = createStreamFromFile( m_sDirPath + fileNames[i] ); m_xLegacyFastParser->parseStream(source); - const OUString& rLegacyFastParserStr = m_xDocumentHandler->getString(); + const OUString rLegacyFastParserStr = m_xDocumentHandler->getString(); CPPUNIT_ASSERT_EQUAL( rParserStr, rLegacyFastParserStr ); // OString o = OUStringToOString( Str, RTL_TEXTENCODING_ASCII_US ); @@ -329,6 +331,33 @@ void XMLImportTest::parse() } } +void XMLImportTest::testMissingNamespaceDeclaration() +{ + OUString fileNames[] = { "manifestwithnsdecl.xml", "manifestwithoutnsdecl.xml" }; + + uno::Reference const xInit(m_xLegacyFastParser, + uno::UNO_QUERY_THROW); + uno::Sequence args(1); + args[0] <<= OUString("IgnoreMissingNSDecl"); + xInit->initialize( args ); + + for (sal_uInt16 i = 0; i < sizeof( fileNames ) / sizeof( OUString ); i++) + { + InputSource source; + source.sSystemId = "internal"; + + source.aInputStream = createStreamFromFile( m_sDirPath + fileNames[i] ); + m_xParser->parseStream(source); + const OUString rParserStr = m_xDocumentHandler->getString(); + + source.aInputStream = createStreamFromFile( m_sDirPath + fileNames[i] ); + m_xLegacyFastParser->parseStream(source); + const OUString rLegacyFastParserStr = m_xDocumentHandler->getString(); + + CPPUNIT_ASSERT_EQUAL( rParserStr, rLegacyFastParserStr ); + } +} + void XMLImportTest::testIllegalNamespaceUse() { rtl::Reference< NSDocumentHandler > m_xNSDocumentHandler; diff --git a/sax/qa/data/manifestwithnsdecl.xml b/sax/qa/data/manifestwithnsdecl.xml new file mode 100644 index 000000000000..ac61c3e206f0 --- /dev/null +++ b/sax/qa/data/manifestwithnsdecl.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/sax/qa/data/manifestwithoutnsdecl.xml b/sax/qa/data/manifestwithoutnsdecl.xml new file mode 100644 index 000000000000..1c8f5359636d --- /dev/null +++ b/sax/qa/data/manifestwithoutnsdecl.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/sax/source/fastparser/fastparser.cxx b/sax/source/fastparser/fastparser.cxx index 0b4137b9e939..49038b8d6357 100644 --- a/sax/source/fastparser/fastparser.cxx +++ b/sax/source/fastparser/fastparser.cxx @@ -233,6 +233,7 @@ public: Entity& getEntity() { return *mpTop; } void parse(); void produce( bool bForceFlush = false ); + bool m_bIgnoreMissingNSDecl; private: bool consume(EventList *); @@ -619,6 +620,7 @@ FastSaxParserImpl::FastSaxParserImpl( FastSaxParser* ) : #if 0 mpFront(pFront), #endif + m_bIgnoreMissingNSDecl(false), mpTop(nullptr) { mxDocumentLocator.set( new FastLocatorImpl( this ) ); @@ -668,7 +670,7 @@ sal_Int32 FastSaxParserImpl::GetTokenWithPrefix( const xmlChar* pPrefix, int nPr break; } - if( !nNamespace ) + if( !nNamespace && !m_bIgnoreMissingNSDecl ) throw SAXException("No namespace defined for " + OUString(XML_CAST(pPrefix), nPrefixLen, RTL_TEXTENCODING_UTF8), Reference< XInterface >(), Any()); } @@ -1129,7 +1131,8 @@ void FastSaxParserImpl::callbackStartElement(const xmlChar *localName , const xm { if( prefix != nullptr ) { - sNamespace = OUString( XML_CAST( URI ), strlen( XML_CAST( URI )), RTL_TEXTENCODING_UTF8 ); + if ( !m_bIgnoreMissingNSDecl || URI != nullptr ) + sNamespace = OUString( XML_CAST( URI ), strlen( XML_CAST( URI )), RTL_TEXTENCODING_UTF8 ); nNamespaceToken = GetNamespaceToken( sNamespace ); rEvent.msNamespace = OUString( XML_CAST( prefix ), strlen( XML_CAST( prefix )), RTL_TEXTENCODING_UTF8 ); } @@ -1300,6 +1303,24 @@ FastSaxParser::~FastSaxParser() { } +void SAL_CALL +FastSaxParser::initialize(css::uno::Sequence< css::uno::Any > const& rArguments) + throw (css::uno::RuntimeException, css::uno::Exception, std::exception) +{ + if (rArguments.getLength()) + { + OUString str; + if ( ( rArguments[0] >>= str ) && "IgnoreMissingNSDecl" == str ) + mpImpl->m_bIgnoreMissingNSDecl = true; + else if ( str == "DoSmeplease" ) + { + //just ignore as this is already immune to billon laughs + } + else + throw IllegalArgumentException(); + } +} + void FastSaxParser::parseStream( const xml::sax::InputSource& aInputSource ) throw (xml::sax::SAXException, io::IOException, uno::RuntimeException, std::exception) diff --git a/sax/source/fastparser/legacyfastparser.cxx b/sax/source/fastparser/legacyfastparser.cxx index ab673441f914..1c82178d0526 100644 --- a/sax/source/fastparser/legacyfastparser.cxx +++ b/sax/source/fastparser/legacyfastparser.cxx @@ -280,9 +280,12 @@ SaxLegacyFastParser::SaxLegacyFastParser( ) : m_aNamespaceHandler( new Namespace m_xParser->setNamespaceHandler( m_aNamespaceHandler.get() ); } -void SAL_CALL SaxLegacyFastParser::initialize(Sequence< Any > const&/* rArguments */) +void SAL_CALL SaxLegacyFastParser::initialize(Sequence< Any > const& rArguments ) throw (RuntimeException, Exception, exception) { + uno::Reference const xInit(m_xParser, + uno::UNO_QUERY_THROW); + xInit->initialize( rArguments ); } void SaxLegacyFastParser::parseStream( const InputSource& structSource ) -- cgit