0001-opengis-correctly-handle-XML-formatted-OpenGIS-error.patch

Benjamin Dauvergne, 15 décembre 2017 22:55

Voir les différences: en ligne côte à côte

Subject: [PATCH] opengis: correctly handle XML formatted OpenGIS errors
 (#20754)

 passerelle/apps/opengis/models.py |   27 +++++++++++++++++++++++++++
 tests/test_opengis.py             |   24 ++++++++++++++++++++++++
 2 files changed, 51 insertions(+)

     import math
     import xml.etree.ElementTree as ET
     from HTMLParser import HTMLParser
     import pyproj
-...
                     params['CQL_FILTER'] += ' AND %s %s \'%%%s%%\'' % (filter_property_name, operator, q)
             response = self.requests.get(self.wfs_service_url, params=params)
             data = []
             try:
                 json_result = response.json()
             except ValueError:
                 self.handle_opengis_error(response)
                 # if handle_opengis_error did not raise an error, we raise a generic one
                 raise APIError(u'OpenGIS Error: unparsable error',
                                data={'content': repr(response.content[:1024])})
             for feature in response.json()['features']:
                 feature['text'] = feature['properties'].get(property_name)
                 data.append(feature)
             return {'data': data}
         def handle_opengis_error(self, response):
             try:
                 root = ET.fromstring(response.content)
             except ET.ParseError:
                 return None
             if root.tag != '{http://www.opengis.net/ows/1.1}ExceptionReport':
                 return None
             exception = root.find('{http://www.opengis.net/ows/1.1}Exception')
             exception_code = exception.attrib.get('exceptionCode')
             if exception is None:
                 return None
             exception_text = exception.find('{http://www.opengis.net/ows/1.1}ExceptionText')
             if exception_text is None:
                 return None
             content = exception_text.text
             htmlparser = HTMLParser()
             content = htmlparser.unescape(content)
             raise APIError(u'OpenGIS Error: %s' % exception_code or 'unknown code',
                            data={'text': content})
         @endpoint(perm='can_access',
                   description=_('Get feature info'),

         "type": "FeatureCollection"
     }'''
     FAKE_ERROR = u'<ows:ExceptionReport xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ows="http://www.opengis.net/ows/1.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.0.0" xsi:schemaLocation="http://www.opengis.net/ows/1.1 https://sigmetropole.lametro.fr/geoserver/schemas/ows/1.1.0/owsAll.xsd">\n  <ows:Exception exceptionCode="NoApplicableCode">\n    <ows:ExceptionText>Could not parse CQL filter list.\nEncountered &amp;quot;BIS&amp;quot; at line 1, column 129.\nWas expecting one of:\n    &amp;lt;EOF&amp;gt; \n    &amp;quot;and&amp;quot; ...\n    &amp;quot;or&amp;quot; ...\n    &amp;quot;;&amp;quot; ...\n    &amp;quot;/&amp;quot; ...\n    &amp;quot;*&amp;quot; ...\n    &amp;quot;+&amp;quot; ...\n    &amp;quot;-&amp;quot; ...\n     Parsing : strEqualsIgnoreCase(nom_commune, &amp;apos;Grenoble&amp;apos;) = true AND strEqualsIgnoreCase(nom_voie, &amp;apos;rue albert recoura&amp;apos;) = true AND numero=8 BIS.</ows:ExceptionText>\n  </ows:Exception>\n</ows:ExceptionReport>\n'
     @pytest.fixture
     def connector(db):
-...
             return utils.FakedResponse(status_code=200, content=FAKE_SERVICE_CAPABILITIES)
         return utils.FakedResponse(status_code=200, content=FAKE_FEATURES_JSON)
     def geoserver_responses_errors(url, **kwargs):
         if kwargs['params'].get('request') == 'GetCapabilities':
             return utils.FakedResponse(status_code=200, content=FAKE_SERVICE_CAPABILITIES)
         return utils.FakedResponse(status_code=200, content=FAKE_ERROR)
     @mock.patch('passerelle.utils.LoggedRequest.get')
     def test_feature_info(mocked_get, app, connector):
         endpoint = utils.generic_endpoint_url('opengis', 'feature_info', slug=connector.slug)
-...
         params.pop('cql_filter')
         resp = app.get(endpoint, params=params)
         assert 'CQL_FILTER' not in mocked_get.call_args[1]['params']
     @mock.patch('passerelle.utils.LoggedRequest.get')
     def test_get_feature(mocked_get, app, connector):
         endpoint = utils.generic_endpoint_url('opengis', 'features', slug=connector.slug)
         assert endpoint == '/opengis/test/features'
         mocked_get.side_effect = geoserver_responses_errors
         resp = app.get(endpoint, params={'type_names': 'ref_metro_limites_communales', 'property_name': 'nom'})
         assert mocked_get.call_args[1]['params']['REQUEST'] == 'GetFeature'
         assert mocked_get.call_args[1]['params']['PROPERTYNAME'] == 'nom'
         assert mocked_get.call_args[1]['params']['TYPENAMES'] == 'ref_metro_limites_communales'
         assert mocked_get.call_args[1]['params']['OUTPUTFORMAT'] == 'json'
         assert mocked_get.call_args[1]['params']['SERVICE'] == 'WFS'
         assert mocked_get.call_args[1]['params']['VERSION'] == connector.get_wfs_service_version()
         result = resp.json
         assert result['err'] == 1
         assert result['err_desc'] == 'OpenGIS Error: NoApplicableCode'
         assert 'Could not parse' in result['data']['text']
+    -

Projet

Général

Profil

Produits Entr'ouvert » Passerelle

0001-opengis-correctly-handle-XML-formatted-OpenGIS-error.patch