[Backport release-3_6] Return 501 on 'OperationNotSupported' error (#…

…9771)

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

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 );
         }
       }
 

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 );
         }
       }
 

src/server/services/wms/qgswms.cpp

@@ -90,7 +90,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 \
@@ -153,7 +153,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 );
         }
       }
 

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 );
         }
       }
 

tests/src/python/test_qgsserver.py

@@ -259,6 +259,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):
 

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'):

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',

tests/src/python/test_qgsserver_wmts.py

@@ -107,6 +107,10 @@ def wmts_request_compare_project(self, project, request, version='', extra_query
 
         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',):