[Backport release-3_4] Return 501 on 'OperationNotSupported' error (#9770)

backporting[bot] · rldhont · commit e445a25c15c2 · 2019-04-11T11:47:11.000+02:00
Return 501 HTTP statues code 'OperationNotSupported' Error According to OGC/OWS standard, 'OperationNotSupported' Error should return 501 but actually return 200. ref http://docs.opengeospatial.org/is/17-007r1/17-007r1.html - table 21
diff --git a/src/server/services/wcs/qgswcs.cpp b/src/server/services/wcs/qgswcs.cpp
@@ -74,7 +74,7 @@ namespace QgsWcs
         if ( req.isEmpty() )
         {
           throw QgsServiceException( QStringLiteral( "OperationNotSupported" ),
-                                     QStringLiteral( "Please check the value of the REQUEST parameter" ) );
+                                     QStringLiteral( "Please check the value of the REQUEST parameter" ), 501 );
         }
 
         if ( QSTR_COMPARE( req, "GetCapabilities" ) )
@@ -93,7 +93,7 @@ namespace QgsWcs
         {
           // Operation not supported
           throw QgsServiceException( QStringLiteral( "OperationNotSupported" ),
-                                     QStringLiteral( "Request %1 is not supported" ).arg( req ) );
+                                     QStringLiteral( "Request %1 is not supported" ).arg( req ), 501 );
         }
       }
 
diff --git a/src/server/services/wfs/qgswfs.cpp b/src/server/services/wfs/qgswfs.cpp
@@ -78,7 +78,7 @@ namespace QgsWfs
         if ( req.isEmpty() )
         {
           throw QgsServiceException( QStringLiteral( "OperationNotSupported" ),
-                                     QStringLiteral( "Please check the value of the REQUEST parameter" ) );
+                                     QStringLiteral( "Please check the value of the REQUEST parameter" ), 501 );
         }
 
         if ( QSTR_COMPARE( req, "GetCapabilities" ) )
@@ -117,7 +117,7 @@ namespace QgsWfs
         {
           // Operation not supported
           throw QgsServiceException( QStringLiteral( "OperationNotSupported" ),
-                                     QStringLiteral( "Request %1 is not supported" ).arg( req ) );
+                                     QStringLiteral( "Request %1 is not supported" ).arg( req ), 501 );
         }
       }
 
diff --git a/src/server/services/wms/qgswms.cpp b/src/server/services/wms/qgswms.cpp
@@ -91,7 +91,7 @@ namespace QgsWms
         if ( req.isEmpty() )
         {
           throw QgsServiceException( QStringLiteral( "OperationNotSupported" ),
-                                     QStringLiteral( "Please check the value of the REQUEST parameter" ) );
+                                     QStringLiteral( "Please check the value of the REQUEST parameter" ), 501 );
         }
 
         if ( ( mVersion.compare( QLatin1String( "1.1.1" ) ) == 0 \
@@ -154,7 +154,7 @@ namespace QgsWms
         {
           // Operation not supported
           throw QgsServiceException( QStringLiteral( "OperationNotSupported" ),
-                                     QString( "Request %1 is not supported" ).arg( req ) );
+                                     QString( "Request %1 is not supported" ).arg( req ), 501 );
         }
       }
 
diff --git a/src/server/services/wmts/qgswmts.cpp b/src/server/services/wmts/qgswmts.cpp
@@ -72,7 +72,7 @@ namespace QgsWmts
         if ( req.isEmpty() )
         {
           throw QgsServiceException( QStringLiteral( "OperationNotSupported" ),
-                                     QStringLiteral( "Please check the value of the REQUEST parameter" ) );
+                                     QStringLiteral( "Please check the value of the REQUEST parameter" ), 501 );
         }
 
         if ( QSTR_COMPARE( req, "GetCapabilities" ) )
@@ -91,7 +91,7 @@ namespace QgsWmts
         {
           // Operation not supported
           throw QgsServiceException( QStringLiteral( "OperationNotSupported" ),
-                                     QStringLiteral( "Request %1 is not supported" ).arg( req ) );
+                                     QStringLiteral( "Request %1 is not supported" ).arg( req ), 501 );
         }
       }
 
diff --git a/tests/src/python/test_qgsserver.py b/tests/src/python/test_qgsserver.py
@@ -262,6 +262,12 @@ def _execute_request_project(self, qs, project, requestMethod=QgsServerRequest.G
             headers.append(("%s: %s" % (k, rh[k])).encode('utf-8'))
         return b"\n".join(headers) + b"\n\n", bytes(response.body())
 
+    def _assert_status_code(self, status_code, qs, requestMethod=QgsServerRequest.GetMethod, data=None, project=None):
+        request = QgsBufferServerRequest(qs, requestMethod, {}, data)
+        response = QgsBufferServerResponse()
+        self.server.handleRequest(request, response, project)
+        assert response.statusCode() == status_code, "%s != %s" % (response.statusCode(), status_code)
+
 
 class TestQgsServerTestBase(unittest.TestCase):
 
diff --git a/tests/src/python/test_qgsserver_wfs.py b/tests/src/python/test_qgsserver_wfs.py
@@ -92,6 +92,10 @@ def wfs_request_compare(self,
             query_string, request))
         return header, body
 
+    def test_operation_not_supported(self):
+        qs = '?MAP=%s&SERVICE=WFS&VERSION=1.1.0&REQUEST=NotAValidRequest' % urllib.parse.quote(self.projectPath)
+        self._assert_status_code(501, qs)
+
     def test_project_wfs(self):
         """Test some WFS request"""
         for request in ('GetCapabilities', 'DescribeFeatureType'):
diff --git a/tests/src/python/test_qgsserver_wms.py b/tests/src/python/test_qgsserver_wms.py
@@ -88,6 +88,10 @@ def test_getprojectsettings(self):
     def test_getcontext(self):
         self.wms_request_compare('GetContext')
 
+    def test_operation_not_supported(self):
+        qs = '?MAP=%s&SERVICE=WMS&VERSION=1.3.0&REQUEST=NotAValidRequest' % urllib.parse.quote(self.projectPath)
+        self._assert_status_code(501, qs)
+
     def test_describelayer(self):
         # Test DescribeLayer
         self.wms_request_compare('DescribeLayer',
diff --git a/tests/src/python/test_qgsserver_wmts.py b/tests/src/python/test_qgsserver_wmts.py
@@ -78,6 +78,10 @@ def wmts_request_compare(self, request, version='', extra_query_string='', refer
 
         self.assertXMLEqual(response, expected, msg="request %s failed.\n Query: %s" % (query_string, request))
 
+    def test_operation_not_supported(self):
+        qs = '?MAP=%s&SERVICE=WFS&VERSION=1.0.0&REQUEST=NotAValidRequest' % urllib.parse.quote(self.projectPath)
+        self._assert_status_code(501, qs)
+
     def test_project_wmts(self):
         """Test some WMTS request"""
         for request in ('GetCapabilities',):

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ namespace QgsWcs`
`74`	`74`	`if ( req.isEmpty() )`
`75`	`75`	`{`
`76`	`76`	`throw QgsServiceException( QStringLiteral( "OperationNotSupported" ),`
`77`		`- QStringLiteral( "Please check the value of the REQUEST parameter" ) );`
	`77`	`+ QStringLiteral( "Please check the value of the REQUEST parameter" ), 501 );`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`if ( QSTR_COMPARE( req, "GetCapabilities" ) )`
`@@ -93,7 +93,7 @@ namespace QgsWcs`
`93`	`93`	`{`
`94`	`94`	`// Operation not supported`
`95`	`95`	`throw QgsServiceException( QStringLiteral( "OperationNotSupported" ),`
`96`		`- QStringLiteral( "Request %1 is not supported" ).arg( req ) );`
	`96`	`+ QStringLiteral( "Request %1 is not supported" ).arg( req ), 501 );`
`97`	`97`	`}`
`98`	`98`	`}`
`99`	`99`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ namespace QgsWfs`
`78`	`78`	`if ( req.isEmpty() )`
`79`	`79`	`{`
`80`	`80`	`throw QgsServiceException( QStringLiteral( "OperationNotSupported" ),`
`81`		`- QStringLiteral( "Please check the value of the REQUEST parameter" ) );`
	`81`	`+ QStringLiteral( "Please check the value of the REQUEST parameter" ), 501 );`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`if ( QSTR_COMPARE( req, "GetCapabilities" ) )`
`@@ -117,7 +117,7 @@ namespace QgsWfs`
`117`	`117`	`{`
`118`	`118`	`// Operation not supported`
`119`	`119`	`throw QgsServiceException( QStringLiteral( "OperationNotSupported" ),`
`120`		`- QStringLiteral( "Request %1 is not supported" ).arg( req ) );`
	`120`	`+ QStringLiteral( "Request %1 is not supported" ).arg( req ), 501 );`
`121`	`121`	`}`
`122`	`122`	`}`
`123`	`123`
Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ namespace QgsWms`
`91`	`91`	`if ( req.isEmpty() )`
`92`	`92`	`{`
`93`	`93`	`throw QgsServiceException( QStringLiteral( "OperationNotSupported" ),`
`94`		`- QStringLiteral( "Please check the value of the REQUEST parameter" ) );`
	`94`	`+ QStringLiteral( "Please check the value of the REQUEST parameter" ), 501 );`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`if ( ( mVersion.compare( QLatin1String( "1.1.1" ) ) == 0 \`
`@@ -154,7 +154,7 @@ namespace QgsWms`
`154`	`154`	`{`
`155`	`155`	`// Operation not supported`
`156`	`156`	`throw QgsServiceException( QStringLiteral( "OperationNotSupported" ),`
`157`		`- QString( "Request %1 is not supported" ).arg( req ) );`
	`157`	`+ QString( "Request %1 is not supported" ).arg( req ), 501 );`
`158`	`158`	`}`
`159`	`159`	`}`
`160`	`160`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ namespace QgsWmts`
`72`	`72`	`if ( req.isEmpty() )`
`73`	`73`	`{`
`74`	`74`	`throw QgsServiceException( QStringLiteral( "OperationNotSupported" ),`
`75`		`- QStringLiteral( "Please check the value of the REQUEST parameter" ) );`
	`75`	`+ QStringLiteral( "Please check the value of the REQUEST parameter" ), 501 );`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`if ( QSTR_COMPARE( req, "GetCapabilities" ) )`
`@@ -91,7 +91,7 @@ namespace QgsWmts`
`91`	`91`	`{`
`92`	`92`	`// Operation not supported`
`93`	`93`	`throw QgsServiceException( QStringLiteral( "OperationNotSupported" ),`
`94`		`- QStringLiteral( "Request %1 is not supported" ).arg( req ) );`
	`94`	`+ QStringLiteral( "Request %1 is not supported" ).arg( req ), 501 );`
`95`	`95`	`}`
`96`	`96`	`}`
`97`	`97`