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

Enhanced Filter200XmlDecoder to throw an Exception if a Literal with gml-Geometry subelement is parsed #642

Merged
merged 4 commits into from
Dec 10, 2015
Merged

Enhanced Filter200XmlDecoder to throw an Exception if a Literal with gml-Geometry subelement is parsed #642

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c5c5241
throw exception if child of a literal is a gml geometry
lgoltz Dec 8, 2015
69de3cc
use OperationprocessingFailed exception code if WFS version is 2.0.0
lgoltz Dec 8, 2015
c5fd366
added missing test resource
lgoltz Dec 8, 2015
57a7583
handle XMLParsingExceptions in KVP requests
lgoltz Dec 8, 2015
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
13 changes: 13 additions & 0 deletions deegree-core/deegree-core-base/src/main/java/org/deegree/filter/xml/Filter200XMLDecoder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@
import org.deegree.commons.tom.primitive.PrimitiveValue;
import org.deegree.commons.uom.Measure;
import org.deegree.commons.utils.ArrayUtils;
import org.deegree.commons.xml.CommonNamespaces;
import org.deegree.commons.xml.NamespaceBindings;
import org.deegree.commons.xml.XMLParsingException;
import org.deegree.commons.xml.XPathUtils;
Expand Down Expand Up @@ -782,6 +783,7 @@ private static Literal<?> parseLiteral( XMLStreamReader xmlStream )
while ( xmlStream.next() != END_ELEMENT ) {
int eventType = xmlStream.getEventType();
if ( eventType == START_ELEMENT ) {
checkIfCurrentStartElementIsGmlGeometry( xmlStream );
children.add( parseElement( xmlStream ) );
} else if ( eventType == CHARACTERS || eventType == CDATA ) {
children.add( new PrimitiveValue( xmlStream.getText() ) );
Expand Down Expand Up @@ -1169,6 +1171,17 @@ private static Geometry parseGeomOrEnvelope( XMLStreamReader xmlStream )
}
}

private static void checkIfCurrentStartElementIsGmlGeometry( XMLStreamReader xmlStream )
throws XMLStreamException {
String ns = xmlStream.getNamespaceURI();
if ( CommonNamespaces.GMLNS.equals( ns ) || CommonNamespaces.GML3_2_NS.equals( ns ) ) {
GMLGeometryReader gmlReader = GMLGeometryVersionHelper.getGeometryReader( xmlStream.getName(), xmlStream );
boolean isGeometryElement = gmlReader.isGeometryOrEnvelopeElement( xmlStream );
if ( isGeometryElement )
throw new XMLParsingException( xmlStream, "Geometry elements as Literal child are not supported!" );
}
}

/**
* Return a String with all element names of the given enum class.
*
Expand Down
14 changes: 10 additions & 4 deletions ...-core/deegree-core-base/src/test/java/org/deegree/filter/xml/Filter200XMLDecoderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
package org.deegree.filter.xml;

import static org.junit.Assert.assertEquals;
import static org.slf4j.LoggerFactory.getLogger;

import java.io.File;
import java.io.IOException;
Expand All @@ -51,6 +50,7 @@
import javax.xml.stream.XMLStreamReader;

import org.deegree.commons.tom.primitive.PrimitiveValue;
import org.deegree.commons.xml.XMLParsingException;
import org.deegree.commons.xml.schema.RedirectingEntityResolver;
import org.deegree.commons.xml.stax.XMLStreamUtils;
import org.deegree.filter.Filter;
Expand All @@ -73,7 +73,6 @@
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.slf4j.Logger;

/**
* Tests the correct parsing of Filter Encoding 2.0.0 documents using the official examples (excluding filter
Expand All @@ -86,8 +85,6 @@
*/
public class Filter200XMLDecoderTest {

private static final Logger LOG = getLogger( Filter200XMLDecoderTest.class );

// files are not really fetched from this URL, but taken from cached version (module deegree-ogcschemas)
private static final String OGC_EXAMPLES_BASE_URL = "http://schemas.opengis.net/filter/2.0/examples/";

Expand Down Expand Up @@ -331,6 +328,15 @@ public void parseOGCExample14()
}
}

@Test(expected = XMLParsingException.class)
public void parsePropertyIsLessThanOrEuqlToWithLiteralContainingUnexpectedGeometry()
throws Exception {
InputStream filterAsStream = this.getClass().getResourceAsStream( "v200/unexectedTestfilter.xml" );
XMLStreamReader xmlStream = XMLInputFactory.newInstance().createXMLStreamReader( filterAsStream );
XMLStreamUtils.skipStartDocument( xmlStream );
Filter200XMLDecoder.parse( xmlStream );
}

// @Test
// public void parseOGCExample15()
// throws XMLStreamException, FactoryConfigurationError, IOException {
Expand Down
14 changes: 14 additions & 0 deletions .../deegree-core-base/src/test/resources/org/deegree/filter/xml/v200/unexectedTestfilter.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<fes:Filter xmlns:app="http://www.deegree.org/app" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:gml="http://www.opengis.net/gml"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.opengis.net/fes/2.0 http://schemas.opengis.net/filter/2.0/filter.xsd http://www.opengis.net/gml/3.2 http://schemas.opengis.net/gml/3.2.1/gml.xsd">
<fes:PropertyIsLessThanOrEqualTo matchAction="All" matchCase="true">
<fes:ValueReference>app:name</fes:ValueReference>
<fes:Literal>
<gml:Envelope xmlns:gml="http://www.opengis.net/gml/3.2" srsName="urn:ogc:def:crs:EPSG::4326">
<gml:lowerCorner>-90 -180</gml:lowerCorner>
<gml:upperCorner>90 180</gml:upperCorner>
</gml:Envelope>
</fes:Literal>
</fes:PropertyIsLessThanOrEqualTo>
</fes:Filter>
11 changes: 10 additions & 1 deletion ...rvices/deegree-services-wfs/src/main/java/org/deegree/services/wfs/WebFeatureService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -794,6 +794,12 @@ public void doKVP( Map<String, String> kvpParamsUC, HttpServletRequest request,
LOG.debug( "OWS-Exception: {}", e.getMessage() );
LOG.trace( e.getMessage(), e );
sendServiceException( requestVersion, e, response );
} catch ( XMLParsingException e ) {
LOG.trace( "Stack trace:", e );
String exceptionCode = INVALID_PARAMETER_VALUE;
if ( VERSION_200.equals( requestVersion ) )
exceptionCode = OWSException.OPERATION_PROCESSING_FAILED;
sendServiceException( requestVersion, new OWSException( e.getMessage(), exceptionCode ), response );
} catch ( MissingParameterException e ) {
LOG.debug( "OWS-Exception: {}", e.getMessage() );
LOG.trace( e.getMessage(), e );
Expand Down Expand Up @@ -944,7 +950,10 @@ public void doXML( XMLStreamReader xmlStream, HttpServletRequest request, HttpRe
sendServiceException( requestVersion, e, response );
} catch ( XMLParsingException e ) {
LOG.trace( "Stack trace:", e );
sendServiceException( requestVersion, new OWSException( e.getMessage(), INVALID_PARAMETER_VALUE ), response );
String exceptionCode = INVALID_PARAMETER_VALUE;
if ( VERSION_200.equals( requestVersion ) )
exceptionCode = OWSException.OPERATION_PROCESSING_FAILED;
sendServiceException( requestVersion, new OWSException( e.getMessage(), exceptionCode ), response );
} catch ( MissingParameterException e ) {
LOG.trace( "Stack trace:", e );
sendServiceException( requestVersion, new OWSException( e ), response );
Expand Down