Merge pull request #5115 from opengisch/QF-3981-no-html

Strip HTML when receiving HTML server errors in cloud API
opengisch · Mar 22, 2024 · ca7efb0 · ca7efb0
2 parents ae37797 + 84a1691
commit ca7efb0
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/src/core/qfieldcloudconnection.cpp b/src/core/qfieldcloudconnection.cpp
@@ -25,7 +25,7 @@
 #include <QNetworkCookie>
 #include <QNetworkCookieJar>
 #include <QSettings>
-#include <QTextDocument>
+#include <QTextDocumentFragment>
 #include <QTimer>
 #include <QUrlQuery>
 #include <qgsapplication.h>
@@ -507,29 +507,31 @@ QFieldCloudConnection::CloudError::CloudError( QNetworkReply *reply )
       break;
   }
 
+  errorMessage = QTextDocumentFragment::fromHtml( errorMessage ).toPlainText().trimmed();
+
   QString httpErrorMessage = QStringLiteral( "[HTTP/%1] %2 " ).arg( mHttpCode ).arg( reply->url().toString() );
   httpErrorMessage += ( mHttpCode >= 400 )
                         ? tr( "Server Error." )
                         : tr( "Network Error." );
   httpErrorMessage += mPayload.left( 200 );
+  httpErrorMessage = QTextDocumentFragment::fromHtml( httpErrorMessage ).toPlainText().trimmed();
+  QString payloadPlainText = QTextDocumentFragment::fromHtml( mPayload ).toPlainText().trimmed();
 
   if ( mPayload.size() > 200 )
     errorMessage += QStringLiteral( "…" );
 
   if ( errorMessage.isEmpty() )
   {
     errorMessage = httpErrorMessage;
-    QgsMessageLog::logMessage( QStringLiteral( "%1\n%2\n%3" ).arg( errorMessage, mPayload ).arg( reply->errorString() ) );
+    QgsMessageLog::logMessage( QStringLiteral( "%1\n%2\n%3" ).arg( errorMessage, payloadPlainText ).arg( reply->errorString() ) );
   }
   else
   {
-    QgsMessageLog::logMessage( QStringLiteral( "%1\n%2\n%3\n%4" ).arg( errorMessage, httpErrorMessage, mPayload ).arg( reply->errorString() ) );
+    QgsMessageLog::logMessage( QStringLiteral( "%1\n%2\n%3\n%4" ).arg( errorMessage, httpErrorMessage, payloadPlainText ).arg( reply->errorString() ) );
   }
 
   // strip HTML tags
-  QTextDocument doc;
-  doc.setHtml( errorMessage );
-  errorMessage = doc.toPlainText();
+  errorMessage = QTextDocumentFragment::fromHtml( httpErrorMessage ).toPlainText();
 
   mMessage = errorMessage;
 }