Merge pull request #44510 from mhugent/backport_3_16_max_image_width

mhugent · web-flow · commit 32270fcafb4a · 2021-08-02T13:22:04.000+02:00
Backport 3_16 max image width/height for GetLegendGraphic
diff --git a/src/server/services/wms/qgswmsrendercontext.cpp b/src/server/services/wms/qgswmsrendercontext.cpp
@@ -616,6 +616,11 @@ int QgsWmsRenderContext::mapHeight() const
 }
 
 bool QgsWmsRenderContext::isValidWidthHeight() const
+{
+  return isValidWidthHeight( mapWidth(), mapHeight() );
+}
+
+bool QgsWmsRenderContext::isValidWidthHeight( int width, int height ) const
 {
   //test if maxWidth / maxHeight are set in the project or as an env variable
   //and WIDTH / HEIGHT parameter is in the range allowed range
@@ -634,7 +639,7 @@ bool QgsWmsRenderContext::isValidWidthHeight() const
     wmsMaxWidth = std::max( wmsMaxWidthProj, wmsMaxWidthEnv );
   }
 
-  if ( wmsMaxWidth != -1 && mapWidth() > wmsMaxWidth )
+  if ( wmsMaxWidth != -1 && width > wmsMaxWidth )
   {
     return false;
   }
@@ -654,7 +659,7 @@ bool QgsWmsRenderContext::isValidWidthHeight() const
     wmsMaxHeight = std::max( wmsMaxHeightProj, wmsMaxHeightEnv );
   }
 
-  if ( wmsMaxHeight != -1 && mapHeight() > wmsMaxHeight )
+  if ( wmsMaxHeight != -1 && height > wmsMaxHeight )
   {
     return false;
   }
@@ -675,13 +680,13 @@ bool QgsWmsRenderContext::isValidWidthHeight() const
       depth = 32;
   }
 
-  const int bytes_per_line = ( ( mapWidth() * depth + 31 ) >> 5 ) << 2; // bytes per scanline (must be multiple of 4)
+  const int bytes_per_line = ( ( width * depth + 31 ) >> 5 ) << 2; // bytes per scanline (must be multiple of 4)
 
-  if ( std::numeric_limits<int>::max() / depth < static_cast<uint>( mapWidth() )
+  if ( std::numeric_limits<int>::max() / depth < static_cast<uint>( width )
        || bytes_per_line <= 0
-       || mapHeight() <= 0
-       || std::numeric_limits<int>::max() / static_cast<uint>( bytes_per_line ) < static_cast<uint>( mapHeight() )
-       || std::numeric_limits<int>::max() / sizeof( uchar * ) < static_cast<uint>( mapHeight() ) )
+       || height <= 0
+       || std::numeric_limits<int>::max() / static_cast<uint>( bytes_per_line ) < static_cast<uint>( height )
+       || std::numeric_limits<int>::max() / sizeof( uchar * ) < static_cast<uint>( height ) )
   {
     return false;
   }
diff --git a/src/server/services/wms/qgswmsrendercontext.h b/src/server/services/wms/qgswmsrendercontext.h
@@ -235,6 +235,14 @@ namespace QgsWms
        */
       bool isValidWidthHeight() const;
 
+      /**
+       * Returns true if width and height are valid according to the maximum image width/height
+       * \param width the image width in pixels
+       * \param height the image height in pixels
+       * \since QGIS 3.22
+       */
+      bool isValidWidthHeight( int width, int height ) const;
+
       /**
        * Returns WIDTH or SRCWIDTH according to \a UseSrcWidthHeight flag.
        */
diff --git a/src/server/services/wms/qgswmsrenderer.cpp b/src/server/services/wms/qgswmsrenderer.cpp
@@ -128,6 +128,10 @@ namespace QgsWms
     const qreal dpmm = mContext.dotsPerMm();
     const QSizeF minSize = renderer.minimumSize();
     const QSize size( static_cast<int>( minSize.width() * dpmm ), static_cast<int>( minSize.height() * dpmm ) );
+    if ( !mContext.isValidWidthHeight( size.width(), size.height() ) )
+    {
+      throw QgsServerException( QStringLiteral( "Legend image is too large" ) );
+    }
     image.reset( createImage( size ) );
 
     // configure painter
@@ -160,6 +164,11 @@ namespace QgsWms
 
     // create image
     const QSize size( mWmsParameters.widthAsInt(), mWmsParameters.heightAsInt() );
+    //test if legend image is larger than max width/height
+    if ( !mContext.isValidWidthHeight( size.width(), size.height() ) )
+    {
+      throw QgsServerException( QStringLiteral( "Legend image is too large" ) );
+    }
     std::unique_ptr<QImage> image( createImage( size ) );
 
     // configure painter
diff --git a/src/ui/qgsprojectpropertiesbase.ui b/src/ui/qgsprojectpropertiesbase.ui
@@ -2098,7 +2098,7 @@
                     <item row="0" column="0" colspan="5">
                      <widget class="QLabel" name="label_21">
                       <property name="text">
-                       <string>Maximums for GetMap request</string>
+                       <string>Maximum image size for GetMap and GetLegendGraphic requests</string>
                       </property>
                      </widget>
                     </item>

Original file line number	Diff line number	Diff line change
`@@ -616,6 +616,11 @@ int QgsWmsRenderContext::mapHeight() const`
`616`	`616`	`}`
`617`	`617`
`618`	`618`	`bool QgsWmsRenderContext::isValidWidthHeight() const`
	`619`	`+{`
	`620`	`+ return isValidWidthHeight( mapWidth(), mapHeight() );`
	`621`	`+}`
	`622`	`+`
	`623`	`+bool QgsWmsRenderContext::isValidWidthHeight( int width, int height ) const`
`619`	`624`	`{`
`620`	`625`	`//test if maxWidth / maxHeight are set in the project or as an env variable`
`621`	`626`	`//and WIDTH / HEIGHT parameter is in the range allowed range`
`@@ -634,7 +639,7 @@ bool QgsWmsRenderContext::isValidWidthHeight() const`
`634`	`639`	`wmsMaxWidth = std::max( wmsMaxWidthProj, wmsMaxWidthEnv );`
`635`	`640`	`}`
`636`	`641`
`637`		`- if ( wmsMaxWidth != -1 && mapWidth() > wmsMaxWidth )`
	`642`	`+ if ( wmsMaxWidth != -1 && width > wmsMaxWidth )`
`638`	`643`	`{`
`639`	`644`	`return false;`
`640`	`645`	`}`
`@@ -654,7 +659,7 @@ bool QgsWmsRenderContext::isValidWidthHeight() const`
`654`	`659`	`wmsMaxHeight = std::max( wmsMaxHeightProj, wmsMaxHeightEnv );`
`655`	`660`	`}`
`656`	`661`
`657`		`- if ( wmsMaxHeight != -1 && mapHeight() > wmsMaxHeight )`
	`662`	`+ if ( wmsMaxHeight != -1 && height > wmsMaxHeight )`
`658`	`663`	`{`
`659`	`664`	`return false;`
`660`	`665`	`}`
`@@ -675,13 +680,13 @@ bool QgsWmsRenderContext::isValidWidthHeight() const`
`675`	`680`	`depth = 32;`
`676`	`681`	`}`
`677`	`682`
`678`		`- const int bytes_per_line = ( ( mapWidth() * depth + 31 ) >> 5 ) << 2; // bytes per scanline (must be multiple of 4)`
	`683`	`+ const int bytes_per_line = ( ( width * depth + 31 ) >> 5 ) << 2; // bytes per scanline (must be multiple of 4)`
`679`	`684`
`680`		`- if ( std::numeric_limits<int>::max() / depth < static_cast<uint>( mapWidth() )`
	`685`	`+ if ( std::numeric_limits<int>::max() / depth < static_cast<uint>( width )`
`681`	`686`	`\|\| bytes_per_line <= 0`
`682`		`- \|\| mapHeight() <= 0`
`683`		`- \|\| std::numeric_limits<int>::max() / static_cast<uint>( bytes_per_line ) < static_cast<uint>( mapHeight() )`
`684`		`- \|\| std::numeric_limits<int>::max() / sizeof( uchar * ) < static_cast<uint>( mapHeight() ) )`
	`687`	`+ \|\| height <= 0`
	`688`	`+ \|\| std::numeric_limits<int>::max() / static_cast<uint>( bytes_per_line ) < static_cast<uint>( height )`
	`689`	`+ \|\| std::numeric_limits<int>::max() / sizeof( uchar * ) < static_cast<uint>( height ) )`
`685`	`690`	`{`
`686`	`691`	`return false;`
`687`	`692`	`}`