qgis · Feb 25, 2019
diff --git a/‎src/server/services/wms/qgswmsparameters.cpp
Lines changed: 9 additions & 5 deletions b/‎src/server/services/wms/qgswmsparameters.cpp
Lines changed: 9 additions & 5 deletions
diff --git a/‎tests/src/python/test_qgsserver_wms_getmap.py
Lines changed: 40 additions & 0 deletions b/‎tests/src/python/test_qgsserver_wms_getmap.py
Lines changed: 40 additions & 0 deletions
diff --git a/‎tests/testdata/control_images/qgis_server/WMS_GetMap_Filter5/WMS_GetMap_Filter5.png
33.1 KB b/‎tests/testdata/control_images/qgis_server/WMS_GetMap_Filter5/WMS_GetMap_Filter5.png
33.1 KB
diff --git a/‎tests/testdata/control_images/qgis_server/WMS_GetMap_Filter5/WMS_GetMap_Filter5_mask.png
31.1 KB b/‎tests/testdata/control_images/qgis_server/WMS_GetMap_Filter5/WMS_GetMap_Filter5_mask.png
31.1 KB
@@ -1332,15 +1332,19 @@ namespace QgsWms
       }
       else if ( !f.isEmpty() )
       {
-        // filter format: "LayerName:filterString;LayerName2:filterString2;..."
+        // filter format: "LayerName,LayerName2:filterString;LayerName3:filterString2;..."
         // several filters can be defined for one layer
         const QStringList splits = f.split( ':' );
         if ( splits.size() == 2 )
         {
-          QgsWmsParametersFilter filter;
-          filter.mFilter = splits[1];
-          filter.mType = QgsWmsParametersFilter::SQL;
-          filters.insert( splits[0], filter );
+          const QStringList layers = splits[0].split( ',' );
+          for ( const QString &layer : layers )
+          {
+            QgsWmsParametersFilter filter;
+            filter.mFilter = splits[1];
+            filter.mType = QgsWmsParametersFilter::SQL;
+            filters.insert( layer, filter );
+          }
         }
         else
         {
 
@@ -798,6 +798,46 @@ def test_wms_getmap_filter(self):
         r, h = self._result(self._execute_request(qs))
         self._img_diff_error(r, h, "WMS_GetMap_Filter4")
 
+        # display multiple features filtered from multiple layers with same filter for some
+        qs = "?" + "&".join(["%s=%s" % i for i in list({
+            "MAP": urllib.parse.quote(self.projectPath),
+            "SERVICE": "WMS",
+            "VERSION": "1.1.1",
+            "REQUEST": "GetMap",
+            "LAYERS": "Country,Country_Diagrams,Hello",
+            "STYLES": "",
+            "FORMAT": "image/png",
+            "BBOX": "1017529,-4226661,11271098,17063190",
+            "HEIGHT": "500",
+            "WIDTH": "500",
+            "CRS": "EPSG:3857",
+            "FILTER": "Country,Country_Diagrams: \"name\" IN ( 'africa' , 'eurasia' );Hello: \"color\" IN ( 'magenta' , 'cerese' )"
+        }.items())])
+
+        r, h = self._result(self._execute_request(qs))
+        self._img_diff_error(r, h, "WMS_GetMap_Filter5")
+
+        # Error in filter (missing quote after africa) with multiple layer filter
+        qs = "?" + "&".join(["%s=%s" % i for i in list({
+            "MAP": urllib.parse.quote(self.projectPath),
+            "SERVICE": "WMS",
+            "VERSION": "1.1.1",
+            "REQUEST": "GetMap",
+            "LAYERS": "Country,Country_Diagrams,Hello",
+            "STYLES": "",
+            "FORMAT": "image/png",
+            "BBOX": "1017529,-4226661,11271098,17063190",
+            "HEIGHT": "500",
+            "WIDTH": "500",
+            "CRS": "EPSG:3857",
+            "FILTER": "Country,Country_Diagrams: \"name\" IN ( 'africa , 'eurasia' );Hello: \"color\" IN ( 'magenta' , 'cerese' )"
+        }.items())])
+
+        expected = self.strip_version_xmlns(b'<ServiceExceptionReport  >\n <ServiceException code="Filter string rejected">The filter string  "name" IN ( \'africa , \'eurasia\' ) has been rejected because of security reasons. Note: Text strings have to be enclosed in single or double quotes. A space between each word / special character is mandatory. Allowed Keywords and special characters are  AND,OR,IN,&lt;,>=,>,>=,!=,\',\',(,),DMETAPHONE,SOUNDEX. Not allowed are semicolons in the filter expression.</ServiceException>\n</ServiceExceptionReport>\n')
+        r, h = self._result(self._execute_request(qs))
+
+        self.assertEqual(self.strip_version_xmlns(r), expected)
+
     def test_wms_getmap_filter_ogc(self):
         filter = "<Filter><PropertyIsEqualTo><PropertyName>name</PropertyName>" + \
                  "<Literal>eurasia</Literal></PropertyIsEqualTo></Filter>"
Original file line number	Diff line number	Diff line change
`@@ -1332,15 +1332,19 @@ namespace QgsWms`
`1332`	`1332`	`}`
`1333`	`1333`	`else if ( !f.isEmpty() )`
`1334`	`1334`	`{`
`1335`		`- // filter format: "LayerName:filterString;LayerName2:filterString2;..."`
	`1335`	`+ // filter format: "LayerName,LayerName2:filterString;LayerName3:filterString2;..."`
`1336`	`1336`	`// several filters can be defined for one layer`
`1337`	`1337`	`const QStringList splits = f.split( ':' );`
`1338`	`1338`	`if ( splits.size() == 2 )`
`1339`	`1339`	`{`
`1340`		`- QgsWmsParametersFilter filter;`
`1341`		`- filter.mFilter = splits[1];`
`1342`		`- filter.mType = QgsWmsParametersFilter::SQL;`
`1343`		`- filters.insert( splits[0], filter );`
	`1340`	`+ const QStringList layers = splits[0].split( ',' );`
	`1341`	`+ for ( const QString &layer : layers )`
	`1342`	`+ {`
	`1343`	`+ QgsWmsParametersFilter filter;`
	`1344`	`+ filter.mFilter = splits[1];`
	`1345`	`+ filter.mType = QgsWmsParametersFilter::SQL;`
	`1346`	`+ filters.insert( layer, filter );`
	`1347`	`+ }`
`1344`	`1348`	`}`
`1345`	`1349`	`else`
`1346`	`1350`	`{`