kiwix/kiwix-desktop
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-desktop.git synced 2025-09-22 03:26:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1116 from kiwix/Issue#904-block-non-zim-external-requests

Browse Source 
Block External Content from Zim Web Pages
This commit is contained in:
Kelson 2024-06-01 14:52:39 +02:00 committed by GitHub
commit 79efd58e1b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/kprofile.cpp
View File

@ -11,6 +11,11 @@ KProfile::KProfile(QObject *parent) :
connect(this, &QWebEngineProfile::downloadRequested, this, &KProfile::startDownload); connect(this, &QWebEngineProfile::downloadRequested, this, &KProfile::startDownload);
installUrlSchemeHandler("zim", &m_schemeHandler); installUrlSchemeHandler("zim", &m_schemeHandler);
settings()->setAttribute(QWebEngineSettings::FullScreenSupportEnabled, true); settings()->setAttribute(QWebEngineSettings::FullScreenSupportEnabled, true);
#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0) // Earlier than Qt 5.13
setRequestInterceptor(new ExternalReqInterceptor(this));
#else // Qt 5.13 and later
setUrlRequestInterceptor(new ExternalReqInterceptor(this));
#endif
} }
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
@ -48,3 +53,13 @@ void KProfile::downloadFinished()
msgBox.setText(gt("download-finished-message")); msgBox.setText(gt("download-finished-message"));
msgBox.exec(); msgBox.exec();
} }
void ExternalReqInterceptor::interceptRequest(QWebEngineUrlRequestInfo &info)
{
const QString reqUrl = info.requestUrl().toString();
if (!reqUrl.startsWith("zim://"))
{
qDebug() << "Blocked external request to URL: " << reqUrl;
info.block(true);
}
}

18
src/kprofile.h
View File

@ -2,6 +2,7 @@
#define KPROFILE_H #define KPROFILE_H
#include <QWebEngineProfile> #include <QWebEngineProfile>
#include <QWebEngineUrlRequestInterceptor>
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
#include <QWebEngineDownloadItem> #include <QWebEngineDownloadItem>
#else #else
@ -30,4 +31,21 @@ public slots:
void downloadFinished(); void downloadFinished();
}; };
/**
* @brief Intercepts and blocks a request if it is not native to our zim file.
* https://stackoverflow.com/questions/70721311/qwebview-disable-external-resources
*/
class ExternalReqInterceptor : public QWebEngineUrlRequestInterceptor
{
Q_OBJECT
public:
explicit ExternalReqInterceptor(QObject *parent = nullptr)
: QWebEngineUrlRequestInterceptor(parent)
{
}
protected:
void interceptRequest(QWebEngineUrlRequestInfo &info) override;
};
#endif // KPROFILE_H #endif // KPROFILE_H