[WFS provider] Do not expand authentication config to username/password when adding layers from source select or browser

rouault · nyalldawson · commit e75343e689af · 2019-10-27T07:58:21.000+10:00
diff --git a/src/providers/wfs/qgswfsdataitems.cpp b/src/providers/wfs/qgswfsdataitems.cpp
@@ -191,7 +191,7 @@ QVector<QgsDataItem *> QgsWfsRootItem::createChildren()
   {
     QgsWfsConnection connection( connName );
     QString path = "wfs:/" + connName;
-    QgsDataItem *conn = new QgsWfsConnectionItem( this, connName, path, connection.uri().uri() );
+    QgsDataItem *conn = new QgsWfsConnectionItem( this, connName, path, connection.uri().uri( false ) );
     connections.append( conn );
   }
   return connections;
@@ -260,7 +260,7 @@ QgsDataItem *QgsWfsDataItemProvider::createDataItem( const QString &path, QgsDat
 
       QgsDebugMsgLevel( QStringLiteral( "WFS full uri: '%1'." ).arg( QString( sourceUri.uri() ) ), 4 );
 
-      return new QgsWfsConnectionItem( parentItem, QStringLiteral( "WFS" ), path, sourceUri.uri( false ) );
+      return new QgsWfsConnectionItem( parentItem, QStringLiteral( "WFS" ), path, sourceUri.uri() );
     }
   }
 
@@ -287,9 +287,9 @@ QVector<QgsDataItem *> QgsWfsDataItemProvider::createDataItems( const QString &p
         for ( const QString &encodedUri : encodedUris )
         {
           QgsWFSDataSourceURI uri( encodedUri );
-          QgsDebugMsgLevel( QStringLiteral( "WFS full uri: '%1'." ).arg( uri.uri( false ) ), 4 );
+          QgsDebugMsgLevel( QStringLiteral( "WFS full uri: '%1'." ).arg( uri.uri() ), 4 );
 
-          QgsDataItem *item = new QgsWfsConnectionItem( parentItem, QStringLiteral( "WFS" ), path, uri.uri( false ) );
+          QgsDataItem *item = new QgsWfsConnectionItem( parentItem, QStringLiteral( "WFS" ), path, uri.uri() );
           if ( item )
           {
             items.append( item );
diff --git a/src/providers/wfs/qgswfsdatasourceuri.cpp b/src/providers/wfs/qgswfsdatasourceuri.cpp
@@ -144,7 +144,7 @@ QgsWFSDataSourceURI::QgsWFSDataSourceURI( const QString &uri )
   }
 }
 
-const QString QgsWFSDataSourceURI::uri( bool expandAuthConfig ) const
+const QString QgsWFSDataSourceURI::uri() const
 {
   QgsDataSourceUri theURI( mURI );
   // Add authcfg param back into the uri (must be non-empty value)
@@ -164,8 +164,8 @@ const QString QgsWFSDataSourceURI::uri( bool expandAuthConfig ) const
       theURI.setPassword( mAuth.mPassword );
     }
   }
-  // NOTE: avoid expanding authcfg here; it is handled during network access
-  return theURI.uri( expandAuthConfig );
+  // NOTE: do not expand authcfg here; it is handled during network access
+  return theURI.uri( false );
 }
 
 
diff --git a/src/providers/wfs/qgswfsdatasourceuri.h b/src/providers/wfs/qgswfsdatasourceuri.h
@@ -85,7 +85,7 @@ class QgsWFSDataSourceURI
     explicit QgsWFSDataSourceURI( const QString &uri );
 
     //! Returns the URI, avoiding expansion of authentication configuration, which is handled during network access
-    const QString uri( bool expandAuthConfig = false ) const;
+    const QString uri() const;
 
     //! Returns base URL (with SERVICE=WFS parameter if bIncludeServiceWFS=true)
     QUrl baseURL( bool bIncludeServiceWFS = true ) const;
diff --git a/src/providers/wfs/qgswfssourceselect.cpp b/src/providers/wfs/qgswfssourceselect.cpp
@@ -404,7 +404,7 @@ void QgsWFSSourceSelect::addButtonClicked()
     }
     QgsDebugMsg( "Layer " + typeName + " SQL is " + sql );
 
-    mUri = QgsWFSDataSourceURI::build( connection.uri().uri(), typeName, pCrsString,
+    mUri = QgsWFSDataSourceURI::build( connection.uri().uri( false ), typeName, pCrsString,
                                        sql, cbxFeatureCurrentViewExtent->isChecked() );
 
     emit addVectorLayer( mUri, layerName );

Original file line number	Diff line number	Diff line change
`@@ -191,7 +191,7 @@ QVector<QgsDataItem *> QgsWfsRootItem::createChildren()`
`191`	`191`	`{`
`192`	`192`	`QgsWfsConnection connection( connName );`
`193`	`193`	`QString path = "wfs:/" + connName;`
`194`		`- QgsDataItem *conn = new QgsWfsConnectionItem( this, connName, path, connection.uri().uri() );`
	`194`	`+ QgsDataItem *conn = new QgsWfsConnectionItem( this, connName, path, connection.uri().uri( false ) );`
`195`	`195`	`connections.append( conn );`
`196`	`196`	`}`
`197`	`197`	`return connections;`
`@@ -260,7 +260,7 @@ QgsDataItem *QgsWfsDataItemProvider::createDataItem( const QString &path, QgsDat`
`260`	`260`
`261`	`261`	`QgsDebugMsgLevel( QStringLiteral( "WFS full uri: '%1'." ).arg( QString( sourceUri.uri() ) ), 4 );`
`262`	`262`
`263`		`- return new QgsWfsConnectionItem( parentItem, QStringLiteral( "WFS" ), path, sourceUri.uri( false ) );`
	`263`	`+ return new QgsWfsConnectionItem( parentItem, QStringLiteral( "WFS" ), path, sourceUri.uri() );`
`264`	`264`	`}`
`265`	`265`	`}`
`266`	`266`
`@@ -287,9 +287,9 @@ QVector<QgsDataItem *> QgsWfsDataItemProvider::createDataItems( const QString &p`
`287`	`287`	`for ( const QString &encodedUri : encodedUris )`
`288`	`288`	`{`
`289`	`289`	`QgsWFSDataSourceURI uri( encodedUri );`
`290`		`- QgsDebugMsgLevel( QStringLiteral( "WFS full uri: '%1'." ).arg( uri.uri( false ) ), 4 );`
	`290`	`+ QgsDebugMsgLevel( QStringLiteral( "WFS full uri: '%1'." ).arg( uri.uri() ), 4 );`
`291`	`291`
`292`		`- QgsDataItem *item = new QgsWfsConnectionItem( parentItem, QStringLiteral( "WFS" ), path, uri.uri( false ) );`
	`292`	`+ QgsDataItem *item = new QgsWfsConnectionItem( parentItem, QStringLiteral( "WFS" ), path, uri.uri() );`
`293`	`293`	`if ( item )`
`294`	`294`	`{`
`295`	`295`	`items.append( item );`
Original file line number	Diff line number	Diff line change
`@@ -144,7 +144,7 @@ QgsWFSDataSourceURI::QgsWFSDataSourceURI( const QString &uri )`
`144`	`144`	`}`
`145`	`145`	`}`
`146`	`146`
`147`		`-const QString QgsWFSDataSourceURI::uri( bool expandAuthConfig ) const`
	`147`	`+const QString QgsWFSDataSourceURI::uri() const`
`148`	`148`	`{`
`149`	`149`	`QgsDataSourceUri theURI( mURI );`
`150`	`150`	`// Add authcfg param back into the uri (must be non-empty value)`
`@@ -164,8 +164,8 @@ const QString QgsWFSDataSourceURI::uri( bool expandAuthConfig ) const`
`164`	`164`	`theURI.setPassword( mAuth.mPassword );`
`165`	`165`	`}`
`166`	`166`	`}`
`167`		`- // NOTE: avoid expanding authcfg here; it is handled during network access`
`168`		`- return theURI.uri( expandAuthConfig );`
	`167`	`+ // NOTE: do not expand authcfg here; it is handled during network access`
	`168`	`+ return theURI.uri( false );`
`169`	`169`	`}`
`170`	`170`
`171`	`171`
Original file line number	Diff line number	Diff line change
`@@ -404,7 +404,7 @@ void QgsWFSSourceSelect::addButtonClicked()`
`404`	`404`	`}`
`405`	`405`	`QgsDebugMsg( "Layer " + typeName + " SQL is " + sql );`
`406`	`406`
`407`		`- mUri = QgsWFSDataSourceURI::build( connection.uri().uri(), typeName, pCrsString,`
	`407`	`+ mUri = QgsWFSDataSourceURI::build( connection.uri().uri( false ), typeName, pCrsString,`
`408`	`408`	`sql, cbxFeatureCurrentViewExtent->isChecked() );`
`409`	`409`
`410`	`410`	`emit addVectorLayer( mUri, layerName );`