Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[server] Fix sub-optimal checks in wms access control #58937

Merged
merged 1 commit into from
Oct 8, 2024
Merged

[server] Fix sub-optimal checks in wms access control #58937

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 49 additions & 23 deletions src/server/services/wms/qgswmsrendercontext.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,15 +206,19 @@ QStringList QgsWmsRenderContext::flattenedQueryLayers( const QStringList &layerN
const auto &layers { mLayerGroups[ name ] };
for ( const auto &l : layers )
{
const auto nick { layerNickname( *l ) };
// This handles the case for root (fake) group
if ( mLayerGroups.contains( nick ) )
// Only add allowed layers
if ( checkLayerReadPermissions( l ) )
{
_result.append( name );
}
else
{
_result.append( findLeaves( nick ) );
const auto nick { layerNickname( *l ) };
// This handles the case for root (fake) group
if ( mLayerGroups.contains( nick ) )
{
_result.append( name );
}
else
{
_result.append( findLeaves( nick ) );
}
}
}
}
Expand Down Expand Up @@ -355,11 +359,7 @@ void QgsWmsRenderContext::initLayerGroupsRecursive( const QgsLayerTreeGroup *gro
{
for ( const auto &tl : treeGroupLayers )
{
auto layer = tl->layer();
if ( checkLayerReadPermissions( layer ) )
{
layerGroup.push_back( layer );
}
layerGroup.push_back( tl->layer() );
}
}
else
Expand All @@ -369,11 +369,7 @@ void QgsWmsRenderContext::initLayerGroupsRecursive( const QgsLayerTreeGroup *gro
QList<QgsMapLayer *> groupLayersList;
for ( const auto &tl : treeGroupLayers )
{
auto layer = tl->layer();
if ( checkLayerReadPermissions( layer ) )
{
groupLayersList << layer;
}
groupLayersList << tl->layer();
}
for ( const auto &l : projectLayerOrder )
{
Expand Down Expand Up @@ -548,11 +544,28 @@ void QgsWmsRenderContext::searchLayersToRenderSld()
throw QgsBadRequestException( QgsServiceException::OGC_LayerNotDefined,
param );
}

bool layerAdded = false;
for ( QgsMapLayer *layer : mLayerGroups[lname] )
{
const QString name = layerNickname( *layer );
mSlds[name] = namedElem;
mLayersToRender.insert( 0, layer );
// Insert only allowed layers
if ( checkLayerReadPermissions( layer ) )
{
const QString name = layerNickname( *layer );
mSlds[name] = namedElem;
mLayersToRender.insert( 0, layer );
layerAdded = true;
}
}
// No layers have been added, consider the group
// as non-existent.
if ( !layerAdded )
{
QgsWmsParameter param( QgsWmsParameter::LAYER );
param.mValue = lname;
throw QgsBadRequestException( QgsServiceException::OGC_LayerNotDefined,
param );

}
}
else
Expand Down Expand Up @@ -626,13 +639,26 @@ void QgsWmsRenderContext::searchLayersToRenderStyle()
layersFromGroup.push_front( nickname );
}

bool layerAdded = false;
for ( const auto &name : layersFromGroup )
{
for ( const auto layer : mNicknameLayers.values( name ) )
{
addLayerToRender( layer );
if ( addLayerToRender( layer ) )
{
layerAdded = true;
}
}
}
// No layers have been added, consider the group
// as non-existent.
if ( !layerAdded )
{
QgsWmsParameter param( QgsWmsParameter::LAYER );
param.mValue = nickname;
throw QgsBadRequestException( QgsServiceException::OGC_LayerNotDefined,
param );
}
}
else
{
Expand Down Expand Up @@ -908,7 +934,7 @@ bool QgsWmsRenderContext::isExternalLayer( const QString &name ) const
return false;
}

bool QgsWmsRenderContext::checkLayerReadPermissions( QgsMapLayer *layer )
bool QgsWmsRenderContext::checkLayerReadPermissions( QgsMapLayer *layer ) const
{
#ifdef HAVE_SERVER_PYTHON_PLUGINS
if ( !accessControl()->layerReadPermission( layer ) )
Expand Down
2 changes: 1 addition & 1 deletion src/server/services/wms/qgswmsrendercontext.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ namespace QgsWms
* Check layer read permissions
* Returns true if the layer is readable, false otherwise
*/
bool checkLayerReadPermissions( QgsMapLayer *layer );
bool checkLayerReadPermissions( QgsMapLayer *layer ) const;

bool layerScaleVisibility( const QString &name ) const;

Expand Down
Loading